@co0ontty/wand 1.6.2 → 1.7.0

package/dist/server-session-routes.js

@@ -78,13 +78,18 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     });
     app.post("/api/structured-sessions", express.json(), async (req, res) => {
         const body = req.body;
-        console.log("[WAND] POST /api/structured-sessions body:", JSON.stringify({ cwd: body.cwd, mode: body.mode, runner: body.runner, hasPrompt: !!body.prompt }));
+        console.log("[WAND] POST /api/structured-sessions body:", JSON.stringify({ cwd: body.cwd, mode: body.mode, runner: body.runner, provider: body.provider, worktreeEnabled: body.worktreeEnabled === true, hasPrompt: !!body.prompt }));
         try {
+            if (body.provider && body.provider !== "claude") {
+                res.status(400).json({ error: "结构化会话当前仅支持 Claude provider。" });
+                return;
+            }
             const snapshot = structured.createSession({
                 cwd: body.cwd?.trim() || process.cwd(),
                 mode: normalizeMode(body.mode, defaultMode),
                 prompt: body.prompt,
                 runner: body.runner ?? "claude-cli-print",
+                worktreeEnabled: body.worktreeEnabled === true,
             });
             console.log("[WAND] structured session created:", JSON.stringify({ id: snapshot.id, sessionKind: snapshot.sessionKind, runner: snapshot.runner, status: snapshot.status }));
             res.status(201).json(snapshot);
@@ -148,17 +153,21 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.status(404).json({ error: "未找到该会话，可能已被删除。" });
             return;
         }
+        const transcriptOutput = (snapshot.sessionKind ?? "pty") === "pty"
+            ? 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(snapshot.output)
+                    ? parseMessages(fallbackOutput, snapshot.command)
                     : [];
-            res.json({ ...snapshot, messages });
+            res.json({ ...snapshot, output: transcriptOutput, messages });
         }
         else {
-            res.json(snapshot);
+            res.json({ ...snapshot, output: transcriptOutput });
         }
     });
     app.post("/api/sessions/:id/resume", (req, res) => {
@@ -176,6 +185,10 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(400).json({ error: "结构化会话不支持 Claude CLI resume。" });
                 return;
             }
+            if (existingSession.provider && existingSession.provider !== "claude") {
+                res.status(400).json({ error: "只有 Claude provider 支持恢复功能。" });
+                return;
+            }
             const claudeSessionId = existingSession.claudeSessionId;
             if (!claudeSessionId) {
                 res.status(400).json({ error: "此会话没有 Claude 会话 ID，无法恢复。" });
@@ -207,6 +220,10 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             }
             const existingSession = storage.getLatestSessionByClaudeSessionId(claudeSessionId);
             if (existingSession) {
+                if (existingSession.provider && existingSession.provider !== "claude") {
+                    res.status(400).json({ error: "只有 Claude provider 支持按 Claude Session ID 恢复。" });
+                    return;
+                }
                 const command = existingSession.command.trim();
                 if ((existingSession.sessionKind ?? "pty") !== "pty") {
                     res.status(400).json({ error: "结构化会话不支持按 Claude Session ID 恢复。" });
@@ -284,7 +301,12 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/sessions/:id/approve-permission", (req, res) => {
         try {
             if (structured.get(req.params.id)) {
-                res.json(structured.approvePermission(req.params.id));
+                res.status(400).json({ error: "结构化会话不需要终端权限操作。" });
+                return;
+            }
+            const snapshot = processes.get(req.params.id);
+            if (snapshot?.provider === "codex") {
+                res.status(400).json({ error: "Codex provider 不支持权限批准操作。" });
                 return;
             }
             res.json(processes.approvePermission(req.params.id));
@@ -296,7 +318,12 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/sessions/:id/deny-permission", (req, res) => {
         try {
             if (structured.get(req.params.id)) {
-                res.json(structured.denyPermission(req.params.id));
+                res.status(400).json({ error: "结构化会话不需要终端权限操作。" });
+                return;
+            }
+            const snapshot = processes.get(req.params.id);
+            if (snapshot?.provider === "codex") {
+                res.status(400).json({ error: "Codex provider 不支持权限拒绝操作。" });
                 return;
             }
             res.json(processes.denyPermission(req.params.id));
@@ -308,7 +335,12 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/sessions/:id/toggle-auto-approve", (req, res) => {
         try {
             if (structured.get(req.params.id)) {
-                res.json(structured.toggleAutoApprove(req.params.id));
+                res.status(400).json({ error: "结构化会话不需要切换终端自动批准。" });
+                return;
+            }
+            const snapshot = processes.get(req.params.id);
+            if (snapshot?.provider === "codex") {
+                res.status(400).json({ error: "Codex provider 不支持自动批准切换。" });
                 return;
             }
             res.json(processes.toggleAutoApprove(req.params.id));

package/dist/server.js

@@ -858,7 +858,10 @@ export async function startServer(config, configPath) {
         }
         const initialInput = body.initialInput?.trim();
         try {
-            const snapshot = processes.start(body.command, body.cwd, normalizeMode(body.mode, config.defaultMode), initialInput || undefined);
+            const snapshot = processes.start(body.command, body.cwd, normalizeMode(body.mode, config.defaultMode), initialInput || undefined, {
+                worktreeEnabled: body.worktreeEnabled === true,
+                provider: body.provider,
+            });
             res.status(201).json(snapshot);
         }
         catch (error) {

package/dist/session-logger.d.ts

@@ -44,6 +44,8 @@ export declare class SessionLogger {
     private rotatePtyLog;
     /** Append raw PTY output chunk */
     appendPtyOutput(sessionId: string, chunk: string): void;
+    /** Read the full PTY transcript including rotated logs, oldest first. */
+    readPtyOutput(sessionId: string): string | null;
     /** Append a native mode NDJSON event */
     appendStreamEvent(sessionId: string, event: unknown): void;
     /** Save the current structured messages snapshot */

package/dist/session-logger.js

@@ -89,6 +89,29 @@ export class SessionLogger {
             // Non-critical — don't let logging failures affect main flow
         }
     }
+    /** Read the full PTY transcript including rotated logs, oldest first. */
+    readPtyOutput(sessionId) {
+        try {
+            const dir = this.ensureDir(sessionId);
+            const parts = [];
+            for (let index = PTY_LOG_MAX_ROTATIONS; index >= 1; index -= 1) {
+                const rotatedPath = path.join(dir, `pty-output.log.${index}`);
+                if (existsSync(rotatedPath)) {
+                    parts.push(readFileSync(rotatedPath, "utf8"));
+                }
+            }
+            const currentPath = path.join(dir, "pty-output.log");
+            if (existsSync(currentPath)) {
+                parts.push(readFileSync(currentPath, "utf8"));
+            }
+            if (parts.length === 0)
+                return null;
+            return parts.join("");
+        }
+        catch {
+            return null;
+        }
+    }
     /** Append a native mode NDJSON event */
     appendStreamEvent(sessionId, event) {
         try {

package/dist/storage.js

@@ -12,6 +12,18 @@ function parseStoredMessages(raw) {
         return undefined;
     }
 }
+function parseQueuedMessages(raw) {
+    if (!raw) {
+        return undefined;
+    }
+    try {
+        const parsed = JSON.parse(raw);
+        return Array.isArray(parsed) ? parsed.filter((item) => typeof item === "string") : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 function parseStructuredState(raw) {
     if (!raw) {
         return undefined;
@@ -23,6 +35,33 @@ function parseStructuredState(raw) {
         return undefined;
     }
 }
+function inferSessionProvider(row) {
+    if (row.provider === "claude" || row.provider === "codex") {
+        return row.provider;
+    }
+    if (row.runner === "claude-cli" || row.runner === "claude-cli-print") {
+        return "claude";
+    }
+    return /^claude\b/.test(row.command.trim()) ? "claude" : undefined;
+}
+function parseWorktreeInfo(raw) {
+    if (!raw) {
+        return undefined;
+    }
+    try {
+        const parsed = JSON.parse(raw);
+        if (parsed
+            && typeof parsed === "object"
+            && typeof parsed.branch === "string"
+            && typeof parsed.path === "string") {
+            return parsed;
+        }
+    }
+    catch {
+        return undefined;
+    }
+    return undefined;
+}
 export const DEFAULT_DB_FILE = "wand.db";
 export function resolveDatabasePath(configPath) {
     return path.resolve(path.dirname(configPath), DEFAULT_DB_FILE);
@@ -46,13 +85,17 @@ const INIT_SQL = `
     archived INTEGER NOT NULL DEFAULT 0,
     archived_at TEXT,
     claude_session_id TEXT,
+    provider TEXT,
     session_kind TEXT NOT NULL DEFAULT 'pty',
     runner TEXT,
     messages TEXT,
+    queued_messages TEXT,
     structured_state TEXT,
     resumed_from_session_id TEXT,
     resumed_to_session_id TEXT,
-    auto_recovered INTEGER NOT NULL DEFAULT 0
+    auto_recovered INTEGER NOT NULL DEFAULT 0,
+    worktree_enabled INTEGER NOT NULL DEFAULT 0,
+    worktree_info TEXT
   );
 
   CREATE TABLE IF NOT EXISTS app_config (
@@ -143,9 +186,9 @@ export class WandStorage {
             this.db
                 .prepare(`INSERT INTO command_sessions (
            id, command, cwd, mode, status, exit_code, started_at, ended_at, output
-             , archived, archived_at, claude_session_id, session_kind, runner, messages, structured_state
-             , resumed_from_session_id, resumed_to_session_id, auto_recovered
-           ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+             , archived, archived_at, claude_session_id, provider, session_kind, runner, messages, queued_messages, structured_state
+             , resumed_from_session_id, resumed_to_session_id, auto_recovered, worktree_enabled, worktree_info
+           ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
            ON CONFLICT(id) DO UPDATE SET
              command = excluded.command,
              cwd = excluded.cwd,
@@ -158,14 +201,18 @@ export class WandStorage {
              archived = excluded.archived,
              archived_at = excluded.archived_at,
              claude_session_id = excluded.claude_session_id,
+             provider = excluded.provider,
              session_kind = excluded.session_kind,
              runner = excluded.runner,
              messages = excluded.messages,
+             queued_messages = excluded.queued_messages,
              structured_state = excluded.structured_state,
              resumed_from_session_id = excluded.resumed_from_session_id,
              resumed_to_session_id = excluded.resumed_to_session_id,
-             auto_recovered = excluded.auto_recovered`)
-                .run(snapshot.id, snapshot.command, snapshot.cwd, snapshot.mode, snapshot.status, snapshot.exitCode, snapshot.startedAt, snapshot.endedAt, snapshot.output, snapshot.archived ? 1 : 0, snapshot.archivedAt, snapshot.claudeSessionId, snapshot.sessionKind ?? "pty", snapshot.runner ?? null, snapshot.messages ? JSON.stringify(snapshot.messages) : null, snapshot.structuredState ? JSON.stringify(snapshot.structuredState) : null, snapshot.resumedFromSessionId ?? null, snapshot.resumedToSessionId ?? null, snapshot.autoRecovered ? 1 : 0);
+             auto_recovered = excluded.auto_recovered,
+             worktree_enabled = excluded.worktree_enabled,
+             worktree_info = excluded.worktree_info`)
+                .run(snapshot.id, snapshot.command, snapshot.cwd, snapshot.mode, snapshot.status, snapshot.exitCode, snapshot.startedAt, snapshot.endedAt, snapshot.output, snapshot.archived ? 1 : 0, snapshot.archivedAt, snapshot.claudeSessionId, snapshot.provider ?? null, snapshot.sessionKind ?? "pty", snapshot.runner ?? null, snapshot.messages ? JSON.stringify(snapshot.messages) : null, snapshot.queuedMessages ? JSON.stringify(snapshot.queuedMessages) : null, snapshot.structuredState ? JSON.stringify(snapshot.structuredState) : null, snapshot.resumedFromSessionId ?? null, snapshot.resumedToSessionId ?? null, snapshot.autoRecovered ? 1 : 0, snapshot.worktreeEnabled ? 1 : 0, snapshot.worktree ? JSON.stringify(snapshot.worktree) : null);
             this.db.exec("COMMIT");
         }
         catch (error) {
@@ -184,15 +231,16 @@ export class WandStorage {
            command = ?, cwd = ?, mode = ?, status = ?, exit_code = ?,
            started_at = ?, ended_at = ?, output = ?,
            archived = ?, archived_at = ?, claude_session_id = ?,
-           session_kind = ?, runner = ?, structured_state = ?,
-           resumed_from_session_id = ?, resumed_to_session_id = ?, auto_recovered = ?
+           provider = ?, session_kind = ?, runner = ?, structured_state = ?,
+           resumed_from_session_id = ?, resumed_to_session_id = ?, auto_recovered = ?,
+           worktree_enabled = ?, worktree_info = ?
          WHERE id = ?`)
-            .run(snapshot.command, snapshot.cwd, snapshot.mode, snapshot.status, snapshot.exitCode, snapshot.startedAt, snapshot.endedAt, snapshot.output, snapshot.archived ? 1 : 0, snapshot.archivedAt, snapshot.claudeSessionId, snapshot.sessionKind ?? "pty", snapshot.runner ?? null, snapshot.structuredState ? JSON.stringify(snapshot.structuredState) : null, snapshot.resumedFromSessionId ?? null, snapshot.resumedToSessionId ?? null, snapshot.autoRecovered ? 1 : 0, snapshot.id);
+            .run(snapshot.command, snapshot.cwd, snapshot.mode, snapshot.status, snapshot.exitCode, snapshot.startedAt, snapshot.endedAt, snapshot.output, snapshot.archived ? 1 : 0, snapshot.archivedAt, snapshot.claudeSessionId, snapshot.provider ?? null, snapshot.sessionKind ?? "pty", snapshot.runner ?? null, snapshot.structuredState ? JSON.stringify(snapshot.structuredState) : null, snapshot.resumedFromSessionId ?? null, snapshot.resumedToSessionId ?? null, snapshot.autoRecovered ? 1 : 0, snapshot.worktreeEnabled ? 1 : 0, snapshot.worktree ? JSON.stringify(snapshot.worktree) : null, snapshot.id);
     }
     getSession(id) {
         const row = this.db
-            .prepare(`SELECT id, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages, structured_state
-             , resumed_from_session_id, resumed_to_session_id, auto_recovered
+            .prepare(`SELECT id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages, queued_messages, structured_state
+             , resumed_from_session_id, resumed_to_session_id, auto_recovered, worktree_enabled, worktree_info
          FROM command_sessions
          WHERE id = ?`)
             .get(id);
@@ -200,8 +248,8 @@ export class WandStorage {
     }
     getLatestSessionByClaudeSessionId(claudeSessionId) {
         const row = this.db
-            .prepare(`SELECT id, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages, structured_state
-             , resumed_from_session_id, resumed_to_session_id, auto_recovered
+            .prepare(`SELECT id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages, queued_messages, structured_state
+             , resumed_from_session_id, resumed_to_session_id, auto_recovered, worktree_enabled, worktree_info
          FROM command_sessions
          WHERE claude_session_id = ?
          ORDER BY started_at DESC
@@ -211,17 +259,19 @@ export class WandStorage {
     }
     loadSessions() {
         const rows = this.db
-            .prepare(`SELECT id, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages, structured_state
-             , resumed_from_session_id, resumed_to_session_id, auto_recovered
+            .prepare(`SELECT id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages, queued_messages, structured_state
+             , resumed_from_session_id, resumed_to_session_id, auto_recovered, worktree_enabled, worktree_info
          FROM command_sessions
          ORDER BY started_at DESC`)
             .all();
         return rows.map((row) => this.mapSessionRow(row));
     }
     mapSessionRow(row) {
+        const provider = inferSessionProvider(row);
         return {
             id: row.id,
             sessionKind: row.session_kind ?? "pty",
+            provider,
             runner: row.runner ?? undefined,
             command: row.command,
             cwd: row.cwd,
@@ -235,10 +285,13 @@ export class WandStorage {
             archivedAt: row.archived_at,
             claudeSessionId: row.claude_session_id,
             messages: parseStoredMessages(row.messages),
+            queuedMessages: parseQueuedMessages(row.queued_messages),
             structuredState: parseStructuredState(row.structured_state),
             resumedFromSessionId: row.resumed_from_session_id ?? undefined,
             resumedToSessionId: row.resumed_to_session_id ?? undefined,
-            autoRecovered: Boolean(row.auto_recovered)
+            autoRecovered: Boolean(row.auto_recovered),
+            worktreeEnabled: Boolean(row.worktree_enabled),
+            worktree: parseWorktreeInfo(row.worktree_info) ?? null
         };
     }
     deleteSession(id) {
@@ -257,6 +310,9 @@ function ensureCommandSessionSchema(db) {
     if (!names.has("claude_session_id")) {
         db.exec("ALTER TABLE command_sessions ADD COLUMN claude_session_id TEXT");
     }
+    if (!names.has("provider")) {
+        db.exec("ALTER TABLE command_sessions ADD COLUMN provider TEXT");
+    }
     if (!names.has("session_kind")) {
         db.exec("ALTER TABLE command_sessions ADD COLUMN session_kind TEXT NOT NULL DEFAULT 'pty'");
     }
@@ -266,6 +322,9 @@ function ensureCommandSessionSchema(db) {
     if (!names.has("messages")) {
         db.exec("ALTER TABLE command_sessions ADD COLUMN messages TEXT");
     }
+    if (!names.has("queued_messages")) {
+        db.exec("ALTER TABLE command_sessions ADD COLUMN queued_messages TEXT");
+    }
     if (!names.has("structured_state")) {
         db.exec("ALTER TABLE command_sessions ADD COLUMN structured_state TEXT");
     }
@@ -275,7 +334,10 @@ function ensureCommandSessionSchema(db) {
     if (!names.has("resumed_to_session_id")) {
         db.exec("ALTER TABLE command_sessions ADD COLUMN resumed_to_session_id TEXT");
     }
-    if (!names.has("auto_recovered")) {
-        db.exec("ALTER TABLE command_sessions ADD COLUMN auto_recovered INTEGER NOT NULL DEFAULT 0");
+    if (!names.has("worktree_enabled")) {
+        db.exec("ALTER TABLE command_sessions ADD COLUMN worktree_enabled INTEGER NOT NULL DEFAULT 0");
+    }
+    if (!names.has("worktree_info")) {
+        db.exec("ALTER TABLE command_sessions ADD COLUMN worktree_info TEXT");
     }
 }

package/dist/structured-session-manager.d.ts

@@ -5,6 +5,7 @@ interface CreateStructuredSessionOptions {
     mode: ExecutionMode;
     prompt?: string;
     runner?: SessionRunner;
+    worktreeEnabled?: boolean;
 }
 export declare class StructuredSessionManager {
     private readonly storage;
@@ -29,6 +30,10 @@ export declare class StructuredSessionManager {
     stop(id: string): SessionSnapshot;
     delete(id: string): void;
     private requireSession;
+    private buildQueuedPlaceholderTurns;
+    private buildRenderableMessages;
+    private emitStructuredSnapshot;
+    private flushNextQueuedMessage;
     private emit;
     private resolvePermission;
     private incrementApprovalStats;