refactor: share approval request registration · openclaw/...

Recent Commits to openclaw:main

vincentkoc · 2026-05-30 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,45 @@ export function listVisiblePendingApprovalRequests<TPayload>(params: {`
`141`	`141`	`}));`
`142`	`142`	`}`
`143`	`143`
	`144`	`+export function bindApprovalRequesterMetadata<TPayload>(params: {`
	`145`	`+record: ExecApprovalRecord<TPayload>;`
	`146`	`+client?: GatewayClient \| null;`
	`147`	`+}): void {`
	`148`	`+params.record.requestedByConnId = params.client?.connId ?? null;`
	`149`	`+params.record.requestedByDeviceId = params.client?.connect?.device?.id ?? null;`
	`150`	`+params.record.requestedByClientId = params.client?.connect?.client?.id ?? null;`
	`151`	`+params.record.requestedByDeviceTokenAuth = params.client?.isDeviceTokenAuth === true;`
	`152`	`+}`
	`153`	`+`
	`154`	`+export function registerPendingApprovalRecord<TPayload>(params: {`
	`155`	`+manager: ExecApprovalManager<TPayload>;`
	`156`	`+record: ExecApprovalRecord<TPayload>;`
	`157`	`+timeoutMs: number;`
	`158`	`+respond: RespondFn;`
	`159`	`+}): Promise<ExecApprovalDecision \| null> \| undefined {`
	`160`	`+try {`
	`161`	`+return params.manager.register(params.record, params.timeoutMs);`
	`162`	`+} catch (err) {`
	`163`	`+params.respond(`
	`164`	`+false,`
	`165`	`+undefined,`
	`166`	+errorShape(ErrorCodes.INVALID_REQUEST, `registration failed: ${String(err)}`),
	`167`	`+);`
	`168`	`+return undefined;`
	`169`	`+}`
	`170`	`+}`
	`171`	`+`
	`172`	`+export function buildRequestedApprovalEvent<TPayload extends ApprovalTurnSourceFields>(`
	`173`	`+record: ExecApprovalRecord<TPayload>,`
	`174`	`+): RequestedApprovalEvent<TPayload> {`
	`175`	`+return {`
	`176`	`+id: record.id,`
	`177`	`+request: record.request,`
	`178`	`+createdAtMs: record.createdAtMs,`
	`179`	`+expiresAtMs: record.expiresAtMs,`
	`180`	`+};`
	`181`	`+}`
	`182`	`+`
`144`	`183`	`export function resolveApprovalRequestRecipientConnIds<TPayload>(params: {`
`145`	`184`	`context: GatewayRequestContext;`
`146`	`185`	`record: ExecApprovalRecord<TPayload>;`

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,13 @@ import type { ExecApprovalManager } from "../exec-approval-manager.js";`
`34`	`34`	`import {`
`35`	`35`	`handleApprovalWaitDecision,`
`36`	`36`	`handlePendingApprovalRequest,`
	`37`	`+bindApprovalRequesterMetadata,`
	`38`	`+buildRequestedApprovalEvent,`
`37`	`39`	`handleApprovalResolve,`
`38`	`40`	`isApprovalDecision,`
`39`	`41`	`isApprovalRecordVisibleToClient,`
`40`	`42`	`listVisiblePendingApprovalRequests,`
	`43`	`+registerPendingApprovalRecord,`
`41`	`44`	`respondPendingApprovalLookupError,`
`42`	`45`	`resolvePendingApprovalRecord,`
`43`	`46`	`} from "./approval-shared.js";`
`@@ -323,31 +326,19 @@ export function createExecApprovalHandlers(`
`323`	`326`	`turnSourceThreadId: p.turnSourceThreadId ?? null,`
`324`	`327`	`};`
`325`	`328`	`const record = manager.create(request, timeoutMs, explicitId);`
`326`		`-record.requestedByConnId = client?.connId ?? null;`
`327`		`-record.requestedByDeviceId = client?.connect?.device?.id ?? null;`
`328`		`-record.requestedByClientId = client?.connect?.client?.id ?? null;`
`329`		`-record.requestedByDeviceTokenAuth = client?.isDeviceTokenAuth === true;`
	`329`	`+bindApprovalRequesterMetadata({ record, client });`
`330`	`330`	`// Use register() to synchronously add to pending map before sending any response.`
`331`	`331`	`// This ensures the approval ID is valid immediately after the "accepted" response.`
`332`		`-let decisionPromise: Promise<`
`333`		`-import("../../infra/exec-approvals.js").ExecApprovalDecision \| null`
`334`		`->;`
`335`		`-try {`
`336`		`-decisionPromise = manager.register(record, timeoutMs);`
`337`		`-} catch (err) {`
`338`		`-respond(`
`339`		`-false,`
`340`		`-undefined,`
`341`		-errorShape(ErrorCodes.INVALID_REQUEST, `registration failed: ${String(err)}`),
`342`		`-);`
	`332`	`+const decisionPromise = registerPendingApprovalRecord({`
	`333`	`+ manager,`
	`334`	`+ record,`
	`335`	`+ timeoutMs,`
	`336`	`+ respond,`
	`337`	`+});`
	`338`	`+if (!decisionPromise) {`
`343`	`339`	`return;`
`344`	`340`	`}`
`345`		`-const requestEvent: ExecApprovalRequest = {`
`346`		`-id: record.id,`
`347`		`-request: record.request,`
`348`		`-createdAtMs: record.createdAtMs,`
`349`		`-expiresAtMs: record.expiresAtMs,`
`350`		`-};`
	`341`	`+const requestEvent: ExecApprovalRequest = buildRequestedApprovalEvent(record);`
`351`	`342`	`await handlePendingApprovalRequest({`
`352`	`343`	`manager,`
`353`	`344`	`record,`

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ import {`
`7`	`7`	`validatePluginApprovalResolveParams,`
`8`	`8`	`} from "../../../packages/gateway-protocol/src/index.js";`
`9`	`9`	`import type { ExecApprovalForwarder } from "../../infra/exec-approval-forwarder.js";`
`10`		`-import type { ExecApprovalDecision } from "../../infra/exec-approvals.js";`
`11`	`10`	`import type { PluginApprovalRequestPayload } from "../../infra/plugin-approvals.js";`
`12`	`11`	`import {`
`13`	`12`	`DEFAULT_PLUGIN_APPROVAL_TIMEOUT_MS,`
`@@ -17,11 +16,14 @@ import {`
`17`	`16`	`import { normalizeOptionalString } from "../../shared/string-coerce.js";`
`18`	`17`	`import type { ExecApprovalManager } from "../exec-approval-manager.js";`
`19`	`18`	`import {`
	`19`	`+bindApprovalRequesterMetadata,`
	`20`	`+buildRequestedApprovalEvent,`
`20`	`21`	`handleApprovalResolve,`
`21`	`22`	`handleApprovalWaitDecision,`
`22`	`23`	`handlePendingApprovalRequest,`
`23`	`24`	`isApprovalDecision,`
`24`	`25`	`listVisiblePendingApprovalRequests,`
	`26`	`+registerPendingApprovalRecord,`
`25`	`27`	`} from "./approval-shared.js";`
`26`	`28`	`import type { GatewayRequestHandlers } from "./types.js";`
`27`	`29`
`@@ -98,29 +100,19 @@ export function createPluginApprovalHandlers(`
`98`	`100`	`// Always server-generate the ID — never accept plugin-provided IDs.`
`99`	`101`	`// Kind-prefix so /approve routing can distinguish plugin vs exec IDs deterministically.`
`100`	`102`	const record = manager.create(request, timeoutMs, `plugin:${randomUUID()}`);
`101`		`-record.requestedByConnId = client?.connId ?? null;`
`102`		`-record.requestedByDeviceId = client?.connect?.device?.id ?? null;`
`103`		`-record.requestedByClientId = client?.connect?.client?.id ?? null;`
`104`		`-record.requestedByDeviceTokenAuth = client?.isDeviceTokenAuth === true;`
	`103`	`+bindApprovalRequesterMetadata({ record, client });`
`105`	`104`
`106`		`-let decisionPromise: Promise<ExecApprovalDecision \| null>;`
`107`		`-try {`
`108`		`-decisionPromise = manager.register(record, timeoutMs);`
`109`		`-} catch (err) {`
`110`		`-respond(`
`111`		`-false,`
`112`		`-undefined,`
`113`		-errorShape(ErrorCodes.INVALID_REQUEST, `registration failed: ${String(err)}`),
`114`		`-);`
	`105`	`+const decisionPromise = registerPendingApprovalRecord({`
	`106`	`+ manager,`
	`107`	`+ record,`
	`108`	`+ timeoutMs,`
	`109`	`+ respond,`
	`110`	`+});`
	`111`	`+if (!decisionPromise) {`
`115`	`112`	`return;`
`116`	`113`	`}`
`117`	`114`
`118`		`-const requestEvent = {`
`119`		`-id: record.id,`
`120`		`-request: record.request,`
`121`		`-createdAtMs: record.createdAtMs,`
`122`		`-expiresAtMs: record.expiresAtMs,`
`123`		`-};`
	`115`	`+const requestEvent = buildRequestedApprovalEvent(record);`
`124`	`116`
`125`	`117`	`await handlePendingApprovalRequest({`
`126`	`118`	`manager,`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main