fix: fail closed on invalid codex resume bindings

This commit is contained in:
kris
2026-04-04 13:04:12 +08:00
parent 4ab0414d43
commit 40b78c5cae
3 changed files with 367 additions and 9 deletions

View File

@@ -1,9 +1,179 @@
import { constants } from "node:fs";
import { access, stat } from "node:fs/promises";
import { DatabaseSync } from "node:sqlite";
import { resolve } from "node:path";
function trimToDefined(value) {
const trimmed = String(value ?? "").trim();
return trimmed ? trimmed : undefined;
}
function resolveResumeTarget(config, task) {
const targetThreadRef = trimToDefined(task?.targetCodexThreadRef || task?.targetThreadId);
const targetFolderRef = trimToDefined(
task?.targetCodexFolderRef || config.masterAgentWorkdir || process.cwd(),
);
const cwd = resolve(targetFolderRef || process.cwd());
return {
targetThreadRef,
targetFolderRef: targetFolderRef || process.cwd(),
cwd,
};
}
function shouldPreflightResumeTask(task) {
const taskType = String(task?.taskType || "").trim();
if (taskType === "dispatch_execution") {
return true;
}
if (taskType !== "conversation_reply") {
return false;
}
return Boolean(
trimToDefined(task?.targetCodexThreadRef || task?.targetThreadId) ||
trimToDefined(task?.targetCodexFolderRef) ||
trimToDefined(task?.targetProjectId) ||
trimToDefined(task?.targetThreadDisplayName),
);
}
function buildStructuredTaskBindingError(code, message, details) {
return {
code,
message,
details,
};
}
function inspectCodexThreadBinding(config, targetThreadRef, targetFolderRef) {
const stateDbPath = trimToDefined(config?.codexStateDbPath);
if (!stateDbPath) {
return {
status: "skipped",
};
}
try {
const db = new DatabaseSync(stateDbPath, { readonly: true });
try {
const row = db
.prepare("SELECT id, cwd, archived FROM threads WHERE id = ? LIMIT 1")
.get(targetThreadRef);
if (!row || row.archived) {
return {
status: "missing",
};
}
const threadCwd = trimToDefined(row.cwd) || "";
if (threadCwd && resolve(threadCwd) !== resolve(targetFolderRef)) {
return {
status: "mismatch",
threadCwd,
};
}
return {
status: "ok",
threadCwd,
};
} finally {
db.close();
}
} catch {
return {
status: "unavailable",
};
}
}
export async function prepareCodexTaskExecution(config, task, outputFile) {
if (!shouldPreflightResumeTask(task)) {
return {
ok: true,
execution: buildCodexTaskExecution(config, task, outputFile),
};
}
const targetThreadRef = trimToDefined(task?.targetCodexThreadRef || task?.targetThreadId);
if (!targetThreadRef) {
return {
ok: false,
error: buildStructuredTaskBindingError(
"LOCAL_AGENT_CODEX_THREAD_BINDING_MISSING",
"LOCAL_AGENT_CODEX_THREAD_BINDING_MISSING: 目标线程绑定缺失,已拒绝 codex exec resume。",
{
taskType: String(task?.taskType || "").trim() || undefined,
targetProjectId: trimToDefined(task?.targetProjectId),
targetCodexFolderRef: trimToDefined(task?.targetCodexFolderRef),
targetThreadDisplayName: trimToDefined(task?.targetThreadDisplayName),
},
),
};
}
const resumeTarget = resolveResumeTarget(config, task);
const bindingInspection = inspectCodexThreadBinding(config, targetThreadRef, resumeTarget.cwd);
if (bindingInspection.status === "missing") {
return {
ok: false,
error: buildStructuredTaskBindingError(
"LOCAL_AGENT_CODEX_THREAD_BINDING_STALE",
"LOCAL_AGENT_CODEX_THREAD_BINDING_STALE: 目标线程绑定在 Codex 状态库中不存在或已归档,已拒绝 codex exec resume。",
{
targetThreadRef,
targetCodexFolderRef: resumeTarget.targetFolderRef,
},
),
};
}
if (bindingInspection.status === "mismatch") {
return {
ok: false,
error: buildStructuredTaskBindingError(
"LOCAL_AGENT_CODEX_THREAD_BINDING_MISMATCH",
`LOCAL_AGENT_CODEX_THREAD_BINDING_MISMATCH: 目标线程绑定的 cwd 与当前目录不一致,已拒绝 codex exec resume。cwd=${resumeTarget.cwd} liveCwd=${bindingInspection.threadCwd}`,
{
cwd: resumeTarget.cwd,
liveCwd: bindingInspection.threadCwd,
targetThreadRef,
targetCodexFolderRef: resumeTarget.targetFolderRef,
},
),
};
}
try {
const folderStat = await stat(resumeTarget.cwd);
if (!folderStat.isDirectory()) {
throw new Error("NOT_A_DIRECTORY");
}
await access(resumeTarget.cwd, constants.R_OK | constants.X_OK);
} catch {
return {
ok: false,
error: buildStructuredTaskBindingError(
"LOCAL_AGENT_CODEX_WORKDIR_INVALID",
`LOCAL_AGENT_CODEX_WORKDIR_INVALID: 线程工作目录不可访问,已拒绝 codex exec resume。cwd=${resumeTarget.cwd}`,
{
cwd: resumeTarget.cwd,
targetThreadRef,
targetCodexFolderRef: resumeTarget.targetFolderRef,
},
),
};
}
return {
ok: true,
execution: buildCodexTaskExecution(config, task, outputFile),
};
}
export function buildCodexTaskExecution(config, task, outputFile) {
const targetThreadRef =
String(task?.targetCodexThreadRef || task?.targetThreadId || "").trim();
const targetFolderRef =
String(task?.targetCodexFolderRef || config.masterAgentWorkdir || process.cwd()).trim() ||
process.cwd();
const { targetThreadRef, cwd } = resolveResumeTarget(config, task);
const prompt = String(task?.executionPrompt || "");
if (
@@ -23,7 +193,7 @@ export function buildCodexTaskExecution(config, task, outputFile) {
args.push(targetThreadRef, prompt);
return {
mode: "resume",
cwd: targetFolderRef,
cwd,
args,
};
}