mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-01 14:37:07 +00:00
* refactor: extract agent core package Introduce packages/agent-core as the OpenClaw-owned home for reusable agent loop, harness, session, prompt, and runtime dependency contracts. * refactor: extract shared llm runtime Move provider model registries, stream wrappers, OAuth helpers, and LLM utilities into src/llm with plugin-sdk barrels instead of depending on the old embedded runtime layout. * refactor: remove pi runtime internals Rename remaining Pi-shaped agent surfaces to OpenClaw agent runtime names, delete obsolete Pi docs and package graph checks, and add the third-party notice for incorporated code. * refactor: tighten agent session runtime Make agent-core/runtime dependencies explicit, consolidate compaction and session transcript helpers, and move model/session helpers behind OpenClaw-owned contracts. * refactor: remove static model and pi auth paths Drop static model catalogs and Pi auth bridges, move model/provider facts to manifest-owned runtime contracts, and harden internal embedded-agent utilities. * refactor: remove legacy provider compat paths * docs: remove agent parity notes * fix: skip provider wildcard metadata parsing * refactor: share session extension sdk loading * refactor: inline acpx proxy error formatter * refactor: fold edit recovery into edit tool * fix: accept extension batch separator * test: align startup provider plugin expectations * fix: restore provider-scoped release discovery * test: align static asset packaging expectations * fix: run static provider catalogs during scoped discovery * fix: add provider entry catalogs for scoped live discovery * fix: load lightweight provider catalog entries * fix: refresh provider-scoped plugin metadata * fix: keep provider catalog entries on release live path * fix: keep static manifest models in release live checks * fix: harden release model discovery * fix: reduce OpenAI live cache probe reasoning * fix: disable OpenAI cache probe reasoning * ci: extend OpenAI gateway live timeout * fix: extend live gateway model budget * fix: stabilize release validation regressions * fix: honor provider aliases in model rows * fix: stabilize release validation lanes * fix: stabilize release memory qa * ci: stabilize release validation lanes * ci: prefer ipv4 for live docker node calls * fix: restore shared tool-call stream wrapper * ci: remove legacy pi test shard alias * fix: clean up embedded agent test drift * fix: stabilize runtime alias status * fix: clean up embedded agent ci drift * fix: restore release ci invariants * fix: clean up post-rebase runtime drift * fix: restore release ci checks * fix: restore release ci after rebase * fix: remove stale pi runtime path * test: align compaction runtime expectations * test: update plugin prerelease expectations * fix: handle claude live tool approvals * fix: stabilize release validation gates * fix: finish agent runtime import * test: finish post-rebase agent runtime mocks * fix: keep codex compaction native * fix: stabilize codex app-server hook tests * test: isolate codex diagnostic active run * test: remove codex diagnostic completion race # Conflicts: # extensions/codex/src/app-server/run-attempt.test.ts * ci: fix full release manifest performance run id * refactor: narrow llm plugin sdk boundary * chore: drop generated google boundary stamps * fix: repair rebase fallout * fix: clean up rebased runtime references * fix: decode codex jwt payloads as base64url * fix: preserve shipped pi runtime alias * fix: add scoped sdk virtual modules * fix: decode llm codex oauth jwt as base64url * fix: avoid stale vertex adc negative cache * fix: harden tool arg decoding and codeql path * fix: keep vertex adc negative checks live * refactor: consolidate codex jwt and edit helpers * fix: await codex oauth node runtime imports * fix: preserve sdk tool and notice contracts * fix: preserve shipped compat config boundaries * fix: align codex oauth callback host * fix: terminate agent-core loop streams on failure * fix: keep codex oauth callback alive during fallback * ci: include session tools in critical codeql scans * fix: keep Cloudflare Anthropic provider auth header * docs: redirect legacy pi runtime pages * fix: honor bundled web provider compat discovery * fix: protect session output spill files * fix: keep legacy agent dir env blocked * fix: contain auto-discovered skill symlinks * fix: harden agent core sdk proxy surfaces * fix: restore approval reaction sdk compat * fix: keep live docker runs bounded * fix: keep codex oauth redirect host aligned * fix: resolve post-rebase agent runtime drift * fix: redact anthropic oauth parse failures * fix: preserve responses strict tool shaping * fix: repair agent runtime rebase cleanup * docs: redirect retired parity pages * fix: bound auto-discovered resources to roots * fix: repair post-rebase agent test drift * fix: preserve bundled provider allowlist migration * fix: preserve manifest-owned provider aliases * fix: declare photon image dependency * fix: keep provider headers out of proxy body * fix: preserve shipped env aliases * fix: refresh control ui i18n generated state * fix: quote read fallback paths * fix: preview edits through configured backend * test: satisfy core test typecheck * fix: preserve ZAI usage auth fallback * test: repair codex diagnostic test * fix: repair agent runtime rebase drift * test: finish embedded runner import rename * fix: repair agent runtime rebase integrations * test: align compaction oauth fallback expectations * fix: allow sdk-auth session models * fix: update doctor tool schema import * fix: preserve bedrock plugin region * fix: stream harmony-like prose immediately * ci: include session runtime in codeql shards * fix: repair latest rebase integrations * fix: honor explicit codex websocket transport * fix: keep openai-compatible credentials provider-scoped * fix: refresh sdk api baseline after rebase * fix: route cli runtime aliases through openclaw harness * test: rename stale harness mock expectation * test: rename embedded agent overflow calls * test: clean embedded auth test wording * test: use openclaw stream types in deepinfra cache test * fix: refresh sdk api baseline on latest main * fix: honor bundled discovery compat allowlists * fix: refresh sdk api baseline after latest rebase * fix: remove stale rebase imports * test: rename stale model catalog mock * test: mock renamed doctor runtime modules * fix: map canonical kimi env auth * fix: use internal model registry in bench script * fix: migrate deepinfra provider catalog entry * fix: enforce builtin tool suppression * fix: route compaction auth and proxy payloads safely * refactor: prune unused llm registry leftovers * test: update codex hooks session import * test: fix model picker ci coverage * test: align model picker auth mock types
518 lines
17 KiB
TypeScript
518 lines
17 KiB
TypeScript
import crypto from "node:crypto";
|
|
import { formatErrorMessage } from "../infra/errors.js";
|
|
import { buildExecApprovalUnavailableReplyPayload } from "../infra/exec-approval-reply.js";
|
|
import {
|
|
type ExecApprovalInitiatingSurfaceState,
|
|
resolveExecApprovalInitiatingSurfaceState,
|
|
} from "../infra/exec-approval-surface.js";
|
|
import {
|
|
minSecurity,
|
|
maxAsk,
|
|
resolveExecApprovalAllowedDecisions,
|
|
resolveExecApprovals,
|
|
type ExecAsk,
|
|
type ExecApprovalDecision,
|
|
type ExecSecurity,
|
|
} from "../infra/exec-approvals.js";
|
|
import { logWarn } from "../logger.js";
|
|
import { registerExecApprovalFollowupRuntimeHandoff } from "./bash-tools.exec-approval-followup-state.js";
|
|
import { sendExecApprovalFollowup } from "./bash-tools.exec-approval-followup.js";
|
|
import {
|
|
type ExecApprovalRegistration,
|
|
resolveRegisteredExecApprovalDecision,
|
|
} from "./bash-tools.exec-approval-request.js";
|
|
import { buildApprovalPendingMessage } from "./bash-tools.exec-runtime.js";
|
|
import { DEFAULT_APPROVAL_TIMEOUT_MS } from "./bash-tools.exec-runtime.js";
|
|
import type { ExecElevatedDefaults, ExecToolDetails } from "./bash-tools.exec-types.js";
|
|
import { isExecDeniedResultText } from "./exec-approval-result.js";
|
|
import type { AgentToolResult } from "./runtime/index.js";
|
|
|
|
type ResolvedExecApprovals = ReturnType<typeof resolveExecApprovals>;
|
|
export const MAX_EXEC_APPROVAL_FOLLOWUP_FAILURE_LOG_KEYS = 256;
|
|
const loggedExecApprovalFollowupFailures = new Set<string>();
|
|
|
|
function rememberExecApprovalFollowupFailureKey(key: string): boolean {
|
|
if (loggedExecApprovalFollowupFailures.has(key)) {
|
|
return false;
|
|
}
|
|
loggedExecApprovalFollowupFailures.add(key);
|
|
// Bound memory growth for long-lived processes that see many unique approval failures.
|
|
if (loggedExecApprovalFollowupFailures.size > MAX_EXEC_APPROVAL_FOLLOWUP_FAILURE_LOG_KEYS) {
|
|
const oldestKey = loggedExecApprovalFollowupFailures.values().next().value;
|
|
if (typeof oldestKey === "string") {
|
|
loggedExecApprovalFollowupFailures.delete(oldestKey);
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
export type ExecHostApprovalContext = {
|
|
approvals: ResolvedExecApprovals;
|
|
hostSecurity: ExecSecurity;
|
|
hostAsk: ExecAsk;
|
|
askFallback: ResolvedExecApprovals["agent"]["askFallback"];
|
|
};
|
|
|
|
export type ExecApprovalPendingState = {
|
|
warningText: string;
|
|
expiresAtMs: number;
|
|
preResolvedDecision: string | null | undefined;
|
|
};
|
|
|
|
export type ExecApprovalRequestState = ExecApprovalPendingState & {
|
|
noticeSeconds: number;
|
|
};
|
|
|
|
export type ExecApprovalUnavailableReason =
|
|
| "no-approval-route"
|
|
| "initiating-platform-disabled"
|
|
| "initiating-platform-unsupported";
|
|
|
|
function isHeadlessExecTrigger(trigger?: string): boolean {
|
|
return trigger === "cron";
|
|
}
|
|
|
|
export type RegisteredExecApprovalRequestContext = {
|
|
approvalId: string;
|
|
approvalSlug: string;
|
|
warningText: string;
|
|
expiresAtMs: number;
|
|
preResolvedDecision: string | null | undefined;
|
|
initiatingSurface: ExecApprovalInitiatingSurfaceState;
|
|
sentApproverDms: boolean;
|
|
unavailableReason: ExecApprovalUnavailableReason | null;
|
|
};
|
|
|
|
export type ExecApprovalFollowupTarget = {
|
|
approvalId: string;
|
|
sessionKey?: string;
|
|
turnSourceChannel?: string;
|
|
turnSourceTo?: string;
|
|
turnSourceAccountId?: string;
|
|
turnSourceThreadId?: string | number;
|
|
direct?: boolean;
|
|
bashElevated?: ExecElevatedDefaults;
|
|
};
|
|
|
|
export type ExecApprovalFollowupResultDeps = {
|
|
sendExecApprovalFollowup?: typeof sendExecApprovalFollowup;
|
|
logWarn?: typeof logWarn;
|
|
};
|
|
|
|
export type DefaultExecApprovalRequestArgs = {
|
|
warnings: string[];
|
|
approvalRunningNoticeMs: number;
|
|
createApprovalSlug: (approvalId: string) => string;
|
|
turnSourceChannel?: string;
|
|
turnSourceAccountId?: string;
|
|
};
|
|
|
|
export function createExecApprovalPendingState(params: {
|
|
warnings: string[];
|
|
timeoutMs: number;
|
|
}): ExecApprovalPendingState {
|
|
return {
|
|
warningText: params.warnings.length ? `${params.warnings.join("\n")}\n\n` : "",
|
|
expiresAtMs: Date.now() + params.timeoutMs,
|
|
preResolvedDecision: undefined,
|
|
};
|
|
}
|
|
|
|
export function createExecApprovalRequestState(params: {
|
|
warnings: string[];
|
|
timeoutMs: number;
|
|
approvalRunningNoticeMs: number;
|
|
}): ExecApprovalRequestState {
|
|
const pendingState = createExecApprovalPendingState({
|
|
warnings: params.warnings,
|
|
timeoutMs: params.timeoutMs,
|
|
});
|
|
return {
|
|
...pendingState,
|
|
noticeSeconds: Math.max(1, Math.round(params.approvalRunningNoticeMs / 1000)),
|
|
};
|
|
}
|
|
|
|
export function createExecApprovalRequestContext(params: {
|
|
warnings: string[];
|
|
timeoutMs: number;
|
|
approvalRunningNoticeMs: number;
|
|
createApprovalSlug: (approvalId: string) => string;
|
|
}): ExecApprovalRequestState & {
|
|
approvalId: string;
|
|
approvalSlug: string;
|
|
contextKey: string;
|
|
} {
|
|
const approvalId = crypto.randomUUID();
|
|
const pendingState = createExecApprovalRequestState({
|
|
warnings: params.warnings,
|
|
timeoutMs: params.timeoutMs,
|
|
approvalRunningNoticeMs: params.approvalRunningNoticeMs,
|
|
});
|
|
return {
|
|
...pendingState,
|
|
approvalId,
|
|
approvalSlug: params.createApprovalSlug(approvalId),
|
|
contextKey: `exec:${approvalId}`,
|
|
};
|
|
}
|
|
|
|
export function createDefaultExecApprovalRequestContext(params: {
|
|
warnings: string[];
|
|
approvalRunningNoticeMs: number;
|
|
createApprovalSlug: (approvalId: string) => string;
|
|
}) {
|
|
return createExecApprovalRequestContext({
|
|
warnings: params.warnings,
|
|
timeoutMs: DEFAULT_APPROVAL_TIMEOUT_MS,
|
|
approvalRunningNoticeMs: params.approvalRunningNoticeMs,
|
|
createApprovalSlug: params.createApprovalSlug,
|
|
});
|
|
}
|
|
|
|
export function resolveBaseExecApprovalDecision(params: {
|
|
decision: string | null;
|
|
askFallback: ResolvedExecApprovals["agent"]["askFallback"];
|
|
}): {
|
|
approvedByAsk: boolean;
|
|
deniedReason: string | null;
|
|
timedOut: boolean;
|
|
} {
|
|
if (params.decision === "deny") {
|
|
return { approvedByAsk: false, deniedReason: "user-denied", timedOut: false };
|
|
}
|
|
if (!params.decision) {
|
|
if (params.askFallback === "full") {
|
|
return { approvedByAsk: true, deniedReason: null, timedOut: true };
|
|
}
|
|
if (params.askFallback === "deny") {
|
|
return { approvedByAsk: false, deniedReason: "approval-timeout", timedOut: true };
|
|
}
|
|
return { approvedByAsk: false, deniedReason: null, timedOut: true };
|
|
}
|
|
return { approvedByAsk: false, deniedReason: null, timedOut: false };
|
|
}
|
|
|
|
export function resolveExecHostApprovalContext(params: {
|
|
agentId?: string;
|
|
security: ExecSecurity;
|
|
ask: ExecAsk;
|
|
host: "gateway" | "node";
|
|
}): ExecHostApprovalContext {
|
|
const approvals = resolveExecApprovals(params.agentId, {
|
|
security: params.security,
|
|
ask: params.ask,
|
|
});
|
|
// Session/config tool policy is the caller's requested contract. The host file
|
|
// may tighten that contract, but it must not silently broaden it.
|
|
const hostSecurity = minSecurity(params.security, approvals.agent.security);
|
|
const hostAsk = maxAsk(params.ask, approvals.agent.ask);
|
|
const askFallback = minSecurity(hostSecurity, approvals.agent.askFallback);
|
|
if (hostSecurity === "deny") {
|
|
throw new Error(`exec denied: host=${params.host} security=deny`);
|
|
}
|
|
return { approvals, hostSecurity, hostAsk, askFallback };
|
|
}
|
|
|
|
export async function resolveApprovalDecisionOrUndefined(params: {
|
|
approvalId: string;
|
|
preResolvedDecision: string | null | undefined;
|
|
onFailure: () => void;
|
|
}): Promise<string | null | undefined> {
|
|
try {
|
|
return await resolveRegisteredExecApprovalDecision({
|
|
approvalId: params.approvalId,
|
|
preResolvedDecision: params.preResolvedDecision,
|
|
});
|
|
} catch {
|
|
params.onFailure();
|
|
return undefined;
|
|
}
|
|
}
|
|
|
|
export function resolveExecApprovalUnavailableState(params: {
|
|
turnSourceChannel?: string;
|
|
turnSourceAccountId?: string;
|
|
preResolvedDecision: string | null | undefined;
|
|
}): {
|
|
initiatingSurface: ExecApprovalInitiatingSurfaceState;
|
|
sentApproverDms: boolean;
|
|
unavailableReason: ExecApprovalUnavailableReason | null;
|
|
} {
|
|
const initiatingSurface = resolveExecApprovalInitiatingSurfaceState({
|
|
channel: params.turnSourceChannel,
|
|
accountId: params.turnSourceAccountId,
|
|
});
|
|
// Native approval runtimes emit routed-elsewhere notices after actual delivery.
|
|
// Avoid claiming approver DMs were sent from config-only guesses here.
|
|
const sentApproverDms = false;
|
|
const unavailableReason =
|
|
params.preResolvedDecision === null
|
|
? "no-approval-route"
|
|
: initiatingSurface.kind === "disabled"
|
|
? "initiating-platform-disabled"
|
|
: initiatingSurface.kind === "unsupported"
|
|
? "initiating-platform-unsupported"
|
|
: null;
|
|
return {
|
|
initiatingSurface,
|
|
sentApproverDms,
|
|
unavailableReason,
|
|
};
|
|
}
|
|
|
|
export async function createAndRegisterDefaultExecApprovalRequest(params: {
|
|
warnings: string[];
|
|
approvalRunningNoticeMs: number;
|
|
createApprovalSlug: (approvalId: string) => string;
|
|
turnSourceChannel?: string;
|
|
turnSourceAccountId?: string;
|
|
register: (approvalId: string) => Promise<ExecApprovalRegistration>;
|
|
}): Promise<RegisteredExecApprovalRequestContext> {
|
|
const {
|
|
approvalId,
|
|
approvalSlug,
|
|
warningText,
|
|
expiresAtMs: defaultExpiresAtMs,
|
|
preResolvedDecision: defaultPreResolvedDecision,
|
|
} = createDefaultExecApprovalRequestContext({
|
|
warnings: params.warnings,
|
|
approvalRunningNoticeMs: params.approvalRunningNoticeMs,
|
|
createApprovalSlug: params.createApprovalSlug,
|
|
});
|
|
const registration = await params.register(approvalId);
|
|
const preResolvedDecision = registration.finalDecision;
|
|
const { initiatingSurface, sentApproverDms, unavailableReason } =
|
|
resolveExecApprovalUnavailableState({
|
|
turnSourceChannel: params.turnSourceChannel,
|
|
turnSourceAccountId: params.turnSourceAccountId,
|
|
preResolvedDecision,
|
|
});
|
|
|
|
return {
|
|
approvalId,
|
|
approvalSlug,
|
|
warningText,
|
|
expiresAtMs: registration.expiresAtMs ?? defaultExpiresAtMs,
|
|
preResolvedDecision:
|
|
registration.finalDecision === undefined
|
|
? defaultPreResolvedDecision
|
|
: registration.finalDecision,
|
|
initiatingSurface,
|
|
sentApproverDms,
|
|
unavailableReason,
|
|
};
|
|
}
|
|
|
|
export function buildDefaultExecApprovalRequestArgs(
|
|
params: DefaultExecApprovalRequestArgs,
|
|
): DefaultExecApprovalRequestArgs {
|
|
return {
|
|
warnings: params.warnings,
|
|
approvalRunningNoticeMs: params.approvalRunningNoticeMs,
|
|
createApprovalSlug: params.createApprovalSlug,
|
|
turnSourceChannel: params.turnSourceChannel,
|
|
turnSourceAccountId: params.turnSourceAccountId,
|
|
};
|
|
}
|
|
|
|
export function buildExecApprovalFollowupTarget(
|
|
params: ExecApprovalFollowupTarget,
|
|
): ExecApprovalFollowupTarget {
|
|
return {
|
|
approvalId: params.approvalId,
|
|
sessionKey: params.sessionKey,
|
|
turnSourceChannel: params.turnSourceChannel,
|
|
turnSourceTo: params.turnSourceTo,
|
|
turnSourceAccountId: params.turnSourceAccountId,
|
|
turnSourceThreadId: params.turnSourceThreadId,
|
|
direct: params.direct,
|
|
bashElevated: params.bashElevated,
|
|
};
|
|
}
|
|
|
|
export function createExecApprovalDecisionState(params: {
|
|
decision: string | null | undefined;
|
|
askFallback: ResolvedExecApprovals["agent"]["askFallback"];
|
|
}) {
|
|
const baseDecision = resolveBaseExecApprovalDecision({
|
|
decision: params.decision ?? null,
|
|
askFallback: params.askFallback,
|
|
});
|
|
return {
|
|
baseDecision,
|
|
approvedByAsk: baseDecision.approvedByAsk,
|
|
deniedReason: baseDecision.deniedReason,
|
|
};
|
|
}
|
|
|
|
export function enforceStrictInlineEvalApprovalBoundary(params: {
|
|
baseDecision: {
|
|
timedOut: boolean;
|
|
};
|
|
approvedByAsk: boolean;
|
|
deniedReason: string | null;
|
|
requiresInlineEvalApproval: boolean;
|
|
}): {
|
|
approvedByAsk: boolean;
|
|
deniedReason: string | null;
|
|
} {
|
|
if (
|
|
!params.baseDecision.timedOut ||
|
|
!params.requiresInlineEvalApproval ||
|
|
!params.approvedByAsk
|
|
) {
|
|
return {
|
|
approvedByAsk: params.approvedByAsk,
|
|
deniedReason: params.deniedReason,
|
|
};
|
|
}
|
|
return {
|
|
approvedByAsk: false,
|
|
deniedReason: params.deniedReason ?? "approval-timeout",
|
|
};
|
|
}
|
|
|
|
export function shouldResolveExecApprovalUnavailableInline(params: {
|
|
trigger?: string;
|
|
unavailableReason: ExecApprovalUnavailableReason | null;
|
|
preResolvedDecision: string | null | undefined;
|
|
}): boolean {
|
|
return (
|
|
isHeadlessExecTrigger(params.trigger) &&
|
|
params.unavailableReason === "no-approval-route" &&
|
|
params.preResolvedDecision === null
|
|
);
|
|
}
|
|
|
|
export function buildHeadlessExecApprovalDeniedMessage(params: {
|
|
trigger?: string;
|
|
host: "gateway" | "node";
|
|
security: ExecSecurity;
|
|
ask: ExecAsk;
|
|
askFallback: ResolvedExecApprovals["agent"]["askFallback"];
|
|
}): string {
|
|
const runLabel = params.trigger === "cron" ? "Cron runs" : "Headless runs";
|
|
return [
|
|
`exec denied: ${runLabel} cannot wait for interactive exec approval.`,
|
|
`Effective host exec policy: security=${params.security} ask=${params.ask} askFallback=${params.askFallback}`,
|
|
"Stricter values from tools.exec and ~/.openclaw/exec-approvals.json both apply.",
|
|
"Fix one of these:",
|
|
'- align both files to security="full" and ask="off" for trusted local automation',
|
|
"- keep allowlist mode and add an explicit allowlist entry for this command",
|
|
"- enable Web UI, terminal UI, or chat exec approvals and rerun interactively",
|
|
'Tip: run "openclaw doctor" and "openclaw approvals get --gateway" to inspect the effective policy.',
|
|
].join("\n");
|
|
}
|
|
|
|
export async function sendExecApprovalFollowupResult(
|
|
target: ExecApprovalFollowupTarget,
|
|
resultText: string,
|
|
deps: ExecApprovalFollowupResultDeps = {},
|
|
): Promise<void> {
|
|
const send = deps.sendExecApprovalFollowup ?? sendExecApprovalFollowup;
|
|
const warn = deps.logWarn ?? logWarn;
|
|
const runtimeHandoff =
|
|
target.direct === true || !target.sessionKey || isExecDeniedResultText(resultText)
|
|
? undefined
|
|
: registerExecApprovalFollowupRuntimeHandoff({
|
|
approvalId: target.approvalId,
|
|
sessionKey: target.sessionKey,
|
|
bashElevated: target.bashElevated,
|
|
});
|
|
await send({
|
|
approvalId: target.approvalId,
|
|
sessionKey: target.sessionKey,
|
|
turnSourceChannel: target.turnSourceChannel,
|
|
turnSourceTo: target.turnSourceTo,
|
|
turnSourceAccountId: target.turnSourceAccountId,
|
|
turnSourceThreadId: target.turnSourceThreadId,
|
|
resultText,
|
|
direct: target.direct,
|
|
...(runtimeHandoff
|
|
? {
|
|
internalRuntimeHandoffId: runtimeHandoff.handoffId,
|
|
idempotencyKey: runtimeHandoff.idempotencyKey,
|
|
}
|
|
: {}),
|
|
}).catch((error) => {
|
|
const message = formatErrorMessage(error);
|
|
const key = `${target.approvalId}:${message}`;
|
|
if (!rememberExecApprovalFollowupFailureKey(key)) {
|
|
return;
|
|
}
|
|
warn(`exec approval followup dispatch failed (id=${target.approvalId}): ${message}`);
|
|
});
|
|
}
|
|
|
|
export function buildExecApprovalPendingToolResult(params: {
|
|
host: "gateway" | "node";
|
|
command: string;
|
|
cwd: string | undefined;
|
|
warningText: string;
|
|
approvalId: string;
|
|
approvalSlug: string;
|
|
expiresAtMs: number;
|
|
initiatingSurface: ExecApprovalInitiatingSurfaceState;
|
|
sentApproverDms: boolean;
|
|
unavailableReason: ExecApprovalUnavailableReason | null;
|
|
allowedDecisions?: readonly ExecApprovalDecision[];
|
|
nodeId?: string;
|
|
}): AgentToolResult<ExecToolDetails> {
|
|
const allowedDecisions = params.allowedDecisions ?? resolveExecApprovalAllowedDecisions();
|
|
return {
|
|
content: [
|
|
{
|
|
type: "text",
|
|
text:
|
|
params.unavailableReason !== null
|
|
? (buildExecApprovalUnavailableReplyPayload({
|
|
warningText: params.warningText,
|
|
reason: params.unavailableReason,
|
|
channel: params.initiatingSurface.channel,
|
|
channelLabel: params.initiatingSurface.channelLabel,
|
|
accountId: params.initiatingSurface.accountId,
|
|
sentApproverDms: params.sentApproverDms,
|
|
}).text ?? "")
|
|
: buildApprovalPendingMessage({
|
|
warningText: params.warningText,
|
|
approvalSlug: params.approvalSlug,
|
|
approvalId: params.approvalId,
|
|
allowedDecisions,
|
|
command: params.command,
|
|
cwd: params.cwd,
|
|
host: params.host,
|
|
nodeId: params.nodeId,
|
|
}),
|
|
},
|
|
],
|
|
details:
|
|
params.unavailableReason !== null
|
|
? ({
|
|
status: "approval-unavailable",
|
|
reason: params.unavailableReason,
|
|
channel: params.initiatingSurface.channel,
|
|
channelLabel: params.initiatingSurface.channelLabel,
|
|
accountId: params.initiatingSurface.accountId,
|
|
sentApproverDms: params.sentApproverDms,
|
|
host: params.host,
|
|
command: params.command,
|
|
cwd: params.cwd,
|
|
nodeId: params.nodeId,
|
|
warningText: params.warningText,
|
|
} satisfies ExecToolDetails)
|
|
: ({
|
|
status: "approval-pending",
|
|
approvalId: params.approvalId,
|
|
approvalSlug: params.approvalSlug,
|
|
expiresAtMs: params.expiresAtMs,
|
|
allowedDecisions,
|
|
host: params.host,
|
|
command: params.command,
|
|
cwd: params.cwd,
|
|
nodeId: params.nodeId,
|
|
warningText: params.warningText,
|
|
} satisfies ExecToolDetails),
|
|
};
|
|
}
|