@co0ontty/wand 1.18.12 → 1.21.4

package/dist/models.js

@@ -1,7 +1,7 @@
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
 const execAsync = promisify(exec);
-const BUILT_IN_MODELS = [
+const CLAUDE_MODELS = [
     { id: "default", label: "default（跟随 Claude Code 默认）", alias: true },
     { id: "opus", label: "opus（最新 Opus）", alias: true },
     { id: "sonnet", label: "sonnet（最新 Sonnet）", alias: true },
@@ -11,9 +11,12 @@ const BUILT_IN_MODELS = [
     { id: "claude-sonnet-4-6", label: "Sonnet 4.6 · claude-sonnet-4-6" },
     { id: "claude-haiku-4-5-20251001", label: "Haiku 4.5 · claude-haiku-4-5-20251001" },
 ];
+const CODEX_FALLBACK_MODELS = [
+    { id: "default", label: "default（跟随 Codex 默认）", alias: true },
+];
 let cache = null;
-function cloneDefaults() {
-    return BUILT_IN_MODELS.map((m) => ({ ...m }));
+function cloneClaudeModels() {
+    return CLAUDE_MODELS.map((m) => ({ ...m }));
 }
 async function probeClaudeVersion() {
     try {
@@ -25,10 +28,37 @@ async function probeClaudeVersion() {
         return null;
     }
 }
+async function probeCodexModels() {
+    try {
+        const { stdout } = await execAsync("codex debug models", { timeout: 8000 });
+        const data = JSON.parse(stdout);
+        const visible = data.models
+            .filter((m) => m.visibility === "list")
+            .sort((a, b) => (a.priority ?? 99) - (b.priority ?? 99));
+        if (!visible.length)
+            return CODEX_FALLBACK_MODELS.map((m) => ({ ...m }));
+        const result = [
+            { id: "default", label: "default（跟随 Codex 默认）", alias: true },
+        ];
+        for (const m of visible) {
+            result.push({
+                id: m.slug,
+                label: m.display_name && m.display_name !== m.slug
+                    ? `${m.display_name} · ${m.slug}`
+                    : m.slug,
+            });
+        }
+        return result;
+    }
+    catch {
+        return CODEX_FALLBACK_MODELS.map((m) => ({ ...m }));
+    }
+}
 export function getCachedModels() {
     if (!cache) {
         cache = {
-            models: cloneDefaults(),
+            models: cloneClaudeModels(),
+            codexModels: CODEX_FALLBACK_MODELS.map((m) => ({ ...m })),
             claudeVersion: null,
             refreshedAt: new Date().toISOString(),
         };
@@ -36,17 +66,25 @@ export function getCachedModels() {
     return cache;
 }
 export async function refreshModels() {
-    const version = await probeClaudeVersion();
+    const [version, codexModels] = await Promise.all([
+        probeClaudeVersion(),
+        probeCodexModels(),
+    ]);
     cache = {
-        models: cloneDefaults(),
+        models: cloneClaudeModels(),
+        codexModels,
         claudeVersion: version,
         refreshedAt: new Date().toISOString(),
     };
     return cache;
 }
+export function getModelsForProvider(provider) {
+    const cached = getCachedModels();
+    return provider === "codex" ? cached.codexModels : cached.models;
+}
 /** 返回可用于 claude CLI 的全部已知 model id（含别名） */
 export function knownModelIds() {
-    return BUILT_IN_MODELS.map((m) => m.id);
+    return CLAUDE_MODELS.map((m) => m.id);
 }
 /** 判断传入值是否是已知模型；允许自由文本，因此总是返回 true。保留接口以便将来严格校验。 */
 export function isKnownModel(_value) {

package/dist/process-manager.d.ts

@@ -35,8 +35,12 @@ export declare class ProcessManager extends EventEmitter {
     private readonly persistDebounceTimers;
     /** Last persisted message state per session — used to skip redundant message writes */
     private readonly lastPersistedMessageState;
+    /** 启动时被识别为孤儿 PTY 并标记为 exited 的旧会话数（旧服务器进程已死） */
+    private orphanRecoveredCount;
     constructor(config: WandConfig, storage: WandStorage, configDir?: string);
     on(event: "process", listener: ProcessEventHandler): this;
+    /** 启动时被识别为孤儿 PTY 并标记为 exited 的旧会话数量（仅用于启动摘要展示）。 */
+    getOrphanRecoveredCount(): number;
     private emitEvent;
     private cleanupOldSessions;
     start(command: string, cwd: string | undefined, mode: ExecutionMode, initialInput?: string, opts?: {
@@ -46,6 +50,8 @@ export declare class ProcessManager extends EventEmitter {
         provider?: SessionProvider;
         model?: string;
         reuseId?: string;
+        cols?: number;
+        rows?: number;
     }): SessionSnapshot;
     list(): SessionSnapshot[];
     /** Return lightweight snapshots for the session list (no output/messages). */
@@ -103,14 +109,6 @@ export declare class ProcessManager extends EventEmitter {
      * Use this at critical points (exit, stop, delete) to ensure no data loss.
      */
     private flushPersist;
-    private backfillExitedClaudeSessionIds;
-    /**
-     * Auto-recover the most recent exited session that has a Claude session ID.
-     * Only resumes one session per server start, using the most recent eligible
-     * session. Reuses the original session ID (in-place resume) and sets
-     * `autoRecovered: true`.
-     */
-    private autoRecoverExitedSessions;
     private archiveExpiredSessions;
     private assertCommandAllowed;
     /**

package/dist/process-manager.js

@@ -10,7 +10,7 @@ import { ClaudePtyBridge } from "./claude-pty-bridge.js";
 import { truncateMessagesForTransport } from "./message-truncator.js";
 import { appendWindow, hasExplicitConfirmSyntax, hasPermissionActionContext, normalizePromptText } from "./pty-text-utils.js";
 import { prepareSessionWorktree } from "./git-worktree.js";
-import { getResumeCommandSessionId, hasRealConversationMessages, } from "./resume-policy.js";
+import { getResumeCommandSessionId } from "./resume-policy.js";
 function resolveProviderFromCommand(command) {
     return /^codex\b/.test(command.trim()) ? "codex" : "claude";
 }
@@ -108,6 +108,10 @@ function hasRecentProjectActivity(candidate, startedAt) {
 }
 function selectClaudeProjectSessionForRecord(record) {
     const knownMtimes = record.knownClaudeProjectMtimes ?? new Map();
+    // Only consider files created/touched AFTER this wand session started — those
+    // are the ones a fresh `claude` invocation could have produced. Files that
+    // existed before (knownMtimes entry present) are tolerated only if they
+    // grew since we observed them, but we de-prioritize them below.
     const candidates = listClaudeProjectSessionCandidates(record.cwd)
         .filter((candidate) => {
         const previousMtime = knownMtimes.get(candidate.id);
@@ -125,54 +129,22 @@ function selectClaudeProjectSessionForRecord(record) {
     if (!hasUserTurn) {
         return null;
     }
-    return candidates[0] ?? null;
-}
-/**
- * Broader fallback: find a JSONL file by mtime proximity when strict
- * mtime-correlation fails (e.g., file existed before session but Claude
- * wrote conversation content during this session).
- * Looks for the most recently modified file that was active near the
- * session's start time and has real conversation content.
- */
-function selectClaudeProjectSessionByProximity(record) {
-    const hasUserTurn = record.messages.some((turn) => turn.role === "user"
-        && turn.content.some((block) => block.type === "text" && block.text.trim().length > 0));
-    if (!hasUserTurn) {
+    // Prefer brand-new files (id not in knownMtimes at session start). When more
+    // than one fresh candidate exists in parallel sessions, refuse to bind —
+    // mis-binding another session's history is worse than waiting for the bridge
+    // to capture the canonical session id from PTY output.
+    const fresh = candidates.filter((candidate) => !knownMtimes.has(candidate.id));
+    if (fresh.length === 1) {
+        return fresh[0];
+    }
+    if (fresh.length > 1) {
         return null;
     }
-    const startedAtMs = Date.parse(record.startedAt);
-    const now = Date.now();
-    // Look for files modified from ~60s before session start up to now
-    const proximityWindowMs = 60 * 1000;
-    const candidates = listClaudeProjectSessionCandidates(record.cwd)
-        .filter((candidate) => {
-        if (!Number.isFinite(startedAtMs))
-            return true;
-        return candidate.mtimeMs >= startedAtMs - proximityWindowMs
-            && candidate.mtimeMs <= now + DISCOVERY_RECENT_WINDOW_MS;
-    })
-        .map((candidate) => readClaudeProjectSessionDetails(candidate.filePath, candidate.id))
-        .filter((candidate) => Boolean(candidate?.hasConversation))
-        .sort((a, b) => b.mtimeMs - a.mtimeMs);
-    return candidates[0] ?? null;
-}
-function getResumeEligibility(record) {
-    const hasClaudeSessionId = Boolean(record.claudeSessionId);
-    const hasRealConversation = hasRealConversationMessages(record.messages);
-    return {
-        hasClaudeSessionId,
-        hasRealConversation,
-        eligible: hasClaudeSessionId && hasRealConversation
-    };
-}
-function hasResumeEligibleConversation(record) {
-    return getResumeEligibility(record).eligible;
+    // Fallback: existing file that grew. Only bind if a single grown candidate.
+    return candidates.length === 1 ? candidates[0] : null;
 }
 function getLatestClaudeProjectSessionId(record) {
-    // Try strict mtime-correlation first, then fall back to mtime proximity
-    return selectClaudeProjectSessionForRecord(record)?.id
-        ?? selectClaudeProjectSessionByProximity(record)?.id
-        ?? null;
+    return selectClaudeProjectSessionForRecord(record)?.id ?? null;
 }
 function listRecentClaudeProjectSessionIds(cwd, startedAt) {
     return listClaudeProjectSessionCandidates(cwd)
@@ -180,33 +152,6 @@ function listRecentClaudeProjectSessionIds(cwd, startedAt) {
         .sort((a, b) => b.mtimeMs - a.mtimeMs)
         .map((candidate) => candidate.id);
 }
-function findRealClaudeProjectSessionId(cwd, startedAt) {
-    // Strict mtime-based discovery first
-    const candidates = listRecentClaudeProjectSessionIds(cwd, startedAt)
-        .map((id) => {
-        const filePath = path.join(getClaudeProjectDir(cwd), `${id}.jsonl`);
-        return readClaudeProjectSessionDetails(filePath, id);
-    })
-        .filter((candidate) => Boolean(candidate?.hasConversation))
-        .sort((a, b) => b.mtimeMs - a.mtimeMs);
-    if (candidates.length > 0)
-        return candidates[0].id;
-    // Fallback: broader proximity search for files with conversation content
-    const startedAtMs = Date.parse(startedAt);
-    const now = Date.now();
-    const proximityWindowMs = 60 * 1000;
-    const proximityCandidates = listClaudeProjectSessionCandidates(cwd)
-        .filter((candidate) => {
-        if (!Number.isFinite(startedAtMs))
-            return true;
-        return candidate.mtimeMs >= startedAtMs - proximityWindowMs
-            && candidate.mtimeMs <= now + DISCOVERY_RECENT_WINDOW_MS;
-    })
-        .map((candidate) => readClaudeProjectSessionDetails(candidate.filePath, candidate.id))
-        .filter((candidate) => Boolean(candidate?.hasConversation))
-        .sort((a, b) => b.mtimeMs - a.mtimeMs);
-    return proximityCandidates[0]?.id ?? null;
-}
 function isClaudeSessionFileAvailable(cwd, claudeSessionId) {
     const filePath = path.join(getClaudeProjectDir(cwd), `${claudeSessionId}.jsonl`);
     return Boolean(readClaudeProjectSessionDetails(filePath, claudeSessionId));
@@ -348,18 +293,6 @@ function listAllClaudeHistorySessions() {
         return [];
     }
 }
-function shouldAutoResumeSession(record) {
-    return record.status === "exited"
-        && !record.archived
-        && record.ptyProcess === null
-        && hasResumeEligibleConversation(record);
-}
-function shouldBackfillClaudeSessionId(record) {
-    return record.status === "exited"
-        && !record.claudeSessionId
-        && /^claude\b/.test(record.command.trim())
-        && hasRealConversationMessages(record.messages);
-}
 function snapshotMessages(record) {
     return record.ptyBridge?.getMessages() ?? record.messages;
 }
@@ -455,6 +388,8 @@ export class ProcessManager extends EventEmitter {
     persistDebounceTimers = new Map();
     /** Last persisted message state per session — used to skip redundant message writes */
     lastPersistedMessageState = new Map();
+    /** 启动时被识别为孤儿 PTY 并标记为 exited 的旧会话数（旧服务器进程已死） */
+    orphanRecoveredCount = 0;
     constructor(config, storage, configDir) {
         super();
         this.config = config;
@@ -488,7 +423,10 @@ export class ProcessManager extends EventEmitter {
                     confirmWindow: "",
                     ptyPermissionBlocked: false,
                     lastAutoConfirmAt: 0,
-                    autoApprovePermissions: this.shouldAutoApprovePermissions(snapshot.command, snapshot.mode, provider),
+                    // Preserve a user-toggled auto-approve setting across server restarts
+                    // instead of recomputing it from the command/mode pair.
+                    autoApprovePermissions: snapshot.autoApprovePermissions
+                        ?? this.shouldAutoApprovePermissions(snapshot.command, snapshot.mode, provider),
                     pendingEscalation: snapshot.pendingEscalation ?? null,
                     lastEscalationResult: snapshot.lastEscalationResult ?? null,
                     autonomyPolicy: snapshot.autonomyPolicy ?? this.defaultAutonomyPolicy(snapshot.mode),
@@ -507,9 +445,11 @@ export class ProcessManager extends EventEmitter {
                     claudeTaskDiscoveryTimer: null,
                     knownClaudeProjectMtimes: isClaudeCmd ? listClaudeProjectSessionMtimes(updated.cwd) : undefined,
                     claudeSessionId: resumeCommandSessionId ?? updated.claudeSessionId,
-                    approvalStats: { tool: 0, command: 0, file: 0, total: 0 }
+                    approvalStats: { tool: 0, command: 0, file: 0, total: 0 },
+                    ptyCols: snapshot.ptyCols ?? 120,
+                    ptyRows: snapshot.ptyRows ?? 36,
                 });
-                console.error(`[ProcessManager] Restored session ${snapshot.id} marked as exited (PTY orphaned)`);
+                this.orphanRecoveredCount += 1;
             }
             else {
                 this.sessions.set(snapshot.id, {
@@ -521,7 +461,8 @@ export class ProcessManager extends EventEmitter {
                     confirmWindow: "",
                     ptyPermissionBlocked: false,
                     lastAutoConfirmAt: 0,
-                    autoApprovePermissions: this.shouldAutoApprovePermissions(snapshot.command, snapshot.mode, provider),
+                    autoApprovePermissions: snapshot.autoApprovePermissions
+                        ?? this.shouldAutoApprovePermissions(snapshot.command, snapshot.mode, provider),
                     pendingEscalation: snapshot.pendingEscalation ?? null,
                     lastEscalationResult: snapshot.lastEscalationResult ?? null,
                     autonomyPolicy: snapshot.autonomyPolicy ?? this.defaultAutonomyPolicy(snapshot.mode),
@@ -540,16 +481,12 @@ export class ProcessManager extends EventEmitter {
                     claudeTaskDiscoveryTimer: null,
                     knownClaudeProjectMtimes: isClaudeCmd ? listClaudeProjectSessionMtimes(snapshot.cwd) : undefined,
                     claudeSessionId: resumeCommandSessionId ?? snapshot.claudeSessionId,
-                    approvalStats: { tool: 0, command: 0, file: 0, total: 0 }
+                    approvalStats: { tool: 0, command: 0, file: 0, total: 0 },
+                    ptyCols: snapshot.ptyCols ?? 120,
+                    ptyRows: snapshot.ptyRows ?? 36,
                 });
             }
         }
-        // Defer expensive file-system scanning and auto-recovery so the server
-        // can start responding to requests immediately.
-        setImmediate(() => {
-            this.backfillExitedClaudeSessionIds();
-            this.autoRecoverExitedSessions();
-        });
         this.archiveExpiredSessions();
         this.archiveTimer = setInterval(() => {
             try {
@@ -564,6 +501,10 @@ export class ProcessManager extends EventEmitter {
     on(event, listener) {
         return super.on("process", listener);
     }
+    /** 启动时被识别为孤儿 PTY 并标记为 exited 的旧会话数量（仅用于启动摘要展示）。 */
+    getOrphanRecoveredCount() {
+        return this.orphanRecoveredCount;
+    }
     emitEvent(event) {
         this.emit("process", event);
     }
@@ -614,12 +555,22 @@ export class ProcessManager extends EventEmitter {
             ? path.resolve(process.cwd(), cwd)
             : path.resolve(process.cwd(), this.config.defaultCwd);
         const id = opts?.reuseId || randomUUID();
+        // When a session is being resumed under the same id, capture its prior
+        // structured messages so the new bridge can present them as the chat
+        // history. We deliberately do NOT carry over rawOutput — `claude --resume`
+        // re-prints its own banner and replayed history into the new PTY, and
+        // mixing the two would surface every line twice in the terminal view.
+        let priorMessages = [];
         if (opts?.reuseId) {
             const oldRecord = this.sessions.get(id);
             if (oldRecord) {
+                priorMessages = oldRecord.ptyBridge?.getMessages() ?? oldRecord.messages ?? [];
                 this.cleanupRecord(oldRecord);
                 this.sessions.delete(id);
             }
+            else {
+                priorMessages = this.storage.getSession(id)?.messages ?? [];
+            }
         }
         const worktreeSetup = opts?.worktreeEnabled
             ? prepareSessionWorktree({ cwd: baseCwd, sessionId: id })
@@ -671,7 +622,7 @@ export class ProcessManager extends EventEmitter {
             rememberedEscalationScopes: new Set(),
             rememberedEscalationTargets: new Set(),
             storedOutput: "",
-            messages: [],
+            messages: priorMessages,
             childProcess: null,
             ptyBridge: null,
             currentTask: null,
@@ -682,6 +633,8 @@ export class ProcessManager extends EventEmitter {
             knownClaudeProjectMtimes: knownClaudeProjectMtimes ?? undefined,
             approvalStats: { tool: 0, command: 0, file: 0, total: 0 },
             selectedModel: selectedModel ?? null,
+            ptyCols: opts?.cols !== undefined ? clampDimension(opts.cols, 20, 400) : 120,
+            ptyRows: opts?.rows !== undefined ? clampDimension(opts.rows, 10, 160) : 36,
         };
         if (isClaudeProvider) {
             record.ptyBridge = new ClaudePtyBridge({
@@ -689,6 +642,7 @@ export class ProcessManager extends EventEmitter {
                 isClaudeCommand: true,
                 autoApprove: record.autoApprovePermissions,
                 approvalPolicy: record.approvalPolicy,
+                initialMessages: priorMessages,
             });
             record.ptyBridge.on("event", (event) => {
                 this.handleBridgeEvent(record, event);
@@ -712,8 +666,10 @@ export class ProcessManager extends EventEmitter {
                     WAND_AUTO_EDIT: effectiveMode === "auto-edit" ? "1" : "0"
                 },
                 name: "xterm-color",
-                cols: 120,
-                rows: 36
+                // 使用 record 上由前端协商好的真实尺寸，避免"先 120 列、几百毫秒后再 resize"
+                // 期间 Claude/Codex 用错列宽渲染出 \x1b[120G 这类绝对列定位序列。
+                cols: record.ptyCols,
+                rows: record.ptyRows
             });
         }
         catch (err) {
@@ -939,15 +895,13 @@ export class ProcessManager extends EventEmitter {
     get(id) {
         const record = this.sessions.get(id);
         if (!record) {
-            // Fallback: check SQLite for sessions that were evicted from memory
             return this.storage.getSession(id) ?? null;
         }
-        // For sessions loaded from storage on startup, in-memory output starts empty.
-        // Prefer in-memory output (live PTY data), fall back to stored output.
+        const result = this.snapshot(record);
         if (!record.output && record.storedOutput) {
-            record.output = record.storedOutput;
+            result.output = record.storedOutput;
         }
-        return this.snapshot(record);
+        return result;
     }
     getPtyTranscript(id) {
         return this.logger.readPtyOutput(id);
@@ -959,12 +913,9 @@ export class ProcessManager extends EventEmitter {
      */
     setSessionModel(id, model) {
         const record = this.mustGet(id);
-        if (record.provider !== "claude") {
-            throw new Error("仅 Claude 会话支持切换模型。");
-        }
         const normalized = model?.trim() || null;
         record.selectedModel = normalized;
-        if (record.status === "running" && record.ptyProcess) {
+        if (record.provider === "claude" && record.status === "running" && record.ptyProcess) {
             const value = normalized && normalized !== "default" ? normalized : "default";
             record.ptyProcess.write(`/model ${value}\r`);
         }
@@ -1037,7 +988,20 @@ export class ProcessManager extends EventEmitter {
         }
         const safeCols = clampDimension(cols, 20, 400);
         const safeRows = clampDimension(rows, 10, 160);
+        const changed = safeCols !== record.ptyCols || safeRows !== record.ptyRows;
         record.ptyProcess.resize(safeCols, safeRows);
+        record.ptyCols = safeCols;
+        record.ptyRows = safeRows;
+        if (changed) {
+            // Notify every subscribed client of the new authoritative dimensions so
+            // any other tab/device can re-fit its terminal instead of rendering
+            // wrap-broken output sized for someone else's viewport.
+            this.emitEvent({
+                type: "status",
+                sessionId: id,
+                data: { ptyCols: safeCols, ptyRows: safeRows },
+            });
+        }
         return this.snapshot(record);
     }
     stop(id) {
@@ -1236,6 +1200,8 @@ export class ProcessManager extends EventEmitter {
             summary: deriveSessionSummary(messages, record.currentTask?.title ?? null),
             currentTaskTitle: record.status === "running" ? record.currentTask?.title ?? undefined : undefined,
             selectedModel: record.selectedModel ?? null,
+            ptyCols: record.ptyCols,
+            ptyRows: record.ptyRows,
         };
     }
     /** Lightweight snapshot for list views — omits output and messages. */
@@ -1374,70 +1340,6 @@ export class ProcessManager extends EventEmitter {
         }
         this.persist(record);
     }
-    backfillExitedClaudeSessionIds() {
-        for (const record of this.sessions.values()) {
-            record.messages = snapshotMessages(record);
-            if (!shouldBackfillClaudeSessionId(record)) {
-                continue;
-            }
-            const discoveredSessionId = findRealClaudeProjectSessionId(record.cwd, record.startedAt);
-            if (!discoveredSessionId) {
-                continue;
-            }
-            record.claudeSessionId = discoveredSessionId;
-            this.persist(record);
-        }
-    }
-    /**
-     * Auto-recover the most recent exited session that has a Claude session ID.
-     * Only resumes one session per server start, using the most recent eligible
-     * session. Reuses the original session ID (in-place resume) and sets
-     * `autoRecovered: true`.
-     */
-    autoRecoverExitedSessions() {
-        // Find eligible exited sessions
-        const eligibleSessions = [];
-        for (const record of this.sessions.values()) {
-            record.messages = snapshotMessages(record);
-            if (shouldAutoResumeSession(record)) {
-                eligibleSessions.push(record);
-            }
-        }
-        if (eligibleSessions.length === 0)
-            return;
-        // Sort by startedAt descending (most recent first)
-        eligibleSessions.sort((a, b) => b.startedAt.localeCompare(a.startedAt));
-        // Only auto-recover the single most recent session
-        const original = eligibleSessions[0];
-        const isClaude = /^claude\b/.test(original.command.trim());
-        if (!isClaude)
-            return;
-        // If no claudeSessionId is bound yet, try to discover it via proximity search
-        if (!original.claudeSessionId) {
-            const discovered = findRealClaudeProjectSessionId(original.cwd, original.startedAt);
-            if (discovered) {
-                original.claudeSessionId = discovered;
-                process.stderr.write(`[wand] Backfilled Claude session ID for auto-recovery: ${discovered}\n`);
-                this.persist(original);
-            }
-        }
-        if (!original.claudeSessionId) {
-            console.error(`[ProcessManager] Skipping auto-recovery: no Claude session ID for session ${original.id}`);
-            return;
-        }
-        console.error(`[ProcessManager] Auto-recovering session ${original.id} with Claude session ID ${original.claudeSessionId}`);
-        const resumeCommand = `${original.command.trim()} --resume ${original.claudeSessionId}`;
-        try {
-            const snapshot = this.start(resumeCommand, original.cwd, original.mode, undefined, {
-                reuseId: original.id,
-                autoRecovered: true
-            });
-            console.error(`[ProcessManager] Auto-recovered session ${snapshot.id} (in-place)`);
-        }
-        catch (err) {
-            console.error(`[ProcessManager] Auto-recovery failed: ${String(err)}`);
-        }
-    }
     archiveExpiredSessions() {
         const now = Date.now();
         for (const record of this.sessions.values()) {
@@ -1518,9 +1420,16 @@ export class ProcessManager extends EventEmitter {
                 record.output = record.ptyBridge?.getRawOutput() ?? record.output;
                 const rawMessages = record.ptyBridge?.getMessages() ?? [];
                 const isStreaming = record.status === "running";
+                const bridgeData = event.data;
                 const data = {
                     permissionBlocked: this.isPermissionBlocked(record),
                 };
+                // 透传 bridge 给出的 isResponding（true=流式中, false=本轮已完成）。
+                // 前端用它检测 thinking→idle 边界并主动做一次终端 resync，把 Claude/Codex
+                // 在流式渲染过程中残留的错位光标定位序列洗掉（等价于按一次右上角缩放）。
+                if (bridgeData && typeof bridgeData.isResponding === "boolean") {
+                    data.isResponding = bridgeData.isResponding;
+                }
                 if (isStreaming && rawMessages.length > 0) {
                     data.incremental = true;
                     const lastTurn = rawMessages[rawMessages.length - 1];
@@ -1672,13 +1581,18 @@ export class ProcessManager extends EventEmitter {
     }
     processCommandForMode(command, mode, provider, model) {
         if (provider === "codex") {
-            if (mode !== "full-access") {
-                return command;
+            let result = command;
+            const trimmedModel = model?.trim();
+            if (trimmedModel && trimmedModel !== "default" && !/--model\s/.test(command) && !/-m\s/.test(command)) {
+                const escapedModel = trimmedModel.replace(/'/g, "'\\''");
+                result += ` --model '${escapedModel}'`;
             }
-            if (/--dangerously-bypass-approvals-and-sandbox(?:\s|$)/.test(command)) {
-                return command;
+            if (mode === "full-access") {
+                if (!/--dangerously-bypass-approvals-and-sandbox(?:\s|$)/.test(result)) {
+                    result += " --dangerously-bypass-approvals-and-sandbox";
+                }
             }
-            return `${command} --dangerously-bypass-approvals-and-sandbox`;
+            return result;
         }
         const isClaudeCmd = /^(?:claude|npx\s+claude|[^\s]+\/claude)(?:\s|$)/.test(command);
         if (!isClaudeCmd)

package/dist/prompt-optimizer.d.ts

@@ -0,0 +1,5 @@
+export declare class PromptOptimizeError extends Error {
+    readonly code: string;
+    constructor(message: string, code: string);
+}
+export declare function optimizePrompt(rawText: string, language: string, cwd?: string): Promise<string>;

package/dist/prompt-optimizer.js

@@ -0,0 +1,72 @@
+import { execFile } from "node:child_process";
+const CLAUDE_TIMEOUT_MS = 60_000;
+const MAX_INPUT_LENGTH = 8000;
+export class PromptOptimizeError extends Error {
+    code;
+    constructor(message, code) {
+        super(message);
+        this.code = code;
+        this.name = "PromptOptimizeError";
+    }
+}
+function callClaudeText(prompt, cwd) {
+    return new Promise((resolve, reject) => {
+        const child = execFile("claude", ["-p", "--output-format", "text"], {
+            cwd: cwd && cwd.length > 0 ? cwd : undefined,
+            encoding: "utf8",
+            maxBuffer: 4 * 1024 * 1024,
+            timeout: CLAUDE_TIMEOUT_MS,
+        }, (error, stdout, stderr) => {
+            if (error) {
+                const e = error;
+                if (e.code === "ENOENT") {
+                    reject(new PromptOptimizeError("未找到 claude CLI。", "CLAUDE_CLI_MISSING"));
+                    return;
+                }
+                if (e.code === "ETIMEDOUT") {
+                    reject(new PromptOptimizeError("Claude 优化超时，请稍后重试。", "CLAUDE_TIMEOUT"));
+                    return;
+                }
+                const msg = (stderr || "").trim() || e.message || "claude 调用失败";
+                reject(new PromptOptimizeError(`Claude CLI 失败：${msg}`, "CLAUDE_CLI_FAILED"));
+                return;
+            }
+            resolve((stdout || "").trim());
+        });
+        child.stdin?.end(prompt);
+    });
+}
+function buildOptimizePrompt(userInput, language) {
+    const lang = (language || "").trim() || "中文";
+    return [
+        `你是一名提示词优化助手。请把用户写给编码 AI 的「原始提示词」改写得更清晰、结构化、可执行，便于 AI 理解并完成任务。`,
+        `要求：`,
+        `1. 保留用户原意和所有关键信息（文件路径、变量名、技术名词、数字、约束等），不要删减事实，也不要新增臆测的需求。`,
+        `2. 必要时拆分为「目标 / 上下文 / 约束 / 验收标准」几个部分；如果原文很短或很简单，则只做语句润色，不要硬塞结构。`,
+        `3. 用${lang}输出。语气克制专业，不寒暄、不解释你做了什么。`,
+        `4. 只输出优化后的提示词正文，不要包裹在代码块或引号里，不要加任何前后缀（比如「优化后：」之类）。`,
+        ``,
+        `原始提示词：`,
+        userInput,
+    ].join("\n");
+}
+export async function optimizePrompt(rawText, language, cwd) {
+    const text = (rawText || "").trim();
+    if (!text) {
+        throw new PromptOptimizeError("请先输入要优化的内容。", "EMPTY_INPUT");
+    }
+    if (text.length > MAX_INPUT_LENGTH) {
+        throw new PromptOptimizeError(`输入过长（${text.length} 字符），请缩短到 ${MAX_INPUT_LENGTH} 以内。`, "INPUT_TOO_LONG");
+    }
+    const prompt = buildOptimizePrompt(text, language);
+    const raw = await callClaudeText(prompt, cwd);
+    const cleaned = raw
+        .replace(/^```[a-zA-Z]*\n?/, "")
+        .replace(/\n?```$/, "")
+        .replace(/^["'`]+|["'`]+$/g, "")
+        .trim();
+    if (!cleaned) {
+        throw new PromptOptimizeError("Claude 返回了空结果。", "EMPTY_RESULT");
+    }
+    return cleaned;
+}