@myagentroam/node 0.1.1 → 0.1.3

package/dist/connector.js

@@ -9,7 +9,7 @@ import { loadNodeConfig, nodeDatabasePath, saveNodeConfig } from './config.js';
 import { NodeMetrics, nodeLog } from './operational.js';
 import { assertLocalSqlitePath } from './storage.js';
 import { detectCapabilitiesAsync, unavailableCapabilities } from './capabilities.js';
-import { inspectWorkspace, listWorkspaceDirectories, listWorkspaceFiles, preflightWorkspaceUpload, readCurrentChangeDiff, readCurrentChangesSummary, readGitSummary, readRestrictedDiff, readAllowedTextFile, readWorkspaceTextFile, restoreCurrentChange, WorkspaceFileIndex, workspaceUploadTemporaryName } from './workspace.js';
+import { inspectWorkspace, isWorkspaceChangeVisible, listWorkspaceDirectories, listWorkspaceFiles, preflightWorkspaceUpload, listInitializedSubmodulePaths, readCurrentChangeDiff, readCurrentChangesSummary, readGitSummary, readRestrictedDiff, readAllowedTextFile, readWorkspaceTextFile, resolveGitRepository, restoreCurrentChange, WorkspaceFileIndex, workspaceUploadTemporaryName } from './workspace.js';
 import { ReliableWorkbenchEventBuffer } from './event-buffer.js';
 import { CodexAppServerClient, codexSessionControl } from './codex-app-server.js';
 import { ClaudeAgentSdkAdapter, denyPermission } from './claude-agent-sdk.js';
@@ -19,7 +19,7 @@ import { TerminalManager } from './terminal.js';
 import { discoverAllNativeSessions, discoverNativeSessions, readCodexNativeContextUsage, readCodexNativeTaskActivity, readNativeSession, removeNativeSession } from './native-session-history.js';
 import { declaredRunnerProfiles, supportsRunnerConfiguration } from './runner-profiles.js';
 import { NodeRuntimeState } from './runtime-state.js';
-import { CommandStateStore, parseCommandInvocation } from './runner-command-engine.js';
+import { CommandStateStore, parseCommandInvocation, withClaudePlanTag, stripClaudePlanTag } from './runner-command-engine.js';
 import { RunnerUsageReader } from './runner-usage.js';
 const HEARTBEAT_MS = 15_000;
 const WORKSPACE_FILE_INDEX_CACHE_LIMIT = 8;
@@ -31,6 +31,7 @@ const CAPABILITY_REFRESH_MS = 60_000;
 const SESSION_WATCH_INTERVAL_MS = 2_000;
 const SESSION_WATCH_TTL_MS = 45_000;
 const SESSION_WATCH_MAX_FAILURES = 3;
+const CLAUDE_CONTEXT_CACHE_MS = 30_000;
 const SESSION_WATCH_INITIAL_TURN_LIMIT = 30;
 const RETRY_MIN_MS = 500;
 const RETRY_MAX_MS = 30_000;
@@ -99,6 +100,7 @@ export class NodeConnector {
     reconnectTimer;
     terminalReconnectTimer;
     attempts = 0;
+    terminalAttempts = 0;
     stopped = false;
     config;
     capabilitiesProvided;
@@ -158,6 +160,7 @@ export class NodeConnector {
     /** Bounded Runner diagnostic paired with a fixed external resume reason code. */
     externalResumeFailureDetails = new Map();
     claudeApprovals = new Map();
+    claudeUserInputs = new Map();
     commandStates = new CommandStateStore();
     runnerUsageReader;
     codexFastEnabled = false;
@@ -234,6 +237,11 @@ export class NodeConnector {
             approval.resolve('REJECTED');
         }
         this.claudeApprovals.clear();
+        for (const pending of this.claudeUserInputs.values()) {
+            clearTimeout(pending.timer);
+            pending.reject('NODE_STOPPED');
+        }
+        this.claudeUserInputs.clear();
         for (const timer of this.queuePauseWindows.values())
             clearTimeout(timer);
         this.queuePauseWindows.clear();
@@ -410,7 +418,7 @@ export class NodeConnector {
         this.terminalReconnectTimer = setTimeout(() => {
             this.terminalReconnectTimer = undefined;
             this.connectTerminal();
-        }, RETRY_MIN_MS);
+        }, nextReconnectDelay(this.terminalAttempts++));
     }
     handleTerminalMessage(raw) {
         let message;
@@ -430,6 +438,9 @@ export class NodeConnector {
                 Object.keys(message).some((key) => key !== 'type' && key !== 'nodeId')) {
                 this.terminalSocket?.close(4002, 'TERMINAL_MESSAGE_INVALID');
             }
+            else {
+                this.terminalAttempts = 0;
+            }
             return;
         }
         if (message.type === 'attach') {
@@ -1077,16 +1088,20 @@ export class NodeConnector {
             return this.currentChangesForWorkspace(workspace);
         }
         if (operation === 'workspace.change.diff') {
-            if (typeof input.workspaceId !== 'string' || typeof input.path !== 'string')
+            if (typeof input.workspaceId !== 'string' ||
+                typeof input.path !== 'string' ||
+                (input.repositoryPath !== undefined && typeof input.repositoryPath !== 'string'))
                 throw new Error('GIT_DIFF_INVALID');
             const workspace = this.requireWorkspace(input.workspaceId);
             if (workspace.kind !== 'GIT_WORKSPACE')
                 throw new Error('WORKSPACE_NOT_GIT');
-            return { diff: await readCurrentChangeDiff(workspace.path, input.path) };
+            const repository = await resolveGitRepository(workspace.path, input.repositoryPath ?? '');
+            return { diff: await readCurrentChangeDiff(repository, input.path) };
         }
         if (operation === 'workspace.change.restore') {
             if (typeof input.workspaceId !== 'string' ||
                 typeof input.path !== 'string' ||
+                (input.repositoryPath !== undefined && typeof input.repositoryPath !== 'string') ||
                 (input.state !== 'STAGED' && input.state !== 'UNSTAGED' && input.state !== 'UNTRACKED'))
                 throw new Error('GIT_CHANGE_RESTORE_UNAVAILABLE');
             const workspace = this.requireWorkspace(input.workspaceId);
@@ -1094,7 +1109,8 @@ export class NodeConnector {
                 throw new Error('WORKSPACE_NOT_GIT');
             if (this.runtime.hasActiveWorkspaceLease(workspace.id))
                 throw new Error('WORKSPACE_BUSY');
-            await restoreCurrentChange(workspace.path, input.path, input.state, this.fileAccessOptions());
+            const repository = await resolveGitRepository(workspace.path, input.repositoryPath ?? '');
+            await restoreCurrentChange(repository, input.path, input.state);
             // A read started before the write must not satisfy the explicit post-write refresh.
             this.invalidateWorkspaceWatchTopics(workspace.id);
             return { restored: true };
@@ -1559,12 +1575,16 @@ export class NodeConnector {
             const runnerInput = withNonImageAttachmentPrompt(input.content, attachmentPaths);
             this.runtime.updateQueuedMessage(created.run.id, runnerInput);
             const commandStates = this.commandStates.list(session.id);
+            const planActive = commandStates.some((state) => state.commandId === 'plan');
             this.queuedRunStarts.set(created.run.id, {
                 runId: created.run.id,
                 sessionId: created.run.sessionId,
                 workspaceId: created.run.workspaceId,
                 runner: created.run.runner,
-                input: runnerInput,
+                // Claude 标签式 Plan Mode 只包装发往 Runner 的输入，用户气泡保持原文。
+                input: created.run.runner === 'claude-code' && planActive
+                    ? withClaudePlanTag(runnerInput)
+                    : runnerInput,
                 attachments: runnerImageAttachments,
                 attachmentPaths,
                 cwd: session.cwd,
@@ -1573,9 +1593,7 @@ export class NodeConnector {
                 effort: session.effort,
                 // Plan 只切换 Codex 协作模式，不得覆盖会话已选权限。
                 access: session.access,
-                collaborationMode: commandStates.some((state) => state.commandId === 'plan')
-                    ? 'plan'
-                    : 'default',
+                collaborationMode: planActive ? 'plan' : 'default',
                 ...(this.codexFastEnabled ? { serviceTier: 'fast' } : {})
             });
             this.runtime.resumeSessionQueue(session.id);
@@ -1647,7 +1665,12 @@ export class NodeConnector {
             const runnerInput = withNonImageAttachmentPrompt(input.content.trim(), pending?.attachmentPaths ?? []);
             this.runtime.updateQueuedMessage(input.runId, runnerInput);
             if (pending !== undefined)
-                this.queuedRunStarts.set(input.runId, { ...pending, input: runnerInput });
+                this.queuedRunStarts.set(input.runId, {
+                    ...pending,
+                    input: pending.runner === 'claude-code' && pending.collaborationMode === 'plan'
+                        ? withClaudePlanTag(runnerInput)
+                        : runnerInput
+                });
             this.emitWorkspaceQueue(run.workspaceId, run.sessionId);
             return { queue: this.presentWorkspaceQueue(run.workspaceId, run.sessionId) };
         }
@@ -1746,7 +1769,7 @@ export class NodeConnector {
                 typeof input.requestId !== 'string' ||
                 !isPlainRecord(input.answers))
                 throw new Error('USER_INPUT_INVALID');
-            this.respondCodexUserInput(input.runId, input.requestId, input.answers);
+            this.respondUserInput(input.runId, input.requestId, input.answers);
             return { accepted: true };
         }
         if (operation === 'session.interrupt') {
@@ -2006,13 +2029,6 @@ export class NodeConnector {
         this.workspaceChangesCache.delete(workspaceId);
         this.workspaceChangesVersions.set(workspaceId, (this.workspaceChangesVersions.get(workspaceId) ?? 0) + 1);
     }
-    fileAccessOptions() {
-        if (this.config === undefined)
-            return {};
-        // The database directory is Node-private even when an operator has
-        // accidentally placed it below an otherwise permitted Workspace root.
-        return { privateRoots: [dirname(nodeDatabasePath(this.config, this.configPath))] };
-    }
     async listFilesForWorkspace(workspace, input) {
         if ((input.path !== undefined && typeof input.path !== 'string') ||
             (input.cursor !== undefined && typeof input.cursor !== 'string') ||
@@ -2021,7 +2037,7 @@ export class NodeConnector {
                     input.limit < 1 ||
                     input.limit > 200)))
             throw new Error('DIRECTORY_CURSOR_INVALID');
-        return listWorkspaceFiles(workspace.path, typeof input.path === 'string' ? input.path : '.', typeof input.cursor === 'string' ? input.cursor : undefined, typeof input.limit === 'number' ? input.limit : undefined, this.fileAccessOptions());
+        return listWorkspaceFiles(workspace.path, typeof input.path === 'string' ? input.path : '.', typeof input.cursor === 'string' ? input.cursor : undefined, typeof input.limit === 'number' ? input.limit : undefined);
     }
     async readFileForWorkspace(workspace, input) {
         if (typeof input.path !== 'string' ||
@@ -2033,8 +2049,8 @@ export class NodeConnector {
                     input.limit > 512 * 1024)))
             throw new Error('FILE_RANGE_INVALID');
         if (isAbsolute(input.path))
-            return readAllowedTextFile(input.path, this.config?.allowedRoots ?? [], typeof input.offset === 'number' ? input.offset : 0, typeof input.limit === 'number' ? input.limit : 512 * 1024, this.fileAccessOptions());
-        return readWorkspaceTextFile(workspace.path, input.path, typeof input.offset === 'number' ? input.offset : 0, typeof input.limit === 'number' ? input.limit : 512 * 1024, this.fileAccessOptions());
+            return readAllowedTextFile(input.path, this.config?.allowedRoots ?? [], typeof input.offset === 'number' ? input.offset : 0, typeof input.limit === 'number' ? input.limit : 512 * 1024);
+        return readWorkspaceTextFile(workspace.path, input.path, typeof input.offset === 'number' ? input.offset : 0, typeof input.limit === 'number' ? input.limit : 512 * 1024);
     }
     async searchFilesForWorkspace(workspace, input) {
         if (typeof input.query !== 'string' ||
@@ -2058,7 +2074,7 @@ export class NodeConnector {
                     this.workspaceFileIndexes.delete(oldestWorkspaceId);
                 }
             }
-            index = new WorkspaceFileIndex(workspace.path, this.fileAccessOptions(), {
+            index = new WorkspaceFileIndex(workspace.path, {
                 onInvalidated: () => this.invalidateWorkspaceWatchTopics(workspace.id)
             });
         }
@@ -2078,7 +2094,7 @@ export class NodeConnector {
             if (seen.has(name))
                 return { name, status: 'INVALID_NAME', path: null };
             seen.add(name);
-            const target = await preflightWorkspaceUpload(workspace.path, typeof input.directory === 'string' ? input.directory : '.', name, this.fileAccessOptions());
+            const target = await preflightWorkspaceUpload(workspace.path, typeof input.directory === 'string' ? input.directory : '.', name);
             return { name, status: target.status, path: target.path || null };
         }));
     }
@@ -2091,8 +2107,6 @@ export class NodeConnector {
             typeof input.overwrite !== 'boolean' ||
             (composerAttachment !== undefined && input.directory !== undefined))
             throw new Error('UPLOAD_INVALID');
-        if (composerAttachment === undefined && this.runtime.hasActiveWorkspaceLease(workspace.id))
-            throw new Error('WORKSPACE_BUSY');
         if (composerAttachment !== undefined) {
             if (!validComposerAttachmentName(input.name) ||
                 input.size > MAX_COMPOSER_ATTACHMENT_BYTES ||
@@ -2101,7 +2115,7 @@ export class NodeConnector {
                 throw new Error('COMPOSER_ATTACHMENT_INVALID');
         }
         const target = composerAttachment === undefined
-            ? await preflightWorkspaceUpload(workspace.path, typeof input.directory === 'string' ? input.directory : '.', input.name, this.fileAccessOptions())
+            ? await preflightWorkspaceUpload(workspace.path, typeof input.directory === 'string' ? input.directory : '.', input.name)
             : await this.composerAttachmentTarget(workspace.path, composerAttachment.id, input.name);
         if (target.status === 'INVALID_NAME')
             throw new Error('UPLOAD_NAME_INVALID');
@@ -2303,18 +2317,56 @@ export class NodeConnector {
             return existing;
         const version = this.workspaceChangesVersions.get(workspace.id) ?? 0;
         const request = this.workspaceChangesLimiter.run(async () => {
-            const summary = await readCurrentChangesSummary(workspace.path);
+            const repositoryPaths = ['', ...(await listInitializedSubmodulePaths(workspace.path))];
+            const readRepository = async (repositoryPath) => {
+                const repository = repositoryPath === ''
+                    ? workspace.path
+                    : await resolveGitRepository(workspace.path, repositoryPath);
+                const summary = await readCurrentChangesSummary(repository);
+                const visibleChanges = (await Promise.all(summary.changes.map(async (change) => ({
+                    change,
+                    visible: await isWorkspaceChangeVisible(repository, change.path)
+                }))))
+                    .filter(({ visible }) => visible)
+                    .map(({ change }) => change);
+                return {
+                    repositoryPath,
+                    repositoryName: repositoryPath === '' ? '根仓库' : repositoryPath,
+                    branch: summary.branch,
+                    changes: visibleChanges
+                };
+            };
+            const root = await readRepository('');
+            const submoduleRepositories = (await Promise.all(repositoryPaths.slice(1).map(async (repositoryPath) => {
+                try {
+                    return await readRepository(repositoryPath);
+                }
+                catch {
+                    return undefined;
+                }
+            }))).filter((repository) => repository !== undefined);
+            const repositories = [root, ...submoduleRepositories];
             const value = {
-                branch: summary.branch,
-                changes: summary.changes.map((change) => ({
+                branch: root.branch,
+                changes: root.changes.map((change) => ({
                     ...change,
                     additions: null,
                     deletions: null,
-                    // Current status does not read file bodies. Detailed binary/diff data
-                    // remains an explicit on-demand Git request rather than a background
-                    // scan of the Workspace.
                     binary: false,
                     diffAvailable: change.state !== 'UNTRACKED'
+                })),
+                repositories: repositories.map((repository) => ({
+                    ...repository,
+                    changes: repository.changes.map((change) => ({
+                        ...change,
+                        additions: null,
+                        deletions: null,
+                        // Current status does not read file bodies. Detailed binary/diff data
+                        // remains an explicit on-demand Git request rather than a background
+                        // scan of the Workspace.
+                        binary: false,
+                        diffAvailable: change.state !== 'UNTRACKED'
+                    }))
                 }))
             };
             if ((this.workspaceChangesVersions.get(workspace.id) ?? 0) === version)
@@ -3310,6 +3362,8 @@ export class NodeConnector {
             this.emitRunEvent(runId, 'run.rejected', { code: 'EXTERNAL_THREAD_OBSERVE_ONLY' }, 'FAILED');
             return;
         }
+        if (typeof payload.externalSessionId === 'string')
+            this.completedClaudeContextReads.delete(`claude:${cwd}:${payload.externalSessionId}`);
         this.activeRuns.add(runId);
         void (async () => {
             try {
@@ -3449,7 +3503,10 @@ export class NodeConnector {
                             dataBase64: attachment.dataBase64
                         }))
                     }),
-                onPermission: (toolName, toolInput) => this.requestClaudeApproval(runId, toolName, toolInput),
+                onPermission: (toolName, toolInput, options) => toolName === 'AskUserQuestion'
+                    ? (toolKinds.set(options.toolUseID, 'user_input_request'),
+                        this.requestClaudeUserInput(runId, toolInput, options.toolUseID))
+                    : this.requestClaudeApproval(runId, toolName, toolInput),
                 onChannelReply: (content) => this.emitRunEvent(runId, 'channel.reply', { content }),
                 onMessage: (message) => {
                     const record = message;
@@ -3472,7 +3529,15 @@ export class NodeConnector {
                     }
                     if (record.type === 'assistant') {
                         const text = extractClaudeText(record);
-                        if (text.length > 0)
+                        const planText = claudePlanText(text);
+                        if (planText !== undefined)
+                            this.emitConversationItem(runId, {
+                                itemId: boundedConversationItemId('claude-plan', typeof record.uuid === 'string' ? record.uuid : `${runId}:plan`),
+                                kind: 'plan',
+                                status: 'COMPLETED',
+                                payload: { explanation: compactRunnerText(planText, 20_000), steps: [] }
+                            });
+                        else if (text.length > 0)
                             this.emitRunEvent(runId, 'text.delta', { text });
                         for (const [index, text] of extractClaudeThinkingSummaries(record).entries()) {
                             this.emitConversationItem(runId, {
@@ -3483,6 +3548,10 @@ export class NodeConnector {
                             });
                         }
                         for (const tool of extractClaudeToolUses(record)) {
+                            if (tool.name === 'AskUserQuestion') {
+                                toolKinds.set(tool.id, 'user_input_request');
+                                continue;
+                            }
                             const itemId = boundedConversationItemId('claude-tool', tool.id);
                             const kind = isClaudeCommandTool(tool.name) ? 'command_execution' : 'tool_call';
                             toolKinds.set(tool.id, kind);
@@ -3533,6 +3602,8 @@ export class NodeConnector {
                     if (record.type === 'user') {
                         for (const result of extractClaudeToolResults(record)) {
                             const kind = toolKinds.get(result.toolUseId) ?? 'tool_call';
+                            if (kind === 'user_input_request')
+                                continue;
                             this.emitConversationItem(runId, {
                                 itemId: boundedConversationItemId('claude-tool', result.toolUseId),
                                 kind,
@@ -3681,6 +3752,41 @@ export class NodeConnector {
             merge: true
         });
     }
+    respondUserInput(runId, requestId, rawAnswers) {
+        if (this.codexUserInputs.has(requestId)) {
+            this.respondCodexUserInput(runId, requestId, rawAnswers);
+            return;
+        }
+        const pending = this.claudeUserInputs.get(requestId);
+        if (pending === undefined || pending.runId !== runId)
+            throw new Error('USER_INPUT_NOT_FOUND');
+        const answers = {};
+        for (const question of pending.questions) {
+            const values = rawAnswers[question.id];
+            if (!Array.isArray(values) || values.length === 0 || values.length > 8)
+                throw new Error('USER_INPUT_INVALID');
+            const normalized = values.map((value) => {
+                if (typeof value !== 'string' || value.length === 0 || value.length > 500)
+                    throw new Error('USER_INPUT_INVALID');
+                if (!question.allowOther && !question.options.some((option) => option.value === value))
+                    throw new Error('USER_INPUT_INVALID');
+                return value;
+            });
+            if (!question.multiSelect && normalized.length !== 1)
+                throw new Error('USER_INPUT_INVALID');
+            answers[question.prompt] = normalized.join(', ');
+        }
+        clearTimeout(pending.timer);
+        this.claudeUserInputs.delete(requestId);
+        pending.resolve(answers);
+        this.emitConversationItem(runId, {
+            itemId: boundedConversationItemId('claude-input', requestId),
+            kind: 'user_input_request',
+            status: 'COMPLETED',
+            payload: { requestId, questions: pending.questions },
+            merge: true
+        });
+    }
     /** Returns true when cancellation already made this Run terminal. */
     completeCancelledRun(runId, cwd) {
         const run = this.runtime.getRun(runId);
@@ -3977,7 +4083,10 @@ export class NodeConnector {
             // Context detail is optional Runner metadata. Cache the miss briefly to
             // avoid spawning one Claude process per browser polling tick.
         }
-        this.completedClaudeContextReads.set(key, { context, expiresAt: Date.now() + 5_000 });
+        this.completedClaudeContextReads.set(key, {
+            context,
+            expiresAt: Date.now() + CLAUDE_CONTEXT_CACHE_MS
+        });
         this.emitWorkbenchEvent('session', {
             sessionId: session.id,
             workspaceId: session.workspaceId,
@@ -3988,9 +4097,27 @@ export class NodeConnector {
     /** Executes only Node-declared interactions; the browser never supplies behavior. */
     async executeRunnerCommand(session, command, input) {
         if (session.runner === 'claude-code') {
-            if (command.id !== 'compact')
+            if (command.id === 'compact')
+                return this.startClaudeCompaction(session, input);
+            if (command.id !== 'plan')
+                throw new Error('RUNNER_COMMAND_UNAVAILABLE');
+            // 标签式 Plan Mode 与 SDK 原生 plan 权限不叠加。
+            if (session.access === 'plan')
                 throw new Error('RUNNER_COMMAND_UNAVAILABLE');
-            return this.startClaudeCompaction(session, input);
+            const current = this.commandStates.get(session.id, 'plan');
+            if (current?.active)
+                this.commandStates.clear(session.id, 'plan');
+            else
+                this.commandStates.set(session.id, {
+                    commandId: 'plan',
+                    active: true,
+                    label: 'Plan Mode',
+                    detail: '后续消息将以标签式规划模式运行，只读规划并输出计划卡。',
+                    closable: true,
+                    closeInput: '/plan',
+                    continuation: { label: 'Implement', prompt: '请根据上述计划开始实施。' }
+                });
+            return { command: command.id, states: this.commandStates.list(session.id) };
         }
         if (command.id === 'plan') {
             await this.codexClient.start();
@@ -4209,6 +4336,45 @@ export class NodeConnector {
             });
         });
     }
+    requestClaudeUserInput(runId, toolInput, toolUseId) {
+        const questions = claudeUserInputQuestions(toolInput);
+        if (questions.length === 0)
+            return Promise.resolve(denyPermission('USER_INPUT_INVALID'));
+        const requestId = `claude:${runId}:${toolUseId}`;
+        return new Promise((resolve) => {
+            const input = { ...toolInput };
+            const settleDeny = (message = 'USER_INPUT_EXPIRED') => resolve(denyPermission(message));
+            const timer = setTimeout(() => {
+                const pending = this.claudeUserInputs.get(requestId);
+                if (pending === undefined)
+                    return;
+                this.claudeUserInputs.delete(requestId);
+                pending.reject('USER_INPUT_EXPIRED');
+                this.emitConversationItem(runId, {
+                    itemId: boundedConversationItemId('claude-input', requestId),
+                    kind: 'user_input_request',
+                    status: 'FAILED',
+                    payload: { requestId, questions },
+                    merge: true
+                });
+            }, this.claudeApprovalTimeoutMs);
+            this.claudeUserInputs.set(requestId, {
+                runId,
+                requestId,
+                questions,
+                input,
+                resolve: (answers) => resolve({ behavior: 'allow', updatedInput: { ...input, answers } }),
+                reject: settleDeny,
+                timer
+            });
+            this.emitConversationItem(runId, {
+                itemId: boundedConversationItemId('claude-input', requestId),
+                kind: 'user_input_request',
+                status: 'PENDING',
+                payload: { requestId, questions }
+            });
+        });
+    }
     /**
      * An approval is an individual Runner callback. Keep its exact payload in
      * the process-local snapshot and emit a Run event so an already open
@@ -5042,9 +5208,24 @@ function nativeConversationPage(session, history, input, runtimeTurns = []) {
         const turnId = `${session.id}:native:${index}`;
         const isToolCall = entry.kind === 'tool_call';
         const isCommand = isToolCall && isClaudeCommandTool(entry.toolName);
+        const userInputQuestions = session.runner === 'claude-code' &&
+            isToolCall &&
+            entry.toolName === 'AskUserQuestion' &&
+            isPlainRecord(entry.input)
+            ? claudeUserInputQuestions(entry.input)
+            : [];
+        const isUserInputRequest = userInputQuestions.length > 0;
         const clientMessageId = !isToolCall && entry.role === 'USER'
             ? nativeUserClientMessageId(entry, time, runtimeTurns)
             : null;
+        // Claude 标签式 Plan Mode：用户正文剥离注入的规划指令标签，
+        // 完整的 <proposed_plan> Agent 文本归一化为计划卡。
+        const entryText = entry.kind === 'message'
+            ? entry.role === 'USER'
+                ? stripClaudePlanTag(entry.text)
+                : entry.text
+            : '';
+        const planText = entry.kind === 'message' && entry.role !== 'USER' ? claudePlanText(entryText) : undefined;
         const item = {
             id: `${turnId}:item`,
             sessionId: session.id,
@@ -5053,38 +5234,49 @@ function nativeConversationPage(session, history, input, runtimeTurns = []) {
             parentItemId: null,
             sourceSequence: index,
             revision: 0,
-            kind: isToolCall
-                ? isCommand
-                    ? 'command_execution'
-                    : 'tool_call'
-                : entry.role === 'USER'
-                    ? 'user_message'
-                    : 'assistant_message',
+            kind: isUserInputRequest
+                ? 'user_input_request'
+                : isToolCall
+                    ? isCommand
+                        ? 'command_execution'
+                        : 'tool_call'
+                    : entry.role === 'USER'
+                        ? 'user_message'
+                        : planText !== undefined
+                            ? 'plan'
+                            : 'assistant_message',
             status: 'COMPLETED',
-            payload: isToolCall
-                ? isCommand
-                    ? {
-                        command: nativeClaudeCommand(entry),
-                        cwd: null,
-                        outputPreview: entry.outputSummary ?? '',
-                        outputRef: null,
-                        exitCode: null,
-                        durationMs: null,
-                        truncated: entry.inputTruncated || entry.outputTruncated
-                    }
-                    : {
-                        namespace: session.runner,
-                        toolName: entry.toolName,
-                        title: entry.toolName,
-                        inputSummary: entry.inputSummary,
-                        outputSummary: entry.outputSummary,
-                        progressLabel: null,
-                        errorCode: entry.failed ? 'TOOL_EXECUTION_FAILED' : null,
-                        truncated: entry.inputTruncated || entry.outputTruncated
-                    }
-                : entry.role === 'USER'
-                    ? { clientMessageId, text: entry.text, contexts: [], delivery: 'ACCEPTED' }
-                    : { text: entry.text, format: 'markdown', source: 'native-file' },
+            payload: isUserInputRequest
+                ? {
+                    requestId: `native:${entry.kind === 'tool_call' ? entry.toolUseId : `item-${index}`}`,
+                    questions: userInputQuestions
+                }
+                : isToolCall
+                    ? isCommand
+                        ? {
+                            command: nativeClaudeCommand(entry),
+                            cwd: null,
+                            outputPreview: entry.outputSummary ?? '',
+                            outputRef: null,
+                            exitCode: null,
+                            durationMs: null,
+                            truncated: entry.inputTruncated || entry.outputTruncated
+                        }
+                        : {
+                            namespace: session.runner,
+                            toolName: entry.toolName,
+                            title: entry.toolName,
+                            inputSummary: entry.inputSummary,
+                            outputSummary: entry.outputSummary,
+                            progressLabel: null,
+                            errorCode: entry.failed ? 'TOOL_EXECUTION_FAILED' : null,
+                            truncated: entry.inputTruncated || entry.outputTruncated
+                        }
+                    : entry.role === 'USER'
+                        ? { clientMessageId, text: entryText, contexts: [], delivery: 'ACCEPTED' }
+                        : planText !== undefined
+                            ? { explanation: compactRunnerText(planText, 20_000), steps: [] }
+                            : { text: entryText, format: 'markdown', source: 'native-file' },
             startedAt: time,
             completedAt: time
         };
@@ -5121,7 +5313,8 @@ function nativeUserClientMessageId(entry, createdAt, runtimeTurns) {
             continue;
         const payload = user.payload;
         const clientMessageId = typeof payload.clientMessageId === 'string' ? payload.clientMessageId : null;
-        if (clientMessageId === null || payload.text !== entry.text)
+        // 标签式 Plan Mode 的指令标签只存在于原生 transcript，运行态气泡始终是原文。
+        if (clientMessageId === null || payload.text !== stripClaudePlanTag(entry.text))
             continue;
         const runtimeCreatedAt = user.startedAt ?? turn.startedAt;
         if (runtimeCreatedAt !== null &&
@@ -5335,6 +5528,20 @@ function codexPlanText(value) {
         .trim();
     return plan.length > 0 ? plan : undefined;
 }
+/**
+ * Claude 标签式 Plan Mode 的最终计划以 `<proposed_plan>` 完整包裹输出；
+ * 未闭合或缺失标签的文本保持普通 assistant 消息。
+ */
+function claudePlanText(text) {
+    const trimmed = text.trim();
+    if (!trimmed.startsWith('<proposed_plan>') || !/<\/proposed_plan>\s*$/.test(trimmed))
+        return undefined;
+    const plan = trimmed
+        .slice('<proposed_plan>'.length)
+        .replace(/<\/proposed_plan>\s*$/, '')
+        .trim();
+    return plan.length > 0 ? plan : undefined;
+}
 function codexOfficialItem(session, nativeTurnId, value, turnSequence, itemSequence, startedAt, completedAt) {
     if (!isPlainRecord(value) || typeof value.type !== 'string')
         return undefined;
@@ -5589,6 +5796,44 @@ function codexUserInputQuestions(value) {
         ? []
         : questions;
 }
+function claudeUserInputQuestions(value) {
+    if (!Array.isArray(value.questions) || value.questions.length === 0 || value.questions.length > 4)
+        return [];
+    const questions = value.questions.map((raw, index) => {
+        if (!isPlainRecord(raw) || typeof raw.question !== 'string')
+            return undefined;
+        const options = Array.isArray(raw.options)
+            ? raw.options.flatMap((option) => {
+                if (!isPlainRecord(option) || typeof option.label !== 'string')
+                    return [];
+                const label = compactRunnerText(option.label, 500);
+                return label.length === 0
+                    ? []
+                    : [
+                        {
+                            value: label,
+                            label,
+                            description: typeof option.description === 'string'
+                                ? compactRunnerText(option.description, 1_000)
+                                : null
+                        }
+                    ];
+            })
+            : [];
+        const multiSelect = raw.multiSelect === true;
+        return {
+            id: `claude-question-${index}`,
+            prompt: compactRunnerText(raw.question, 5_000),
+            input: options.length === 0 ? 'SHORT_TEXT' : multiSelect ? 'MULTI_SELECT' : 'SINGLE_SELECT',
+            options,
+            allowOther: options.length === 0,
+            multiSelect
+        };
+    });
+    return questions.some((question) => question === undefined)
+        ? []
+        : questions;
+}
 function codexItemStatus(value, completed) {
     if (value === 'failed')
         return 'FAILED';