@openclaw/codex 2026.6.10-beta.2 → 2026.6.11-beta.2

package/dist/harness.js

@@ -32,14 +32,14 @@ function createCodexAppServerAgentHarness(options) {
 			};
 		},
 		runAttempt: async (params) => {
-			const { runCodexAppServerAttempt } = await import("./run-attempt-DafK4VP9.js");
+			const { runCodexAppServerAttempt } = await import("./run-attempt-CXxtFC9d.js");
 			return runCodexAppServerAttempt(params, {
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
 				nativeHookRelay: { enabled: true }
 			});
 		},
 		runSideQuestion: async (params) => {
-			const { runCodexAppServerSideQuestion } = await import("./side-question-Di5YsbLx.js");
+			const { runCodexAppServerSideQuestion } = await import("./side-question-C-DhgJOd.js");
 			return runCodexAppServerSideQuestion(params, {
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
 				nativeHookRelay: { enabled: true }

package/dist/{provider-capabilities-D-8g7Lb2.js → provider-capabilities-D7hnTO76.js}

@@ -1211,6 +1211,7 @@ async function buildDynamicTools(input) {
 		...sessionKeys,
 		sessionId: params.sessionId,
 		runId: params.runId,
+		approvalReviewerDeviceId: params.approvalReviewerDeviceId,
 		agentDir,
 		cwd: input.effectiveCwd ?? input.effectiveWorkspace,
 		workspaceDir: input.effectiveWorkspace,

package/dist/{run-attempt-DafK4VP9.js → run-attempt-CXxtFC9d.js}

@@ -10,7 +10,7 @@ import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS, t as buil
 import { a as formatCodexDisplayText, n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BPTiVNsW.js";
 import { d as resolveCodexAppServerAuthAccountCacheKey, f as resolveCodexAppServerAuthProfileId, h as resolveCodexAppServerHomeDir, m as resolveCodexAppServerFallbackApiKeyCacheKey, n as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, o as releaseLeasedSharedCodexAppServerClient, p as resolveCodexAppServerAuthProfileIdForAgent, s as retireSharedCodexAppServerClientIfCurrent, t as clearSharedCodexAppServerClientIfCurrent, u as refreshCodexAppServerAuthTokens } from "./shared-client-Dtx5i7Ez.js";
 import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-Bm6HsGob.js";
-import { A as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, C as resolveCodexMessageToolProvider, D as shouldWarnCodexDynamicToolBuildStageSummary, E as shouldRequireCodexSandboxExecServerEnvironment, F as resolveCodexTurnTerminalIdleTimeoutMs, I as withCodexStartupTimeout, M as resolveCodexStartupTimeoutMs, N as resolveCodexTurnAssistantCompletionIdleTimeoutMs, P as resolveCodexTurnCompletionIdleTimeoutMs, S as resolveCodexExternalSandboxPolicyForOpenClawSandbox, T as shouldEnableCodexAppServerNativeToolSurface, _ as createCodexDynamicToolBuildStageTracker, a as buildCodexNativeHookRelayConfig, b as resolveCodexAppServerExecutionCwd, c as resolveCodexNativeHookRelayEvents, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, g as buildDynamicTools, h as emitDynamicToolTerminalDiagnostic, i as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, j as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, k as handleCodexAppServerApprovalRequest, l as resolveCodexNativeHookRelayTtlMs, m as emitDynamicToolStartedDiagnostic, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, s as createCodexNativeHookRelay, t as resolveCodexProviderWebSearchSupport, u as scheduleCodexNativeHookRelayUnregister, v as disableCodexPluginThreadConfig, w as resolveCodexSandboxEnvironmentSelection, x as resolveCodexAppServerHookChannelId, y as formatCodexDynamicToolBuildStageSummary } from "./provider-capabilities-D-8g7Lb2.js";
+import { A as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, C as resolveCodexMessageToolProvider, D as shouldWarnCodexDynamicToolBuildStageSummary, E as shouldRequireCodexSandboxExecServerEnvironment, F as resolveCodexTurnTerminalIdleTimeoutMs, I as withCodexStartupTimeout, M as resolveCodexStartupTimeoutMs, N as resolveCodexTurnAssistantCompletionIdleTimeoutMs, P as resolveCodexTurnCompletionIdleTimeoutMs, S as resolveCodexExternalSandboxPolicyForOpenClawSandbox, T as shouldEnableCodexAppServerNativeToolSurface, _ as createCodexDynamicToolBuildStageTracker, a as buildCodexNativeHookRelayConfig, b as resolveCodexAppServerExecutionCwd, c as resolveCodexNativeHookRelayEvents, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, g as buildDynamicTools, h as emitDynamicToolTerminalDiagnostic, i as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, j as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, k as handleCodexAppServerApprovalRequest, l as resolveCodexNativeHookRelayTtlMs, m as emitDynamicToolStartedDiagnostic, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, s as createCodexNativeHookRelay, t as resolveCodexProviderWebSearchSupport, u as scheduleCodexNativeHookRelayUnregister, v as disableCodexPluginThreadConfig, w as resolveCodexSandboxEnvironmentSelection, x as resolveCodexAppServerHookChannelId, y as formatCodexDynamicToolBuildStageSummary } from "./provider-capabilities-D7hnTO76.js";
 import { t as ensureCodexComputerUse } from "./computer-use-ClrJwoFp.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-C7qmZ0Jh.js";
 import fs from "node:fs/promises";
@@ -21,7 +21,7 @@ import { createHash, randomUUID } from "node:crypto";
 import fsSync from "node:fs";
 import { markAuthProfileBlockedUntil, resolveAgentDir, resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
-import { CODEX_APP_SERVER_CONTEXT_ENGINE_HOST, FAST_MODE_AUTO_PROGRESS_KIND, TOOL_PROGRESS_OUTPUT_MAX_CHARS, acquireSessionWriteLock, appendSessionTranscriptMessage, assembleHarnessContextEngine, assertContextEngineHostSupport, awaitAgentEndSideEffects, bootstrapHarnessContextEngine, buildBootstrapContextForFiles, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, embeddedAgentLog, emitAgentEvent, emitSessionTranscriptUpdate, finalizeHarnessContextEngineTurn, formatErrorMessage, formatFastModeAutoProgressText, formatToolAggregate, formatToolProgressOutput, getAgentHarnessHookRunner, getBeforeToolCallPolicyDiagnosticState, inferToolMetaFromArgs, isActiveHarnessContextEngine, loadCodexBundleMcpThreadConfig, normalizeUsage, resolveAgentHarnessBeforePromptBuildResult, resolveBootstrapFilesForRun, resolveContextEngineOwnerPluginId, resolveFastModeForElapsed, resolveSandboxContext, resolveSessionAgentIds as resolveSessionAgentIds$1, resolveSessionWriteLockOptions, resolveUserPath, runAgentCleanupStep, runAgentEndSideEffects, runAgentHarnessAfterCompactionHook, runAgentHarnessAfterToolCallHook, runAgentHarnessBeforeCompactionHook, runAgentHarnessBeforeMessageWriteHook, runAgentHarnessLlmInputHook, runAgentHarnessLlmOutputHook, runHarnessContextEngineMaintenance, setActiveEmbeddedRun, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { CODEX_APP_SERVER_CONTEXT_ENGINE_HOST, FAST_MODE_AUTO_PROGRESS_KIND, TOOL_PROGRESS_OUTPUT_MAX_CHARS, assembleHarnessContextEngine, assertContextEngineHostSupport, awaitAgentEndSideEffects, bootstrapHarnessContextEngine, buildAgentHarnessUserInputAnswers, buildBootstrapContextForFiles, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, deliverAgentHarnessUserInputPrompt, embeddedAgentLog, emitAgentEvent, emptyAgentHarnessUserInputAnswers, finalizeHarnessContextEngineTurn, formatErrorMessage, formatFastModeAutoProgressText, formatToolAggregate, formatToolProgressOutput, getAgentHarnessHookRunner, getBeforeToolCallPolicyDiagnosticState, inferToolMetaFromArgs, isActiveHarnessContextEngine, loadCodexBundleMcpThreadConfig, normalizeUsage, resolveAgentHarnessBeforePromptBuildResult, resolveBootstrapFilesForRun, resolveContextEngineOwnerPluginId, resolveFastModeForElapsed, resolveSandboxContext, resolveSessionAgentIds as resolveSessionAgentIds$1, resolveUserPath, runAgentCleanupStep, runAgentEndSideEffects, runAgentHarnessAfterCompactionHook, runAgentHarnessAfterToolCallHook, runAgentHarnessBeforeCompactionHook, runAgentHarnessBeforeMessageWriteHook, runAgentHarnessLlmInputHook, runAgentHarnessLlmOutputHook, runHarnessContextEngineMaintenance, setActiveEmbeddedRun, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { buildMemorySystemPromptAddition } from "openclaw/plugin-sdk/core";
 import { spawn } from "node:child_process";
 import { once } from "node:events";
@@ -31,6 +31,7 @@ import { createDiagnosticTraceContextFromActiveScope, emitTrustedDiagnosticEvent
 import { appendRegularFile, pathExists } from "openclaw/plugin-sdk/security-runtime";
 import { MESSAGE_TOOL_DELIVERY_HINTS } from "openclaw/plugin-sdk/message-tool-delivery-hints";
 import { buildSessionContext, migrateSessionEntries, parseSessionEntries } from "openclaw/plugin-sdk/agent-sessions";
+import { publishSessionTranscriptUpdateByIdentity, resolveSessionTranscriptTarget, withSessionTranscriptWriteLock } from "openclaw/plugin-sdk/session-transcript-runtime";
 import { isIP } from "node:net";
 import { SsrFBlockedError, isBlockedHostnameOrIp } from "openclaw/plugin-sdk/ssrf-runtime";
 import { generatedImageAssetFromBase64 } from "openclaw/plugin-sdk/image-generation";
@@ -146,22 +147,30 @@ async function retireCodexAppServerClientAfterTimedOutTurn(client, params) {
 * Reads OpenClaw session history for Codex transcript mirroring and sanitizes
 * image payloads before replaying messages into the app-server projector.
 */
-function isMissingFileError(error) {
-	return Boolean(error && typeof error === "object" && "code" in error && error.code === "ENOENT");
-}
 /** Returns sanitized session-context messages for a Codex mirrored session file. */
-async function readCodexMirroredSessionHistoryMessages(sessionFile) {
+async function readCodexMirroredSessionHistoryMessages(target) {
 	try {
-		const entries = parseSessionEntries(await fs.readFile(sessionFile, "utf-8"));
+		await resolveSessionTranscriptTarget(resolveCodexHistoryTranscriptTarget(target));
+		const entries = parseSessionEntries(await fs.readFile(target.sessionFile, "utf-8"));
+		if (entries.length === 0) return [];
 		const firstEntry = entries[0];
 		if (firstEntry?.type !== "session" || typeof firstEntry.id !== "string") return;
 		migrateSessionEntries(entries);
-		return sanitizeCodexHistoryImagePayloads(buildSessionContext(entries.filter((entry) => entry.type !== "session")).messages, "codex mirrored history");
-	} catch (error) {
-		if (isMissingFileError(error)) return [];
+		return sanitizeCodexHistoryImagePayloads(buildSessionContext(entries.filter((entry) => {
+			return entry !== null && typeof entry === "object" && !Array.isArray(entry) && entry.type !== "session";
+		})).messages, "codex mirrored history");
+	} catch {
 		return;
 	}
 }
+function resolveCodexHistoryTranscriptTarget(target) {
+	return {
+		...target.agentId ? { agentId: target.agentId } : {},
+		sessionFile: target.sessionFile,
+		sessionId: target.sessionId,
+		sessionKey: target.sessionKey ?? ""
+	};
+}
 //#endregion
 //#region extensions/codex/src/app-server/attempt-context.ts
 /**
@@ -189,9 +198,9 @@ const CODEX_BOOTSTRAP_CONTEXT_ORDER = new Map([
 	["heartbeat.md", 70]
 ]);
 /** Reads mirrored Codex session history for harness hooks. */
-async function readMirroredSessionHistoryMessages(sessionFile) {
-	const messages = await readCodexMirroredSessionHistoryMessages(sessionFile);
-	if (!messages) embeddedAgentLog.warn("failed to read mirrored session history for codex harness hooks", { sessionFile });
+async function readMirroredSessionHistoryMessages(params) {
+	const messages = await readCodexMirroredSessionHistoryMessages(params);
+	if (!messages) embeddedAgentLog.warn("failed to read mirrored session history for codex harness hooks", { sessionFile: params.sessionFile });
 	return messages;
 }
 /** Reads a valid thread-bootstrap projection request from context-engine output. */
@@ -3644,14 +3653,14 @@ function buildMirrorDedupeIdentity(message) {
 async function mirrorCodexAppServerTranscript(params) {
 	const messages = params.messages.filter((message) => message.role === "user" || message.role === "assistant" || message.role === "toolResult");
 	if (messages.length === 0) return { userMessagesPresent: [] };
-	const lock = await acquireSessionWriteLock({
-		sessionFile: params.sessionFile,
-		...resolveSessionWriteLockOptions(params.config)
-	});
-	const appendedUpdates = [];
-	const userMessagesPresent = [];
-	try {
-		const mirrorState = await readTranscriptMirrorState(params.sessionFile);
+	const transcriptTarget = resolveCodexMirrorTranscriptTarget(params);
+	const { appendedUpdates, userMessagesPresent } = await withSessionTranscriptWriteLock({
+		...transcriptTarget,
+		config: params.config
+	}, async (transcript) => {
+		const nextAppendedUpdates = [];
+		const nextUserMessagesPresent = [];
+		const mirrorState = readTranscriptMirrorState(await transcript.readEvents());
 		let nextMessageSeq = mirrorState.messageCount;
 		for (const message of messages) {
 			const dedupeIdentity = buildMirrorDedupeIdentity(message);
@@ -3662,7 +3671,7 @@ async function mirrorCodexAppServerTranscript(params) {
 			};
 			if (idempotencyKey && mirrorState.idempotencyKeys.has(idempotencyKey)) {
 				const persistedUserMessage = mirrorState.userMessagesByIdempotencyKey.get(idempotencyKey);
-				if (persistedUserMessage) userMessagesPresent.push(persistedUserMessage);
+				if (persistedUserMessage) nextUserMessagesPresent.push(persistedUserMessage);
 				continue;
 			}
 			const nextMessage = runAgentHarnessBeforeMessageWriteHook({
@@ -3675,65 +3684,61 @@ async function mirrorCodexAppServerTranscript(params) {
 				...nextMessage,
 				idempotencyKey
 			} : nextMessage;
-			const { messageId, message: appendedMessage } = await appendSessionTranscriptMessage({
-				transcriptPath: params.sessionFile,
+			const appended = await transcript.appendMessage({
 				message: messageToAppend,
 				idempotencyLookup: idempotencyKey ? "caller-checked" : "scan",
-				sessionId: params.sessionId,
-				cwd: params.cwd,
-				config: params.config
+				cwd: params.cwd
 			});
+			if (!appended) continue;
+			const { messageId, message: appendedMessage } = appended;
 			if (appendedMessage.role === "user") {
-				userMessagesPresent.push(appendedMessage);
+				nextUserMessagesPresent.push(appendedMessage);
 				if (idempotencyKey) mirrorState.userMessagesByIdempotencyKey.set(idempotencyKey, appendedMessage);
 			}
 			nextMessageSeq += 1;
-			appendedUpdates.push({
+			nextAppendedUpdates.push({
 				messageId,
 				message: appendedMessage,
 				messageSeq: nextMessageSeq
 			});
 			if (idempotencyKey) mirrorState.idempotencyKeys.add(idempotencyKey);
 		}
-	} finally {
-		await lock.release();
-	}
-	for (const update of appendedUpdates) emitSessionTranscriptUpdate({
-		sessionFile: params.sessionFile,
-		...params.sessionKey ? { sessionKey: params.sessionKey } : {},
-		...params.agentId ? { agentId: params.agentId } : {},
-		message: update.message,
-		messageId: update.messageId,
-		messageSeq: update.messageSeq
+		return {
+			appendedUpdates: nextAppendedUpdates,
+			userMessagesPresent: nextUserMessagesPresent
+		};
+	});
+	for (const update of appendedUpdates) await publishSessionTranscriptUpdateByIdentity({
+		...transcriptTarget,
+		update: {
+			...params.sessionKey ? { sessionKey: params.sessionKey } : {},
+			...params.agentId ? { agentId: params.agentId } : {},
+			message: update.message,
+			messageId: update.messageId,
+			messageSeq: update.messageSeq
+		}
 	});
 	return { userMessagesPresent };
 }
-async function readTranscriptMirrorState(sessionFile) {
+function resolveCodexMirrorTranscriptTarget(params) {
+	return {
+		...params.agentId ? { agentId: params.agentId } : {},
+		sessionFile: params.sessionFile,
+		sessionId: params.sessionId,
+		sessionKey: params.sessionKey ?? ""
+	};
+}
+function readTranscriptMirrorState(events) {
 	const idempotencyKeys = /* @__PURE__ */ new Set();
 	const userMessagesByIdempotencyKey = /* @__PURE__ */ new Map();
 	let messageCount = 0;
-	let raw;
-	try {
-		raw = await fs.readFile(sessionFile, "utf8");
-	} catch (error) {
-		if (error.code !== "ENOENT") throw error;
-		return {
-			idempotencyKeys,
-			messageCount,
-			userMessagesByIdempotencyKey
-		};
-	}
-	for (const line of raw.split(/\r?\n/)) {
-		if (!line.trim()) continue;
-		try {
-			const parsed = JSON.parse(line);
-			if (parsed.type === "message") messageCount += 1;
-			if (typeof parsed.message?.idempotencyKey === "string") {
-				idempotencyKeys.add(parsed.message.idempotencyKey);
-				if (parsed.message.role === "user") userMessagesByIdempotencyKey.set(parsed.message.idempotencyKey, parsed.message);
-			}
-		} catch {
-			continue;
+	for (const event of events) {
+		if (!event || typeof event !== "object" || Array.isArray(event)) continue;
+		const parsed = event;
+		if (parsed.type === "message") messageCount += 1;
+		if (typeof parsed.message?.idempotencyKey === "string") {
+			idempotencyKeys.add(parsed.message.idempotencyKey);
+			if (parsed.message.role === "user") userMessagesByIdempotencyKey.set(parsed.message.idempotencyKey, parsed.message);
 		}
 	}
 	return {
@@ -3830,7 +3835,6 @@ var CodexAppServerEventProjector = class {
 		this.toolTrajectoryNamesById = /* @__PURE__ */ new Map();
 		this.toolTrajectoryItemsById = /* @__PURE__ */ new Map();
 		this.transcriptToolProgressCallIds = /* @__PURE__ */ new Set();
-		this.nativeGeneratedMediaUrls = /* @__PURE__ */ new Set();
 		this.nativeGeneratedMediaItemIds = /* @__PURE__ */ new Set();
 		this.nativeGeneratedMediaUrlsByItemId = /* @__PURE__ */ new Map();
 		this.diagnosticToolStartedAtByItem = /* @__PURE__ */ new Map();
@@ -3838,6 +3842,7 @@ var CodexAppServerEventProjector = class {
 		this.assistantStarted = false;
 		this.reasoningStarted = false;
 		this.reasoningEnded = false;
+		this.streamedPartialAssistantItemReplaceable = false;
 		this.promptErrorSource = null;
 		this.synthesizedMissingToolResultError = null;
 		this.aborted = false;
@@ -4053,10 +4058,28 @@ var CodexAppServerEventProjector = class {
 			itemId,
 			text
 		});
-		else if (this.shouldStreamAssistantPartial(itemId)) await this.params.onPartialReply?.({
-			text,
-			delta
-		});
+		else {
+			const knownFinalAnswer = this.shouldStreamAssistantPartial(itemId);
+			const replace = this.streamedPartialAssistantItemId !== void 0 && this.streamedPartialAssistantItemId !== itemId;
+			if (replace && (!knownFinalAnswer || this.streamedPartialAssistantItemReplaceable)) this.streamedPartialAssistantItemReplaceable = true;
+			else if (this.streamedPartialAssistantItemId === void 0) this.streamedPartialAssistantItemReplaceable = !knownFinalAnswer;
+			this.streamedPartialAssistantItemId = itemId;
+			const replaceable = this.streamedPartialAssistantItemReplaceable;
+			const replacement = replace && replaceable;
+			const streamPayload = {
+				text,
+				delta: replacement ? "" : delta,
+				...replacement ? { replace: true } : {}
+			};
+			this.emitAgentEvent({
+				stream: "assistant",
+				data: {
+					...streamPayload,
+					...replaceable ? { replaceable: true } : {}
+				}
+			});
+			if (knownFinalAnswer && !replaceable) await this.params.onPartialReply?.(streamPayload);
+		}
 	}
 	async handleReasoningDelta(method, params) {
 		const itemId = readString$5(params, "itemId") ?? readString$5(params, "id") ?? "reasoning";
@@ -4456,7 +4479,8 @@ var CodexAppServerEventProjector = class {
 			const saved = await saveMediaBuffer(asset.buffer, asset.mimeType, GENERATED_IMAGE_MEDIA_SUBDIR, maxBytes, asset.fileName);
 			this.recordNativeGeneratedMediaUrl({
 				itemId,
-				mediaUrl: saved.path
+				mediaUrl: saved.path,
+				replaceExisting: true
 			});
 		} catch (error) {
 			embeddedAgentLog.warn("codex app-server raw image generation result save failed", {
@@ -4466,17 +4490,16 @@ var CodexAppServerEventProjector = class {
 		}
 	}
 	recordNativeGeneratedMediaUrl(params) {
-		if (this.nativeGeneratedMediaUrlsByItemId.has(params.itemId)) {
+		if (this.nativeGeneratedMediaUrlsByItemId.has(params.itemId) && params.replaceExisting !== true) {
 			this.nativeGeneratedMediaItemIds.add(params.itemId);
 			return;
 		}
 		this.nativeGeneratedMediaUrlsByItemId.set(params.itemId, params.mediaUrl);
-		this.nativeGeneratedMediaUrls.add(params.mediaUrl);
 		this.nativeGeneratedMediaItemIds.add(params.itemId);
 	}
 	buildToolMediaUrls(toolTelemetry) {
 		const mediaUrls = new Set(toolTelemetry.toolMediaUrls?.map((url) => url.trim()).filter(Boolean) ?? []);
-		if ((toolTelemetry.messagingToolSentMediaUrls?.length ?? 0) === 0) for (const mediaUrl of this.nativeGeneratedMediaUrls) mediaUrls.add(mediaUrl);
+		if ((toolTelemetry.messagingToolSentMediaUrls?.length ?? 0) === 0) for (const mediaUrl of this.nativeGeneratedMediaUrlsByItemId.values()) mediaUrls.add(mediaUrl);
 		return mediaUrls.size > 0 ? [...mediaUrls] : toolTelemetry.toolMediaUrls;
 	}
 	async maybeEndReasoning() {
@@ -5007,7 +5030,12 @@ var CodexAppServerEventProjector = class {
 		}
 	}
 	async readMirroredSessionMessages() {
-		return await readCodexMirroredSessionHistoryMessages(this.params.sessionFile) ?? [];
+		return await readCodexMirroredSessionHistoryMessages({
+			agentId: this.params.agentId,
+			sessionFile: this.params.sessionFile,
+			sessionId: this.params.sessionId,
+			sessionKey: this.params.sessionKey
+		}) ?? [];
 	}
 	createAssistantMessage(text) {
 		const attribution = resolveCodexLocalRuntimeAttribution(this.params);
@@ -6018,6 +6046,7 @@ const DEFAULT_COMPLETION_DELIVERY_RETRY_DELAYS_MS = [
 ];
 const DEFAULT_TASK_ROW_RECONCILE_INTERVAL_MS = 1e4;
 const RECENT_TERMINAL_TASK_RECONCILE_GRACE_MS = 6e4;
+const CODEX_ROLLOUT_FILENAME_RE = /^rollout-\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-(.+)\.jsonl$/u;
 const defaultRuntime = {
 	createAgentHarnessTaskRuntime,
 	deliverAgentHarnessTaskCompletion
@@ -6689,8 +6718,9 @@ async function findTranscriptCompletion(params) {
 async function findTranscriptPaths(params) {
 	const sessionsDir = path.join(params.codexHome, "sessions");
 	const found = /* @__PURE__ */ new Map();
+	const remaining = new Set(params.childThreadIds);
 	const stack = [sessionsDir];
-	while (stack.length > 0 && found.size < params.childThreadIds.size) {
+	while (stack.length > 0 && remaining.size > 0) {
 		const dir = stack.pop();
 		let entries;
 		try {
@@ -6705,7 +6735,17 @@ async function findTranscriptPaths(params) {
 				continue;
 			}
 			if (!entry.isFile() || !entry.name.endsWith(".jsonl")) continue;
-			for (const childThreadId of params.childThreadIds) if (!found.has(childThreadId) && entry.name.includes(childThreadId)) found.set(childThreadId, entryPath);
+			const rolloutMatch = entry.name.match(CODEX_ROLLOUT_FILENAME_RE);
+			if (rolloutMatch) {
+				const childThreadId = rolloutMatch[1];
+				if (remaining.delete(childThreadId)) found.set(childThreadId, entryPath);
+				continue;
+			}
+			for (const childThreadId of remaining) if (entry.name.includes(childThreadId)) {
+				found.set(childThreadId, entryPath);
+				remaining.delete(childThreadId);
+				break;
+			}
 		}
 	}
 	return found;
@@ -6726,7 +6766,8 @@ async function findTranscriptPath(params) {
 				stack.push(entryPath);
 				continue;
 			}
-			if (entry.isFile() && entry.name.endsWith(".jsonl") && entry.name.includes(params.childThreadId)) return entryPath;
+			const rolloutMatch = entry.name.match(CODEX_ROLLOUT_FILENAME_RE);
+			if (entry.isFile() && entry.name.endsWith(".jsonl") && (rolloutMatch ? rolloutMatch[1] === params.childThreadId : entry.name.includes(params.childThreadId))) return entryPath;
 		}
 	}
 }
@@ -7520,69 +7561,16 @@ function readOption(value) {
 	} : void 0;
 }
 async function deliverUserInputPrompt(params, questions) {
-	const text = formatUserInputPrompt(questions);
-	if (params.onBlockReply) {
-		await params.onBlockReply({ text });
-		return;
-	}
-	await params.onPartialReply?.({ text });
-}
-function formatUserInputPrompt(questions) {
-	const lines = ["Codex needs input:"];
-	questions.forEach((question, index) => {
-		if (questions.length > 1) lines.push("", `${index + 1}. ${formatCodexDisplayText(question.header)}`, formatCodexDisplayText(question.question));
-		else lines.push("", formatCodexDisplayText(question.header), formatCodexDisplayText(question.question));
-		if (question.isSecret) lines.push("This channel may show your reply to other participants.");
-		question.options?.forEach((option, optionIndex) => {
-			lines.push(`${optionIndex + 1}. ${formatCodexDisplayText(option.label)}${option.description ? ` - ${formatCodexDisplayText(option.description)}` : ""}`);
-		});
-		if (question.isOther) lines.push("Other: reply with your own answer.");
+	await deliverAgentHarnessUserInputPrompt(params, questions, {
+		formatText: formatCodexDisplayText,
+		intro: "Codex needs input:"
 	});
-	return lines.join("\n");
 }
 function buildUserInputResponse(questions, inputText) {
-	const answers = {};
-	if (questions.length === 1) {
-		const question = questions[0];
-		if (question) {
-			const answer = normalizeAnswer(inputText, question);
-			answers[question.id] = { answers: answer ? [answer] : [] };
-		}
-		return { answers };
-	}
-	const keyed = parseKeyedAnswers(inputText);
-	const fallbackLines = inputText.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-	questions.forEach((question, index) => {
-		const answer = keyed.get(question.id.toLowerCase()) ?? keyed.get(question.header.toLowerCase()) ?? keyed.get(question.question.toLowerCase()) ?? keyed.get(String(index + 1)) ?? fallbackLines[index] ?? "";
-		const normalized = answer ? normalizeAnswer(answer, question) : void 0;
-		answers[question.id] = { answers: normalized ? [normalized] : [] };
-	});
-	return { answers };
-}
-function normalizeAnswer(answer, question) {
-	const trimmed = answer.trim();
-	const options = question.options ?? [];
-	const optionIndex = /^\d+$/.test(trimmed) ? Number(trimmed) - 1 : -1;
-	const indexed = optionIndex >= 0 ? options[optionIndex] : void 0;
-	if (indexed) return indexed.label;
-	const exact = options.find((option) => option.label.toLowerCase() === trimmed.toLowerCase());
-	if (exact) return exact.label;
-	if (options.length > 0 && !question.isOther) return;
-	return trimmed || void 0;
-}
-function parseKeyedAnswers(inputText) {
-	const answers = /* @__PURE__ */ new Map();
-	for (const line of inputText.split(/\r?\n/)) {
-		const match = line.match(/^\s*([^:=-]+?)\s*[:=-]\s*(.+?)\s*$/);
-		if (!match) continue;
-		const key = match[1]?.trim().toLowerCase();
-		const value = match[2]?.trim();
-		if (key && value) answers.set(key, value);
-	}
-	return answers;
+	return buildAgentHarnessUserInputAnswers(questions, inputText);
 }
 function emptyUserInputResponse() {
-	return { answers: {} };
+	return emptyAgentHarnessUserInputAnswers();
 }
 function readString(record, key) {
 	const value = record[key];
@@ -8041,7 +8029,13 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		}
 	});
 	const hadSessionFile = await pathExists(activeSessionFile);
-	let historyMessages = await readMirroredSessionHistoryMessages(activeSessionFile) ?? [];
+	const activeTranscriptTarget = {
+		agentId: sessionAgentId,
+		sessionFile: activeSessionFile,
+		sessionId: activeSessionId,
+		sessionKey: contextSessionKey
+	};
+	let historyMessages = !activeContextEngine && initialStartupBindingHadInactiveThreadBootstrap ? [] : await readMirroredSessionHistoryMessages(activeTranscriptTarget) ?? [];
 	const hookContextWindowFields = {
 		...params.contextWindowInfo?.tokens ? { contextTokenBudget: params.contextWindowInfo.tokens } : params.contextTokenBudget ? { contextTokenBudget: params.contextTokenBudget } : {},
 		...params.contextWindowInfo?.source ? { contextWindowSource: params.contextWindowInfo.source } : {},
@@ -8087,7 +8081,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			config: params.config,
 			warn: (message) => embeddedAgentLog.warn(message)
 		});
-		historyMessages = await readMirroredSessionHistoryMessages(activeSessionFile) ?? historyMessages;
+		historyMessages = await readMirroredSessionHistoryMessages(activeTranscriptTarget) ?? historyMessages;
 	}
 	const workspaceBootstrapContext = await buildCodexWorkspaceBootstrapContext({
 		params,
@@ -9437,6 +9431,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	}
 	turnIdRef.current = turn.turn.id;
 	const activeTurnId = turn.turn.id;
+	let assistantStreamEventEmitted = false;
+	let assistantStreamNeedsTerminalSnapshot = false;
 	emitExecutionPhaseOnce("turn_accepted", { phase: "turn_accepted" });
 	userInputBridgeRef.current = createCodexUserInputBridge({
 		paramsForRun: params,
@@ -9450,7 +9446,16 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		prompt: codexTurnPromptText,
 		imagesCount: params.images?.length ?? 0
 	});
-	projectorRef.current = new CodexAppServerEventProjector(dynamicToolParams, thread.threadId, activeTurnId, {
+	projectorRef.current = new CodexAppServerEventProjector({
+		...dynamicToolParams,
+		onAgentEvent: (event) => {
+			if (event.stream === "assistant" && typeof event.data.delta === "string") {
+				assistantStreamEventEmitted = true;
+				assistantStreamNeedsTerminalSnapshot ||= event.data.replaceable === true;
+			}
+			return dynamicToolParams.onAgentEvent?.(event);
+		}
+	}, thread.threadId, activeTurnId, {
 		nativePostToolUseRelayEnabled: nativeHookRelay?.allowedEvents.includes("post_tool_use") === true && nativeHookRelay.shouldRelayEvent("post_tool_use"),
 		trajectoryRecorder,
 		onNativeToolResultRecorded: maybeAnnounceFastModeAutoOff
@@ -9629,7 +9634,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			turnId: activeTurnId
 		});
 		const terminalAssistantText = collectTerminalAssistantText(result);
-		if (terminalAssistantText && !finalAborted && !finalPromptError) emitCodexAppServerEvent(params, {
+		if (terminalAssistantText && (!assistantStreamEventEmitted || assistantStreamNeedsTerminalSnapshot) && !finalAborted && !finalPromptError) emitCodexAppServerEvent(params, {
 			stream: "assistant",
 			data: { text: terminalAssistantText }
 		});
@@ -9643,7 +9648,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		});
 		if (activeContextEngine) {
 			const activeContextEnginePluginIdLocal = resolveContextEngineOwnerPluginId(activeContextEngine);
-			const finalMessages = await readMirroredSessionHistoryMessages(activeSessionFile) ?? historyMessages.concat(result.messagesSnapshot);
+			const finalMessages = await readMirroredSessionHistoryMessages(activeTranscriptTarget) ?? historyMessages.concat(result.messagesSnapshot);
 			await finalizeHarnessContextEngineTurn({
 				contextEngine: activeContextEngine,
 				promptError: Boolean(finalPromptError),

package/dist/{side-question-Di5YsbLx.js → side-question-C-DhgJOd.js}

@@ -8,7 +8,7 @@ import { i as isCodexAppServerNativeAuthProfile, o as readCodexAppServerBinding
 import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BPTiVNsW.js";
 import { a as getLeasedSharedCodexAppServerClient, o as releaseLeasedSharedCodexAppServerClient, u as refreshCodexAppServerAuthTokens } from "./shared-client-Dtx5i7Ez.js";
 import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-3tnjhjFb.js";
-import { C as resolveCodexMessageToolProvider, O as filterToolsForVisionInputs, T as shouldEnableCodexAppServerNativeToolSurface, a as buildCodexNativeHookRelayConfig, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, h as emitDynamicToolTerminalDiagnostic, k as handleCodexAppServerApprovalRequest, m as emitDynamicToolStartedDiagnostic, n as resolveCodexProviderWebSearchSupportForClient, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, r as CODEX_NATIVE_HOOK_RELAY_EVENTS } from "./provider-capabilities-D-8g7Lb2.js";
+import { C as resolveCodexMessageToolProvider, O as filterToolsForVisionInputs, T as shouldEnableCodexAppServerNativeToolSurface, a as buildCodexNativeHookRelayConfig, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, h as emitDynamicToolTerminalDiagnostic, k as handleCodexAppServerApprovalRequest, m as emitDynamicToolStartedDiagnostic, n as resolveCodexProviderWebSearchSupportForClient, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, r as CODEX_NATIVE_HOOK_RELAY_EVENTS } from "./provider-capabilities-D7hnTO76.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-C7qmZ0Jh.js";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
 import { buildAgentHookContextChannelFields, embeddedAgentLog, formatErrorMessage, registerNativeHookRelay, resolveAgentDir, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.6.10-beta.2",
+  "version": "2026.6.11-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/codex",
-      "version": "2026.6.10-beta.2",
+      "version": "2026.6.11-beta.2",
       "dependencies": {
         "@openai/codex": "0.139.0",
         "typebox": "1.1.39",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.6.10-beta.2",
+  "version": "2026.6.11-beta.2",
   "description": "OpenClaw Codex app-server harness and model provider plugin with a Codex-managed GPT catalog.",
   "repository": {
     "type": "git",
@@ -34,10 +34,10 @@
       ]
     },
     "compat": {
-      "pluginApi": ">=2026.6.10-beta.2"
+      "pluginApi": ">=2026.6.11-beta.2"
     },
     "build": {
-      "openclawVersion": "2026.6.10-beta.2"
+      "openclawVersion": "2026.6.11-beta.2"
     },
     "release": {
       "publishToClawHub": true,
@@ -55,7 +55,7 @@
     "README.md"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.6.10-beta.2"
+    "openclaw": ">=2026.6.11-beta.2"
   },
   "peerDependenciesMeta": {
     "openclaw": {