@openclaw/codex 2026.9.4 → 2026.9.6

package/dist/{native-subagent-task-ids-BzTdT0Uw.js → .setup/native-subagent-task-ids-wb8CKZGN.mjs}

@@ -1,9 +1,8 @@
-import { o as isJsonObject } from "./protocol-5bh1G-H7.js";
-import { C as readNonEmptyString, _ as normalizeOptionalString$1, c as itemName, l as itemStatus, m as shouldSynthesizeToolProgressForItem, w as readNonEmptyStringArray } from "./event-projector-items-5VhsECCO.js";
-import { asNonArrayRecord, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
+import { T as readNonEmptyStringArray, c as itemName, h as unknownItemStatus, l as itemStatus, m as shouldSynthesizeToolProgressForItem, t as auditNativeToolName, v as normalizeOptionalString$1, w as readNonEmptyString } from "./event-projector-items-C6L_5ZiT.mjs";
+import { asNonArrayRecord, normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
-import { formatToolAggregate, formatToolProgressOutput, inferToolMetaFromArgs } from "openclaw/plugin-sdk/agent-harness-runtime";
-import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
+import { formatToolAggregate, formatToolProgressOutput, inferToolMetaFromArgs, projectAgentToolActivity, sanitizeToolArgs } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/event-projector-tool-output.ts
 const TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS = 1e4;
 const TOOL_PROGRESS_ECHO_PREFIX_MIN_CHARS = 1024;
@@ -16,6 +15,9 @@ var ToolOutputAccumulator = class {
 		this.truncatedItemIds = /* @__PURE__ */ new Set();
 		this.textByItem = /* @__PURE__ */ new Map();
 	}
+	isTruncated(itemId) {
+		return this.truncatedItemIds.has(itemId);
+	}
 	append(itemId, delta) {
 		const originalLength = (this.originalLengthByItem.get(itemId) ?? this.textByItem.get(itemId)?.length ?? 0) + delta.length;
 		this.originalLengthByItem.set(itemId, originalLength);
@@ -74,6 +76,17 @@ function collectDynamicToolContentText(contentItems) {
 		return text ? [text] : [];
 	}).join("\n");
 }
+function readCodexResponseOutput(item) {
+	if (typeof item.output === "string") return item.output;
+	if (!Array.isArray(item.output)) return;
+	return JSON.stringify(item.output.map((part) => isJsonObject(part) && part.type === "input_text" && typeof part.text === "string" ? {
+		type: part.type,
+		text: part.text
+	} : {
+		type: isJsonObject(part) ? part.type : "unknown",
+		omitted: true
+	}), null, 2);
+}
 function appendBoundedToolTranscriptText(currentPrefix, delta, originalLength) {
 	if (originalLength <= 1e4) {
 		const rawPrefix = currentPrefix + delta;
@@ -146,26 +159,9 @@ function isCodexCommandBearingToolCall(name, args) {
 	const normalizedName = name?.trim().toLowerCase();
 	return normalizedName === "exec" || normalizedName === "bash" || normalizedName === "shell" || typeof args?.command === "string" && args.command.trim().length > 0;
 }
-/** Recursively redacts sensitive strings and handles circular values in event payloads. */
-function sanitizeCodexAgentEventValue(value, seen = /* @__PURE__ */ new WeakSet()) {
-	if (typeof value === "string") return redactToolPayloadText(value);
-	if (Array.isArray(value)) {
-		if (seen.has(value)) return "[Circular]";
-		seen.add(value);
-		return value.map((entry) => sanitizeCodexAgentEventValue(entry, seen));
-	}
-	if (value && typeof value === "object") {
-		if (seen.has(value)) return "[Circular]";
-		seen.add(value);
-		const out = {};
-		for (const [key, child] of Object.entries(value)) out[key] = typeof child === "string" ? redactSensitiveFieldValue(key, child) : sanitizeCodexAgentEventValue(child, seen);
-		return out;
-	}
-	return value;
-}
 /** Sanitizes a record-shaped Codex agent event payload. */
 function sanitizeCodexAgentEventRecord(value) {
-	return sanitizeCodexAgentEventValue(value);
+	return sanitizeToolArgs(value);
 }
 /** Sanitizes dynamic-tool arguments before diagnostic/event emission. */
 function sanitizeCodexToolArguments(value) {
@@ -182,6 +178,46 @@ function inferCodexDynamicToolMeta(call, detailMode) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/event-projector-tool-items.ts
+const CODE_MODE_NATIVE_PATCH_SOURCE_RE = /^\s*(?:\/\/[^\r\n]*\r?\n\s*)?(?:const|let)\s+([A-Za-z_$][\w$]*)\s*=\s*await\s+tools\.apply_patch\(\s*("(?:\\[\s\S]|[^"\\])*")\s*\)\s*;?\s*text\(\s*\1\s*\)\s*;?\s*$/u;
+function readCodeModeNativePatchInput(source) {
+	if (typeof source !== "string") return;
+	const match = CODE_MODE_NATIVE_PATCH_SOURCE_RE.exec(source);
+	if (!match?.[2]) return;
+	try {
+		const patch = JSON.parse(match[2]);
+		return typeof patch === "string" && /^\*\*\* Begin Patch\r?\n[\s\S]*\r?\n\*\*\* End Patch(?:\r?\n)?$/u.test(patch) ? patch : void 0;
+	} catch {
+		return;
+	}
+}
+function readInterceptedNativePatchInput(command) {
+	if (typeof command !== "string") return;
+	const lines = command.replace(/\r\n?/gu, "\n").split("\n");
+	const patchStart = lines.indexOf("*** Begin Patch");
+	const invocation = /^[\t ]*(?:cd[\t ]+(?:'([^'\n]+)'|([A-Za-z0-9_./-]+))[\t ]+&&[\t ]+)?apply_patch[\t ]*<<-?[\t ]*'([^'\n]+)'[\t ]*$/u.exec(lines[0] ?? "");
+	if (!invocation || patchStart !== 1) return;
+	const patchEnd = lines.indexOf("*** End Patch", patchStart + 1);
+	const cwd = invocation[1] ?? invocation[2];
+	const delimiter = invocation[3];
+	if (patchEnd < 0 || lines[patchEnd + 1] !== delimiter || lines.slice(patchEnd + 2).some((line) => line.trim().length > 0)) return;
+	return {
+		input: `${lines.slice(patchStart, patchEnd + 1).join("\n")}\n`,
+		...cwd ? { cwd } : {}
+	};
+}
+function projectCodexToolActivity(item, phase, meta) {
+	const name = itemName(item) ?? auditNativeToolName(item);
+	return name ? projectAgentToolActivity({
+		toolCallId: item.id,
+		name,
+		phase,
+		args: item.type === "dynamicToolCall" ? void 0 : itemToolArgs(item),
+		meta,
+		status: item.type === "collabAgentToolCall" && item.status === "interrupted" ? "failed" : unknownItemStatus(item) ? "unknown" : itemStatus(item),
+		result: { details: itemToolResult(item).result },
+		...item.type === "collabAgentToolCall" && item.tool === "wait" ? { nativeOperation: "wait" } : {}
+	}) : void 0;
+}
 function isNativePostToolUseRelayItem(item) {
 	switch (item.type) {
 		case "commandExecution":
@@ -344,25 +380,19 @@ function itemMeta(item, detailMode = "explain") {
 	if ((item.type === "dynamicToolCall" || item.type === "mcpToolCall") && toolName) return inferToolMetaFromArgs(toolName, item.arguments, { detailMode });
 }
 function itemOutputText(item, outputTextByItem) {
-	if (item.type === "commandExecution") {
-		const output = item.aggregatedOutput?.trim() || outputTextByItem?.get(item.id)?.trim();
-		return output ? truncateToolTranscriptText(output) : void 0;
-	}
-	if (item.type === "dynamicToolCall") {
-		const output = collectDynamicToolContentText(item.contentItems).trim();
-		return output ? truncateToolTranscriptText(output) : void 0;
-	}
-	if (item.type === "mcpToolCall") {
-		const output = item.error ? stringifyJsonValue(item.error) : item.result ? stringifyJsonValue(item.result) : void 0;
-		return output ? truncateToolTranscriptText(output) : void 0;
-	}
+	const output = itemObservedOutputText(item, outputTextByItem)?.trim();
+	return output ? truncateToolTranscriptText(output) : void 0;
+}
+function itemObservedOutputText(item, outputTextByItem) {
+	if (item.type === "commandExecution") return item.aggregatedOutput ?? outputTextByItem?.get(item.id);
+	if (item.type === "dynamicToolCall") return collectDynamicToolContentText(item.contentItems);
+	if (item.type === "mcpToolCall") return item.error ? stringifyJsonValue(item.error) : item.result ? stringifyJsonValue(item.result) : void 0;
 }
 function itemTranscriptResultText(item, outputTextByItem) {
-	const output = itemOutputText(item, outputTextByItem);
-	if (output) return output;
+	const output = itemObservedOutputText(item, outputTextByItem);
+	if (output !== void 0) return output;
 	const result = itemToolResult(item).result;
-	const resultText = result ? stringifyJsonValue(result) : void 0;
-	return resultText ? truncateToolTranscriptText(resultText) : itemStatus(item);
+	return (result ? stringifyJsonValue(result) : void 0) ?? itemStatus(item);
 }
 function stringifyJsonValue(value) {
 	try {
@@ -373,15 +403,39 @@ function stringifyJsonValue(value) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/native-subagent-task-ids.ts
-/**
-* Shared identifiers for representing Codex native subagents as OpenClaw task
-* runtime rows.
-*/
 /** Task runtime namespace for Codex native subagent task rows. */
 const CODEX_NATIVE_SUBAGENT_RUNTIME = "subagent";
 /** Task kind used to distinguish native Codex subagents from other subagent runtimes. */
 const CODEX_NATIVE_SUBAGENT_TASK_KIND = "codex-native";
 /** Run id prefix for task rows keyed by Codex child thread ids. */
 const CODEX_NATIVE_SUBAGENT_RUN_ID_PREFIX = "codex-thread:";
+/** Initial tasks keep their shipped locator; later assignments belong to a native turn. */
+function codexNativeSubagentRunId(threadId, turnId) {
+	return `${CODEX_NATIVE_SUBAGENT_RUN_ID_PREFIX}${threadId.trim()}${turnId ? `:turn:${turnId}` : ""}`;
+}
+function readCodexNativeSubagentRunId(runId) {
+	if (!runId?.startsWith("codex-thread:")) return;
+	const [threadId, turnId] = runId.slice(13).split(":turn:");
+	return threadId?.trim() ? {
+		threadId,
+		...turnId ? { turnId } : {}
+	} : void 0;
+}
+function readNativeTaskAssignment(task) {
+	const runId = task.runId;
+	const identity = readCodexNativeSubagentRunId(runId);
+	if (!runId || !identity) return;
+	const storedTurnId = isJsonObject(task.detail) ? normalizeOptionalString(readStringField(task.detail, "nativeTurnId")) : void 0;
+	return {
+		runId,
+		childThreadId: identity.threadId,
+		nativeTurnId: storedTurnId ?? identity.turnId,
+		initialTurnId: identity.turnId
+	};
+}
+function readNativeSubagentThreadIds(value) {
+	if (!Array.isArray(value)) return [];
+	return value.filter((entry) => typeof entry === "string" && entry.trim() !== "");
+}
 //#endregion
-export { formatToolSummary as C, truncateToolTranscriptText as E, formatToolOutput as S, toolOutputRawEchoSignature as T, sanitizeCodexToolResponse as _, isNativePostToolUseRelayItem as a, ToolOutputAccumulator as b, itemToolArgs as c, itemTranscriptResultText as d, shouldSuppressChannelProgressForItem as f, sanitizeCodexToolArguments as g, resolveCodexToolProgressDetailMode as h, isCommandBearingToolItem as i, itemToolError as l, isCodexCommandBearingToolCall as m, CODEX_NATIVE_SUBAGENT_RUN_ID_PREFIX as n, itemMeta as o, inferCodexDynamicToolMeta as p, CODEX_NATIVE_SUBAGENT_TASK_KIND as r, itemOutputText as s, CODEX_NATIVE_SUBAGENT_RUNTIME as t, itemToolResult as u, TOOL_PROGRESS_ECHO_PREFIX_MIN_CHARS as v, normalizeToolTranscriptArguments as w, collectDynamicToolContentText as x, TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS as y };
+export { formatToolSummary as A, sanitizeCodexToolArguments as C, ToolOutputAccumulator as D, TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS as E, readCodexResponseOutput as M, toolOutputRawEchoSignature as N, collectDynamicToolContentText as O, truncateToolTranscriptText as P, resolveCodexToolProgressDetailMode as S, TOOL_PROGRESS_ECHO_PREFIX_MIN_CHARS as T, readCodeModeNativePatchInput as _, readCodexNativeSubagentRunId as a, inferCodexDynamicToolMeta as b, isCommandBearingToolItem as c, itemOutputText as d, itemToolArgs as f, projectCodexToolActivity as g, itemTranscriptResultText as h, codexNativeSubagentRunId as i, normalizeToolTranscriptArguments as j, formatToolOutput as k, isNativePostToolUseRelayItem as l, itemToolResult as m, CODEX_NATIVE_SUBAGENT_RUN_ID_PREFIX as n, readNativeSubagentThreadIds as o, itemToolError as p, CODEX_NATIVE_SUBAGENT_TASK_KIND as r, readNativeTaskAssignment as s, CODEX_NATIVE_SUBAGENT_RUNTIME as t, itemMeta as u, readInterceptedNativePatchInput as v, sanitizeCodexToolResponse as w, isCodexCommandBearingToolCall as x, shouldSuppressChannelProgressForItem as y };

package/dist/{node-cli-sessions-DKaOmVUh.js → .setup/node-cli-sessions-r3avj02l.mjs}

@@ -1,19 +1,22 @@
-import { o as formatCodexDisplayText } from "./command-formatters-lxlkNZgU.js";
+import { p as resolveCodexAppServerUserHomeDir } from "./config-security-BEReZ6go.mjs";
+import { N as readBoundedOptionalString } from "./session-catalog-native-projection-DowriLid.mjs";
+import { s as codexCatalogHomeId } from "./session-catalog-events-Bj6j94E_.mjs";
+import { o as formatCodexDisplayText } from "./command-formatters-Bmqvr9tO.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
-import { runCommandBuffered } from "openclaw/plugin-sdk/process-runtime";
+import { runCommandBuffered, withCommandProcessScope } from "openclaw/plugin-sdk/process-runtime";
 import { materializeWindowsSpawnProgram, resolveWindowsSpawnProgram } from "openclaw/plugin-sdk/windows-spawn";
 import path from "node:path";
-import os from "node:os";
 import fs from "node:fs/promises";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import process from "node:process";
+import { parseAgentSessionKey } from "openclaw/plugin-sdk/routing";
 import { resolvePreferredOpenClawTmpDir } from "openclaw/plugin-sdk/temp-path";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 //#region extensions/codex/src/jsonl-lines.ts
 const JSONL_STREAM_THRESHOLD_BYTES = 4194304;
 const JSONL_READ_CHUNK_BYTES = 1048576;
-async function visitJsonlLines(file, visitor, chunkBytes = JSONL_READ_CHUNK_BYTES) {
+async function visitJsonlLines(file, visitor) {
 	let size;
 	try {
 		size = (await fs.stat(file)).size;
@@ -40,7 +43,7 @@ async function visitJsonlLines(file, visitor, chunkBytes = JSONL_READ_CHUNK_BYTE
 		let lineCount = 0;
 		for (const line of content.split(/\r?\n/u)) {
 			lineCount += 1;
-			if (visitor(line) === false) break;
+			visitor(line);
 		}
 		return {
 			ok: true,
@@ -56,7 +59,7 @@ async function visitJsonlLines(file, visitor, chunkBytes = JSONL_READ_CHUNK_BYTE
 			lineCount: 0
 		};
 	}
-	const buffer = Buffer.allocUnsafe(chunkBytes);
+	const buffer = Buffer.allocUnsafe(JSONL_READ_CHUNK_BYTES);
 	const decoder = new TextDecoder();
 	let pendingFragments = [];
 	let lineCount = 0;
@@ -77,10 +80,7 @@ async function visitJsonlLines(file, visitor, chunkBytes = JSONL_READ_CHUNK_BYTE
 				}
 				const line = rawLine.endsWith("\r") ? rawLine.slice(0, -1) : rawLine;
 				lineCount += 1;
-				if (visitor(line) === false) return {
-					ok: true,
-					lineCount
-				};
+				visitor(line);
 				lineStart = newline + 1;
 			}
 			if (lineStart < content.length) pendingFragments.push(content.slice(lineStart));
@@ -110,21 +110,25 @@ async function visitJsonlLines(file, visitor, chunkBytes = JSONL_READ_CHUNK_BYTE
 //#region extensions/codex/src/node-cli-sessions.ts
 const CODEX_CLI_SESSIONS_LIST_COMMAND = "codex.cli.sessions.list";
 const CODEX_CLI_SESSION_RESUME_COMMAND = "codex.cli.session.resume";
+const CODEX_CLI_SESSION_SOURCE_CAPABILITY = "codex-cli-session-source";
+const CODEX_CLI_SESSION_SOURCE_UPGRADE_MESSAGE = "Update the node and approve its refreshed capabilities before continuing this Codex catalog session.";
 const DEFAULT_SESSION_LIMIT = 10;
 const MAX_SESSION_LIMIT = 50;
 const DEFAULT_RESUME_TIMEOUT_MS = 12e5;
 const SESSION_ID_PATTERN = /^[A-Za-z0-9._:-]{1,128}$/;
 const activeResumeSessions = /* @__PURE__ */ new Set();
-function createCodexCliSessionNodeHostCommands() {
+function createCodexCliSessionNodeHostCommands(resolveCatalogSource) {
 	return [{
 		command: CODEX_CLI_SESSIONS_LIST_COMMAND,
 		cap: "codex-cli-sessions",
+		hasActiveWork: () => false,
 		handle: listLocalCodexCliSessions
 	}, {
 		command: CODEX_CLI_SESSION_RESUME_COMMAND,
-		cap: "codex-cli-sessions",
+		cap: CODEX_CLI_SESSION_SOURCE_CAPABILITY,
 		dangerous: true,
-		handle: resumeLocalCodexCliSession
+		hasActiveWork: () => activeResumeSessions.size > 0,
+		handle: (paramsJSON, _io, context) => resumeLocalCodexCliSession(paramsJSON, resolveCatalogSource, context)
 	}];
 }
 function createCodexCliSessionNodeInvokePolicies() {
@@ -139,7 +143,11 @@ function createCodexCliSessionNodeInvokePolicies() {
 	}, {
 		commands: [CODEX_CLI_SESSION_RESUME_COMMAND],
 		dangerous: true,
-		handle: (ctx) => ctx.invokeNode()
+		handle: (ctx) => isRecord(ctx.params) && (ctx.params.agentId !== void 0 || ctx.params.sourceHomeId !== void 0) && !ctx.node?.caps?.includes("codex-cli-session-source") ? {
+			ok: false,
+			code: "CODEX_NODE_SOURCE_UNAVAILABLE",
+			message: CODEX_CLI_SESSION_SOURCE_UPGRADE_MESSAGE
+		} : ctx.invokeNode()
 	}];
 }
 async function listCodexCliSessionsOnNode(params) {
@@ -176,11 +184,30 @@ async function resolveCodexCliSessionForBindingOnNode(params) {
 	};
 }
 async function resumeCodexCliSessionOnNode(params) {
+	let catalogAgentId;
+	let catalogHomeId;
+	if (params.sessionKey) {
+		const { adoptionSessionKeyRest, CODEX_NODE_SESSION_KEY_PREFIX, readNodeSessionMarker } = await import("./session-catalog-node-adoption-ITddWx_X.mjs");
+		const entry = params.runtime.agent.session.getSessionEntry({
+			sessionKey: params.sessionKey,
+			readConsistency: "latest"
+		});
+		const codex = entry?.pluginExtensions?.codex;
+		if (adoptionSessionKeyRest(params.sessionKey).startsWith(CODEX_NODE_SESSION_KEY_PREFIX) || isRecord(codex) && codex.sessionCatalog !== void 0) {
+			const marker = entry ? readNodeSessionMarker(entry) : void 0;
+			catalogAgentId = params.agentId?.trim();
+			if (!catalogAgentId || parseAgentSessionKey(params.sessionKey)?.agentId !== catalogAgentId || !marker || marker.initializing === true || marker.nodeId !== params.nodeId || marker.sourceHostId !== `node:${params.nodeId}` || marker.sourceThreadId !== params.sessionId || entry?.initializationPending === true || entry?.agentHarnessId !== "codex" || entry.modelSelectionLocked !== true) throw new Error("Codex catalog session changed before its node turn could run.");
+			if (!marker.sourceHomeId) throw new Error("This Codex catalog session has no saved source home. Reopen it from the catalog to continue in a new chat.");
+			catalogHomeId = marker.sourceHomeId;
+		}
+	}
 	const payload = unwrapNodeInvokePayload(await params.runtime.nodes.invoke({
 		nodeId: params.nodeId,
 		command: CODEX_CLI_SESSION_RESUME_COMMAND,
 		params: {
 			sessionId: params.sessionId,
+			...catalogAgentId ? { agentId: catalogAgentId } : {},
+			...catalogHomeId ? { sourceHomeId: catalogHomeId } : {},
 			prompt: params.prompt,
 			cwd: params.cwd,
 			timeoutMs: params.timeoutMs
@@ -206,9 +233,8 @@ async function listLocalCodexCliSessions(paramsJSON) {
 	const params = readRecordParam(paramsJSON);
 	const limit = normalizeLimit(params.limit);
 	const filter = typeof params.filter === "string" ? params.filter.trim().toLowerCase() : "";
-	const codexHome = resolveCodexHome();
+	const codexHome = resolveCodexAppServerUserHomeDir();
 	const summaries = await readHistorySessions(codexHome);
-	await hydrateSessionFiles(codexHome, summaries);
 	await hydrateSessionsFromSessionFiles(codexHome, summaries);
 	const sessions = [...summaries.values()].filter((session) => {
 		if (!filter) return true;
@@ -223,20 +249,39 @@ async function listLocalCodexCliSessions(paramsJSON) {
 		codexHome
 	});
 }
-async function resumeLocalCodexCliSession(paramsJSON) {
+async function resumeLocalCodexCliSession(paramsJSON, resolveCatalogSource, context) {
+	context?.signal?.throwIfAborted();
 	const params = readRecordParam(paramsJSON);
 	const sessionId = typeof params.sessionId === "string" ? params.sessionId.trim() : "";
 	const prompt = typeof params.prompt === "string" ? params.prompt.trim() : "";
+	const expectedHomeId = readBoundedOptionalString(params, "sourceHomeId", 256);
 	if (!sessionId || !SESSION_ID_PATTERN.test(sessionId)) throw new Error("Missing or invalid Codex CLI session id.");
 	if (!prompt) throw new Error("Missing Codex CLI prompt.");
-	if (activeResumeSessions.has(sessionId)) throw new Error(`Codex CLI session ${sessionId} already has an active resume turn.`);
-	activeResumeSessions.add(sessionId);
+	let codexHome = resolveCodexAppServerUserHomeDir();
+	let sourceHomeId;
+	let assertCurrent;
+	if (params.agentId !== void 0) {
+		if (typeof params.agentId !== "string" || !params.agentId.trim()) throw new Error("Codex catalog agent id must be a nonempty string.");
+		const source = await resolveCatalogSource(params.agentId.trim());
+		if (source.transport !== "stdio") throw new Error("Codex CLI continuation requires a local Codex catalog source.");
+		codexHome = source.codexHome;
+		sourceHomeId = source.sourceHomeId;
+		assertCurrent = () => source.assertCurrent();
+	} else sourceHomeId = codexCatalogHomeId(codexHome);
+	if (expectedHomeId && expectedHomeId !== sourceHomeId) throw new Error("Codex catalog source home changed. Reopen the session from the catalog.");
+	context?.signal?.throwIfAborted();
+	const resumeKey = `${sourceHomeId}\0${sessionId}`;
+	if (activeResumeSessions.has(resumeKey)) throw new Error(`Codex CLI session ${sessionId} already has an active resume turn.`);
+	activeResumeSessions.add(resumeKey);
 	try {
 		const text = await runCodexExecResume({
 			sessionId,
 			prompt,
 			cwd: typeof params.cwd === "string" && params.cwd.trim() ? params.cwd.trim() : void 0,
-			timeoutMs: normalizeTimeoutMs(params.timeoutMs)
+			timeoutMs: normalizeTimeoutMs(params.timeoutMs),
+			codexHome,
+			assertCurrent,
+			signal: context?.signal
 		});
 		return JSON.stringify({
 			ok: true,
@@ -244,7 +289,7 @@ async function resumeLocalCodexCliSession(paramsJSON) {
 			text: text.trim() || "Codex completed without a text reply."
 		});
 	} finally {
-		activeResumeSessions.delete(sessionId);
+		activeResumeSessions.delete(resumeKey);
 	}
 }
 async function runCodexExecResume(params) {
@@ -266,22 +311,31 @@ async function runCodexExecResume(params) {
 			execPath: process.execPath,
 			packageName: "@openai/codex"
 		}), args);
-		const result = await runCommandBuffered([invocation.command, ...invocation.argv], {
-			cwd: params.cwd || process.cwd(),
-			input: params.prompt,
-			env: process.env,
-			killGraceMs: 2e3,
-			killProcessTree: false,
-			terminateOnOutputError: true,
-			timeoutMs: params.timeoutMs
-		});
+		const result = await withCommandProcessScope(() => {
+			params.assertCurrent?.();
+			return runCommandBuffered([invocation.command, ...invocation.argv], {
+				cwd: params.cwd || process.cwd(),
+				input: params.prompt,
+				env: {
+					...process.env,
+					CODEX_HOME: params.codexHome
+				},
+				killGraceMs: 2e3,
+				signal: params.signal,
+				terminateOnOutputError: true,
+				timeoutMs: params.timeoutMs
+			});
+		}, params.signal);
+		params.signal?.throwIfAborted();
 		if (result.termination === "timeout") throw new Error(`codex exec resume timed out after ${String(params.timeoutMs)}ms`);
 		if (result.termination === "error" && result.error) throw result.error;
 		if (result.code !== 0) {
 			const message = result.stderr.toString("utf8").trim() || result.stdout.toString("utf8").trim() || `codex exec resume exited with code ${String(result.code)}`;
 			throw new Error(message);
 		}
-		return await fs.readFile(outputPath, "utf8");
+		const text = await fs.readFile(outputPath, "utf8");
+		params.signal?.throwIfAborted();
+		return text;
 	} finally {
 		await fs.rm(path.dirname(outputPath), {
 			recursive: true,
@@ -314,23 +368,6 @@ async function readHistorySessions(codexHome) {
 	})).ok) return /* @__PURE__ */ new Map();
 	return summaries;
 }
-async function hydrateSessionFiles(codexHome, summaries) {
-	if (summaries.size === 0) return;
-	const files = await findSessionFiles(path.join(codexHome, "sessions"), 4);
-	const pending = new Set(summaries.keys());
-	for (const file of files) {
-		const basename = path.basename(file);
-		const sessionId = [...pending].find((id) => basename.includes(id));
-		if (!sessionId) continue;
-		const entry = summaries.get(sessionId);
-		if (!entry) continue;
-		entry.sessionFile = file;
-		const cwd = readSessionMetaCwd(await readFirstLine(file) ?? "");
-		if (cwd) entry.cwd = cwd;
-		pending.delete(sessionId);
-		if (pending.size === 0) return;
-	}
-}
 async function hydrateSessionsFromSessionFiles(codexHome, summaries) {
 	const files = await findSessionFiles(path.join(codexHome, "sessions"), 4);
 	for (const file of files) {
@@ -405,15 +442,6 @@ async function findSessionFiles(dir, maxDepth) {
 	}
 	return files;
 }
-function readSessionMetaCwd(line) {
-	try {
-		const parsed = JSON.parse(line);
-		if (!isRecord(parsed) || parsed.type !== "session_meta" || !isRecord(parsed.payload)) return;
-		return typeof parsed.payload.cwd === "string" && parsed.payload.cwd.trim() ? parsed.payload.cwd.trim() : void 0;
-	} catch {
-		return;
-	}
-}
 function readResponseItemMessageText(parsed) {
 	if (parsed.type !== "response_item" || !isRecord(parsed.payload)) return;
 	if (parsed.payload.type !== "message") return;
@@ -482,16 +510,6 @@ function readRecordParam(paramsJSON) {
 		return {};
 	}
 }
-function resolveCodexHome() {
-	return process.env.CODEX_HOME?.trim() || path.join(os.homedir(), ".codex");
-}
-async function readFirstLine(file) {
-	let firstLine;
-	return (await visitJsonlLines(file, (line) => {
-		firstLine = line;
-		return false;
-	}, 65536)).ok ? firstLine : void 0;
-}
 async function readFileMtimeIso(file) {
 	try {
 		return (await fs.stat(file)).mtime.toISOString();
@@ -524,4 +542,4 @@ function formatNodeLabel(node) {
 	].filter(Boolean).join(" / ") || "node";
 }
 //#endregion
-export { listCodexCliSessionsOnNode as a, formatCodexCliSessions as i, createCodexCliSessionNodeHostCommands as n, resolveCodexCliSessionForBindingOnNode as o, createCodexCliSessionNodeInvokePolicies as r, resumeCodexCliSessionOnNode as s, CODEX_CLI_SESSION_RESUME_COMMAND as t };
+export { createCodexCliSessionNodeInvokePolicies as a, resolveCodexCliSessionForBindingOnNode as c, createCodexCliSessionNodeHostCommands as i, resumeCodexCliSessionOnNode as l, CODEX_CLI_SESSION_SOURCE_CAPABILITY as n, formatCodexCliSessions as o, CODEX_CLI_SESSION_SOURCE_UPGRADE_MESSAGE as r, listCodexCliSessionsOnNode as s, CODEX_CLI_SESSION_RESUME_COMMAND as t };