@myagentroam/node 0.9.0 → 0.9.2

package/dist/connector.d.ts

@@ -27,6 +27,7 @@ export declare class NodeConnector {
     private readonly sessionIdentityService;
     private readonly nativeSessionProjectionService;
     private readonly conversationHistoryService;
+    private readonly conversationSegmentService;
     private readonly runnerInteractionService;
     private readonly runnerChannelMessages;
     private readonly managedRunnerSessions;
@@ -78,6 +79,7 @@ export declare class NodeConnector {
     private readonly handleMessage;
     private readonly emitRunEvent;
     private readonly emitConversationItem;
+    private readonly emitConversationTurn;
     private readonly emitWorkbenchEvent;
     private readonly discoverWorkspaceSessions;
     private readonly invalidateWorkspaceWatchTopics;

package/dist/connector.js

@@ -44,6 +44,7 @@ import { WorkspaceQueueWorkbenchService } from './service/workspace-queue-workbe
 import { SessionIdentityService } from './service/session-identity-service.js';
 import { NativeSessionProjectionService } from './service/native-session-projection-service.js';
 import { ConversationHistoryService, hasManagedActiveRun } from './service/conversation-history-service.js';
+import { ConversationSegmentService, conversationSegmentIdentityForItem, conversationSegments } from './service/conversation-segment-service.js';
 import { RunnerInteractionService } from './service/runner-interaction-service.js';
 import { SessionLifecycleService } from './service/session-lifecycle-service.js';
 import { ExternalSessionResumeService } from './service/external-session-resume-service.js';
@@ -51,7 +52,7 @@ import { SessionMessageService } from './service/session-message-service.js';
 import { SessionCatalogService } from './service/session-catalog-service.js';
 import { SessionCommandService } from './service/session-command-service.js';
 import { SessionPresentationService } from './service/session-presentation-service.js';
-import { isRunnerImageAttachment, parseRunnerImageAttachments } from './runner/codex/conversation-parser.js';
+import { isPlainRecord, isRunnerImageAttachment, parseRunnerImageAttachments } from './runner/codex/conversation-parser.js';
 export { nodeConnectEndpoint, validatedCapabilities } from './runner/codex/conversation-parser.js';
 import { NodeControlChannel } from './service/node-control-channel.js';
 import { NodeControlMessageService } from './service/node-control-message-service.js';
@@ -114,6 +115,7 @@ export class NodeConnector {
     sessionIdentityService;
     nativeSessionProjectionService;
     conversationHistoryService;
+    conversationSegmentService;
     runnerInteractionService;
     runnerChannelMessages;
     managedRunnerSessions;
@@ -173,7 +175,12 @@ export class NodeConnector {
         isBootstrapSession: (sessionId) => this.sessionIdentityService.bootstrapIds.has(sessionId),
         presentSession: (session) => this.sessionPresentationService.present(session),
         rejectBootstrap: (sessionId, code) => this.sessionIdentityService.reject(sessionId, code),
-        emitWorkbench: (category, payload) => this.emitWorkbenchEvent(category, payload),
+        emitWorkbench: (category, payload) => {
+            if (category === 'conversation' && isPlainRecord(payload) && 'turn' in payload)
+                this.emitConversationTurn(payload.turn);
+            else
+                this.emitWorkbenchEvent(category, payload);
+        },
         cleanupAttachments: (runId) => this.runAttachmentService.cleanup(runId),
         expireImages: (runId) => this.runAttachmentService.expire(runId),
         scheduleContextRefresh: (sessionId) => this.sessionContextService.schedule(sessionId),
@@ -190,8 +197,9 @@ export class NodeConnector {
         refreshActivity: (session) => this.conversationHistoryService.refreshExternalActivity(session),
         present: (session) => this.sessionPresentationService.present(session),
         readPage: (session, limit) => this.conversationHistoryService.read(session, { limit }),
+        projectInitialPage: (session, page, _unit, limit) => this.conversationSegmentService.projectInitial(session, page, limit),
         emitSession: (session) => this.emitWorkbenchEvent('session', { session }),
-        emitTurn: (turn) => this.emitWorkbenchEvent('conversation', { turn })
+        emitTurn: (turn) => this.emitConversationTurn(turn)
     });
     constructor(options = {}) {
         this.config = options.config;
@@ -230,7 +238,7 @@ export class NodeConnector {
         this.fakeRunner =
             options.fakeRunner === undefined ? undefined : new FakeTestRunner(options.fakeRunner);
         this.fakeScript = options.fakeScript;
-        this.runAttachmentService = new RunAttachmentService((session) => this.runners.require(session.runner).nativeImageRoot(session));
+        this.runAttachmentService = new RunAttachmentService((session) => this.runners.require(session.runner).nativeImageRoots(session));
         this.codexClient = new CodexRunner(options.codexClient, options.codexProfileClientFactory);
         this.codexRunController = new CodexManagedRunController(this.codexClient, {
             available: () => this.capabilities.codex.available,
@@ -252,7 +260,7 @@ export class NodeConnector {
             cancel: (runId, threadId, turnId, cwd, status) => this.runnerInteractionService.cancelCodexTurn(runId, threadId, turnId, cwd, status),
             createApproval: (input) => this.runtime.createApproval(input),
             publishApproval: (input) => this.runEventBridge.publishApproval(input),
-            emitItem: (runId, item) => this.runEventBridge.emitRun(runId, 'conversation.item', item),
+            emitItem: (runId, item) => this.emitConversationItem(runId, item),
             appendImages: (runId, images) => this.runAttachmentService.append(runId, images.filter(isRunnerImageAttachment)),
             captureSnapshot: (runId, cwd) => this.workspaceCoordinator.captureRunSnapshot(runId, cwd),
             syncTitle: (sessionId, nativeSessionId, cwd) => this.managedRunnerSessions.refreshTitle(sessionId, nativeSessionId, cwd),
@@ -273,8 +281,9 @@ export class NodeConnector {
             intercepted: () => this.fakeRunner !== undefined,
             active: this.runState.active,
             parseAttachments: parseRunnerImageAttachments,
+            persistAttachments: (cwd, runId, attachments) => this.runAttachmentService.persistFiles(cwd, `${runId}-opencode-images`, attachments),
             emit: (runId, eventType, payload, status) => this.runEventBridge.emitRun(runId, eventType, payload, status),
-            emitItem: (runId, item) => this.runEventBridge.emitRun(runId, 'conversation.item', item),
+            emitItem: (runId, item) => this.emitConversationItem(runId, item),
             adopt: (input) => this.runtime.adoptRun(input),
             promote: (sessionId, nativeSessionId) => this.sessionIdentityService.promote(sessionId, nativeSessionId),
             rememberNative: (nativeSessionId, sessionId) => this.managedRunnerSessions.remember(nativeSessionId, sessionId),
@@ -306,7 +315,7 @@ export class NodeConnector {
             rememberNative: (nativeSessionId, sessionId) => this.managedRunnerSessions.remember(nativeSessionId, sessionId),
             promote: (sessionId, nativeSessionId) => this.sessionIdentityService.promote(sessionId, nativeSessionId),
             send: (type, payload) => this.send(type, payload),
-            emitItem: (runId, item) => this.runEventBridge.emitRun(runId, 'conversation.item', item),
+            emitItem: (runId, item) => this.emitConversationItem(runId, item),
             syncTitle: (sessionId, nativeSessionId, cwd) => this.managedRunnerSessions.refreshTitle(sessionId, nativeSessionId, cwd),
             setChannelToken: (sessionId, token) => this.runtime.setChannelToken(sessionId, token),
             commandState: (sessionId, commandId) => this.commandStates.get(sessionId, commandId),
@@ -330,7 +339,7 @@ export class NodeConnector {
             claude: () => this.claudeClient,
             runners: this.runners,
             emitRun: (runId, eventType, payload, status) => this.runEventBridge.emitRun(runId, eventType, payload, status),
-            emitItem: (runId, item) => this.runEventBridge.emitRun(runId, 'conversation.item', item),
+            emitItem: (runId, item) => this.emitConversationItem(runId, item),
             captureSnapshot: (runId, cwd) => this.workspaceCoordinator.captureRunSnapshot(runId, cwd),
             approvalTimeoutMs: this.claudeApprovalTimeoutMs,
             publishApproval: (input) => this.runEventBridge.publishApproval(input)
@@ -368,6 +377,7 @@ export class NodeConnector {
             hasManagedActiveRun: (session) => hasManagedActiveRun(this.runtime, session),
             setExternalActivity: (sessionId, activity) => this.sessionState.externalActivity.set(sessionId, activity)
         });
+        this.conversationSegmentService = new ConversationSegmentService((session, input) => this.conversationHistoryService.read(session, input));
         this.sessionContextService = new SessionContextService({
             runners: this.runners,
             session: (sessionId) => this.runtime.getAgentSession(sessionId),
@@ -392,6 +402,7 @@ export class NodeConnector {
             resolve: (sessionId) => this.nativeSessionProjectionService.resolve(sessionId),
             present: (session) => this.sessionPresentationService.present(session),
             history: (session, input) => this.conversationHistoryService.read(session, input),
+            segments: (session, input) => this.conversationSegmentService.read(session, input),
             context: this.sessionContextService,
             discover: (runner, workspaceId) => this.nativeSessionProjectionService.discover(runner, workspaceId),
             workspaceIdForCwd: (cwd) => this.database?.listWorkspaces().find((candidate) => candidate.path === cwd)?.id
@@ -401,7 +412,7 @@ export class NodeConnector {
             emit: (workspaceId, sessionId) => this.runEventBridge.emitQueue(workspaceId, sessionId),
             clearImages: (runId) => this.runAttachmentService.clear(runId),
             emitRun: (runId, eventType, payload, status) => this.runEventBridge.emitRun(runId, eventType, payload, status),
-            emitConversation: (turn) => this.emitWorkbenchEvent('conversation', { turn }),
+            emitConversation: (turn) => this.emitConversationTurn(turn),
             control: (operation, payload) => this.controlMessages.handle(JSON.stringify(createEnvelope(operation, payload))),
             stopped: () => this.stopped,
             markInterrupted: (runId) => this.runState.interruptRequested.add(runId),
@@ -428,7 +439,7 @@ export class NodeConnector {
             emitSession: (session) => this.emitWorkbenchEvent('session', { session }),
             emitRun: (run) => this.emitWorkbenchEvent('run', { run }),
             emitQueue: (workspaceId, sessionId) => this.runEventBridge.emitQueue(workspaceId, sessionId),
-            emitTurn: (turn) => this.emitWorkbenchEvent('conversation', { turn })
+            emitTurn: (turn) => this.emitConversationTurn(turn)
         });
         this.sessionLifecycleService = new SessionLifecycleService({
             database: () => {
@@ -596,7 +607,7 @@ export class NodeConnector {
                 this.terminalChannel.disconnect();
                 if (code === 4000 && reason === 'NODE_CONNECTION_REPLACED')
                     nodeLog('node.connection.replaced', {
-                        message: '当前 Node 已被同一身份的新实例接管，请检查是否启动了重复实例。'
+                        message: 'This Node connection was replaced by a newer instance with the same identity. Check for duplicate processes.'
                     });
                 if (code === 4003 || code === 1001)
                     void this.terminalManager.shutdown();
@@ -781,7 +792,22 @@ export class NodeConnector {
     /** @internal Thin compatibility delegates; all behavior remains in the extracted services. */
     handleMessage = (raw) => this.controlMessages.handle(raw);
     emitRunEvent = (runId, eventType, payload, status) => this.runEventBridge.emitRun(runId, eventType, payload, status);
-    emitConversationItem = (runId, item) => this.runEventBridge.emitRun(runId, 'conversation.item', item);
+    emitConversationItem = (runId, item) => {
+        this.runEventService.flushPendingText(runId);
+        const itemId = isPlainRecord(item) && typeof item.itemId === 'string' ? item.itemId : undefined;
+        const itemKind = isPlainRecord(item) && typeof item.kind === 'string' ? item.kind : undefined;
+        const turn = this.runtime.conversationTurnForRun(runId);
+        const segment = itemId === undefined || turn === undefined
+            ? undefined
+            : conversationSegmentIdentityForItem(turn, itemId, itemKind);
+        this.runEventBridge.emitRun(runId, 'conversation.item', segment === undefined || !isPlainRecord(item)
+            ? item
+            : { ...item, segmentId: segment.id, segmentIndex: segment.index });
+    };
+    emitConversationTurn = (turn) => {
+        const segments = isPlainRecord(turn) && Array.isArray(turn.items) ? conversationSegments(turn) : [];
+        this.emitWorkbenchEvent('conversation', { turn, segments });
+    };
     emitWorkbenchEvent = (category, payload) => this.runEventBridge.emitWorkbench(category, payload);
     discoverWorkspaceSessions = (workspaceId) => this.nativeSessionProjectionService.discoverWorkspace(workspaceId);
     invalidateWorkspaceWatchTopics = (workspaceId) => this.workspaceCoordinator.invalidate(workspaceId);

package/dist/native-session-history.js

@@ -286,7 +286,7 @@ async function readTranscript(path, runner, byteLimit) {
         items.push({
             kind: 'tool_call',
             toolUseId: result.toolUseId,
-            toolName: '工具',
+            toolName: 'Tool',
             input: null,
             inputSummary: null,
             inputTruncated: false,
@@ -301,7 +301,7 @@ async function readTranscript(path, runner, byteLimit) {
     if (cwd === undefined)
         return undefined;
     const title = items.find((item) => item.kind === 'message' && item.role === 'USER')?.text;
-    // 标签式 Plan Mode 的指令标签不构成会话标题。
+    // Tagged Plan Mode instruction labels do not form a session title.
     const strippedTitle = title === undefined ? undefined : stripClaudePlanTag(title);
     return {
         runner,
@@ -591,7 +591,7 @@ function codexGeneratedImageEvent(record) {
         input: null,
         inputSummary: null,
         inputTruncated: false,
-        outputSummary: payload['status'] === 'completed' ? '图片生成完成' : '图片生成失败',
+        outputSummary: payload['status'] === 'completed' ? 'Image generation completed' : 'Image generation failed',
         outputTruncated: false,
         imageAttachments: [{ name: basename(localPath), mime: imageMime(localPath), localPath }],
         failed: payload['status'] !== 'completed',
@@ -620,7 +620,7 @@ function codexVisibleToolText(value) {
         const start = value.indexOf(marker, cursor);
         if (start < 0)
             return visible + value.slice(cursor);
-        visible += `${value.slice(cursor, start)}[图片内容已过滤]`;
+        visible += `${value.slice(cursor, start)}[Image content filtered]`;
         const doubleQuote = value.indexOf('"', start);
         const singleQuote = value.indexOf("'", start);
         const end = doubleQuote < 0
@@ -636,14 +636,20 @@ function codexVisibleToolText(value) {
 }
 /** Extract only image placeholder metadata from native Codex output. */
 function codexImagePlaceholders(value) {
-    const paths = [];
+    const attachments = [];
     let visited = 0;
     const visit = (current, depth) => {
-        if (paths.length >= 5 || visited >= 128 || depth > 5 || current == null)
+        if (attachments.length >= 5 || visited >= 128 || depth > 5 || current == null)
             return;
         visited += 1;
         if (typeof current === 'string') {
+            const paths = [];
             collectGeneratedImagePaths(current, paths);
+            for (const localPath of paths) {
+                if (attachments.some((attachment) => attachment.localPath === localPath))
+                    continue;
+                attachments.push({ name: basename(localPath), mime: imageMime(localPath), localPath });
+            }
             return;
         }
         if (Array.isArray(current)) {
@@ -653,15 +659,28 @@ function codexImagePlaceholders(value) {
         }
         if (!isRecord(current))
             return;
+        const type = typeof current['type'] === 'string' ? current['type'] : '';
+        if (type === 'input_text' && typeof current['text'] === 'string') {
+            const mime = /["']image_url["']\s*:\s*["']data:(image\/[^;,"']+)[;,]/.exec(current['text'])?.[1];
+            if (mime !== undefined)
+                attachments.push({ name: `image-${attachments.length + 1}.${imageExtension(mime)}`, mime });
+        }
+        const imageUrl = isRecord(current['image_url'])
+            ? firstString(current['image_url'], ['url'])
+            : typeof current['image_url'] === 'string'
+                ? current['image_url']
+                : undefined;
+        const data = typeof current['data'] === 'string' ? current['data'] : imageUrl;
+        if ((type === 'image' || type === 'input_image' || type === 'output_image') &&
+            data?.startsWith('data:image/')) {
+            const mime = /^data:([^;,]+)[;,]/.exec(data)?.[1] ?? 'image/png';
+            attachments.push({ name: `image-${attachments.length + 1}.${imageExtension(mime)}`, mime });
+        }
         for (const child of Object.values(current))
             visit(child, depth + 1);
     };
     visit(value, 0);
-    return paths.map((localPath) => ({
-        name: basename(localPath),
-        mime: imageMime(localPath),
-        localPath
-    }));
+    return attachments;
 }
 function collectGeneratedImagePaths(value, paths) {
     const marker = '/.codex/generated_images/';
@@ -690,15 +709,54 @@ function imageMime(path) {
         return 'image/webp';
     return 'image/png';
 }
+function imageExtension(mime) {
+    if (mime === 'image/jpeg')
+        return 'jpg';
+    if (mime === 'image/webp')
+        return 'webp';
+    if (mime === 'image/gif')
+        return 'gif';
+    return 'png';
+}
 function withToolResult(call, result) {
+    const viewedImagePath = codexViewedImagePath(call);
+    const imageAttachments = result.imageAttachments?.map((attachment) => attachment.localPath !== undefined || viewedImagePath === undefined
+        ? attachment
+        : {
+            name: basename(viewedImagePath),
+            mime: imageMime(viewedImagePath),
+            localPath: viewedImagePath
+        });
     return {
         ...call,
         outputSummary: result.output,
         outputTruncated: result.truncated,
-        ...(result.imageAttachments === undefined ? {} : { imageAttachments: result.imageAttachments }),
+        ...(imageAttachments === undefined ? {} : { imageAttachments }),
         failed: result.failed
     };
 }
+function codexViewedImagePath(call) {
+    const toolName = call.toolName.toLowerCase();
+    if (toolName === 'view_image' || toolName === 'imageview') {
+        return isRecord(call.input) && typeof call.input['path'] === 'string'
+            ? call.input['path']
+            : undefined;
+    }
+    if (toolName !== 'exec' || typeof call.input !== 'string')
+        return undefined;
+    if (!/tools\.view_image\s*\(/.test(call.input))
+        return undefined;
+    const encodedPath = /["']path["']\s*:\s*("(?:\\.|[^"\\])*")/.exec(call.input)?.[1];
+    if (encodedPath === undefined)
+        return undefined;
+    try {
+        const path = JSON.parse(encodedPath);
+        return typeof path === 'string' ? path : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 function isInjectedContextPrompt(text) {
     const normalized = text.replace(/\s+/g, ' ').trim();
     if (normalized.startsWith('<codex_internal_context'))
@@ -776,7 +834,7 @@ function compactValue(value, limit) {
             text = JSON.stringify(value);
         }
         catch {
-            return { text: '（无法显示）', truncated: false };
+            return { text: '(Unable to display)', truncated: false };
         }
     }
     return {
@@ -812,7 +870,7 @@ function nestedString(value, keys) {
 function compact(value) {
     return value.replace(/\s+/g, ' ').trim().slice(0, 16_000);
 }
-/** 对话正文可能是 Markdown，不能像标题一样压缩内部空白。 */
+/** Conversation content can be Markdown, so its internal whitespace must not be collapsed like a title. */
 function messageText(value) {
     return value.trim().slice(0, 16_000);
 }

package/dist/runner/abstract-runner.d.ts

@@ -53,7 +53,7 @@ export declare abstract class AbstractRunner<TName extends RegisteredRunnerName
     }, managedTurn: (nativeTurnId: string) => NodeConversationTurn | undefined): Promise<RunnerOfficialConversationPage | undefined>;
     readExternalActivity(session: NodeAgentSession): Promise<SessionActivityState | undefined>;
     acceptsTruncatedNativeHistory(): boolean;
-    nativeImageRoot(session: NodeAgentSession): string | undefined;
+    nativeImageRoots(session: NodeAgentSession): readonly string[];
     managedRunForNativeTurn(nativeTurnId: string): string | undefined;
     abstract stop(): void | Promise<void>;
     bindControl(control: RunnerControl): void;

package/dist/runner/abstract-runner.js

@@ -106,9 +106,9 @@ export class AbstractRunner {
     acceptsTruncatedNativeHistory() {
         return true;
     }
-    nativeImageRoot(session) {
+    nativeImageRoots(session) {
         void session;
-        return undefined;
+        return [];
     }
     managedRunForNativeTurn(nativeTurnId) {
         void nativeTurnId;

package/dist/runner/claude/managed-run-controller.js

@@ -4,6 +4,7 @@ import { boundedConversationItemId, claudePlanText, compactRunnerText, compactRu
 import { isTerminalRunStatus } from '../../util/node-operation-parsers.js';
 import { claudeContentBlocks } from '../../util/node-operation-parsers.js';
 import { parseSecretEnvironment } from '../../util/secret-environment.js';
+import { safeErrorCode } from '../../util/safe-error.js';
 export class ClaudeManagedRunController {
     runner;
     host;
@@ -24,10 +25,10 @@ export class ClaudeManagedRunController {
                 commandId: 'plan',
                 active: true,
                 label: 'Plan Mode',
-                detail: '后续消息将以标签式规划模式运行，只读规划并输出计划卡。',
+                detail: 'Subsequent messages run in read-only tagged Plan Mode and produce a plan card.',
                 closable: true,
                 closeInput: '/plan',
-                continuation: { label: '执行', prompt: '请根据上述计划开始实施。' }
+                continuation: { label: 'Implement', prompt: 'Implement the plan above.' }
             });
         return { command: command.id, states: this.host.commandStates(session.id) };
     }
@@ -83,7 +84,7 @@ export class ClaudeManagedRunController {
             secretEnvironment = parseSecretEnvironment(payload.secretEnvironment);
         }
         catch (error) {
-            this.host.emit(runId, 'run.rejected', { code: error instanceof Error ? error.message : 'MESSAGE_ATTACHMENTS_INVALID' }, 'FAILED');
+            this.host.emit(runId, 'run.rejected', { code: safeErrorCode(error, 'MESSAGE_ATTACHMENTS_INVALID') }, 'FAILED');
             return;
         }
         this.host.adopt({
@@ -255,14 +256,23 @@ export class ClaudeManagedRunController {
                         const kind = toolKinds.get(record.tool_use_id);
                         if (kind === 'tool_call') {
                             const elapsed = typeof record.elapsed_time_seconds === 'number'
-                                ? `（${Math.max(0, Math.round(record.elapsed_time_seconds))} 秒）`
+                                ? ` (${Math.max(0, Math.round(record.elapsed_time_seconds))} seconds)`
                                 : '';
                             this.host.emitItem(runId, {
                                 itemId: boundedConversationItemId('claude-tool', record.tool_use_id),
                                 kind,
                                 status: 'IN_PROGRESS',
                                 payload: {
-                                    progressLabel: compactRunnerText(`${typeof record.tool_name === 'string' ? record.tool_name : '工具'}正在执行${elapsed}`, 500)
+                                    progressLabel: compactRunnerText(`${typeof record.tool_name === 'string' ? record.tool_name : 'Tool'} is running${elapsed}`, 500),
+                                    progressLabelCode: typeof record.elapsed_time_seconds === 'number'
+                                        ? 'TOOL_RUNNING_WITH_DURATION'
+                                        : 'TOOL_RUNNING',
+                                    progressLabelParameters: {
+                                        tool: typeof record.tool_name === 'string' ? record.tool_name : 'Tool',
+                                        seconds: typeof record.elapsed_time_seconds === 'number'
+                                            ? Math.max(0, Math.round(record.elapsed_time_seconds))
+                                            : 0
+                                    }
                                 },
                                 merge: true
                             });
@@ -315,12 +325,12 @@ export class ClaudeManagedRunController {
             this.host.send('session.channel.ready', { sessionId, token: gate.token });
             this.host.emit(runId, 'run.running', {}, 'RUNNING');
             void handle.completed.then(() => finish('SUCCEEDED', 'run.completed', { subtype: 'stream_closed' }), (error) => finish('FAILED', 'run.failed', {
-                code: error instanceof Error ? error.message : 'CLAUDE_RUN_FAILED'
+                code: safeErrorCode(error, 'CLAUDE_RUN_FAILED')
             }));
         }
         catch (error) {
             finish('FAILED', 'run.failed', {
-                code: error instanceof Error ? error.message : 'CLAUDE_RUN_START_FAILED'
+                code: safeErrorCode(error, 'CLAUDE_RUN_START_FAILED')
             });
         }
     }

package/dist/runner/claude-code-runner.js

@@ -3,7 +3,7 @@ import { AbstractRunner } from './abstract-runner.js';
 import { claudeDefaultModel, declaredRunnerProfiles } from '../runner-profiles.js';
 import { withClaudePlanTag } from '../runner-command-engine.js';
 import { discoverNativeSessions, readNativeSession, readClaudeNativeContextUsage } from '../native-session-history.js';
-import { claudeDiscoveredSession, deduplicateDirectSessions, externalResumeFailureDetail, isNativeHistory, isWithinWorkspace, latestNativeActivity } from './codex/conversation-parser.js';
+import { claudeDiscoveredSession, deduplicateDirectSessions, isNativeHistory, isWithinWorkspace, latestNativeActivity } from './codex/conversation-parser.js';
 export class ClaudeCodeRunner extends AbstractRunner {
     client;
     environment;
@@ -102,11 +102,10 @@ export class ClaudeCodeRunner extends AbstractRunner {
             context.rememberManagedNative(external.externalSessionId, configured.id);
             return { session: configured, activity: 'IDLE' };
         }
-        catch (error) {
+        catch {
             return {
                 failureCode: 'RUNNER_RESUME_FAILED',
-                messageFailureCode: 'SESSION_RESUME_REJECTED',
-                failureDetail: externalResumeFailureDetail(error)
+                messageFailureCode: 'SESSION_RESUME_REJECTED'
             };
         }
     }

package/dist/runner/codex/conversation-parser.d.ts

@@ -32,8 +32,8 @@ export declare function mergeCodexCustomToolItems(invocation: NodeConversationIt
 export declare function coalesceImageGenerationItems(items: readonly NodeConversationItem[]): readonly NodeConversationItem[];
 export declare function codexPlanText(value: Record<string, unknown>): string | undefined;
 /**
- * Claude 标签式 Plan Mode 的最终计划以 `<proposed_plan>` 完整包裹输出；
- * 未闭合或缺失标签的文本保持普通 assistant 消息。
+ * A final Claude tagged Plan Mode plan is fully wrapped in `<proposed_plan>` tags;
+ * text with missing or unclosed tags remains a regular assistant message.
  */
 export declare function codexOfficialItem(session: NodeAgentSession, nativeTurnId: string, value: unknown, turnSequence: number, itemSequence: number, startedAt: number | null, completedAt: number | null): NodeConversationItem | undefined;
 export declare function codexLiveConversationItem(value: Record<string, unknown>, completed: boolean, imageAttachments?: readonly Record<string, unknown>[]): PublicConversationItem | undefined;

package/dist/runner/codex/conversation-parser.js

@@ -201,6 +201,11 @@ export function codexOfficialItems(session, nativeTurnId, values, turnSequence,
         const item = codexOfficialItem(session, nativeTurnId, value, turnSequence, itemSequence, startedAt, completedAt);
         if (item === undefined)
             continue;
+        // Codex persists one compaction as both `compacted` state and a
+        // `context_compacted` event. App Server normalizes both records to
+        // consecutive `contextCompaction` items without preserving their source.
+        if (item.kind === 'context_compaction' && items.at(-1)?.kind === 'context_compaction')
+            continue;
         const key = codexPairedToolCallId(value);
         if (key === undefined) {
             items.push(item);
@@ -295,8 +300,8 @@ export function codexPlanText(value) {
     return plan.length > 0 ? plan : undefined;
 }
 /**
- * Claude 标签式 Plan Mode 的最终计划以 `<proposed_plan>` 完整包裹输出；
- * 未闭合或缺失标签的文本保持普通 assistant 消息。
+ * A final Claude tagged Plan Mode plan is fully wrapped in `<proposed_plan>` tags;
+ * text with missing or unclosed tags remains a regular assistant message.
  */
 export function codexOfficialItem(session, nativeTurnId, value, turnSequence, itemSequence, startedAt, completedAt) {
     if (!isPlainRecord(value) || typeof value.type !== 'string')
@@ -361,7 +366,7 @@ export function codexOfficialItem(session, nativeTurnId, value, turnSequence, it
             payload: {
                 command: typeof value.command === 'string'
                     ? compactRunnerText(value.command, 10_000)
-                    : '（未提供命令）',
+                    : '(No command provided)',
                 cwd: typeof value.cwd === 'string' ? compactRunnerText(value.cwd, 4_096) : null,
                 outputPreview: compactRunnerText(output, 10_000),
                 outputRef: null,
@@ -415,7 +420,7 @@ export function codexOfficialItem(session, nativeTurnId, value, turnSequence, it
                 namespace: 'codex',
                 toolName: 'imagegen',
                 inputSummary: typeof value.revisedPrompt === 'string' ? value.revisedPrompt : null,
-                outputSummary: value.status === 'completed' ? '图片生成完成' : '图片生成失败',
+                outputSummary: value.status === 'completed' ? 'Image generation completed' : 'Image generation failed',
                 progressLabel: null,
                 errorCode: value.status === 'failed' ? 'IMAGE_GENERATION_FAILED' : null,
                 truncated: false
@@ -456,7 +461,11 @@ export function codexOfficialItem(session, nativeTurnId, value, turnSequence, it
         return {
             ...base,
             kind: 'context_compaction',
-            payload: { phase: 'COMPLETED', summary: '上下文已整理' }
+            payload: {
+                phase: 'COMPLETED',
+                summary: 'Context compacted',
+                summaryCode: 'CONTEXT_COMPACTED'
+            }
         };
     return codexUnknownOfficialItem(base, value);
 }
@@ -501,7 +510,7 @@ export function codexLiveConversationItem(value, completed, imageAttachments = [
             payload: {
                 command: typeof value.command === 'string'
                     ? compactRunnerText(value.command, 10_000)
-                    : '（未提供命令）',
+                    : '(No command provided)',
                 cwd: typeof value.cwd === 'string' ? compactRunnerText(value.cwd, 4_096) : null,
                 outputPreview: compactRunnerText(output, 10_000),
                 outputRef: null,
@@ -550,7 +559,8 @@ export function codexLiveConversationItem(value, completed, imageAttachments = [
                 title: 'Web Search',
                 inputSummary: typeof value.query === 'string' ? compactRunnerText(value.query, 10_000) : null,
                 outputSummary: null,
-                progressLabel: completed ? null : '正在搜索',
+                progressLabel: completed ? null : 'Searching',
+                progressLabelCode: completed ? null : 'SEARCHING',
                 errorCode: null,
                 truncated: false
             }
@@ -575,8 +585,10 @@ export function codexLiveConversationItem(value, completed, imageAttachments = [
                 inputSummary: typeof value.revisedPrompt === 'string'
                     ? compactRunnerText(value.revisedPrompt, 10_000)
                     : null,
-                outputSummary: completed ? '图片生成完成' : null,
-                progressLabel: completed ? null : '正在生成图片',
+                outputSummary: completed ? 'Image generation completed' : null,
+                outputSummaryCode: completed ? 'IMAGE_GENERATION_COMPLETED' : null,
+                progressLabel: completed ? null : 'Generating image',
+                progressLabelCode: completed ? null : 'GENERATING_IMAGE',
                 errorCode: value.status === 'failed' ? 'IMAGE_GENERATION_FAILED' : null,
                 truncated: false,
                 ...(imageAttachments.length === 0 ? {} : { attachments: imageAttachments })
@@ -704,7 +716,9 @@ export function codexImageAttachments(value) {
                 totalBytes + Buffer.byteLength(dataBase64, 'base64') <= MAX_COMPOSER_ATTACHMENTS_BYTES) {
                 totalBytes += Buffer.byteLength(dataBase64, 'base64');
                 found.push({
-                    name: typeof current.name === 'string' ? current.name : `生成图片-${found.length + 1}.png`,
+                    name: typeof current.name === 'string'
+                        ? current.name
+                        : `generated-image-${found.length + 1}.png`,
                     mime,
                     dataBase64
                 });
@@ -802,10 +816,14 @@ export function codexToolOutput(value) {
             return [block.content];
         return [];
     });
-    return text.length > 0 ? text.join('') : value.some(isCodexImageBlock) ? '图片已生成' : value;
+    return text.length > 0
+        ? text.join('')
+        : value.some(isCodexImageBlock)
+            ? 'Image generated'
+            : value;
 }
 export function codexVisibleToolText(value) {
-    return value.replace(/(["']image_url["']\s*:\s*["'])data:image\/[^"']+(["'])/g, '$1[图片内容已提取]$2');
+    return value.replace(/(["']image_url["']\s*:\s*["'])data:image\/[^"']+(["'])/g, '$1[Image content extracted]$2');
 }
 export function isCodexImageBlock(value) {
     if (!isPlainRecord(value))

package/dist/runner/codex/managed-run-controller.js

@@ -1,5 +1,6 @@
 import { extractId } from '../../util/runner-native-session-parsers.js';
 import { parseSecretEnvironment } from '../../util/secret-environment.js';
+import { safeErrorCode } from '../../util/safe-error.js';
 import { boundedConversationItemId, codexImageAttachments, codexLiveConversationItem, codexUserInputQuestions, compactRunnerText, isPlainRecord } from './conversation-parser.js';
 export class CodexManagedRunController {
     runner;
@@ -32,10 +33,10 @@ export class CodexManagedRunController {
                     commandId: 'plan',
                     active: true,
                     label: 'Plan Mode',
-                    detail: '后续消息将以协作规划模式运行。',
+                    detail: 'Subsequent messages run in collaborative Plan Mode.',
                     closable: true,
                     closeInput: '/plan',
-                    continuation: { label: '执行', prompt: '请根据上述计划开始实施。' }
+                    continuation: { label: 'Implement', prompt: 'Implement the plan above.' }
                 });
             return { command: command.id, states: this.host.commandStates(session.id) };
         }
@@ -83,7 +84,7 @@ export class CodexManagedRunController {
             };
         }
         catch (error) {
-            this.host.emit(runId, 'run.failed', { code: error instanceof Error ? error.message : 'CODEX_COMPACT_FAILED' }, 'FAILED');
+            this.host.emit(runId, 'run.failed', { code: safeErrorCode(error, 'CODEX_COMPACT_FAILED') }, 'FAILED');
             this.runner.execution.runs.delete(runId);
             this.runner.releaseEnvironment(runId);
             this.host.removeActive(runId);
@@ -283,7 +284,7 @@ export class CodexManagedRunController {
             secretEnvironment = parseSecretEnvironment(payload.secretEnvironment);
         }
         catch (error) {
-            this.host.emit(runId, 'run.rejected', { code: error instanceof Error ? error.message : 'MESSAGE_ATTACHMENTS_INVALID' }, 'FAILED');
+            this.host.emit(runId, 'run.rejected', { code: safeErrorCode(error, 'MESSAGE_ATTACHMENTS_INVALID') }, 'FAILED');
             return;
         }
         this.host.adopt({
@@ -311,7 +312,7 @@ export class CodexManagedRunController {
             this.runner.prepareEnvironment(secretEnvironment, runId);
         }
         catch (error) {
-            this.host.emit(runId, 'run.rejected', { code: error instanceof Error ? error.message : 'SECRET_ENVIRONMENT_INVALID' }, 'FAILED');
+            this.host.emit(runId, 'run.rejected', { code: safeErrorCode(error, 'SECRET_ENVIRONMENT_INVALID') }, 'FAILED');
             return;
         }
         this.host.addActive(runId);
@@ -381,7 +382,7 @@ export class CodexManagedRunController {
                 this.runner.releaseEnvironment(runId);
                 return;
             }
-            this.host.emit(runId, 'run.failed', { code: error instanceof Error ? error.message : 'CODEX_RUN_FAILED' }, 'FAILED');
+            this.host.emit(runId, 'run.failed', { code: safeErrorCode(error, 'CODEX_RUN_FAILED') }, 'FAILED');
             this.runner.execution.runs.delete(runId);
             this.runner.releaseEnvironment(runId);
             this.host.removeActive(runId);