refactor: share approval resolve param parsing · 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
`@@ -1,4 +1,9 @@`
`1`		`-import { ErrorCodes, errorShape } from "../../../packages/gateway-protocol/src/index.js";`
	`1`	`+import {`
	`2`	`+ErrorCodes,`
	`3`	`+errorShape,`
	`4`	`+formatValidationErrors,`
	`5`	`+} from "../../../packages/gateway-protocol/src/index.js";`
	`6`	`+import type { ValidationError } from "../../../packages/gateway-protocol/src/index.js";`
`2`	`7`	`import { hasApprovalTurnSourceRoute } from "../../infra/approval-turn-source.js";`
`3`	`8`	`import type { ExecApprovalDecision } from "../../infra/exec-approvals.js";`
`4`	`9`	`import { normalizeOptionalString } from "../../shared/string-coerce.js";`
`@@ -51,6 +56,17 @@ type PendingApprovalListEntry<TPayload> = {`
`51`	`56`	`expiresAtMs: number;`
`52`	`57`	`};`
`53`	`58`
	`59`	`+type ApprovalResolveParams = {`
	`60`	`+id: string;`
	`61`	`+decision: string;`
	`62`	`+};`
	`63`	`+`
	`64`	`+type ApprovalResolveParamsValidator<TParams extends ApprovalResolveParams> = ((`
	`65`	`+params: unknown,`
	`66`	`+) => params is TParams) & {`
	`67`	`+errors?: ValidationError[] \| null;`
	`68`	`+};`
	`69`	`+`
`54`	`70`	`function isPromiseLike<T>(value: T \| Promise<T>): value is Promise<T> {`
`55`	`71`	`return typeof value === "object" && value !== null && "then" in value;`
`56`	`72`	`}`
`@@ -180,6 +196,34 @@ export function buildRequestedApprovalEvent<TPayload extends ApprovalTurnSourceF`
`180`	`196`	`};`
`181`	`197`	`}`
`182`	`198`
	`199`	`+export function resolveApprovalDecisionParams<TParams extends ApprovalResolveParams>(params: {`
	`200`	`+rawParams: unknown;`
	`201`	`+validate: ApprovalResolveParamsValidator<TParams>;`
	`202`	`+methodName: string;`
	`203`	`+respond: RespondFn;`
	`204`	`+}): { inputId: string; decision: ExecApprovalDecision } \| null {`
	`205`	`+const rawParams = params.rawParams;`
	`206`	`+if (!params.validate(rawParams)) {`
	`207`	`+params.respond(`
	`208`	`+false,`
	`209`	`+undefined,`
	`210`	`+errorShape(`
	`211`	`+ErrorCodes.INVALID_REQUEST,`
	`212`	+`invalid ${params.methodName} params: ${formatValidationErrors(params.validate.errors)}`,
	`213`	`+),`
	`214`	`+);`
	`215`	`+return null;`
	`216`	`+}`
	`217`	`+if (!isApprovalDecision(rawParams.decision)) {`
	`218`	`+params.respond(false, undefined, errorShape(ErrorCodes.INVALID_REQUEST, "invalid decision"));`
	`219`	`+return null;`
	`220`	`+}`
	`221`	`+return {`
	`222`	`+inputId: rawParams.id,`
	`223`	`+decision: rawParams.decision,`
	`224`	`+};`
	`225`	`+}`
	`226`	`+`
`183`	`227`	`export function resolveApprovalRequestRecipientConnIds<TPayload>(params: {`
`184`	`228`	`context: GatewayRequestContext;`
`185`	`229`	`record: ExecApprovalRecord<TPayload>;`

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ import {`
`20`	`20`	`DEFAULT_EXEC_APPROVAL_TIMEOUT_MS,`
`21`	`21`	`resolveExecApprovalAllowedDecisions,`
`22`	`22`	`resolveExecApprovalRequestAllowedDecisions,`
`23`		`-type ExecApprovalDecision,`
`24`	`23`	`type ExecApprovalRequest,`
`25`	`24`	`type ExecApprovalResolved,`
`26`	`25`	`} from "../../infra/exec-approvals.js";`
`@@ -37,10 +36,10 @@ import {`
`37`	`36`	`bindApprovalRequesterMetadata,`
`38`	`37`	`buildRequestedApprovalEvent,`
`39`	`38`	`handleApprovalResolve,`
`40`		`-isApprovalDecision,`
`41`	`39`	`isApprovalRecordVisibleToClient,`
`42`	`40`	`listVisiblePendingApprovalRequests,`
`43`	`41`	`registerPendingApprovalRecord,`
	`42`	`+resolveApprovalDecisionParams,`
`44`	`43`	`respondPendingApprovalLookupError,`
`45`	`44`	`resolvePendingApprovalRecord,`
`46`	`45`	`} from "./approval-shared.js";`
`@@ -416,28 +415,19 @@ export function createExecApprovalHandlers(`
`416`	`415`	`});`
`417`	`416`	`},`
`418`	`417`	`"exec.approval.resolve": async ({ params, respond, client, context }) => {`
`419`		`-if (!validateExecApprovalResolveParams(params)) {`
`420`		`-respond(`
`421`		`-false,`
`422`		`-undefined,`
`423`		`-errorShape(`
`424`		`-ErrorCodes.INVALID_REQUEST,`
`425`		-`invalid exec.approval.resolve params: ${formatValidationErrors(
`426`		`- validateExecApprovalResolveParams.errors,`
`427`		- )}`,
`428`		`-),`
`429`		`-);`
`430`		`-return;`
`431`		`-}`
`432`		`-const p = params as { id: string; decision: string };`
`433`		`-if (!isApprovalDecision(p.decision)) {`
`434`		`-respond(false, undefined, errorShape(ErrorCodes.INVALID_REQUEST, "invalid decision"));`
	`418`	`+const resolveParams = resolveApprovalDecisionParams({`
	`419`	`+rawParams: params,`
	`420`	`+validate: validateExecApprovalResolveParams,`
	`421`	`+methodName: "exec.approval.resolve",`
	`422`	`+ respond,`
	`423`	`+});`
	`424`	`+if (!resolveParams) {`
`435`	`425`	`return;`
`436`	`426`	`}`
`437`		`-const decision: ExecApprovalDecision = p.decision;`
	`427`	`+const { inputId, decision } = resolveParams;`
`438`	`428`	`await handleApprovalResolve({`
`439`	`429`	`manager,`
`440`		`-inputId: p.id,`
	`430`	`+ inputId,`
`441`	`431`	`decision,`
`442`	`432`	`respond,`
`443`	`433`	`context,`

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ import {`
`21`	`21`	`handleApprovalResolve,`
`22`	`22`	`handleApprovalWaitDecision,`
`23`	`23`	`handlePendingApprovalRequest,`
`24`		`-isApprovalDecision,`
`25`	`24`	`listVisiblePendingApprovalRequests,`
`26`	`25`	`registerPendingApprovalRecord,`
	`26`	`+resolveApprovalDecisionParams,`
`27`	`27`	`} from "./approval-shared.js";`
`28`	`28`	`import type { GatewayRequestHandlers } from "./types.js";`
`29`	`29`
`@@ -147,28 +147,19 @@ export function createPluginApprovalHandlers(`
`147`	`147`	`},`
`148`	`148`
`149`	`149`	`"plugin.approval.resolve": async ({ params, respond, client, context }) => {`
`150`		`-if (!validatePluginApprovalResolveParams(params)) {`
`151`		`-respond(`
`152`		`-false,`
`153`		`-undefined,`
`154`		`-errorShape(`
`155`		`-ErrorCodes.INVALID_REQUEST,`
`156`		-`invalid plugin.approval.resolve params: ${formatValidationErrors(
`157`		`- validatePluginApprovalResolveParams.errors,`
`158`		- )}`,
`159`		`-),`
`160`		`-);`
`161`		`-return;`
`162`		`-}`
`163`		`-const p = params as { id: string; decision: string };`
`164`		`-if (!isApprovalDecision(p.decision)) {`
`165`		`-respond(false, undefined, errorShape(ErrorCodes.INVALID_REQUEST, "invalid decision"));`
	`150`	`+const resolveParams = resolveApprovalDecisionParams({`
	`151`	`+rawParams: params,`
	`152`	`+validate: validatePluginApprovalResolveParams,`
	`153`	`+methodName: "plugin.approval.resolve",`
	`154`	`+ respond,`
	`155`	`+});`
	`156`	`+if (!resolveParams) {`
`166`	`157`	`return;`
`167`	`158`	`}`
`168`		`-const decision = p.decision;`
	`159`	`+const { inputId, decision } = resolveParams;`
`169`	`160`	`await handleApprovalResolve({`
`170`	`161`	`manager,`
`171`		`-inputId: p.id,`
	`162`	`+ inputId,`
`172`	`163`	`decision,`
`173`	`164`	`respond,`
`174`	`165`	`context,`

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

推荐订阅源

Recent Commits to openclaw:main