@openclaw/codex 2026.10.1-beta.2 → 2026.10.5-beta.1

package/dist/.setup/{native-subagent-pending-assignments-BDqhOdJp.mjs → native-subagent-pending-assignments-DmVhedNs.mjs}

@@ -63,8 +63,7 @@ function readCodexNativeSubagentRunId(runId) {
 	} : void 0;
 }
 function readNativeSubagentThreadIds(value) {
-	if (!Array.isArray(value)) return [];
-	return value.filter((entry) => typeof entry === "string" && entry.trim() !== "");
+	return Array.isArray(value) ? value.filter((entry) => typeof entry === "string" && entry.trim() !== "") : [];
 }
 function readThreadParentThreadId(thread) {
 	return readStringField(thread, "parentThreadId")?.trim() ?? readStringField(readThreadSpawnSource(thread), "parent_thread_id")?.trim();
@@ -110,25 +109,15 @@ function mutateCodexNativeSubagentSubmissions(params) {
 	const receipts = current?.receipts ?? [];
 	const existing = receipts.find((entry) => entry.parentTurnId === receipt.parentTurnId && entry.callId === receipt.callId);
 	if (existing && !isDeepStrictEqual(existing, receipt)) return { applied: false };
-	if (params.consume) {
-		if (!current) return { applied: false };
-		const remaining = receipts.filter((entry) => entry !== existing);
-		return {
-			applied: true,
-			...remaining.length ? { next: {
-				version: 1,
-				owner: current.owner,
-				receipts: remaining
-			} } : {}
-		};
-	}
+	if (params.consume && !current) return { applied: false };
+	const nextReceipts = params.consume ? receipts.filter((entry) => entry !== existing) : existing ? receipts : [...receipts, receipt];
 	return {
 		applied: true,
-		next: {
+		...nextReceipts.length ? { next: {
 			version: 1,
 			owner: current?.owner ?? owner,
-			receipts: existing ? receipts : [...receipts, receipt]
-		}
+			receipts: nextReceipts
+		} } : {}
 	};
 }
 /** Physical adoption cannot establish continuity for an unstamped receipt. */
@@ -180,13 +169,12 @@ function mutateNativePendingAssignments(params) {
 	if (!matchesNativeAssignmentLifecycle(assignment.owner, owner)) return { applied: false };
 	const assignments = current?.assignments ?? [];
 	const existing = assignments.find((entry) => entry.runId === assignment.runId);
-	if (existing && (!isDeepStrictEqual(existing.owner, assignment.owner) || existing.nativeParentThreadId !== assignment.nativeParentThreadId || existing.childThreadId !== assignment.childThreadId)) return { applied: false };
-	if (params.consume && (!existing || existing.nativeTurnId !== assignment.nativeTurnId)) return { applied: false };
+	if (existing && (!isDeepStrictEqual(existing.owner, assignment.owner) || existing.nativeParentThreadId !== assignment.nativeParentThreadId || existing.childThreadId !== assignment.childThreadId) || params.consume && (!existing || existing.nativeTurnId !== assignment.nativeTurnId)) return { applied: false };
 	const remaining = assignments.filter((entry) => entry !== existing);
-	if (!params.consume) remaining.push(existing?.recordedCompletion && !assignment.recordedCompletion ? {
-		...assignment,
-		recordedCompletion: existing.recordedCompletion
-	} : assignment);
+	if (!params.consume) {
+		if (existing?.recordedCompletion && !assignment.recordedCompletion) assignment.recordedCompletion = existing.recordedCompletion;
+		remaining.push(assignment);
+	}
 	return {
 		applied: true,
 		next: remaining.length ? {

package/dist/.setup/{native-task-assignments-C6KVqiN1.mjs → native-task-assignments-DimsQ9Qa.mjs}

@@ -1,4 +1,4 @@
-import { _ as readCodexNativeSubagentHistoryOwner, h as codexNativeSubagentHistoryConnectionFingerprint, r as readNativePendingAssignments, u as readCodexNativeSubagentRunId } from "./native-subagent-pending-assignments-BDqhOdJp.mjs";
+import { _ as readCodexNativeSubagentHistoryOwner, h as codexNativeSubagentHistoryConnectionFingerprint, r as readNativePendingAssignments, u as readCodexNativeSubagentRunId } from "./native-subagent-pending-assignments-DmVhedNs.mjs";
 import { i as CODEX_APP_SERVER_BINDING_NAMESPACE, r as CODEX_APP_SERVER_BINDING_MAX_ENTRIES } from "./session-binding-meta-Lkm5Lpf4.mjs";
 import { isDeepStrictEqual } from "node:util";
 import { z } from "zod";
@@ -11,6 +11,26 @@ const importSchema = z.object({
 	taskIds: z.array(z.string().min(1))
 }).strict();
 const detailSchema = z.object({ nativeTurnId: z.string().trim().min(1).optional() });
+const taskColumns = [
+	"task_id",
+	"runtime",
+	"task_kind",
+	"run_id",
+	"agent_id",
+	"requester_session_key",
+	"owner_key",
+	"scope_kind",
+	"status",
+	"delivery_status",
+	"ended_at",
+	"terminal_summary",
+	"error",
+	"detail_json"
+];
+var UnbindableRequesterError = class extends Error {};
+function isTerminal(task) {
+	return task.status === "succeeded" || task.status === "failed" || task.status === "cancelled";
+}
 function databasePath(params) {
 	return path.join(params.stateDir, "state", "openclaw.sqlite");
 }
@@ -36,7 +56,7 @@ async function inspect(params) {
 		if (extractErrorCode(error) === "ENOENT") return [];
 		throw error;
 	}
-	const { bindingStoreKey, readStoredCodexAppServerBinding } = await import("./session-binding-record-BZB8RgcF.mjs").then((n) => n.h);
+	const { bindingStoreKey, readStoredCodexAppServerBinding } = await import("./session-binding-record-DU_0biMD.mjs").then((n) => n.h);
 	const { executeSqliteQuerySync, getNodeSqliteKysely, openNodeSqliteDatabase, prepareSqliteReadOnlyLocation, tableExists } = await import("openclaw/plugin-sdk/sqlite-runtime");
 	const snapshot = await prepareSqliteReadOnlyLocation(source, { preserveSourceArtifacts: true });
 	try {
@@ -44,21 +64,7 @@ async function inspect(params) {
 		try {
 			if (!tableExists(db, "task_runs") || !tableExists(db, "plugin_state_entries")) return [];
 			const sql = getNodeSqliteKysely(db);
-			return executeSqliteQuerySync(db, sql.selectFrom("task_runs").select([
-				"task_id",
-				"runtime",
-				"task_kind",
-				"run_id",
-				"agent_id",
-				"requester_session_key",
-				"owner_key",
-				"scope_kind",
-				"status",
-				"delivery_status",
-				"ended_at",
-				"terminal_summary",
-				"detail_json"
-			]).select((eb) => eb.selectFrom("task_runs as all_runs").select((count) => count.fn.countAll().as("count")).whereRef("all_runs.run_id", "=", "task_runs.run_id").where("all_runs.runtime", "=", "subagent").where("all_runs.task_kind", "=", "codex-native").as("run_count")).where("runtime", "=", "subagent").where("task_kind", "=", "codex-native").where("delivery_status", "!=", "delivered").where((eb) => eb.or([
+			return executeSqliteQuerySync(db, sql.selectFrom("task_runs").select(taskColumns).select((eb) => eb.selectFrom("task_runs as all_runs").select((count) => count.fn.countAll().as("count")).whereRef("all_runs.run_id", "=", "task_runs.run_id").where("all_runs.runtime", "=", "subagent").where("all_runs.task_kind", "=", "codex-native").as("run_count")).where("runtime", "=", "subagent").where("task_kind", "=", "codex-native").where("delivery_status", "!=", "delivered").where((eb) => eb.or([
 				eb("status", "in", ["queued", "running"]),
 				eb("delivery_status", "=", "pending"),
 				eb.and([eb("delivery_status", "=", "not_applicable"), eb("ended_at", ">=", Date.now() - 6e4)])
@@ -87,7 +93,11 @@ function prepareAssignment(task, stored, params, { getSessionEntry, resolveStore
 	const detail = task.detail_json ? JSON.parse(task.detail_json) : {};
 	const owner = readCodexNativeSubagentHistoryOwner(detail);
 	if (!owner) throw new Error(missingOwnerMessage);
-	if (!identity || !native || !task.run_id || stored.state !== "active" || stored.binding.pendingSupervisionBranch) throw new Error("current requester binding is unavailable; reconnect the original requester and run openclaw doctor --fix");
+	const nativeTurnId = detailSchema.parse(detail).nativeTurnId ?? native?.turnId;
+	if (!identity || !native || !task.run_id || task.scope_kind !== "session" || task.owner_key !== identity.sessionKey) throw new Error("Task requester ownership or native locator is invalid; inspect the original child in its native Codex account");
+	if (!stored) throw new UnbindableRequesterError("original requester binding is unavailable; inspect the child in its native Codex account");
+	if (stored.state !== "active") throw new UnbindableRequesterError("original requester binding was cleared; inspect the child in its native Codex account");
+	if (stored.binding.pendingSupervisionBranch) throw new Error("current requester binding is unavailable; reconnect the original requester and run openclaw doctor --fix");
 	const session = getSessionEntry({
 		agentId: identity.agentId,
 		sessionKey: identity.sessionKey,
@@ -98,9 +108,7 @@ function prepareAssignment(task, stored, params, { getSessionEntry, resolveStore
 		}),
 		readConsistency: "latest"
 	});
-	if (!session || session.sessionId !== owner.sessionId || stored.sessionId !== owner.sessionId || session.lifecycleRevision !== owner.lifecycleRevision || session.agentHarnessId !== void 0 && session.agentHarnessId !== "codex" || codexNativeSubagentHistoryConnectionFingerprint(stored.binding) !== owner.connectionFingerprint) throw new Error("requester session, lifecycle, or connection ownership no longer matches; inspect the original child in its native Codex account");
-	if (task.scope_kind !== "session" || task.owner_key !== identity.sessionKey) throw new Error("Task requester ownership does not match its session; inspect the original child in its native Codex account");
-	const nativeTurnId = detailSchema.parse(detail).nativeTurnId ?? native.turnId;
+	if (!session || session.sessionId !== owner.sessionId || stored.sessionId !== owner.sessionId || session.lifecycleRevision !== owner.lifecycleRevision || session.agentHarnessId !== void 0 && session.agentHarnessId !== "codex" || codexNativeSubagentHistoryConnectionFingerprint(stored.binding) !== owner.connectionFingerprint) throw new UnbindableRequesterError("requester session, lifecycle, or connection ownership no longer matches; inspect the original child in its native Codex account");
 	return {
 		runId: task.run_id,
 		childThreadId: native.threadId,
@@ -116,6 +124,35 @@ function prepareAssignment(task, stored, params, { getSessionEntry, resolveStore
 		} } : {}
 	};
 }
+async function settleHistoricalDelivery(task, key, observedBinding, params, sessionStore) {
+	const { executeSqliteQuerySync, getNodeSqliteKysely, openNodeSqliteDatabase, resolveExistingSqliteFileUri, runSqliteImmediateTransactionSync } = await import("openclaw/plugin-sdk/sqlite-runtime");
+	const { readStoredCodexAppServerBinding } = await import("./session-binding-record-DU_0biMD.mjs").then((n) => n.h);
+	const db = openNodeSqliteDatabase(resolveExistingSqliteFileUri(databasePath(params)));
+	try {
+		const sql = getNodeSqliteKysely(db);
+		runSqliteImmediateTransactionSync(db, () => {
+			const current = executeSqliteQuerySync(db, sql.selectFrom("task_runs").select(taskColumns).where("task_id", "=", task.task_id)).rows[0];
+			const count = executeSqliteQuerySync(db, sql.selectFrom("task_runs").select((eb) => eb.fn.countAll().as("count")).where("runtime", "=", "subagent").where("task_kind", "=", "codex-native").where("run_id", "=", task.run_id)).rows[0]?.count;
+			const binding = executeSqliteQuerySync(db, sql.selectFrom("plugin_state_entries").select("value_json").where("plugin_id", "=", "codex").where("namespace", "=", CODEX_APP_SERVER_BINDING_NAMESPACE).where("entry_key", "=", key).where((eb) => eb.or([eb("expires_at", "is", null), eb("expires_at", ">", Date.now())]))).rows[0];
+			const value = binding ? JSON.parse(binding.value_json) : void 0;
+			if (!taskColumns.every((column) => current?.[column] === task[column]) || count !== 1 || !isDeepStrictEqual(value, observedBinding)) throw new Error("Task or binding changed during settlement; run openclaw doctor --fix again");
+			let reason;
+			try {
+				prepareAssignment(task, readStoredCodexAppServerBinding(value), params, sessionStore);
+				throw new Error("requester became available during settlement; run openclaw doctor --fix again");
+			} catch (error) {
+				if (!(error instanceof UnbindableRequesterError)) throw error;
+				reason = `Undeliverable historical delivery: ${error.message}`;
+			}
+			executeSqliteQuerySync(db, sql.updateTable("task_runs").set({
+				delivery_status: "failed",
+				error: task.error ? `${task.error}\n${reason}` : reason
+			}).where("task_id", "=", task.task_id));
+		});
+	} finally {
+		db.close();
+	}
+}
 const codexNativeTaskAssignmentMigration = {
 	id: "codex-native-task-assignments",
 	label: "Codex native pending assignments",
@@ -133,9 +170,10 @@ const codexNativeTaskAssignmentMigration = {
 			changes: [],
 			warnings
 		};
-		const { bindingStoreKey, readStoredCodexAppServerBinding } = await import("./session-binding-record-BZB8RgcF.mjs").then((n) => n.h);
+		const { bindingStoreKey, readStoredCodexAppServerBinding } = await import("./session-binding-record-DU_0biMD.mjs").then((n) => n.h);
 		const sessionStore = await import("openclaw/plugin-sdk/session-store-runtime");
 		let imported = 0;
+		let settled = 0;
 		const store = params.context.openPluginStateKeyedStore({
 			namespace: CODEX_APP_SERVER_BINDING_NAMESPACE,
 			maxEntries: CODEX_APP_SERVER_BINDING_MAX_ENTRIES,
@@ -150,14 +188,22 @@ const codexNativeTaskAssignmentMigration = {
 			const key = bindingStoreKey(identity);
 			const observed = await store.observe(key);
 			const stored = readStoredCodexAppServerBinding(observed.value);
-			if (!stored) throw new Error("original requester binding is unavailable; inspect the child in its native Codex account");
-			const marker = stored.nativeSubagentTaskImport === void 0 ? {
+			if (observed.value !== void 0 && !stored) throw new Error("original requester binding is invalid; inspect the retained binding");
+			const marker = stored?.nativeSubagentTaskImport === void 0 ? {
 				version: 1,
 				taskIds: []
 			} : importSchema.parse(stored.nativeSubagentTaskImport);
 			if (marker.taskIds.includes(task.task_id)) continue;
-			const assignment = prepareAssignment(task, stored, params, sessionStore);
-			if (stored.state !== "active" || observed.value?.state !== "active") continue;
+			let assignment;
+			try {
+				assignment = prepareAssignment(task, stored, params, sessionStore);
+			} catch (error) {
+				if (!(error instanceof UnbindableRequesterError) || !isTerminal(task) || task.delivery_status !== "pending") throw error;
+				await settleHistoricalDelivery(task, key, observed.value, params, sessionStore);
+				settled += 1;
+				continue;
+			}
+			if (stored?.state !== "active" || observed.value?.state !== "active") continue;
 			const assignments = readNativePendingAssignments(stored.nativeSubagentAssignments)?.assignments ?? [];
 			const existing = assignments.find((value) => value.runId === assignment.runId);
 			if (existing && !isDeepStrictEqual(existing, assignment)) throw new Error("a newer binding assignment already owns this result; preserve both records for inspection");
@@ -185,7 +231,7 @@ const codexNativeTaskAssignmentMigration = {
 			warnings.push(`Native Codex task ${task.task_id} (${task.run_id ?? "unknown child"}) was preserved without migration: ${String(error)}`);
 		}
 		return {
-			changes: imported ? [`Preserved ${imported} native Codex assignment(s) in their existing parent bindings`] : [],
+			changes: [...imported ? [`Preserved ${imported} native Codex assignment(s) in their existing parent bindings`] : [], ...settled ? [`Settled ${settled} native Codex task(s) as undeliverable historical delivery; retained original results and ownership for inspection`] : []],
 			warnings,
 			...warnings.length ? { warningDisposition: "recoverable" } : {}
 		};

package/dist/.setup/{node-cli-sessions-B5oNDkUS.mjs → node-cli-sessions-CzKg2nGq.mjs}

@@ -1,18 +1,18 @@
-import { A as unwrapNodeInvokePayload, x as readBoundedOptionalString } from "./session-catalog-parsing-B-qWJh2x.mjs";
+import { A as unwrapNodeInvokePayload, x as readBoundedOptionalString } from "./session-catalog-parsing-DkeoVn60.mjs";
 import { r as resolveCodexAppServerUserHomeDir } from "./auth-start-options-BPIPeEX8.mjs";
-import { o as formatCodexDisplayText } from "./command-formatters-DV3DHhdr.mjs";
+import { o as formatCodexDisplayText } from "./command-formatters-xW9KpoSZ.mjs";
 import { t as codexCatalogHomeId } from "./session-catalog-home-id-vlih0B_g.mjs";
 import { asNonArrayRecord, isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
 import { materializeWindowsSpawnProgram, resolveWindowsSpawnProgram } from "openclaw/plugin-sdk/windows-spawn";
 import { runCommandBuffered, withCommandProcessScope } from "openclaw/plugin-sdk/process-runtime";
+import { safeParseJson, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import path from "node:path";
 import fs from "node:fs/promises";
 import process from "node:process";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { parseAgentSessionKey } from "openclaw/plugin-sdk/routing";
 import { resolvePreferredOpenClawTmpDir } from "openclaw/plugin-sdk/temp-path";
-import { safeParseJson, 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;
@@ -151,11 +151,20 @@ function createCodexCliSessionNodeInvokePolicies() {
 	}];
 }
 async function listCodexCliSessionsOnNode(params) {
-	const node = await resolveCodexCliNode({
-		runtime: params.runtime,
-		requestedNode: params.requestedNode,
-		command: CODEX_CLI_SESSIONS_LIST_COMMAND
-	});
+	const { runtime, requestedNode } = params;
+	const command = CODEX_CLI_SESSIONS_LIST_COMMAND;
+	const list = await runtime.nodes.list(requestedNode ? void 0 : { connected: true });
+	const requested = requestedNode?.trim();
+	const candidates = list.nodes.filter((node) => requested ? [
+		node.nodeId,
+		node.displayName,
+		node.remoteIp
+	].some((value) => value === requested) : node.connected === true && node.commands?.includes(command));
+	if (candidates.length === 0) throw new Error(requested ? `Codex CLI node ${requested} was not found.` : "No connected node exposes Codex CLI session commands.");
+	const usable = candidates.filter((node) => node.commands?.includes(command));
+	if (usable.length === 0) throw new Error(`Node ${requested ?? "candidate"} does not expose ${command}.`);
+	if (usable.length > 1) throw new Error("Multiple Codex CLI-capable nodes connected. Pass --host <node-id>.");
+	const node = expectDefined(usable[0], "single usable Codex CLI node");
 	return {
 		node,
 		result: parseCodexCliSessionsListResult(await params.runtime.nodes.invoke({
@@ -187,7 +196,7 @@ 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-7-WEQTB1.mjs");
+		const { adoptionSessionKeyRest, CODEX_NODE_SESSION_KEY_PREFIX, readNodeSessionMarker } = await import("./session-catalog-node-adoption-BdP9Zjqo.mjs");
 		const entry = params.runtime.agent.session.getSessionEntry({
 			sessionKey: params.sessionKey,
 			readConsistency: "latest"
@@ -439,23 +448,6 @@ function readResponseItemMessageText(parsed) {
 function readSessionIdFromFilename(file) {
 	return path.basename(file).match(/[0-9a-f]{8}-[0-9a-f-]{27,}/iu)?.[0];
 }
-async function resolveCodexCliNode(params) {
-	const list = await params.runtime.nodes.list(params.requestedNode ? void 0 : { connected: true });
-	const requested = params.requestedNode?.trim();
-	const candidates = list.nodes.filter((node) => {
-		if (requested) return [
-			node.nodeId,
-			node.displayName,
-			node.remoteIp
-		].some((value) => value === requested);
-		return node.connected === true && node.commands?.includes(params.command);
-	});
-	if (candidates.length === 0) throw new Error(requested ? `Codex CLI node ${requested} was not found.` : "No connected node exposes Codex CLI session commands.");
-	const usable = candidates.filter((node) => node.commands?.includes(params.command));
-	if (usable.length === 0) throw new Error(`Node ${requested ?? "candidate"} does not expose ${params.command}.`);
-	if (usable.length > 1) throw new Error("Multiple Codex CLI-capable nodes connected. Pass --host <node-id>.");
-	return expectDefined(usable[0], "single usable Codex CLI node");
-}
 function parseCodexCliSessionsListResult(raw) {
 	const payload = unwrapNodeInvokePayload(raw, "Codex CLI node command returned malformed payloadJSON.");
 	if (!isRecord(payload) || !Array.isArray(payload.sessions)) throw new Error("Codex CLI session list returned an invalid payload.");

package/dist/.setup/{node-exec-server.runtime-0xSEjKYt.mjs → node-exec-server.runtime-BWkULhBM.mjs}

@@ -1,5 +1,5 @@
-import { i as resolveManagedCodexNativeCommand, r as resolveManagedCodexAppServerStartOptions, t as isManagedCodexDesktopCommand } from "./managed-binary-C1VFoVPf.mjs";
-import { a as closeCodexAppServerTransportAndWait, t as createStdioTransport } from "./transport-stdio-a0HDa2Mj.mjs";
+import { i as resolveManagedCodexNativeCommand, r as resolveManagedCodexAppServerStartOptions, t as isManagedCodexDesktopCommand } from "./managed-binary-BtIjV7yN.mjs";
+import { o as closeCodexAppServerTransportAndWait, t as createStdioTransport } from "./transport-stdio-CRWTkKOn.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { stripVTControlCharacters } from "node:util";
 import { killProcessTree } from "openclaw/plugin-sdk/process-runtime";
@@ -156,7 +156,6 @@ async function runCodexNodeExecServer(params) {
 		const nativeReady = createDeferred();
 		const exit = createDeferred();
 		let stderr = Buffer.alloc(0);
-		let startupSettled = false;
 		let pendingLine = "";
 		const decoder = new StringDecoder("utf8");
 		const child = await createStdioTransport({
@@ -191,18 +190,16 @@ async function runCodexNodeExecServer(params) {
 			spawned.stderr.on("data", (chunk) => {
 				const next = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
 				stderr = Buffer.concat([stderr, next.subarray(-4096)]).subarray(-4096);
-				if (startupSettled) return;
+				if (pendingLine === void 0) return;
 				const lines = (pendingLine + decoder.write(next)).split("\n");
 				pendingLine = lines.pop();
 				for (const line of [...lines, pendingLine]) if (Buffer.byteLength(line, "utf8") > MAX_CODEX_EXEC_SERVER_STDERR_BYTES) {
-					startupSettled = true;
-					pendingLine = "";
+					pendingLine = void 0;
 					rejectDisconnected(/* @__PURE__ */ new Error("Codex node startup diagnostic line exceeded 4 KiB."));
 					return;
 				}
 				if (lines.some((line) => stripVTControlCharacters(line).trimEnd().endsWith(CODEX_EXEC_SERVER_READY_LINE))) {
-					startupSettled = true;
-					pendingLine = "";
+					pendingLine = void 0;
 					nativeReady.resolve();
 				}
 			});

package/dist/.setup/{plan-BJ37d2Og.mjs → plan-C_F3aio0.mjs}

@@ -1,7 +1,7 @@
 import { t as isOnlyMigrationKind } from "./scope-DOC1Xjc8.mjs";
-import { l as CODEX_PLUGINS_MARKETPLACE_NAME } from "./plugin-inventory-Bf0_piTw.mjs";
-import "./config-0Gxk3_eq.mjs";
-import { i as hasCodexSource, n as defaultCodexHome, o as readJsonObject, r as discoverCodexSource, s as sanitizeName, t as codexPluginMigrationSubscriptionWarning } from "./source-BYu0T780.mjs";
+import { u as CODEX_PLUGINS_MARKETPLACE_NAME } from "./plugin-inventory-CYgdo14P.mjs";
+import "./config-C1YVVLEA.mjs";
+import { i as hasCodexSource, n as defaultCodexHome, o as readJsonObject, r as discoverCodexSource, s as sanitizeName, t as codexPluginMigrationSubscriptionWarning } from "./source-Bxbqf3S1.mjs";
 import { asBoolean, asOptionalRecord, isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import { runCommandBuffered } from "openclaw/plugin-sdk/process-runtime";
@@ -23,14 +23,15 @@ function findMatchingAuthProfile(store, credential) {
 	const subject = credential.kind === "oauth" ? oauthSubject(credential.credential) : void 0;
 	const provider = credential.kind === "oauth" ? credential.credential.provider : credential.provider;
 	if (credential.kind === "oauth" && !subject) return;
-	for (const [profileId, existing] of Object.entries(store.profiles)) {
-		if (existing.provider !== provider) continue;
-		if (credential.kind === "api_key" && existing.type === "api_key" && existing.key === credential.key) return profileId;
+	return Object.entries(store.profiles).find(([, existing]) => {
+		if (existing.provider !== provider) return false;
+		if (credential.kind === "api_key") return existing.type === "api_key" && existing.key === credential.key;
 		if (subject && existing.type === "oauth") {
 			const previous = oauthSubject(existing);
-			if (previous?.accountId === subject.accountId && previous.userId === subject.userId) return profileId;
+			return previous?.accountId === subject.accountId && previous.userId === subject.userId;
 		}
-	}
+		return false;
+	})?.[0];
 }
 function oauthSubject(credential) {
 	const claims = decodeOpenAICodexJwtPayload$1(credential.access)?.["https://api.openai.com/auth"];
@@ -96,8 +97,8 @@ async function readCodexCliCredentialsAsync(options) {
 	options.signal?.throwIfAborted();
 	if (!options.allowKeychainPrompt) return;
 	const home = await fs.realpath(options.codexHome).catch(() => path.resolve(options.codexHome));
-	const { CodexAppServerClient } = await import("./client-C8lgBOoO.mjs").then((n) => n.n);
-	const { resolveManagedCodexPackageEntrypoint, resolveManagedCodexNativeCommand } = await import("./managed-binary-C1VFoVPf.mjs").then((n) => n.n);
+	const { CodexAppServerClient } = await import("./client-y7nO6X9c.mjs").then((n) => n.n);
+	const { resolveManagedCodexPackageEntrypoint, resolveManagedCodexNativeCommand } = await import("./managed-binary-BtIjV7yN.mjs").then((n) => n.n);
 	const launcher = resolveManagedCodexPackageEntrypoint(path.dirname(fileURLToPath(import.meta.url)));
 	const command = launcher ? resolveManagedCodexNativeCommand(launcher) : void 0;
 	if (!command) return;
@@ -338,17 +339,14 @@ function resolveRequestedCredentialKind(ctx) {
 	return kind === "oauth" || kind === "api_key" ? kind : void 0;
 }
 function authProfileConfigForCredential(credential, profileId) {
-	if (credential.kind === "api_key") return {
-		profileId,
+	const profile = credential.kind === "oauth" ? credential.credential : {
 		provider: credential.provider,
-		mode: "api_key",
 		displayName: CODEX_IMPORT_DISPLAY_NAME
 	};
-	const profile = credential.credential;
 	return {
 		profileId,
 		provider: profile.provider,
-		mode: "oauth",
+		mode: credential.kind,
 		...profile.email ? { email: profile.email } : {},
 		...profile.displayName ? { displayName: profile.displayName } : {}
 	};
@@ -614,34 +612,34 @@ async function buildCodexMemoryItems(params) {
 	}
 	return items;
 }
-function uniqueSkillName(skill, counts) {
-	const base = sanitizeName(skill.name) || "codex-skill";
-	if ((counts.get(base) ?? 0) <= 1) return base;
-	const parent = sanitizeName(path.basename(path.dirname(skill.source)));
-	return sanitizeName([
-		"codex",
-		parent,
-		base
-	].filter(Boolean).join("-")) || base;
-}
 async function buildCodexSkillItems(params) {
 	const counts = /* @__PURE__ */ new Map();
-	for (const skill of params.skills) {
-		const base = sanitizeName(skill.name) || "codex-skill";
-		counts.set(base, (counts.get(base) ?? 0) + 1);
-	}
-	const planned = params.skills.map((skill) => {
-		const name = uniqueSkillName(skill, counts);
+	const named = params.skills.map((skill) => {
+		const name = sanitizeName(skill.name) || "codex-skill";
+		counts.set(name, (counts.get(name) ?? 0) + 1);
+		return {
+			skill,
+			name
+		};
+	});
+	const resolvedCounts = /* @__PURE__ */ new Map();
+	const planned = named.map(({ skill, name: initialName }) => {
+		let name = initialName;
+		if ((counts.get(name) ?? 0) > 1) {
+			const parent = sanitizeName(path.basename(path.dirname(skill.source)));
+			name = sanitizeName([
+				"codex",
+				parent,
+				name
+			].filter(Boolean).join("-")) || name;
+		}
+		resolvedCounts.set(name, (resolvedCounts.get(name) ?? 0) + 1);
 		return {
 			skill,
 			name,
 			target: path.join(params.workspaceDir, "skills", name)
 		};
 	});
-	const resolvedCounts = planned.reduce((resolved, item) => {
-		resolved.set(item.name, (resolved.get(item.name) ?? 0) + 1);
-		return resolved;
-	}, /* @__PURE__ */ new Map());
 	return await Promise.all(planned.map(async (item) => {
 		const collision = (resolvedCounts.get(item.name) ?? 0) > 1;
 		const targetExists = await pathExists(item.target);
@@ -771,27 +769,19 @@ function normalizeExistingAllowDestructiveActions(value) {
 	if (value === "ask") return "ask";
 	return asBoolean(value);
 }
-function readExistingPluginPolicyRepairs(config) {
-	return Object.fromEntries(Object.entries(readExistingCodexPluginEntries(config)).flatMap(([configKey, entry]) => {
-		const pluginEntry = isRecord(entry) ? entry : void 0;
-		if (pluginEntry?.allow_destructive_actions !== "on-request") return [];
-		return [[configKey, {
-			...pluginEntry,
-			allow_destructive_actions: "auto"
-		}]];
-	}));
-}
 function buildCodexPluginsConfigValue(entries, config) {
-	const plugins = {
-		...readExistingPluginPolicyRepairs(config),
-		...Object.fromEntries(entries.toSorted((a, b) => a.configKey.localeCompare(b.configKey)).map((entry) => [entry.configKey, pluginConfigValue(entry)]))
-	};
+	const plugins = /* @__PURE__ */ new Map();
+	for (const [key, entry] of Object.entries(readExistingCodexPluginEntries(config))) if (isRecord(entry) && entry.allow_destructive_actions === "on-request") plugins.set(key, {
+		...entry,
+		allow_destructive_actions: "auto"
+	});
+	for (const entry of entries.toSorted((a, b) => a.configKey.localeCompare(b.configKey))) plugins.set(entry.configKey, pluginConfigValue(entry));
 	return {
 		enabled: true,
 		config: { codexPlugins: {
 			enabled: true,
 			allow_destructive_actions: normalizeExistingAllowDestructiveActions(readMigrationConfigPath(config, [...CODEX_PLUGIN_NATIVE_CONFIG_PATH, "allow_destructive_actions"])) ?? true,
-			plugins
+			plugins: Object.fromEntries(plugins)
 		} }
 	};
 }

package/dist/.setup/{plugin-activation-BcyBv8PG.mjs → plugin-activation-D7WkJMvU.mjs}

@@ -1,6 +1,6 @@
-import { r as CodexAppServerRpcError } from "./rpc-error-hmWM21RB.mjs";
-import { a as pluginReadParams, l as CODEX_PLUGINS_MARKETPLACE_NAME, n as isOpenAiCuratedMarketplaceName, r as listCodexPluginMetadata, t as findCodexMarketplacePluginSummary } from "./plugin-inventory-Bf0_piTw.mjs";
-import "./config-0Gxk3_eq.mjs";
+import { r as CodexAppServerRpcError } from "./rpc-error-C98SHchT.mjs";
+import { i as listCodexPluginMetadata, n as findCodexMarketplacePluginSummary, o as pluginReadParams, r as isOpenAiCuratedMarketplaceName, t as createCodexAppInventoryRequest, u as CODEX_PLUGINS_MARKETPLACE_NAME } from "./plugin-inventory-CYgdo14P.mjs";
+import "./config-C1YVVLEA.mjs";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 //#region extensions/codex/src/app-server/plugin-activation.ts
 /** Activates legacy curated plugins without granting install authority to other marketplaces. */
@@ -80,10 +80,9 @@ async function refreshCodexPluginRuntimeState(params) {
 async function refreshCodexAppRuntimeState(params) {
 	params.appCache.invalidate(params.appCacheKey, "Codex plugin app inventory refresh requested", void 0, params.targetAppIds);
 	if (params.deferAppInventoryRefresh) return;
-	const request = async (method, requestParams) => await params.request(method, requestParams);
 	await params.appCache.refreshNow({
 		key: params.appCacheKey,
-		request,
+		request: createCodexAppInventoryRequest(params),
 		forceRefetch: true,
 		targetAppIds: params.targetAppIds
 	});

package/dist/.setup/{plugin-app-cache-key-BW8rd98k.mjs → plugin-app-cache-key-Bg9DbDI6.mjs}

@@ -38,26 +38,21 @@ var CodexAppInventoryCache = class {
 	read(params) {
 		const nowMs = resolveDateTimestampMs(params.nowMs);
 		const entry = this.entries.get(params.key);
-		if (!entry) {
-			const refreshScheduled = params.suppressRefresh ? false : this.scheduleRefresh(params);
-			return {
-				state: "missing",
-				key: params.key,
-				revision: this.revision,
-				refreshScheduled,
-				...this.diagnostics.get(params.key) ? { diagnostic: this.diagnostics.get(params.key) } : {}
-			};
+		const state = !entry ? "missing" : entry.invalidated || !isFutureDateTimestampMs(entry.expiresAtMs, { nowMs }) ? "stale" : "fresh";
+		const refreshScheduled = (state === "missing" ? !params.suppressRefresh : state === "stale" || Boolean(params.forceRefetch)) && this.scheduleRefresh(params);
+		let snapshot;
+		if (entry) {
+			const { invalidated: _invalidated, invalidatedAppIds: _invalidatedAppIds, ...rest } = entry;
+			snapshot = rest;
 		}
-		const state = entry.invalidated || !isFutureDateTimestampMs(entry.expiresAtMs, { nowMs }) ? "stale" : "fresh";
-		const refreshScheduled = state === "fresh" && !params.forceRefetch ? false : this.scheduleRefresh(params);
-		const { invalidated: _invalidated, invalidatedAppIds: _invalidatedAppIds, ...snapshot } = entry;
+		const diagnostic = entry ? entry.lastError : this.diagnostics.get(params.key);
 		return {
 			state,
 			key: params.key,
-			revision: entry.revision,
-			snapshot,
+			revision: entry?.revision ?? this.revision,
+			...snapshot ? { snapshot } : {},
 			refreshScheduled,
-			...entry.lastError ? { diagnostic: entry.lastError } : {}
+			...diagnostic ? { diagnostic } : {}
 		};
 	}
 	/**
@@ -106,7 +101,7 @@ var CodexAppInventoryCache = class {
 		const promise = this.refreshUncoalesced(params, refreshToken, previousRefresh);
 		const currentRefresh = {
 			promise,
-			targetAppIds: new Set(params.targetAppIds?.filter(Boolean).map(codexAppIdentityKey) ?? [])
+			targetAppIds: targetAppIdSet(params.targetAppIds)
 		};
 		this.inFlight.set(params.key, currentRefresh);
 		try {
@@ -133,7 +128,7 @@ var CodexAppInventoryCache = class {
 				key: params.key,
 				apps: inventory.apps,
 				installedApps: inventory.installedApps,
-				...params.targetAppIds?.some(Boolean) ? { targetAppIds: Array.from(new Set(params.targetAppIds.filter(Boolean).map(codexAppIdentityKey))).toSorted() } : {},
+				...params.targetAppIds?.some(Boolean) ? { targetAppIds: Array.from(targetAppIdSet(params.targetAppIds)).toSorted() } : {},
 				fetchedAtMs: nowMs,
 				expiresAtMs,
 				revision: this.revision
@@ -217,9 +212,12 @@ function resolveRemainingInvalidationScope(existing, snapshot) {
 		invalidatedAppIds: remaining
 	} : { invalidated: false };
 }
+function targetAppIdSet(appIds) {
+	return new Set(appIds?.filter(Boolean).map(codexAppIdentityKey) ?? []);
+}
 function doesInFlightRefreshCover(existing, params) {
 	if (existing.targetAppIds.size === 0) return true;
-	const requestedAppIds = new Set(params.targetAppIds?.filter(Boolean).map(codexAppIdentityKey) ?? []);
+	const requestedAppIds = targetAppIdSet(params.targetAppIds);
 	return requestedAppIds.size > 0 && Array.from(requestedAppIds).every((appId) => existing.targetAppIds.has(appId));
 }
 function serializeCodexAppInventoryError(error) {
@@ -256,7 +254,7 @@ function normalizeRuntimeIdentityForCacheKey(value) {
 }
 async function readInstalledApps(request, options) {
 	const installed = await request("app/installed", { forceRefresh: options.forceRefresh });
-	const targetIds = new Set((options.targetAppIds ?? []).filter(Boolean).map(codexAppIdentityKey));
+	const targetIds = targetAppIdSet(options.targetAppIds);
 	const apps = targetIds.size === 0 ? installed.apps : installed.apps.filter((app) => targetIds.has(codexAppIdentityKey(app.id)));
 	if (apps.length === 0) return {
 		apps: [],
@@ -290,7 +288,7 @@ function redactErrorData(value, depth = 0) {
 	if (Array.isArray(value)) return value.map((entry) => redactErrorData(entry, depth + 1) ?? null);
 	if (isRecord(value)) {
 		const redacted = {};
-		for (const [key, entry] of Object.entries(value)) redacted[key] = isSensitiveErrorDataKey(key) ? "<redacted>" : redactErrorData(entry, depth + 1) ?? null;
+		for (const [key, entry] of Object.entries(value)) redacted[key] = /api[_-]?key|authorization|cookie|credential|password|secret|token/i.test(key) ? "<redacted>" : redactErrorData(entry, depth + 1) ?? null;
 		return redacted;
 	}
 	if (typeof value === "string") return truncateSerializedErrorText(value);
@@ -303,9 +301,6 @@ function sanitizeErrorMessage(message) {
 	const htmlStart = message.search(/<html[\s>]/i);
 	return truncateSerializedErrorText((htmlStart >= 0 ? `${message.slice(0, htmlStart).trimEnd()} [HTML response body omitted]` : message).replace(/([?&][^=\s"'<>]*(?:api[_-]?key|authorization|cookie|credential|password|secret|token|tk)[^=\s"'<>]*=)[^&\s"'<>]+/gi, "$1<redacted>"));
 }
-function isSensitiveErrorDataKey(key) {
-	return /api[_-]?key|authorization|cookie|credential|password|secret|token/i.test(key);
-}
 //#endregion
 //#region extensions/codex/src/app-server/plugin-app-cache-key.ts
 /**