@co0ontty/wand 1.7.0 → 1.9.0

package/dist/storage.js

@@ -62,6 +62,179 @@ function parseWorktreeInfo(raw) {
     }
     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);
@@ -95,7 +268,9 @@ const INIT_SQL = `
     resumed_to_session_id TEXT,
     auto_recovered INTEGER NOT NULL DEFAULT 0,
     worktree_enabled INTEGER NOT NULL DEFAULT 0,
-    worktree_info TEXT
+    worktree_info TEXT,
+    worktree_merge_status TEXT,
+    worktree_merge_info TEXT
   );
 
   CREATE TABLE IF NOT EXISTS app_config (
@@ -185,34 +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, provider, session_kind, runner, messages, queued_messages, structured_state
-             , resumed_from_session_id, resumed_to_session_id, auto_recovered, worktree_enabled, worktree_info
-           ) 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,
-             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`)
-                .run(snapshot.id, snapshot.command, snapshot.cwd, snapshot.mode, snapshot.status, snapshot.exitCode, snapshot.startedAt, snapshot.endedAt, snapshot.output, snapshot.archived ? 1 : 0, snapshot.archivedAt, snapshot.claudeSessionId, snapshot.provider ?? null, snapshot.sessionKind ?? "pty", snapshot.runner ?? null, snapshot.messages ? JSON.stringify(snapshot.messages) : null, snapshot.queuedMessages ? JSON.stringify(snapshot.queuedMessages) : null, snapshot.structuredState ? JSON.stringify(snapshot.structuredState) : null, snapshot.resumedFromSessionId ?? null, snapshot.resumedToSessionId ?? null, snapshot.autoRecovered ? 1 : 0, snapshot.worktreeEnabled ? 1 : 0, snapshot.worktree ? JSON.stringify(snapshot.worktree) : null);
+             ${sessionPersistAssignments()}`)
+                .run(...sessionPersistValues(snapshot));
             this.db.exec("COMMIT");
         }
         catch (error) {
@@ -228,19 +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 = ?,
-           provider = ?, session_kind = ?, runner = ?, structured_state = ?,
-           resumed_from_session_id = ?, resumed_to_session_id = ?, auto_recovered = ?,
-           worktree_enabled = ?, worktree_info = ?
+           ${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.provider ?? null, snapshot.sessionKind ?? "pty", snapshot.runner ?? null, snapshot.structuredState ? JSON.stringify(snapshot.structuredState) : null, snapshot.resumedFromSessionId ?? null, snapshot.resumedToSessionId ?? null, snapshot.autoRecovered ? 1 : 0, snapshot.worktreeEnabled ? 1 : 0, snapshot.worktree ? JSON.stringify(snapshot.worktree) : null, snapshot.id);
+            .run(...sessionMetadataValues(snapshot));
     }
     getSession(id) {
         const row = this.db
-            .prepare(`SELECT id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages, queued_messages, structured_state
-             , resumed_from_session_id, resumed_to_session_id, auto_recovered, worktree_enabled, worktree_info
+            .prepare(`${sessionRowQuery("SELECT")}
          FROM command_sessions
          WHERE id = ?`)
             .get(id);
@@ -248,8 +394,7 @@ export class WandStorage {
     }
     getLatestSessionByClaudeSessionId(claudeSessionId) {
         const row = this.db
-            .prepare(`SELECT id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages, queued_messages, structured_state
-             , resumed_from_session_id, resumed_to_session_id, auto_recovered, worktree_enabled, worktree_info
+            .prepare(`${sessionRowQuery("SELECT")}
          FROM command_sessions
          WHERE claude_session_id = ?
          ORDER BY started_at DESC
@@ -259,40 +404,27 @@ export class WandStorage {
     }
     loadSessions() {
         const rows = this.db
-            .prepare(`SELECT id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages, queued_messages, structured_state
-             , resumed_from_session_id, resumed_to_session_id, auto_recovered, worktree_enabled, worktree_info
+            .prepare(`${sessionRowQuery("SELECT")}
          FROM command_sessions
          ORDER BY started_at DESC`)
             .all();
         return rows.map((row) => this.mapSessionRow(row));
     }
     mapSessionRow(row) {
-        const provider = inferSessionProvider(row);
-        return {
-            id: row.id,
-            sessionKind: row.session_kind ?? "pty",
-            provider,
-            runner: row.runner ?? undefined,
-            command: row.command,
-            cwd: row.cwd,
-            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
+        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);
@@ -340,4 +472,10 @@ function ensureCommandSessionSchema(db) {
     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/types.d.ts

@@ -47,6 +47,21 @@ export interface StructuredChatPersonaConfig {
     user?: StructuredChatPersonaRoleConfig;
     assistant?: StructuredChatPersonaRoleConfig;
 }
+export interface DefaultPanelStateConfig {
+    sessionsDrawerOpen?: boolean;
+    filePanelOpen?: boolean;
+    shortcutsExpanded?: boolean;
+    claudeHistoryExpanded?: boolean;
+    chatMessageExpanded?: boolean;
+    structuredThinkingExpanded?: boolean;
+    structuredToolGroupExpanded?: boolean;
+    structuredInlineToolExpanded?: boolean;
+    structuredTerminalExpanded?: boolean;
+    structuredToolCardExpanded?: boolean;
+}
+export interface UiPreferencesConfig {
+    defaultPanelState?: DefaultPanelStateConfig;
+}
 export interface WandConfig {
     host: string;
     port: number;
@@ -64,11 +79,45 @@ export interface WandConfig {
     shortcutLogMaxBytes?: number;
     /** Preferred response language for Claude (e.g. "中文", "English"). Empty string means no override. */
     language?: string;
+    /** UI defaults used for initializing panel open/expanded state. */
+    uiPreferences?: UiPreferencesConfig;
 }
 interface WorktreeInfo {
     branch: string;
     path: string;
 }
+export interface WorktreeMergeInfo {
+    targetBranch?: string;
+    mergedAt?: string;
+    mergeCommit?: string;
+    cleanupDone?: boolean;
+    lastError?: string;
+    conflict?: boolean;
+}
+export interface WorktreeMergeCheckResult {
+    ok: boolean;
+    sourceBranch: string;
+    targetBranch: string;
+    worktreePath: string;
+    repoRoot: string;
+    hasUncommittedChanges: boolean;
+    aheadCount: number;
+    hasConflicts: boolean;
+    recommendedAction: "merge" | "noop" | "resolve-conflict";
+    reason?: string;
+}
+export interface WorktreeMergeResult {
+    ok: boolean;
+    sourceBranch: string;
+    targetBranch: string;
+    repoRoot: string;
+    mergeCommit?: string;
+    mergedAt?: string;
+    cleanupDone: boolean;
+    conflict: boolean;
+    errorCode?: string;
+    reason?: string;
+}
 export interface CommandRequest {
     command: string;
     provider?: SessionProvider;
@@ -167,6 +216,8 @@ export interface SessionSnapshot {
     mode: ExecutionMode;
     worktreeEnabled?: boolean;
     worktree?: WorktreeInfo | null;
+    worktreeMergeStatus?: "ready" | "checking" | "merging" | "merged" | "failed";
+    worktreeMergeInfo?: WorktreeMergeInfo | null;
     autonomyPolicy?: AutonomyPolicy;
     approvalPolicy?: ApprovalPolicy;
     allowedScopes?: EscalationScope[];