refactor(core): extract shared dedup helpers

This commit is contained in:
Peter Steinberger
2026-03-07 10:40:49 +00:00
parent 14c61bb33f
commit 3c71e2bd48
114 changed files with 3400 additions and 2040 deletions

View File

@@ -1,3 +1,4 @@
import crypto from "node:crypto";
import {
maxAsk,
minSecurity,
@@ -6,6 +7,7 @@ import {
type ExecSecurity,
} from "../infra/exec-approvals.js";
import { resolveRegisteredExecApprovalDecision } from "./bash-tools.exec-approval-request.js";
import { DEFAULT_APPROVAL_TIMEOUT_MS } from "./bash-tools.exec-runtime.js";
type ResolvedExecApprovals = ReturnType<typeof resolveExecApprovals>;
@@ -16,6 +18,110 @@ export type ExecHostApprovalContext = {
askFallback: ResolvedExecApprovals["agent"]["askFallback"];
};
export type ExecApprovalPendingState = {
warningText: string;
expiresAtMs: number;
preResolvedDecision: string | null | undefined;
};
export type ExecApprovalRequestState = ExecApprovalPendingState & {
noticeSeconds: number;
};
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"];
obfuscationDetected: boolean;
}): {
approvedByAsk: boolean;
deniedReason: string | null;
timedOut: boolean;
} {
if (params.decision === "deny") {
return { approvedByAsk: false, deniedReason: "user-denied", timedOut: false };
}
if (!params.decision) {
if (params.obfuscationDetected) {
return {
approvedByAsk: false,
deniedReason: "approval-timeout (obfuscation-detected)",
timedOut: true,
};
}
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;