@co0ontty/wand 1.3.6 → 1.5.1

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,56 @@
+import { WandStorage } from "./storage.js";
+import { ExecutionMode, SessionRunner, SessionSnapshot, WandConfig } 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 config;
+    private readonly sessions;
+    private readonly pendingChildren;
+    private emitEvent;
+    constructor(storage: WandStorage, config: WandConfig);
+    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 {};