Vendor OpenClaw source as Adolf fork baseline
Some checks failed
ClawSweeper Dispatch / dispatch (push) Has been cancelled
CodeQL / Security High (actions) (push) Has been cancelled
CodeQL / Security High (channel-runtime-boundary) (push) Has been cancelled
CodeQL / Security High (core-auth-secrets) (push) Has been cancelled
CodeQL / Security High (mcp-process-tool-boundary) (push) Has been cancelled
CodeQL / Security High (network-ssrf-boundary) (push) Has been cancelled
CodeQL / Security High (plugin-trust-boundary) (push) Has been cancelled
CodeQL / Security High (process-exec-boundary) (push) Has been cancelled
Docs Sync Publish Repo / sync-publish-repo (push) Has been cancelled
Docs / docs (push) Has been cancelled
OpenClaw Stable Main Closeout / Resolve stable release closeout inputs (push) Has been cancelled
OpenClaw Stable Main Closeout / Verify stable main closeout (push) Has been cancelled
Workflow Sanity / no-tabs (push) Has been cancelled
Workflow Sanity / actionlint (push) Has been cancelled
Workflow Sanity / generated-doc-baselines (push) Has been cancelled
CI / runner-admission (push) Has been cancelled
CI / preflight (push) Has been cancelled
CI / security-fast (push) Has been cancelled
CI / pnpm-store-warmup (push) Has been cancelled
CI / build-artifacts (push) Has been cancelled
CI / native-i18n (push) Has been cancelled
CI / ${{ matrix.check_name }} (push) Has been cancelled
CI / ${{ matrix.checkName }} (push) Has been cancelled
CI / checks-node-compat-node22 (push) Has been cancelled
CI / check-bundled-channel-config-metadata (push) Has been cancelled
CI / check-dependencies (push) Has been cancelled
CI / check-guards (push) Has been cancelled
CI / check-lint (push) Has been cancelled
CI / check-prod-types (push) Has been cancelled
CI / check-shrinkwrap (push) Has been cancelled
CI / check-test-types (push) Has been cancelled
CI / check-additional-boundaries-a (push) Has been cancelled
CI / check-additional-boundaries-bcd (push) Has been cancelled
CI / check-additional-extension-bundled (push) Has been cancelled
CI / check-additional-extension-channels (push) Has been cancelled
CI / check-additional-extension-package-boundary (push) Has been cancelled
CI / check-additional-runtime-topology-architecture (push) Has been cancelled
CI / check-session-accessor-boundary (push) Has been cancelled
CI / check-session-transcript-reader-boundary (push) Has been cancelled
CI / check-docs (push) Has been cancelled
CI / skills-python (push) Has been cancelled
CI / macos-swift (push) Has been cancelled
CI / ios-build (push) Has been cancelled
CI / ci-timings-summary (push) Has been cancelled
Native App Locale Refresh / Refresh native fa (push) Has been cancelled
Native App Locale Refresh / Refresh native fr (push) Has been cancelled
Native App Locale Refresh / Refresh native hi (push) Has been cancelled
Native App Locale Refresh / Refresh native id (push) Has been cancelled
Native App Locale Refresh / Refresh native it (push) Has been cancelled
Native App Locale Refresh / Refresh native ja-JP (push) Has been cancelled
Control UI Locale Refresh / plan (push) Has been cancelled
Control UI Locale Refresh / Refresh ${{ matrix.locale }} (push) Has been cancelled
Control UI Locale Refresh / Commit control UI locale refresh (push) Has been cancelled
Live Media Runner Image / Build live media runner image (push) Has been cancelled
Native App Locale Refresh / Refresh native ar (push) Has been cancelled
Native App Locale Refresh / Refresh native de (push) Has been cancelled
Native App Locale Refresh / Refresh native es (push) Has been cancelled
Native App Locale Refresh / Refresh native ko (push) Has been cancelled
Native App Locale Refresh / Refresh native nl (push) Has been cancelled
Native App Locale Refresh / Refresh native pl (push) Has been cancelled
Native App Locale Refresh / Refresh native pt-BR (push) Has been cancelled
Native App Locale Refresh / Refresh native ru (push) Has been cancelled
Native App Locale Refresh / Refresh native sv (push) Has been cancelled
Native App Locale Refresh / Refresh native th (push) Has been cancelled
Native App Locale Refresh / Refresh native tr (push) Has been cancelled
Native App Locale Refresh / Refresh native uk (push) Has been cancelled
Native App Locale Refresh / Refresh native vi (push) Has been cancelled
Native App Locale Refresh / Refresh native zh-CN (push) Has been cancelled
Native App Locale Refresh / Refresh native zh-TW (push) Has been cancelled
Native App Locale Refresh / Commit native locale refresh (push) Has been cancelled
Plugin Init Scaffold Validation / Validate provider scaffold (push) Has been cancelled
Plugin NPM Release / preview_plugins_npm (push) Has been cancelled
Plugin NPM Release / Validate release publish approval (push) Has been cancelled
Plugin NPM Release / preview_plugin_pack (push) Has been cancelled
Plugin NPM Release / publish_plugins_npm (push) Has been cancelled
Sandbox Common Smoke / sandbox-common-smoke (push) Has been cancelled
Website Installer Sync / static (push) Has been cancelled
Website Installer Sync / linux-docker (push) Has been cancelled
Website Installer Sync / macos-installer (push) Has been cancelled
Website Installer Sync / windows-installer (push) Has been cancelled
Website Installer Sync / sync-website (push) Has been cancelled
Some checks failed
ClawSweeper Dispatch / dispatch (push) Has been cancelled
CodeQL / Security High (actions) (push) Has been cancelled
CodeQL / Security High (channel-runtime-boundary) (push) Has been cancelled
CodeQL / Security High (core-auth-secrets) (push) Has been cancelled
CodeQL / Security High (mcp-process-tool-boundary) (push) Has been cancelled
CodeQL / Security High (network-ssrf-boundary) (push) Has been cancelled
CodeQL / Security High (plugin-trust-boundary) (push) Has been cancelled
CodeQL / Security High (process-exec-boundary) (push) Has been cancelled
Docs Sync Publish Repo / sync-publish-repo (push) Has been cancelled
Docs / docs (push) Has been cancelled
OpenClaw Stable Main Closeout / Resolve stable release closeout inputs (push) Has been cancelled
OpenClaw Stable Main Closeout / Verify stable main closeout (push) Has been cancelled
Workflow Sanity / no-tabs (push) Has been cancelled
Workflow Sanity / actionlint (push) Has been cancelled
Workflow Sanity / generated-doc-baselines (push) Has been cancelled
CI / runner-admission (push) Has been cancelled
CI / preflight (push) Has been cancelled
CI / security-fast (push) Has been cancelled
CI / pnpm-store-warmup (push) Has been cancelled
CI / build-artifacts (push) Has been cancelled
CI / native-i18n (push) Has been cancelled
CI / ${{ matrix.check_name }} (push) Has been cancelled
CI / ${{ matrix.checkName }} (push) Has been cancelled
CI / checks-node-compat-node22 (push) Has been cancelled
CI / check-bundled-channel-config-metadata (push) Has been cancelled
CI / check-dependencies (push) Has been cancelled
CI / check-guards (push) Has been cancelled
CI / check-lint (push) Has been cancelled
CI / check-prod-types (push) Has been cancelled
CI / check-shrinkwrap (push) Has been cancelled
CI / check-test-types (push) Has been cancelled
CI / check-additional-boundaries-a (push) Has been cancelled
CI / check-additional-boundaries-bcd (push) Has been cancelled
CI / check-additional-extension-bundled (push) Has been cancelled
CI / check-additional-extension-channels (push) Has been cancelled
CI / check-additional-extension-package-boundary (push) Has been cancelled
CI / check-additional-runtime-topology-architecture (push) Has been cancelled
CI / check-session-accessor-boundary (push) Has been cancelled
CI / check-session-transcript-reader-boundary (push) Has been cancelled
CI / check-docs (push) Has been cancelled
CI / skills-python (push) Has been cancelled
CI / macos-swift (push) Has been cancelled
CI / ios-build (push) Has been cancelled
CI / ci-timings-summary (push) Has been cancelled
Native App Locale Refresh / Refresh native fa (push) Has been cancelled
Native App Locale Refresh / Refresh native fr (push) Has been cancelled
Native App Locale Refresh / Refresh native hi (push) Has been cancelled
Native App Locale Refresh / Refresh native id (push) Has been cancelled
Native App Locale Refresh / Refresh native it (push) Has been cancelled
Native App Locale Refresh / Refresh native ja-JP (push) Has been cancelled
Control UI Locale Refresh / plan (push) Has been cancelled
Control UI Locale Refresh / Refresh ${{ matrix.locale }} (push) Has been cancelled
Control UI Locale Refresh / Commit control UI locale refresh (push) Has been cancelled
Live Media Runner Image / Build live media runner image (push) Has been cancelled
Native App Locale Refresh / Refresh native ar (push) Has been cancelled
Native App Locale Refresh / Refresh native de (push) Has been cancelled
Native App Locale Refresh / Refresh native es (push) Has been cancelled
Native App Locale Refresh / Refresh native ko (push) Has been cancelled
Native App Locale Refresh / Refresh native nl (push) Has been cancelled
Native App Locale Refresh / Refresh native pl (push) Has been cancelled
Native App Locale Refresh / Refresh native pt-BR (push) Has been cancelled
Native App Locale Refresh / Refresh native ru (push) Has been cancelled
Native App Locale Refresh / Refresh native sv (push) Has been cancelled
Native App Locale Refresh / Refresh native th (push) Has been cancelled
Native App Locale Refresh / Refresh native tr (push) Has been cancelled
Native App Locale Refresh / Refresh native uk (push) Has been cancelled
Native App Locale Refresh / Refresh native vi (push) Has been cancelled
Native App Locale Refresh / Refresh native zh-CN (push) Has been cancelled
Native App Locale Refresh / Refresh native zh-TW (push) Has been cancelled
Native App Locale Refresh / Commit native locale refresh (push) Has been cancelled
Plugin Init Scaffold Validation / Validate provider scaffold (push) Has been cancelled
Plugin NPM Release / preview_plugins_npm (push) Has been cancelled
Plugin NPM Release / Validate release publish approval (push) Has been cancelled
Plugin NPM Release / preview_plugin_pack (push) Has been cancelled
Plugin NPM Release / publish_plugins_npm (push) Has been cancelled
Sandbox Common Smoke / sandbox-common-smoke (push) Has been cancelled
Website Installer Sync / static (push) Has been cancelled
Website Installer Sync / linux-docker (push) Has been cancelled
Website Installer Sync / macos-installer (push) Has been cancelled
Website Installer Sync / windows-installer (push) Has been cancelled
Website Installer Sync / sync-website (push) Has been cancelled
Adolf is a fork/vendored clone of github.com/openclaw/openclaw (v2026.6.11), free to diverge. Tree copied sans upstream .git; upstream remote added for future syncs. Node pinned to 24 (.nvmrc); engines already require >=22.19. Preserves docs/ARCHITECTURE.md. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LeqyaxJF2nbRXJtae2kNB2
This commit is contained in:
204
extensions/qqbot/src/bridge/approval/handler-runtime.ts
Normal file
204
extensions/qqbot/src/bridge/approval/handler-runtime.ts
Normal file
@@ -0,0 +1,204 @@
|
||||
/**
|
||||
* QQ Bot Native Approval Runtime Adapter.
|
||||
*
|
||||
* Implements the framework's ChannelApprovalNativeRuntimeSpec to deliver
|
||||
* approval requests as QQ messages with inline keyboard buttons and handle
|
||||
* resolved/expired lifecycle events.
|
||||
*
|
||||
* This file is lazily imported by capability.ts to avoid loading
|
||||
* heavy dependencies on the critical startup path.
|
||||
*/
|
||||
|
||||
import type { ChannelApprovalNativeRuntimeSpec } from "openclaw/plugin-sdk/approval-handler-runtime";
|
||||
import { createChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-runtime";
|
||||
import type { ChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-runtime";
|
||||
import { resolveApprovalRequestSessionConversation } from "openclaw/plugin-sdk/approval-native-runtime";
|
||||
import {
|
||||
buildExecApprovalText,
|
||||
buildPluginApprovalText,
|
||||
buildApprovalKeyboard,
|
||||
resolveApprovalTarget,
|
||||
type ExecApprovalRequest,
|
||||
type PluginApprovalRequest,
|
||||
} from "../../engine/approval/index.js";
|
||||
import { getMessageApi, accountToCreds } from "../../engine/messaging/sender.js";
|
||||
import type { ChatScope, InlineKeyboard, MessageResponse } from "../../engine/types.js";
|
||||
import {
|
||||
matchesQQBotApprovalAccount,
|
||||
resolveQQBotExecApprovalConfig,
|
||||
isQQBotExecApprovalClientEnabled,
|
||||
shouldHandleQQBotExecApprovalRequest,
|
||||
} from "../../exec-approvals.js";
|
||||
import { ensurePlatformAdapter } from "../bootstrap.js";
|
||||
import { resolveQQBotAccount } from "../config.js";
|
||||
import { getBridgeLogger } from "../logger.js";
|
||||
|
||||
type ApprovalRequest = ExecApprovalRequest | PluginApprovalRequest;
|
||||
|
||||
type QQBotPendingEntry = {
|
||||
messageId?: string;
|
||||
targetType: ChatScope;
|
||||
targetId: string;
|
||||
};
|
||||
|
||||
type QQBotPendingPayload = {
|
||||
text: string;
|
||||
keyboard: InlineKeyboard;
|
||||
};
|
||||
|
||||
function isExecRequest(request: ApprovalRequest): request is ExecApprovalRequest {
|
||||
return "expiresAtMs" in request;
|
||||
}
|
||||
|
||||
function resolveQQTarget(request: ApprovalRequest): { type: ChatScope; id: string } | null {
|
||||
const sessionConversation = resolveApprovalRequestSessionConversation({
|
||||
request: request as never,
|
||||
channel: "qqbot",
|
||||
bundledFallback: true,
|
||||
});
|
||||
|
||||
const sessionKey = request.request.sessionKey ?? null;
|
||||
const turnSourceTo = request.request.turnSourceTo ?? null;
|
||||
|
||||
const target = resolveApprovalTarget(sessionKey, turnSourceTo);
|
||||
if (target) {
|
||||
return target;
|
||||
}
|
||||
|
||||
if (sessionConversation?.id) {
|
||||
const kind = sessionConversation.kind;
|
||||
const chatScope: ChatScope = kind === "group" ? "group" : "c2c";
|
||||
return { type: chatScope, id: sessionConversation.id };
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
type QQBotPreparedTarget = { type: ChatScope; id: string };
|
||||
|
||||
const qqbotApprovalRuntimeSpec: ChannelApprovalNativeRuntimeSpec<
|
||||
QQBotPendingPayload,
|
||||
QQBotPreparedTarget,
|
||||
QQBotPendingEntry
|
||||
> = {
|
||||
eventKinds: ["exec", "plugin"],
|
||||
|
||||
availability: {
|
||||
isConfigured: ({ cfg, accountId }) => {
|
||||
if (resolveQQBotExecApprovalConfig({ cfg, accountId }) !== undefined) {
|
||||
const result = isQQBotExecApprovalClientEnabled({ cfg, accountId });
|
||||
getBridgeLogger().debug?.(
|
||||
`[qqbot:approval-runtime] isConfigured(profile) accountId=${accountId} → ${result}`,
|
||||
);
|
||||
return result;
|
||||
}
|
||||
const account = resolveQQBotAccount(cfg, accountId ?? undefined);
|
||||
const result = account.enabled && account.secretSource !== "none";
|
||||
getBridgeLogger().debug?.(
|
||||
`[qqbot:approval-runtime] isConfigured(fallback) accountId=${accountId} enabled=${account.enabled} secretSource=${account.secretSource} → ${result}`,
|
||||
);
|
||||
return result;
|
||||
},
|
||||
shouldHandle: ({ cfg, accountId, request }) => {
|
||||
if (resolveQQBotExecApprovalConfig({ cfg, accountId }) !== undefined) {
|
||||
const result = shouldHandleQQBotExecApprovalRequest({ cfg, accountId, request });
|
||||
getBridgeLogger().debug?.(
|
||||
`[qqbot:approval-runtime] shouldHandle(profile) accountId=${accountId} → ${result}`,
|
||||
);
|
||||
return result;
|
||||
}
|
||||
const target = resolveQQTarget(request as ApprovalRequest);
|
||||
if (target === null) {
|
||||
getBridgeLogger().debug?.(
|
||||
`[qqbot:approval-runtime] shouldHandle(fallback) accountId=${accountId} target=null → false`,
|
||||
);
|
||||
return false;
|
||||
}
|
||||
const accountMatches = matchesQQBotApprovalAccount({
|
||||
cfg,
|
||||
accountId,
|
||||
request: request as ApprovalRequest,
|
||||
});
|
||||
getBridgeLogger().debug?.(
|
||||
`[qqbot:approval-runtime] shouldHandle(fallback) accountId=${accountId} target=${JSON.stringify(
|
||||
target,
|
||||
)} accountMatches=${accountMatches} → ${accountMatches}`,
|
||||
);
|
||||
return accountMatches;
|
||||
},
|
||||
},
|
||||
|
||||
presentation: {
|
||||
buildPendingPayload: ({ request, view }) => {
|
||||
const req = request as ApprovalRequest;
|
||||
const text = isExecRequest(req) ? buildExecApprovalText(req) : buildPluginApprovalText(req);
|
||||
const keyboard = buildApprovalKeyboard(
|
||||
req.id,
|
||||
view.actions.map((action) => action.decision),
|
||||
);
|
||||
getBridgeLogger().debug?.(
|
||||
`[qqbot:approval-runtime] buildPendingPayload requestId=${req.id} kind=${
|
||||
isExecRequest(req) ? "exec" : "plugin"
|
||||
}`,
|
||||
);
|
||||
return { text, keyboard };
|
||||
},
|
||||
buildResolvedResult: () => ({ kind: "leave" }),
|
||||
buildExpiredResult: () => ({ kind: "leave" }),
|
||||
},
|
||||
|
||||
transport: {
|
||||
prepareTarget: ({ request }) => {
|
||||
const target = resolveQQTarget(request as ApprovalRequest);
|
||||
getBridgeLogger().debug?.(
|
||||
`[qqbot:approval-runtime] prepareTarget requestId=${request.id} target=${JSON.stringify(target)}`,
|
||||
);
|
||||
if (!target) {
|
||||
return null;
|
||||
}
|
||||
return { target, dedupeKey: `${target.type}:${target.id}` };
|
||||
},
|
||||
|
||||
deliverPending: async ({ cfg, accountId, preparedTarget, pendingPayload }) => {
|
||||
// Ensure the PlatformAdapter is registered — resolveQQBotAccount below
|
||||
// calls getPlatformAdapter() to resolve secret inputs.
|
||||
ensurePlatformAdapter();
|
||||
const account = resolveQQBotAccount(cfg, accountId ?? undefined);
|
||||
const creds = accountToCreds(account);
|
||||
const messageApi = getMessageApi(account.appId);
|
||||
|
||||
let result: MessageResponse;
|
||||
try {
|
||||
getBridgeLogger().debug?.(
|
||||
`[qqbot:approval-runtime] deliverPending accountId=${accountId} target=${preparedTarget.type}:${preparedTarget.id}`,
|
||||
);
|
||||
result = await messageApi.sendMessage(
|
||||
preparedTarget.type,
|
||||
preparedTarget.id,
|
||||
pendingPayload.text,
|
||||
creds,
|
||||
{ inlineKeyboard: pendingPayload.keyboard },
|
||||
);
|
||||
} catch (err) {
|
||||
const msg = err instanceof Error ? err.message : String(err);
|
||||
throw new Error(
|
||||
`Failed to send approval message to ${preparedTarget.type}:${preparedTarget.id}: ${msg}`,
|
||||
{ cause: err },
|
||||
);
|
||||
}
|
||||
|
||||
getBridgeLogger().debug?.(
|
||||
`[qqbot:approval-runtime] deliverPending success accountId=${accountId} messageId=${result.id ?? ""}`,
|
||||
);
|
||||
return {
|
||||
messageId: result.id,
|
||||
targetType: preparedTarget.type,
|
||||
targetId: preparedTarget.id,
|
||||
};
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
export const qqbotApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter(
|
||||
qqbotApprovalRuntimeSpec,
|
||||
) as unknown as ChannelApprovalNativeRuntimeAdapter;
|
||||
Reference in New Issue
Block a user