@co0ontty/wand 1.6.2 → 1.9.0

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,206 @@ 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;
+}
+function parseWorktreeMergeInfo(raw) {
+    if (!raw) {
+        return undefined;
+    }
+    try {
+        const parsed = JSON.parse(raw);
+        if (parsed && typeof parsed === "object") {
+            return parsed;
+        }
+    }
+    catch {
+        return undefined;
+    }
+    return undefined;
+}
+function serializeWorktreeMergeInfo(info) {
+    return info ? JSON.stringify(info) : null;
+}
+function serializeWorktreeInfo(info) {
+    return info ? JSON.stringify(info) : null;
+}
+function normalizeWorktreeMergeStatus(raw) {
+    if (raw === "ready" || raw === "checking" || raw === "merging" || raw === "merged" || raw === "failed") {
+        return raw;
+    }
+    return undefined;
+}
+function getWorktreeMergeStatusValue(snapshot) {
+    return snapshot.worktreeMergeStatus ?? null;
+}
+function getWorktreeMergeInfoValue(snapshot) {
+    return serializeWorktreeMergeInfo(snapshot.worktreeMergeInfo);
+}
+function getWorktreeInfoValue(snapshot) {
+    return serializeWorktreeInfo(snapshot.worktree);
+}
+function mapWorktreeMergeFields(row) {
+    return {
+        worktreeMergeStatus: normalizeWorktreeMergeStatus(row.worktree_merge_status),
+        worktreeMergeInfo: parseWorktreeMergeInfo(row.worktree_merge_info) ?? null,
+    };
+}
+function sessionSelectFields() {
+    return `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, worktree_merge_status, worktree_merge_info`;
+}
+function sessionPersistFields() {
+    return `id, command, cwd, mode, status, exit_code, started_at, ended_at, output
+             , 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, worktree_merge_status, worktree_merge_info`;
+}
+function sessionPersistAssignments() {
+    return `command = excluded.command,
+             cwd = excluded.cwd,
+             mode = excluded.mode,
+             status = excluded.status,
+             exit_code = excluded.exit_code,
+             started_at = excluded.started_at,
+             ended_at = excluded.ended_at,
+             output = excluded.output,
+             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,
+             worktree_enabled = excluded.worktree_enabled,
+             worktree_info = excluded.worktree_info,
+             worktree_merge_status = excluded.worktree_merge_status,
+             worktree_merge_info = excluded.worktree_merge_info`;
+}
+function sessionMetadataAssignments() {
+    return `command = ?, cwd = ?, mode = ?, status = ?, exit_code = ?,
+           started_at = ?, ended_at = ?, output = ?,
+           archived = ?, archived_at = ?, claude_session_id = ?,
+           provider = ?, session_kind = ?, runner = ?, structured_state = ?,
+           resumed_from_session_id = ?, resumed_to_session_id = ?, auto_recovered = ?,
+           worktree_enabled = ?, worktree_info = ?, worktree_merge_status = ?, worktree_merge_info = ?`;
+}
+function sessionPersistValues(snapshot) {
+    return [
+        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,
+        getWorktreeInfoValue(snapshot),
+        getWorktreeMergeStatusValue(snapshot),
+        getWorktreeMergeInfoValue(snapshot),
+    ];
+}
+function sessionMetadataValues(snapshot) {
+    return [
+        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,
+        getWorktreeInfoValue(snapshot),
+        getWorktreeMergeStatusValue(snapshot),
+        getWorktreeMergeInfoValue(snapshot),
+        snapshot.id,
+    ];
+}
+function mapSessionCore(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,
+        mode: row.mode,
+        status: row.status,
+        exitCode: row.exit_code,
+        startedAt: row.started_at,
+        endedAt: row.ended_at,
+        output: row.output,
+        archived: Boolean(row.archived),
+        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),
+        worktreeEnabled: Boolean(row.worktree_enabled),
+        worktree: parseWorktreeInfo(row.worktree_info) ?? null,
+        ...mapWorktreeMergeFields(row),
+    };
+}
+function sessionRowQuery(base) {
+    return `${base} ${sessionSelectFields()}`;
+}
 export const DEFAULT_DB_FILE = "wand.db";
 export function resolveDatabasePath(configPath) {
     return path.resolve(path.dirname(configPath), DEFAULT_DB_FILE);
@@ -46,13 +258,19 @@ 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,
+    worktree_merge_status TEXT,
+    worktree_merge_info TEXT
   );
 
   CREATE TABLE IF NOT EXISTS app_config (
@@ -142,30 +360,11 @@ export class WandStorage {
         try {
             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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+           ${sessionPersistFields()}
+           ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
            ON CONFLICT(id) DO UPDATE SET
-             command = excluded.command,
-             cwd = excluded.cwd,
-             mode = excluded.mode,
-             status = excluded.status,
-             exit_code = excluded.exit_code,
-             started_at = excluded.started_at,
-             ended_at = excluded.ended_at,
-             output = excluded.output,
-             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.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);
+             ${sessionPersistAssignments()}`)
+                .run(...sessionPersistValues(snapshot));
             this.db.exec("COMMIT");
         }
         catch (error) {
@@ -181,18 +380,13 @@ export class WandStorage {
     saveSessionMetadata(snapshot) {
         this.db
             .prepare(`UPDATE command_sessions SET
-           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 = ?
+           ${sessionMetadataAssignments()}
          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(...sessionMetadataValues(snapshot));
     }
     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(`${sessionRowQuery("SELECT")}
          FROM command_sessions
          WHERE id = ?`)
             .get(id);
@@ -200,8 +394,7 @@ 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(`${sessionRowQuery("SELECT")}
          FROM command_sessions
          WHERE claude_session_id = ?
          ORDER BY started_at DESC
@@ -211,35 +404,27 @@ 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(`${sessionRowQuery("SELECT")}
          FROM command_sessions
          ORDER BY started_at DESC`)
             .all();
         return rows.map((row) => this.mapSessionRow(row));
     }
     mapSessionRow(row) {
-        return {
-            id: row.id,
-            sessionKind: row.session_kind ?? "pty",
-            runner: row.runner ?? undefined,
-            command: row.command,
-            cwd: row.cwd,
-            mode: row.mode,
-            status: row.status,
-            exitCode: row.exit_code,
-            startedAt: row.started_at,
-            endedAt: row.ended_at,
-            output: row.output,
-            archived: Boolean(row.archived),
-            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)
+        return mapSessionCore(row);
+    }
+    updateSessionWorktreeMergeState(id, status, info) {
+        const current = this.getSession(id);
+        if (!current) {
+            return null;
+        }
+        const updated = {
+            ...current,
+            worktreeMergeStatus: status,
+            worktreeMergeInfo: info,
         };
+        this.saveSessionMetadata(updated);
+        return updated;
     }
     deleteSession(id) {
         this.db.prepare("DELETE FROM command_sessions WHERE id = ?").run(id);
@@ -257,6 +442,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 +454,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 +466,16 @@ 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");
+    }
+    if (!names.has("worktree_merge_status")) {
+        db.exec("ALTER TABLE command_sessions ADD COLUMN worktree_merge_status TEXT");
+    }
+    if (!names.has("worktree_merge_info")) {
+        db.exec("ALTER TABLE command_sessions ADD COLUMN worktree_merge_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;