@co0ontty/wand 1.3.4 → 1.4.0

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";
-function getErrorMessage(error, fallback) {
+export function getErrorMessage(error, fallback) {
     return error instanceof Error ? error.message : fallback;
 }
 function getInputErrorResponse(error, sessionId) {
@@ -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,16 +242,19 @@ 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;
-        console.error("[wand] Input request received", { sessionId, inputLength: input.length, view: view ?? "chat" });
         try {
+            if (structured.get(sessionId)) {
+                const snapshot = await structured.sendMessage(sessionId, input);
+                res.json(snapshot);
+                return;
+            }
             const snapshot = processes.sendInput(sessionId, input, view, shortcutKey);
-            console.error("[wand] Input request succeeded", { sessionId, status: snapshot.status, inputLength: input.length, view: view ?? "chat" });
             res.json(snapshot);
         }
         catch (error) {
@@ -203,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);
         }
@@ -212,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) {
@@ -220,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) {
@@ -238,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) {
@@ -246,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,17 +57,14 @@ 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 { registerClaudeHistoryRoutes, registerSessionRoutes } from "./server-session-routes.js";
+import { getErrorMessage, registerClaudeHistoryRoutes, registerSessionRoutes } from "./server-session-routes.js";
 import { resolveDatabasePath, WandStorage } from "./storage.js";
 import { renderApp } from "./web-ui/index.js";
 import { WsBroadcastManager } from "./ws-broadcast.js";
 import { checkRateLimit, recordFailedLogin, resetRateLimit } from "./middleware/rate-limit.js";
 import { isPathWithinBase, isBlockedFolderPath, normalizeFolderPath } from "./middleware/path-safety.js";
-// ── Error helpers ──
-function getErrorMessage(error, fallback) {
-    return error instanceof Error ? error.message : fallback;
-}
 // ── Git helpers ──
 async function isGitRepo(dirPath) {
     try {
@@ -221,23 +218,6 @@ function parseStoredPathList(raw) {
         return [];
     }
 }
-const HIDDEN_CLAUDE_SESSIONS_KEY = "hidden_claude_sessions";
-function getHiddenClaudeSessionIds(storage) {
-    return new Set(parseStoredPathList(storage.getConfigValue(HIDDEN_CLAUDE_SESSIONS_KEY)));
-}
-function saveHiddenClaudeSessionIds(storage, hidden) {
-    storage.setConfigValue(HIDDEN_CLAUDE_SESSIONS_KEY, JSON.stringify(Array.from(hidden)));
-}
-function removeFromHiddenClaudeSessionIds(storage, idsToRemove) {
-    const hidden = getHiddenClaudeSessionIds(storage);
-    let changed = false;
-    for (const id of idsToRemove) {
-        if (hidden.delete(id))
-            changed = true;
-    }
-    if (changed)
-        saveHiddenClaudeSessionIds(storage, hidden);
-}
 const MAX_RECENT_PATHS = 10;
 // ── File language detection ──
 function getLanguageFromExt(ext, filePath) {
@@ -273,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");
@@ -289,18 +270,14 @@ export async function startServer(config, configPath) {
         res.setHeader("Content-Type", "application/manifest+json");
         res.send(generatePwaManifest());
     });
-    app.get("/icon.svg", (_req, res) => {
-        res.type("image/svg+xml").send(getAvatarSvg(avatarSeed, 192));
-    });
+    for (const [route, size] of [["/icon.svg", 192], ["/icon-192.png", 192], ["/icon-512.png", 512]]) {
+        app.get(route, (_req, res) => {
+            res.type("image/svg+xml").send(getAvatarSvg(avatarSeed, size));
+        });
+    }
     const iconsDir = path.resolve(existsSync(path.join(SERVER_MODULE_DIR, "web-ui", "content"))
         ? path.join(SERVER_MODULE_DIR, "web-ui", "content")
         : path.join(RUNTIME_ROOT_DIR, "src", "web-ui", "content"));
-    app.get("/icon-192.png", (_req, res) => {
-        res.type("image/svg+xml").send(getAvatarSvg(avatarSeed, 192));
-    });
-    app.get("/icon-512.png", (_req, res) => {
-        res.type("image/svg+xml").send(getAvatarSvg(avatarSeed, 512));
-    });
     app.get("/sw.js", (_req, res) => {
         res.setHeader("Content-Type", "application/javascript");
         res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
@@ -358,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,
@@ -485,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) => {
@@ -823,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/session-lifecycle.js

@@ -25,7 +25,6 @@ export class SessionLifecycleManager {
             lastActivityAt: Date.now(),
         };
         this.sessions.set(sessionId, lifecycle);
-        console.error(`[Lifecycle] Session ${sessionId} registered with state: ${initialState}`);
     }
     /**
      * Update session state
@@ -33,7 +32,6 @@ export class SessionLifecycleManager {
     setState(sessionId, newState) {
         const lifecycle = this.sessions.get(sessionId);
         if (!lifecycle) {
-            console.error(`[Lifecycle] Session ${sessionId} not found`);
             return;
         }
         const oldState = lifecycle.state;
@@ -43,7 +41,6 @@ export class SessionLifecycleManager {
         lifecycle.state = newState;
         lifecycle.stateSince = Date.now();
         lifecycle.lastActivityAt = Date.now();
-        console.error(`[Lifecycle] Session ${sessionId} state changed: ${oldState} -> ${newState}`);
         // Emit state change event
         this.events.onStateChange?.(sessionId, oldState, newState);
     }
@@ -89,7 +86,6 @@ export class SessionLifecycleManager {
         lifecycle.stateSince = Date.now();
         lifecycle.archivedBy = by;
         lifecycle.archiveReason = reason;
-        console.error(`[Lifecycle] Session ${sessionId} archived: ${reason} (by: ${by})`);
         // Emit archived event
         this.events.onArchived?.(sessionId, reason);
     }
@@ -98,7 +94,6 @@ export class SessionLifecycleManager {
      */
     unregister(sessionId) {
         this.sessions.delete(sessionId);
-        console.error(`[Lifecycle] Session ${sessionId} unregistered`);
     }
     /**
      * Get session lifecycle

package/dist/session-logger.d.ts

@@ -3,12 +3,22 @@ import type { ConversationTurn, ExecutionMode } from "./types.js";
 export interface ShortcutLogContext {
     /** Execution mode the session is running in (e.g. "managed", "full-access") */
     mode: ExecutionMode;
+    /** Permission scope that was approved (e.g. "run_command", "write_file") */
+    scope?: string;
     /** Whether auto-approve is active for this session */
     autoApprove: boolean;
     /** Whether a permission prompt was blocking at the time of the keypress */
     permissionBlocked: boolean;
     /** The actual input string sent to PTY */
     input: string;
+    /** Auto-approve detection type: "strict" | "fallback" | "idle_probe" */
+    approveType?: string;
+    /** Fallback detection score */
+    score?: number;
+    /** Fallback detection matched keywords */
+    matched?: string[];
+    /** Whether the auto-approve was a false positive */
+    falsePositive?: boolean;
 }
 /**
  * SessionLogger saves raw session content to local files for debugging and analysis.

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");
     }

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

@@ -0,0 +1,55 @@
+import { WandStorage } from "./storage.js";
+import { ExecutionMode, SessionRunner, SessionSnapshot } from "./types.js";
+import { ProcessEvent } from "./ws-broadcast.js";
+interface CreateStructuredSessionOptions {
+    cwd: string;
+    mode: ExecutionMode;
+    prompt?: string;
+    runner?: SessionRunner;
+}
+export declare class StructuredSessionManager {
+    private readonly storage;
+    private readonly sessions;
+    private readonly pendingChildren;
+    private emitEvent;
+    constructor(storage: WandStorage);
+    setEventEmitter(emitEvent: (event: ProcessEvent) => void): void;
+    list(): SessionSnapshot[];
+    get(id: string): SessionSnapshot | null;
+    createSession(options: CreateStructuredSessionOptions): SessionSnapshot;
+    sendMessage(id: string, input: string): Promise<SessionSnapshot>;
+    /** Approve a pending permission request. */
+    approvePermission(sessionId: string): SessionSnapshot;
+    /** Deny a pending permission request. */
+    denyPermission(sessionId: string): SessionSnapshot;
+    /** Toggle auto-approve for the session. */
+    toggleAutoApprove(sessionId: string): SessionSnapshot;
+    /** Resolve a specific escalation by requestId. */
+    resolveEscalation(sessionId: string, requestId: string, resolution?: "approve_once" | "approve_turn" | "deny"): SessionSnapshot;
+    stop(id: string): SessionSnapshot;
+    delete(id: string): void;
+    private requireSession;
+    private emit;
+    private resolvePermission;
+    private incrementApprovalStats;
+    private buildPermissionArgs;
+    /**
+     * Spawn `claude -p --output-format stream-json` and parse NDJSON lines as
+     * they arrive, emitting incremental WebSocket events so the UI can render
+     * text / thinking / tool_use blocks in real-time.
+     *
+     * Permission handling:
+     * - Non-root + full-access/managed: --permission-mode bypassPermissions
+     * - Non-root + auto-edit: --permission-mode acceptEdits
+     * - Root: --permission-mode acceptEdits + --allowedTools (extends approval
+     *   outside CWD). stdin is always "ignore" — no ACP bidirectional control.
+     */
+    private runClaudeStreaming;
+    private extractAssistantMessage;
+    private compactContentBlocks;
+    private normalizeToolInput;
+    private normalizeToolResultContent;
+    private extractModelName;
+    private extractUsage;
+}
+export {};