@co0ontty/wand 1.3.6 → 1.4.0

package/dist/auth.js

@@ -3,9 +3,10 @@ const sessions = new Map();
 const SESSION_TTL_MS = 1000 * 60 * 60 * 12;
 let storage = null;
 // Periodic cleanup every 10 minutes
-setInterval(() => {
+const sessionCleanupTimer = setInterval(() => {
     cleanupExpiredSessions();
 }, 1000 * 60 * 10);
+sessionCleanupTimer.unref();
 export function createSession() {
     const token = crypto.randomBytes(24).toString("hex");
     const expiresAt = Date.now() + SESSION_TTL_MS;

package/dist/claude-pty-bridge.d.ts

@@ -33,6 +33,8 @@ interface PermissionState {
     } | null;
     /** Output length snapshot taken right before fallback auto-approve fires */
     fallbackOutputLenAtApprove: number;
+    /** Consecutive auto-approve attempts for the same prompt without resolution */
+    retryCount: number;
 }
 /** Permission resolution result */
 export type PermissionResolution = "approve_once" | "approve_turn" | "deny";
@@ -113,6 +115,10 @@ export declare class ClaudePtyBridge extends EventEmitter {
      * Set the PTY write function for sending approval input.
      */
     setPtyWrite(fn: (input: string) => void): void;
+    /**
+     * Toggle auto-approve at runtime.
+     */
+    setAutoApprove(enabled: boolean): void;
     /**
      * Resolve the current permission prompt.
      * @param resolution - How to resolve the permission

package/dist/claude-pty-bridge.js

@@ -12,7 +12,7 @@ import { stripAnsi, isNoiseLine, appendWindow, normalizePromptText, hasExplicitC
 const OUTPUT_MAX_SIZE = 120000;
 const SESSION_ID_WINDOW_SIZE = 16384;
 const PERMISSION_WINDOW_SIZE = 2000;
-const AUTO_APPROVE_DELAY_MS = 150;
+const AUTO_APPROVE_DELAY_MS = 350;
 /** How long to monitor output after fallback auto-approve for false-positive detection */
 const FALLBACK_VERIFY_WINDOW_MS = 600;
 /** How long a session must be idle (no user input, no new output) before sending a probe */
@@ -101,6 +101,7 @@ export class ClaudePtyBridge extends EventEmitter {
             fallbackVerifyUntil: 0,
             fallbackContext: null,
             fallbackOutputLenAtApprove: 0,
+            retryCount: 0,
         };
         this.sessionIdWindow = "";
         this.lastOutputAt = 0;
@@ -240,6 +241,24 @@ export class ClaudePtyBridge extends EventEmitter {
     setPtyWrite(fn) {
         this.ptyWrite = fn;
     }
+    /**
+     * Toggle auto-approve at runtime.
+     */
+    setAutoApprove(enabled) {
+        this.autoApprove = enabled;
+        if (!enabled) {
+            // Cancel any pending auto-approve timer
+            if (this.permissionState.pendingAutoApproveTimer) {
+                clearTimeout(this.permissionState.pendingAutoApproveTimer);
+                this.permissionState.pendingAutoApproveTimer = null;
+            }
+            // Cancel idle probe
+            if (this.idleProbeTimer) {
+                clearTimeout(this.idleProbeTimer);
+                this.idleProbeTimer = null;
+            }
+        }
+    }
     // ── Permission Resolution ──
     /**
      * Resolve the current permission prompt.
@@ -518,6 +537,24 @@ export class ClaudePtyBridge extends EventEmitter {
                 timestamp: Date.now(),
                 data: { resolution: "approve_once", autoApproved: true, approveType: "strict" },
             });
+            // Schedule a retry check: if the prompt re-appears shortly after,
+            // the \r may have arrived before the CLI was ready. Retry with a
+            // longer delay to handle slow-rendering selection menus.
+            if (this.permissionState.retryCount < 3) {
+                const retryDelay = 800 + this.permissionState.retryCount * 400;
+                setTimeout(() => {
+                    if (this._exited)
+                        return;
+                    if (this.permissionState.isBlocked && this.autoApprove) {
+                        this.permissionState.retryCount++;
+                        this.permissionState.lastAutoConfirmAt = 0; // allow immediate retry
+                        this.scheduleAutoApprove(scope, target);
+                    }
+                    else {
+                        this.permissionState.retryCount = 0;
+                    }
+                }, retryDelay);
+            }
         }, AUTO_APPROVE_DELAY_MS);
     }
     /**

package/dist/cli.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env -S node --disable-warning=ExperimentalWarning
 import process from "node:process";
 import { ensureConfig, hasConfigFile, isExecutionMode, resolveConfigPath, saveConfig } from "./config.js";
-import { startServer } from "./server.js";
-import { ensureDatabaseFile, resolveDatabasePath } from "./storage.js";
 async function main() {
     const args = process.argv.slice(2);
     const command = args[0] || "help";
@@ -14,6 +12,7 @@ async function main() {
         }
         case "web": {
             const config = await ensureRequiredFiles(configPath);
+            const { startServer } = await import("./server.js");
             await startServer(config, configPath);
             break;
         }
@@ -67,6 +66,7 @@ Options:
 `);
 }
 async function ensureRequiredFiles(configPath) {
+    const { ensureDatabaseFile, resolveDatabasePath } = await import("./storage.js");
     const dbPath = resolveDatabasePath(configPath);
     const hadConfig = hasConfigFile(configPath);
     const config = await ensureConfig(configPath);

package/dist/middleware/rate-limit.js

@@ -34,4 +34,5 @@ export function cleanupRateLimiter() {
     }
 }
 // Cleanup expired entries every 5 minutes
-setInterval(cleanupRateLimiter, 5 * 60 * 1000);
+const rateLimitCleanupTimer = setInterval(cleanupRateLimiter, 5 * 60 * 1000);
+rateLimitCleanupTimer.unref();

package/dist/process-manager.d.ts

@@ -71,6 +71,7 @@ export declare class ProcessManager extends EventEmitter {
     resolveEscalation(id: string, requestId: string, resolution?: "approve_once" | "approve_turn" | "deny"): SessionSnapshot;
     approvePermission(id: string): SessionSnapshot;
     denyPermission(id: string): SessionSnapshot;
+    toggleAutoApprove(id: string): SessionSnapshot;
     /**
      * Canonical permission resolution method.
      * All other permission methods delegate to this.

package/dist/process-manager.js

@@ -423,6 +423,9 @@ export class ProcessManager extends EventEmitter {
             },
         });
         for (const snapshot of this.storage.loadSessions()) {
+            if ((snapshot.sessionKind ?? "pty") !== "pty") {
+                continue;
+            }
             const isClaudeCmd = /^claude\b/.test(snapshot.command.trim());
             const resumeCommandSessionId = getResumeCommandSessionId(snapshot.command);
             // Sessions restored from storage have ptyProcess: null — the old server's PTY
@@ -1075,6 +1078,8 @@ export class ProcessManager extends EventEmitter {
         const messages = record.ptyBridge?.getMessages() ?? record.messages;
         return {
             id: record.id,
+            sessionKind: "pty",
+            runner: "pty",
             command: record.command,
             cwd: record.cwd,
             mode: record.mode,
@@ -1096,6 +1101,7 @@ export class ProcessManager extends EventEmitter {
             resumedFromSessionId: record.resumedFromSessionId ?? undefined,
             resumedToSessionId: record.resumedToSessionId ?? undefined,
             autoRecovered: record.autoRecovered ?? false,
+            autoApprovePermissions: record.autoApprovePermissions || undefined,
             approvalStats: record.approvalStats.total > 0 ? record.approvalStats : undefined
         };
     }
@@ -1117,6 +1123,15 @@ export class ProcessManager extends EventEmitter {
     denyPermission(id) {
         return this.resolvePermission(id, "deny");
     }
+    toggleAutoApprove(id) {
+        const record = this.mustGet(id);
+        record.autoApprovePermissions = !record.autoApprovePermissions;
+        if (record.ptyBridge) {
+            record.ptyBridge.setAutoApprove(record.autoApprovePermissions);
+        }
+        this.persist(record);
+        return this.snapshot(record);
+    }
     /**
      * Canonical permission resolution method.
      * All other permission methods delegate to this.
@@ -1513,11 +1528,28 @@ export class ProcessManager extends EventEmitter {
         if (!isClaudeCmd)
             return command;
         let result = command;
-        // When running as root, Claude CLI refuses --permission-mode bypassPermissions.
-        // Use acceptEdits to let Claude auto-accept edits natively, reducing the number
-        // of permission prompts wand has to auto-approve.
-        if (isRunningAsRoot() && (mode === "managed" || mode === "full-access" || mode === "auto-edit")) {
-            result += " --permission-mode acceptEdits";
+        // Skip if command already contains --permission-mode
+        const hasPermFlag = /--permission-mode\s/.test(command);
+        if (!hasPermFlag) {
+            if (isRunningAsRoot()) {
+                // Root: Claude CLI refuses --permission-mode bypassPermissions.
+                // Use acceptEdits + --allowedTools to auto-approve all tool calls
+                // regardless of whether the target path is inside or outside the CWD.
+                if (mode === "managed" || mode === "full-access" || mode === "auto-edit") {
+                    result += " --permission-mode acceptEdits";
+                    result += " --allowedTools Bash Edit Write Read Glob Grep NotebookEdit WebFetch WebSearch";
+                }
+            }
+            else {
+                // Non-root: use bypassPermissions for full-access (skips all prompts),
+                // acceptEdits for auto-edit (auto-accepts file writes, prompts for bash).
+                if (mode === "full-access" || mode === "managed") {
+                    result += " --permission-mode bypassPermissions";
+                }
+                else if (mode === "auto-edit") {
+                    result += " --permission-mode acceptEdits";
+                }
+            }
         }
         // In managed mode, append a system prompt instructing Claude to act autonomously
         // without asking the user for confirmation, since the user may not be monitoring.

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

@@ -1,7 +1,8 @@
 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";
 export declare function getErrorMessage(error: unknown, fallback: string): string;
-export declare function registerSessionRoutes(app: Express, processes: ProcessManager, storage: WandStorage, defaultMode: ExecutionMode): void;
+export declare function registerSessionRoutes(app: Express, processes: ProcessManager, structured: StructuredSessionManager, storage: WandStorage, defaultMode: ExecutionMode): void;
 export declare function registerClaudeHistoryRoutes(app: Express, processes: ProcessManager, storage: WandStorage): void;

package/dist/server-session-routes.js

@@ -63,9 +63,54 @@ function removeFromHiddenClaudeSessionIds(storage, ids) {
         saveHiddenClaudeSessionIds(storage, hidden);
     }
 }
-export function registerSessionRoutes(app, processes, storage, defaultMode) {
+function getSessionById(processes, structured, id) {
+    return structured.get(id) ?? processes.get(id);
+}
+function listAllSessions(processes, structured) {
+    return [...structured.list(), ...processes.list()]
+        .sort((a, b) => b.startedAt.localeCompare(a.startedAt));
+}
+export function registerSessionRoutes(app, processes, structured, storage, defaultMode) {
     app.get("/api/sessions", (_req, res) => {
-        res.json(processes.list());
+        const all = listAllSessions(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 })));
+        res.json(all);
+    });
+    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 }));
+        try {
+            const snapshot = structured.createSession({
+                cwd: body.cwd?.trim() || process.cwd(),
+                mode: normalizeMode(body.mode, defaultMode),
+                prompt: body.prompt,
+                runner: body.runner ?? "claude-cli-print",
+            });
+            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);
+        }
+        catch (error) {
+            res.status(400).json({ error: getErrorMessage(error, "无法启动结构化会话。") });
+        }
+    });
+    app.get("/api/structured-sessions/:id/messages", (req, res) => {
+        const snapshot = structured.get(req.params.id);
+        if (!snapshot) {
+            res.status(404).json({ error: "未找到该结构化会话。" });
+            return;
+        }
+        res.json({ id: snapshot.id, messages: snapshot.messages ?? [] });
+    });
+    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));
+        try {
+            const snapshot = await structured.sendMessage(req.params.id, input);
+            res.json(snapshot);
+        }
+        catch (error) {
+            res.status(400).json({ error: getErrorMessage(error, "无法发送结构化消息。") });
+        }
     });
     app.post("/api/sessions/batch-delete", express.json(), (req, res) => {
         const sessionIds = Array.isArray(req.body?.sessionIds)
@@ -79,7 +124,12 @@ export function registerSessionRoutes(app, processes, storage, defaultMode) {
         const failed = [];
         for (const sessionId of sessionIds) {
             try {
-                processes.delete(sessionId);
+                if (structured.get(sessionId)) {
+                    structured.delete(sessionId);
+                }
+                else {
+                    processes.delete(sessionId);
+                }
                 deleted += 1;
             }
             catch {
@@ -93,15 +143,18 @@ export function registerSessionRoutes(app, processes, storage, defaultMode) {
         res.json({ ok: true, deleted, failed });
     });
     app.get("/api/sessions/:id", (req, res) => {
-        const snapshot = processes.get(req.params.id);
+        const snapshot = getSessionById(processes, structured, req.params.id);
         if (!snapshot) {
             res.status(404).json({ error: "未找到该会话，可能已被删除。" });
             return;
         }
         if (req.query.format === "chat") {
+            const allowFallback = (snapshot.sessionKind ?? "pty") === "pty";
             const messages = snapshot.messages && snapshot.messages.length > 0
                 ? snapshot.messages
-                : parseMessages(snapshot.output);
+                : allowFallback
+                    ? parseMessages(snapshot.output)
+                    : [];
             res.json({ ...snapshot, messages });
         }
         else {
@@ -111,12 +164,18 @@ export function registerSessionRoutes(app, processes, storage, defaultMode) {
     app.post("/api/sessions/:id/resume", (req, res) => {
         const sessionId = req.params.id;
         const body = req.body;
+        console.log("[WAND] POST /api/sessions/:id/resume sessionId:", sessionId);
         try {
             const existingSession = processes.get(sessionId) || storage.getSession(sessionId);
+            console.log("[WAND] resume lookup: found:", !!existingSession, "sessionKind:", existingSession?.sessionKind, "claudeSessionId:", existingSession?.claudeSessionId);
             if (!existingSession) {
                 res.status(404).json({ error: "会话不存在。" });
                 return;
             }
+            if ((existingSession.sessionKind ?? "pty") !== "pty") {
+                res.status(400).json({ error: "结构化会话不支持 Claude CLI resume。" });
+                return;
+            }
             const claudeSessionId = existingSession.claudeSessionId;
             if (!claudeSessionId) {
                 res.status(400).json({ error: "此会话没有 Claude 会话 ID，无法恢复。" });
@@ -140,6 +199,7 @@ export function registerSessionRoutes(app, processes, storage, defaultMode) {
     app.post("/api/claude-sessions/:claudeSessionId/resume", (req, res) => {
         const claudeSessionId = String(req.params.claudeSessionId || "").trim();
         const body = req.body;
+        console.log("[WAND] POST /api/claude-sessions/:claudeSessionId/resume claudeSessionId:", claudeSessionId, "cwd:", body.cwd);
         try {
             if (!claudeSessionId) {
                 res.status(400).json({ error: "Claude 会话 ID 不能为空。" });
@@ -148,6 +208,10 @@ export function registerSessionRoutes(app, processes, storage, defaultMode) {
             const existingSession = storage.getLatestSessionByClaudeSessionId(claudeSessionId);
             if (existingSession) {
                 const command = existingSession.command.trim();
+                if ((existingSession.sessionKind ?? "pty") !== "pty") {
+                    res.status(400).json({ error: "结构化会话不支持按 Claude Session ID 恢复。" });
+                    return;
+                }
                 if (!/^claude\b/.test(command)) {
                     res.status(400).json({ error: "只有 Claude 命令支持按 Claude Session ID 恢复。" });
                     return;
@@ -178,13 +242,18 @@ export function registerSessionRoutes(app, processes, storage, defaultMode) {
             res.status(400).json({ error: getErrorMessage(error, "无法按 Claude 会话 ID 恢复会话。") });
         }
     });
-    app.post("/api/sessions/:id/input", (req, res) => {
+    app.post("/api/sessions/:id/input", async (req, res) => {
         const body = req.body;
         const sessionId = req.params.id;
         const input = body.input ?? "";
         const view = body.view;
         const shortcutKey = body.shortcutKey;
         try {
+            if (structured.get(sessionId)) {
+                const snapshot = await structured.sendMessage(sessionId, input);
+                res.json(snapshot);
+                return;
+            }
             const snapshot = processes.sendInput(sessionId, input, view, shortcutKey);
             res.json(snapshot);
         }
@@ -201,6 +270,10 @@ export function registerSessionRoutes(app, processes, storage, defaultMode) {
     app.post("/api/sessions/:id/resize", (req, res) => {
         const body = req.body;
         try {
+            if (structured.get(req.params.id)) {
+                res.status(400).json({ error: "结构化会话不支持调整终端大小。" });
+                return;
+            }
             const snapshot = processes.resize(req.params.id, body.cols ?? 0, body.rows ?? 0);
             res.json(snapshot);
         }
@@ -210,6 +283,10 @@ export function registerSessionRoutes(app, processes, storage, defaultMode) {
     });
     app.post("/api/sessions/:id/approve-permission", (req, res) => {
         try {
+            if (structured.get(req.params.id)) {
+                res.json(structured.approvePermission(req.params.id));
+                return;
+            }
             res.json(processes.approvePermission(req.params.id));
         }
         catch (error) {
@@ -218,16 +295,36 @@ export function registerSessionRoutes(app, processes, storage, defaultMode) {
     });
     app.post("/api/sessions/:id/deny-permission", (req, res) => {
         try {
+            if (structured.get(req.params.id)) {
+                res.json(structured.denyPermission(req.params.id));
+                return;
+            }
             res.json(processes.denyPermission(req.params.id));
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法拒绝该授权请求。") });
         }
     });
+    app.post("/api/sessions/:id/toggle-auto-approve", (req, res) => {
+        try {
+            if (structured.get(req.params.id)) {
+                res.json(structured.toggleAutoApprove(req.params.id));
+                return;
+            }
+            res.json(processes.toggleAutoApprove(req.params.id));
+        }
+        catch (error) {
+            res.status(400).json({ error: getErrorMessage(error, "无法切换自动批准状态。") });
+        }
+    });
     app.post("/api/sessions/:id/escalations/:requestId/resolve", (req, res) => {
         try {
             const { requestId } = req.params;
             const body = req.body;
+            if (structured.get(req.params.id)) {
+                res.json(structured.resolveEscalation(req.params.id, requestId, body.resolution));
+                return;
+            }
             res.json(processes.resolveEscalation(req.params.id, requestId, body.resolution));
         }
         catch (error) {
@@ -236,6 +333,10 @@ export function registerSessionRoutes(app, processes, storage, defaultMode) {
     });
     app.post("/api/sessions/:id/stop", (req, res) => {
         try {
+            if (structured.get(req.params.id)) {
+                res.json(structured.stop(req.params.id));
+                return;
+            }
             res.json(processes.stop(req.params.id));
         }
         catch (error) {
@@ -244,7 +345,12 @@ export function registerSessionRoutes(app, processes, storage, defaultMode) {
     });
     app.delete("/api/sessions/:id", (req, res) => {
         try {
-            processes.delete(req.params.id);
+            if (structured.get(req.params.id)) {
+                structured.delete(req.params.id);
+            }
+            else {
+                processes.delete(req.params.id);
+            }
             res.json({ ok: true });
         }
         catch (error) {

package/dist/server.js

@@ -57,6 +57,7 @@ import { createSession, revokeSession, setAuthStorage, validateSession } from ".
 import { ensureCertificates } from "./cert.js";
 import { isExecutionMode, resolveConfigDir, saveConfig } from "./config.js";
 import { ProcessManager } from "./process-manager.js";
+import { StructuredSessionManager } from "./structured-session-manager.js";
 import { generatePwaManifest, generateServiceWorker } from "./pwa.js";
 import { getErrorMessage, registerClaudeHistoryRoutes, registerSessionRoutes } from "./server-session-routes.js";
 import { resolveDatabasePath, WandStorage } from "./storage.js";
@@ -252,6 +253,7 @@ export async function startServer(config, configPath) {
     const configDir = resolveConfigDir(configPath);
     const avatarSeed = await ensureAvatarSeed(configDir);
     const processes = new ProcessManager(config, storage, configDir);
+    const structuredSessions = new StructuredSessionManager(storage);
     const useHttps = config.https === true;
     const protocol = useHttps ? "https" : "http";
     const nodeModulesDir = path.join(RUNTIME_ROOT_DIR, "node_modules");
@@ -333,6 +335,7 @@ export async function startServer(config, configPath) {
             defaultMode: config.defaultMode,
             defaultCwd: config.defaultCwd,
             commandPresets: config.commandPresets,
+            structuredRunners: [{ label: "Claude Structured", runner: "claude-cli-print" }],
             experimentalDomTerminal: config.experimentalDomTerminal ?? false,
             updateAvailable: cachedUpdateInfo?.updateAvailable ?? false,
             latestVersion: cachedUpdateInfo?.latest ?? null,
@@ -460,7 +463,7 @@ export async function startServer(config, configPath) {
             updateInFlight = false;
         }
     });
-    registerSessionRoutes(app, processes, storage, config.defaultMode);
+    registerSessionRoutes(app, processes, structuredSessions, storage, config.defaultMode);
     registerClaudeHistoryRoutes(app, processes, storage);
     // ── Path suggestion ──
     app.get("/api/path-suggestions", async (req, res) => {
@@ -798,12 +801,14 @@ export async function startServer(config, configPath) {
         : createHttpServer(app);
     const wss = new WebSocketServer({ server, path: "/ws" });
     const wsManager = new WsBroadcastManager(wss);
-    wsManager.setup((id) => processes.get(id));
+    wsManager.setup((id) => structuredSessions.get(id) ?? processes.get(id));
     // Wire process events to WebSocket broadcast
     processes.on("process", (event) => {
         wsManager.emitEvent(event);
     });
-    // ── Start listening ──
+    structuredSessions.setEventEmitter((event) => {
+        wsManager.emitEvent(event);
+    });
     await new Promise((resolve, reject) => {
         server.listen(config.port, config.host, () => {
             const listenAddr = config.host === "0.0.0.0" ? "0.0.0.0 (所有接口)" : config.host;

package/dist/storage.js

@@ -12,6 +12,17 @@ function parseStoredMessages(raw) {
         return undefined;
     }
 }
+function parseStructuredState(raw) {
+    if (!raw) {
+        return undefined;
+    }
+    try {
+        return JSON.parse(raw);
+    }
+    catch {
+        return undefined;
+    }
+}
 export const DEFAULT_DB_FILE = "wand.db";
 export function resolveDatabasePath(configPath) {
     return path.resolve(path.dirname(configPath), DEFAULT_DB_FILE);
@@ -34,7 +45,14 @@ const INIT_SQL = `
     output TEXT NOT NULL,
     archived INTEGER NOT NULL DEFAULT 0,
     archived_at TEXT,
-    claude_session_id TEXT
+    claude_session_id TEXT,
+    session_kind TEXT NOT NULL DEFAULT 'pty',
+    runner TEXT,
+    messages TEXT,
+    structured_state TEXT,
+    resumed_from_session_id TEXT,
+    resumed_to_session_id TEXT,
+    auto_recovered INTEGER NOT NULL DEFAULT 0
   );
 
   CREATE TABLE IF NOT EXISTS app_config (
@@ -125,9 +143,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, messages
+             , archived, archived_at, claude_session_id, session_kind, runner, messages, structured_state
              , resumed_from_session_id, resumed_to_session_id, auto_recovered
-           ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+           ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
            ON CONFLICT(id) DO UPDATE SET
              command = excluded.command,
              cwd = excluded.cwd,
@@ -140,11 +158,14 @@ export class WandStorage {
              archived = excluded.archived,
              archived_at = excluded.archived_at,
              claude_session_id = excluded.claude_session_id,
+             session_kind = excluded.session_kind,
+             runner = excluded.runner,
              messages = excluded.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.messages ? JSON.stringify(snapshot.messages) : null, snapshot.resumedFromSessionId ?? null, snapshot.resumedToSessionId ?? null, snapshot.autoRecovered ? 1 : 0);
+                .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);
             this.db.exec("COMMIT");
         }
         catch (error) {
@@ -163,13 +184,14 @@ 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 = ?
          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.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.sessionKind ?? "pty", snapshot.runner ?? null, snapshot.structuredState ? JSON.stringify(snapshot.structuredState) : null, snapshot.resumedFromSessionId ?? null, snapshot.resumedToSessionId ?? null, snapshot.autoRecovered ? 1 : 0, snapshot.id);
     }
     getSession(id) {
         const row = this.db
-            .prepare(`SELECT id, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages
+            .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
          FROM command_sessions
          WHERE id = ?`)
@@ -178,7 +200,7 @@ export class WandStorage {
     }
     getLatestSessionByClaudeSessionId(claudeSessionId) {
         const row = this.db
-            .prepare(`SELECT id, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages
+            .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
          FROM command_sessions
          WHERE claude_session_id = ?
@@ -189,7 +211,7 @@ export class WandStorage {
     }
     loadSessions() {
         const rows = this.db
-            .prepare(`SELECT id, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages
+            .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
          FROM command_sessions
          ORDER BY started_at DESC`)
@@ -199,6 +221,8 @@ export class WandStorage {
     mapSessionRow(row) {
         return {
             id: row.id,
+            sessionKind: row.session_kind ?? "pty",
+            runner: row.runner ?? undefined,
             command: row.command,
             cwd: row.cwd,
             mode: row.mode,
@@ -211,6 +235,7 @@ export class WandStorage {
             archivedAt: row.archived_at,
             claudeSessionId: row.claude_session_id,
             messages: parseStoredMessages(row.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)
@@ -232,9 +257,18 @@ function ensureCommandSessionSchema(db) {
     if (!names.has("claude_session_id")) {
         db.exec("ALTER TABLE command_sessions ADD COLUMN claude_session_id TEXT");
     }
+    if (!names.has("session_kind")) {
+        db.exec("ALTER TABLE command_sessions ADD COLUMN session_kind TEXT NOT NULL DEFAULT 'pty'");
+    }
+    if (!names.has("runner")) {
+        db.exec("ALTER TABLE command_sessions ADD COLUMN runner TEXT");
+    }
     if (!names.has("messages")) {
         db.exec("ALTER TABLE command_sessions ADD COLUMN messages TEXT");
     }
+    if (!names.has("structured_state")) {
+        db.exec("ALTER TABLE command_sessions ADD COLUMN structured_state TEXT");
+    }
     if (!names.has("resumed_from_session_id")) {
         db.exec("ALTER TABLE command_sessions ADD COLUMN resumed_from_session_id TEXT");
     }