@co0ontty/wand 1.18.1 → 1.20.4

package/dist/process-manager.js

@@ -6,12 +6,11 @@ import process from "node:process";
 import os from "node:os";
 import pty from "node-pty";
 import { SessionLogger } from "./session-logger.js";
-import { SessionLifecycleManager } from "./session-lifecycle.js";
 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";
 }
@@ -128,52 +127,8 @@ function selectClaudeProjectSessionForRecord(record) {
     }
     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) {
-        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;
-}
 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)
@@ -181,33 +136,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));
@@ -349,19 +277,6 @@ function listAllClaudeHistorySessions() {
         return [];
     }
 }
-function shouldAutoResumeSession(record) {
-    return record.status === "exited"
-        && !record.archived
-        && !record.resumedToSessionId
-        && 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;
 }
@@ -451,26 +366,19 @@ export class ProcessManager extends EventEmitter {
     storage;
     sessions = new Map();
     logger;
-    lifecycleManager;
+    /** 24h archive scan timer */
+    archiveTimer = null;
     /** Per-session debounce timers for throttled persist calls */
     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;
         this.storage = storage;
         this.logger = new SessionLogger(configDir || path.join(process.env.HOME || process.cwd(), ".wand"), config.shortcutLogMaxBytes);
-        // Initialize lifecycle manager
-        this.lifecycleManager = new SessionLifecycleManager({
-            onStateChange: (sessionId, oldState, newState) => {
-                this.emitEvent({ type: "status", sessionId, data: { oldState, newState } });
-            },
-            onIdle: (_sessionId) => { },
-            onArchived: (sessionId, reason) => {
-                console.error(`[ProcessManager] Session ${sessionId} archived: ${reason}`);
-            },
-        });
         for (const snapshot of this.storage.loadSessions()) {
             if ((snapshot.sessionKind ?? "pty") !== "pty") {
                 continue;
@@ -520,8 +428,7 @@ export class ProcessManager extends EventEmitter {
                     claudeSessionId: resumeCommandSessionId ?? updated.claudeSessionId,
                     approvalStats: { tool: 0, command: 0, file: 0, total: 0 }
                 });
-                this.lifecycleManager.register(snapshot.id, "idle");
-                console.error(`[ProcessManager] Restored session ${snapshot.id} marked as exited (PTY orphaned)`);
+                this.orphanRecoveredCount += 1;
             }
             else {
                 this.sessions.set(snapshot.id, {
@@ -554,20 +461,26 @@ export class ProcessManager extends EventEmitter {
                     claudeSessionId: resumeCommandSessionId ?? snapshot.claudeSessionId,
                     approvalStats: { tool: 0, command: 0, file: 0, total: 0 }
                 });
-                this.lifecycleManager.register(snapshot.id, "archived");
             }
         }
-        // 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 {
+                this.archiveExpiredSessions();
+            }
+            catch (err) {
+                console.error(`[ProcessManager] archive scan failed: ${String(err)}`);
+            }
+        }, 60 * 1000);
+        this.archiveTimer.unref?.();
     }
     on(event, listener) {
         return super.on("process", listener);
     }
+    /** 启动时被识别为孤儿 PTY 并标记为 exited 的旧会话数量（仅用于启动摘要展示）。 */
+    getOrphanRecoveredCount() {
+        return this.orphanRecoveredCount;
+    }
     emitEvent(event) {
         this.emit("process", event);
     }
@@ -670,7 +583,7 @@ export class ProcessManager extends EventEmitter {
             ptyPermissionBlocked: false,
             lastAutoConfirmAt: 0,
             autoApprovePermissions: this.shouldAutoApprovePermissions(command, effectiveMode, provider),
-            resumedFromSessionId: opts?.resumedFromSessionId ?? null,
+            resumedFromSessionId: opts?.resumedFromSessionId ?? (opts?.reuseId ? opts.reuseId : null),
             autoRecovered: opts?.autoRecovered ?? false,
             rememberedEscalationScopes: new Set(),
             rememberedEscalationTargets: new Set(),
@@ -704,7 +617,6 @@ export class ProcessManager extends EventEmitter {
             this.claudeHistoryCache = null;
         }
         this.cleanupOldSessions();
-        this.lifecycleManager.register(id, "initializing");
         const shellArgs = this.buildShellArgs(processedCommand);
         let child;
         try {
@@ -727,14 +639,12 @@ export class ProcessManager extends EventEmitter {
             record.exitCode = -1;
             record.endedAt = new Date().toISOString();
             record.ptyProcess = null;
-            this.lifecycleManager.archive(id, "Session spawn failed", "error");
             this.persist(record);
             return this.snapshot(record);
         }
         record.processId = child.pid;
         record.ptyProcess = child;
         record.status = "running";
-        this.lifecycleManager.setState(id, "running");
         child.onExit(({ exitCode }) => {
             const current = this.sessions.get(id);
             if (!current)
@@ -757,7 +667,6 @@ export class ProcessManager extends EventEmitter {
             current.exitCode = current.stopRequested ? null : exitCode;
             current.endedAt = new Date().toISOString();
             current.ptyProcess = null;
-            this.lifecycleManager.archive(id, `Session ${current.status}`, current.stopRequested ? "user" : "error");
             this.flushPersist(current);
             this.storage.saveSession(this.snapshot(current));
             this.emitEvent({ type: "ended", sessionId: id, data: this.snapshot(current) });
@@ -877,14 +786,12 @@ export class ProcessManager extends EventEmitter {
         return this.snapshot(record);
     }
     list() {
-        this.archiveExpiredSessions();
         return Array.from(this.sessions.values())
             .sort((a, b) => b.startedAt.localeCompare(a.startedAt))
             .map((session) => this.snapshot(session));
     }
     /** Return lightweight snapshots for the session list (no output/messages). */
     listSlim() {
-        this.archiveExpiredSessions();
         return Array.from(this.sessions.values())
             .sort((a, b) => b.startedAt.localeCompare(a.startedAt))
             .map((session) => this.snapshotSlim(session));
@@ -947,18 +854,15 @@ export class ProcessManager extends EventEmitter {
         return deleted;
     }
     get(id) {
-        this.archiveExpiredSessions();
         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);
@@ -990,8 +894,6 @@ export class ProcessManager extends EventEmitter {
             throw new SessionInputError("Session is not running.", "SESSION_NOT_RUNNING", id, record.status);
         }
         // Update lifecycle
-        this.lifecycleManager.touch(id);
-        this.lifecycleManager.startThinking(id);
         if (!record.ptyProcess) {
             console.error(`[ProcessManager] Rejecting input: session ${id} has no PTY`);
             throw new SessionInputError("Session is not running.", "SESSION_NO_PTY", id, record.status);
@@ -1003,7 +905,7 @@ export class ProcessManager extends EventEmitter {
             const ctx = {
                 mode: record.mode,
                 autoApprove: record.autoApprovePermissions,
-                permissionBlocked: record.ptyPermissionBlocked || !!record.pendingEscalation,
+                permissionBlocked: this.isPermissionBlocked(record),
                 input,
             };
             this.logger.appendShortcutLog(id, shortcutKey, tailLines, ctx);
@@ -1093,7 +995,6 @@ export class ProcessManager extends EventEmitter {
             record.ptyBridge = null;
         }
         // Update lifecycle
-        this.lifecycleManager.archive(id, "Session stopped by user", "user");
         this.persist(record);
         return this.snapshot(record);
     }
@@ -1130,7 +1031,6 @@ export class ProcessManager extends EventEmitter {
             record.ptyBridge.removeAllListeners();
             record.ptyBridge = null;
         }
-        this.lifecycleManager.unregister(record.id);
     }
     delete(id) {
         const record = this.mustGet(id);
@@ -1183,7 +1083,6 @@ export class ProcessManager extends EventEmitter {
         this.deleteClaudeCache(record);
         this.sessions.delete(id);
         this.lastPersistedMessageState.delete(id);
-        this.lifecycleManager.unregister(id);
         if (record.claudeSessionId) {
             this.claudeHistoryCache = null;
         }
@@ -1246,7 +1145,6 @@ export class ProcessManager extends EventEmitter {
             claudeSessionId: record.claudeSessionId || null,
             messages: messages.length > 0 ? messages : undefined,
             resumedFromSessionId: record.resumedFromSessionId ?? undefined,
-            resumedToSessionId: record.resumedToSessionId ?? undefined,
             autoRecovered: record.autoRecovered ?? false,
             autoApprovePermissions: record.autoApprovePermissions || undefined,
             approvalStats: record.approvalStats.total > 0 ? record.approvalStats : undefined,
@@ -1265,7 +1163,7 @@ export class ProcessManager extends EventEmitter {
         };
     }
     isPermissionBlocked(record) {
-        return record.ptyBridge?.isPermissionBlocked() ?? record.pendingEscalation !== null;
+        return record.ptyPermissionBlocked || record.pendingEscalation !== null;
     }
     defaultAutonomyPolicy(mode) {
         if (mode === "agent" || mode === "agent-max" || mode === "managed" || mode === "native" || mode === "full-access") {
@@ -1357,7 +1255,6 @@ export class ProcessManager extends EventEmitter {
             endedAt: record.endedAt,
             claudeSessionId: record.claudeSessionId,
             resumedFromSessionId: record.resumedFromSessionId ?? null,
-            resumedToSessionId: record.resumedToSessionId ?? null,
             autoRecovered: record.autoRecovered ?? false,
         });
         if (shouldSaveMessages) {
@@ -1392,70 +1289,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()) {
@@ -1637,8 +1470,6 @@ export class ProcessManager extends EventEmitter {
                 record.ptyBridge?.clearRememberedPermissions();
                 record.rememberedEscalationScopes.clear();
                 record.rememberedEscalationTargets.clear();
-                this.lifecycleManager.stopThinking(record.id);
-                this.lifecycleManager.waitingInput(record.id);
                 this.persist(record);
                 this.storage.saveSession(this.snapshot(record));
                 break;

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;
+}

package/dist/pty-text-utils.d.ts

@@ -1,7 +1,5 @@
 /**
- * Shared PTY text processing utilities.
- * Used by both claude-pty-bridge.ts and message-parser.ts to ensure
- * consistent ANSI stripping and noise filtering.
+ * Shared PTY text processing utilities for consistent ANSI stripping and noise filtering.
  */
 /** Strip ANSI escape sequences and control characters from raw PTY output. */
 export declare function stripAnsi(text: string): string;

package/dist/pty-text-utils.js

@@ -1,7 +1,5 @@
 /**
- * Shared PTY text processing utilities.
- * Used by both claude-pty-bridge.ts and message-parser.ts to ensure
- * consistent ANSI stripping and noise filtering.
+ * Shared PTY text processing utilities for consistent ANSI stripping and noise filtering.
  */
 /** Strip ANSI escape sequences and control characters from raw PTY output. */
 export function stripAnsi(text) {

package/dist/server-session-routes.d.ts

@@ -2,7 +2,7 @@ import { Express } from "express";
 import { ProcessManager } from "./process-manager.js";
 import { StructuredSessionManager } from "./structured-session-manager.js";
 import { WandStorage } from "./storage.js";
-import { ExecutionMode } from "./types.js";
+import { ExecutionMode, WandConfig } from "./types.js";
 export declare function getErrorMessage(error: unknown, fallback: string): string;
-export declare function registerSessionRoutes(app: Express, processes: ProcessManager, structured: StructuredSessionManager, storage: WandStorage, defaultMode: ExecutionMode): void;
+export declare function registerSessionRoutes(app: Express, processes: ProcessManager, structured: StructuredSessionManager, storage: WandStorage, defaultMode: ExecutionMode, config: WandConfig): void;
 export declare function registerClaudeHistoryRoutes(app: Express, processes: ProcessManager, storage: WandStorage): void;

package/dist/server-session-routes.js

@@ -1,7 +1,7 @@
 import express from "express";
-import { parseMessages } from "./message-parser.js";
 import { SessionInputError } from "./process-manager.js";
 import { checkSessionWorktreeMergeability, cleanupSessionWorktree, getWorktreeMergeErrorCode, mergeSessionWorktree, WorktreeMergeError } from "./git-worktree.js";
+import { getGitStatus, QuickCommitError, runQuickCommit, generateCommitMessageOnly } from "./git-quick-commit.js";
 export function getErrorMessage(error, fallback) {
     return error instanceof Error ? error.message : fallback;
 }
@@ -136,7 +136,7 @@ function canMergeSession(snapshot) {
 function isMergeActionAllowed(snapshot) {
     return snapshot.status !== "running";
 }
-export function registerSessionRoutes(app, processes, structured, storage, defaultMode) {
+export function registerSessionRoutes(app, processes, structured, storage, defaultMode, config) {
     app.get("/api/sessions", (_req, res) => {
         const all = listAllSessionsSlim(processes, structured);
         console.log("[WAND] GET /api/sessions count:", all.length, "sessions:", all.map(s => ({ id: s.id.substring(0, 8), kind: s.sessionKind, runner: s.runner, status: s.status })));
@@ -198,9 +198,10 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     });
     app.post("/api/structured-sessions/:id/messages", express.json(), async (req, res) => {
         const input = String(req.body?.input ?? "");
-        console.log("[WAND] POST /api/structured-sessions/:id/messages id:", req.params.id, "input:", input.substring(0, 50));
+        const interrupt = !!req.body?.interrupt;
+        console.log("[WAND] POST /api/structured-sessions/:id/messages id:", req.params.id, "input:", input.substring(0, 50), "interrupt:", interrupt);
         try {
-            const snapshot = await structured.sendMessage(req.params.id, input);
+            const snapshot = await structured.sendMessage(req.params.id, input, { interrupt });
             res.json(snapshot);
         }
         catch (error) {
@@ -302,6 +303,77 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.status(getWorktreeMergeResponseStatus(error)).json(getWorktreeMergePayload(error, "无法合并 worktree。"));
         }
     });
+    app.get("/api/sessions/:id/git-status", (req, res) => {
+        const snapshot = getLatestSessionSnapshot(processes, structured, storage, req.params.id);
+        if (!snapshot) {
+            res.status(404).json({ error: "未找到该会话。" });
+            return;
+        }
+        if (!snapshot.cwd) {
+            res.json({ isGit: false });
+            return;
+        }
+        try {
+            res.json(getGitStatus(snapshot.cwd));
+        }
+        catch (error) {
+            res.json({ isGit: false, error: getErrorMessage(error, "无法读取 git 状态。") });
+        }
+    });
+    app.post("/api/sessions/:id/quick-commit", express.json(), async (req, res) => {
+        const snapshot = getLatestSessionSnapshot(processes, structured, storage, req.params.id);
+        if (!snapshot) {
+            res.status(404).json({ error: "未找到该会话。" });
+            return;
+        }
+        if (!snapshot.cwd) {
+            res.status(400).json({ error: "会话没有工作目录。", errorCode: "NO_CWD" });
+            return;
+        }
+        const body = (req.body ?? {});
+        try {
+            const result = await runQuickCommit({
+                cwd: snapshot.cwd,
+                language: config.language ?? "",
+                autoMessage: body.autoMessage !== false,
+                customMessage: typeof body.customMessage === "string" ? body.customMessage : undefined,
+                tag: typeof body.tag === "string" ? body.tag : undefined,
+                autoTag: !!body.autoTag,
+                push: !!body.push,
+            });
+            res.json(result);
+        }
+        catch (error) {
+            if (error instanceof QuickCommitError) {
+                const status = error.code === "NOTHING_TO_COMMIT" || error.code === "TAG_EXISTS" ? 409 : 400;
+                res.status(status).json({ error: error.message, errorCode: error.code });
+                return;
+            }
+            res.status(400).json({ error: getErrorMessage(error, "快捷提交失败。") });
+        }
+    });
+    app.post("/api/sessions/:id/generate-commit-message", express.json(), async (req, res) => {
+        const snapshot = getLatestSessionSnapshot(processes, structured, storage, req.params.id);
+        if (!snapshot) {
+            res.status(404).json({ error: "未找到该会话。" });
+            return;
+        }
+        if (!snapshot.cwd) {
+            res.status(400).json({ error: "会话没有工作目录。" });
+            return;
+        }
+        try {
+            const message = await generateCommitMessageOnly(snapshot.cwd, config.language ?? "");
+            res.json({ message });
+        }
+        catch (error) {
+            if (error instanceof QuickCommitError) {
+                res.status(400).json({ error: error.message, errorCode: error.code });
+                return;
+            }
+            res.status(400).json({ error: getErrorMessage(error, "生成 commit message 失败。") });
+        }
+    });
     app.post("/api/sessions/:id/worktree/cleanup", (req, res) => {
         try {
             const current = requireWorktreeSession(getLatestSessionSnapshot(processes, structured, storage, req.params.id));
@@ -362,13 +434,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             ? processes.getPtyTranscript(snapshot.id) ?? snapshot.output
             : snapshot.output;
         if (req.query.format === "chat") {
-            const allowFallback = (snapshot.sessionKind ?? "pty") === "pty";
-            const fallbackOutput = allowFallback ? transcriptOutput : "";
-            const messages = snapshot.messages && snapshot.messages.length > 0
-                ? snapshot.messages
-                : allowFallback
-                    ? parseMessages(fallbackOutput, snapshot.command)
-                    : [];
+            const messages = snapshot.messages ?? [];
             res.json({ ...snapshot, output: transcriptOutput, messages });
         }
         else {
@@ -407,7 +473,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             const newMode = body.mode ? normalizeMode(body.mode, defaultMode) : normalizeMode(existingSession.mode, defaultMode);
             const resumeCommand = `${command} --resume ${claudeSessionId}`;
             const newSnapshot = processes.start(resumeCommand, existingSession.cwd, newMode, undefined, { reuseId: sessionId });
-            res.status(201).json({ resumedFromSessionId: sessionId, ...newSnapshot });
+            res.status(201).json(newSnapshot);
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法恢复会话。") });
@@ -444,7 +510,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 const newMode = body.mode ? normalizeMode(body.mode, defaultMode) : normalizeMode(existingSession.mode, defaultMode);
                 const resumeCommand = `${command} --resume ${claudeSessionId}`;
                 const newSnapshot = processes.start(resumeCommand, existingSession.cwd, newMode, undefined, { reuseId: existingSession.id });
-                res.status(201).json({ resumedFromSessionId: existingSession.id, resumedClaudeSessionId: claudeSessionId, ...newSnapshot });
+                res.status(201).json({ resumedClaudeSessionId: claudeSessionId, ...newSnapshot });
             }
             else {
                 const cwd = body.cwd?.trim();