@co0ontty/wand 1.7.0 → 1.10.0

package/dist/server-session-routes.js

@@ -1,6 +1,7 @@
 import express from "express";
 import { parseMessages } from "./message-parser.js";
 import { SessionInputError } from "./process-manager.js";
+import { checkSessionWorktreeMergeability, cleanupSessionWorktree, getWorktreeMergeErrorCode, mergeSessionWorktree, WorktreeMergeError } from "./git-worktree.js";
 export function getErrorMessage(error, fallback) {
     return error instanceof Error ? error.message : fallback;
 }
@@ -70,6 +71,66 @@ function listAllSessions(processes, structured) {
     return [...structured.list(), ...processes.list()]
         .sort((a, b) => b.startedAt.localeCompare(a.startedAt));
 }
+function requireWorktreeSession(snapshot) {
+    if (!snapshot) {
+        throw new Error("未找到该会话。");
+    }
+    if (!snapshot.worktreeEnabled || !snapshot.worktree?.branch || !snapshot.worktree?.path) {
+        throw new Error("该会话未启用 worktree 模式。 ");
+    }
+    return snapshot;
+}
+function buildWorktreeMergeInfo(current, status, info) {
+    return {
+        ...(current.worktreeMergeInfo ?? null),
+        ...(info ?? null),
+        lastError: info?.lastError,
+        conflict: info?.conflict,
+    };
+}
+function saveWorktreeMergeState(storage, current, status, info) {
+    const mergedInfo = buildWorktreeMergeInfo(current, status, info);
+    const updated = {
+        ...current,
+        worktreeMergeStatus: status,
+        worktreeMergeInfo: mergedInfo,
+    };
+    storage.saveSessionMetadata(updated);
+    return updated;
+}
+function getWorktreeMergeResponseStatus(error) {
+    const code = getWorktreeMergeErrorCode(error);
+    if (!code) {
+        return 400;
+    }
+    if (code === "WORKTREE_MERGE_CONFLICT") {
+        return 409;
+    }
+    return 400;
+}
+function getWorktreeMergePayload(error, fallback) {
+    if (error instanceof WorktreeMergeError) {
+        return {
+            error: error.message,
+            errorCode: error.code,
+            result: error.result ?? null,
+        };
+    }
+    return {
+        error: getErrorMessage(error, fallback),
+        errorCode: getWorktreeMergeErrorCode(error) ?? null,
+        result: null,
+    };
+}
+function getLatestSessionSnapshot(processes, structured, storage, id) {
+    return getSessionById(processes, structured, id) ?? storage.getSession(id);
+}
+function canMergeSession(snapshot) {
+    return Boolean(snapshot.worktreeEnabled && snapshot.worktree?.branch && snapshot.worktree?.path);
+}
+function isMergeActionAllowed(snapshot) {
+    return snapshot.status !== "running";
+}
 export function registerSessionRoutes(app, processes, structured, storage, defaultMode) {
     app.get("/api/sessions", (_req, res) => {
         const all = listAllSessions(processes, structured);
@@ -117,6 +178,98 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.status(400).json({ error: getErrorMessage(error, "无法发送结构化消息。") });
         }
     });
+    app.post("/api/sessions/:id/worktree/merge/check", (req, res) => {
+        try {
+            const current = requireWorktreeSession(getLatestSessionSnapshot(processes, structured, storage, req.params.id));
+            if (!isMergeActionAllowed(current)) {
+                res.status(409).json({ error: "会话仍在运行，请结束后再合并。", errorCode: "SESSION_STILL_RUNNING" });
+                return;
+            }
+            const checking = saveWorktreeMergeState(storage, current, "checking", {
+                ...(current.worktreeMergeInfo ?? null),
+                targetBranch: current.worktreeMergeInfo?.targetBranch,
+                lastError: undefined,
+                conflict: false,
+            });
+            const result = checkSessionWorktreeMergeability({
+                worktree: checking.worktree,
+                targetBranch: current.worktreeMergeInfo?.targetBranch,
+            });
+            const nextStatus = result.ok ? "ready" : "failed";
+            const updated = saveWorktreeMergeState(storage, checking, nextStatus, {
+                targetBranch: result.targetBranch,
+                conflict: result.hasConflicts,
+                lastError: result.ok ? undefined : result.reason,
+            });
+            res.json({ session: updated, result });
+        }
+        catch (error) {
+            res.status(getWorktreeMergeResponseStatus(error)).json(getWorktreeMergePayload(error, "无法检查 worktree 合并状态。"));
+        }
+    });
+    app.post("/api/sessions/:id/worktree/merge", express.json(), (req, res) => {
+        try {
+            const current = requireWorktreeSession(getLatestSessionSnapshot(processes, structured, storage, req.params.id));
+            if (!isMergeActionAllowed(current)) {
+                res.status(409).json({ error: "会话仍在运行，请结束后再合并。", errorCode: "SESSION_STILL_RUNNING" });
+                return;
+            }
+            const merging = saveWorktreeMergeState(storage, current, "merging", {
+                ...(current.worktreeMergeInfo ?? null),
+                lastError: undefined,
+                conflict: false,
+            });
+            const result = mergeSessionWorktree({
+                worktree: merging.worktree,
+                targetBranch: current.worktreeMergeInfo?.targetBranch,
+            });
+            const updated = saveWorktreeMergeState(storage, merging, "merged", {
+                targetBranch: result.targetBranch,
+                mergedAt: result.mergedAt,
+                mergeCommit: result.mergeCommit,
+                cleanupDone: result.cleanupDone,
+                lastError: undefined,
+                conflict: false,
+            });
+            res.json({ session: updated, result });
+        }
+        catch (error) {
+            const current = getLatestSessionSnapshot(processes, structured, storage, req.params.id);
+            if (current && canMergeSession(current)) {
+                const payload = getWorktreeMergePayload(error, "无法合并 worktree。");
+                saveWorktreeMergeState(storage, current, "failed", {
+                    ...(current.worktreeMergeInfo ?? null),
+                    targetBranch: payload.result?.targetBranch ?? current.worktreeMergeInfo?.targetBranch,
+                    mergedAt: payload.result?.mergedAt,
+                    mergeCommit: payload.result?.mergeCommit,
+                    cleanupDone: payload.result?.cleanupDone,
+                    lastError: payload.error,
+                    conflict: payload.result?.conflict === true,
+                });
+            }
+            res.status(getWorktreeMergeResponseStatus(error)).json(getWorktreeMergePayload(error, "无法合并 worktree。"));
+        }
+    });
+    app.post("/api/sessions/:id/worktree/cleanup", (req, res) => {
+        try {
+            const current = requireWorktreeSession(getLatestSessionSnapshot(processes, structured, storage, req.params.id));
+            if (current.worktreeMergeStatus !== "merged" || current.worktreeMergeInfo?.cleanupDone !== false) {
+                res.status(400).json({ error: "当前 worktree 无需补偿清理。", errorCode: "WORKTREE_CLEANUP_NOT_NEEDED" });
+                return;
+            }
+            cleanupSessionWorktree({ worktree: current.worktree });
+            const updated = saveWorktreeMergeState(storage, current, "merged", {
+                ...(current.worktreeMergeInfo ?? null),
+                cleanupDone: true,
+                lastError: undefined,
+                conflict: false,
+            });
+            res.json({ session: updated, ok: true });
+        }
+        catch (error) {
+            res.status(getWorktreeMergeResponseStatus(error)).json(getWorktreeMergePayload(error, "无法清理 worktree。"));
+        }
+    });
     app.post("/api/sessions/batch-delete", express.json(), (req, res) => {
         const sessionIds = Array.isArray(req.body?.sessionIds)
             ? req.body.sessionIds.filter((value) => typeof value === "string" && value.trim().length > 0)

package/dist/server.js

@@ -3,7 +3,7 @@ import { readdir, readFile, stat } from "node:fs/promises";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { createServer as createHttpServer } from "node:http";
 import { createServer as createHttpsServer } from "node:https";
-import { exec } from "node:child_process";
+import { exec, spawn } from "node:child_process";
 import { promisify } from "node:util";
 import path from "node:path";
 import process from "node:process";
@@ -478,6 +478,8 @@ export async function startServer(config, configPath) {
             repoUrl: PKG_REPO_URL,
             config: safeConfig,
             hasCert: existsSync(certPaths.keyPath) && existsSync(certPaths.certPath),
+            updateAvailable: cachedUpdateInfo?.updateAvailable ?? false,
+            latestVersion: cachedUpdateInfo?.latest ?? null,
         });
     });
     app.post("/api/settings/config", async (req, res) => {
@@ -885,6 +887,30 @@ export async function startServer(config, configPath) {
     structuredSessions.setEventEmitter((event) => {
         wsManager.emitEvent(event);
     });
+    // ── Restart endpoint (needs server + wss in scope) ──
+    app.post("/api/restart", async (_req, res) => {
+        res.json({ ok: true, message: "服务正在重启..." });
+        wsManager.emitEvent({
+            type: "notification",
+            sessionId: "__system__",
+            data: { kind: "restart" },
+        });
+        setTimeout(() => {
+            // Close all WebSocket connections first
+            wss.clients.forEach((client) => client.close());
+            server.close(() => {
+                spawn(process.execPath, process.argv.slice(1), {
+                    detached: true,
+                    stdio: "inherit",
+                    cwd: process.cwd(),
+                    env: process.env,
+                }).unref();
+                process.exit(0);
+            });
+            // Force exit after 5s if graceful shutdown stalls
+            setTimeout(() => process.exit(0), 5000);
+        }, 600);
+    });
     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.d.ts

@@ -37,5 +37,6 @@ export declare class WandStorage {
     getLatestSessionByClaudeSessionId(claudeSessionId: string): SessionSnapshot | null;
     loadSessions(): SessionSnapshot[];
     private mapSessionRow;
+    updateSessionWorktreeMergeState(id: string, status: SessionSnapshot["worktreeMergeStatus"], info: SessionSnapshot["worktreeMergeInfo"]): SessionSnapshot | null;
     deleteSession(id: string): void;
 }

package/dist/storage.js

@@ -1,10 +1,9 @@
 import { existsSync, mkdirSync } from "node:fs";
 import path from "node:path";
 import { DatabaseSync } from "node:sqlite";
-function parseStoredMessages(raw) {
-    if (!raw) {
+function safeJsonParse(raw) {
+    if (!raw)
         return undefined;
-    }
     try {
         return JSON.parse(raw);
     }
@@ -13,27 +12,8 @@ function parseStoredMessages(raw) {
     }
 }
 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;
-    }
-    try {
-        return JSON.parse(raw);
-    }
-    catch {
-        return undefined;
-    }
+    const parsed = safeJsonParse(raw);
+    return Array.isArray(parsed) ? parsed.filter((item) => typeof item === "string") : undefined;
 }
 function inferSessionProvider(row) {
     if (row.provider === "claude" || row.provider === "codex") {
@@ -45,23 +25,164 @@ function inferSessionProvider(row) {
     return /^claude\b/.test(row.command.trim()) ? "claude" : undefined;
 }
 function parseWorktreeInfo(raw) {
-    if (!raw) {
-        return undefined;
+    const parsed = safeJsonParse(raw);
+    if (parsed && typeof parsed.branch === "string" && typeof parsed.path === "string") {
+        return { branch: parsed.branch, path: parsed.path };
     }
-    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) {
+    return safeJsonParse(raw);
+}
+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 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,
+        serializeWorktreeInfo(snapshot.worktree),
+        snapshot.worktreeMergeStatus ?? null,
+        serializeWorktreeMergeInfo(snapshot.worktreeMergeInfo),
+    ];
+}
+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,
+        serializeWorktreeInfo(snapshot.worktree),
+        snapshot.worktreeMergeStatus ?? null,
+        serializeWorktreeMergeInfo(snapshot.worktreeMergeInfo),
+        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: safeJsonParse(row.messages),
+        queuedMessages: parseQueuedMessages(row.queued_messages),
+        structuredState: safeJsonParse(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 +216,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 +308,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 +328,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 +342,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,85 +352,56 @@ 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);
     }
 }
+const SCHEMA_MIGRATIONS = [
+    ["archived", "ALTER TABLE command_sessions ADD COLUMN archived INTEGER NOT NULL DEFAULT 0"],
+    ["archived_at", "ALTER TABLE command_sessions ADD COLUMN archived_at TEXT"],
+    ["claude_session_id", "ALTER TABLE command_sessions ADD COLUMN claude_session_id TEXT"],
+    ["provider", "ALTER TABLE command_sessions ADD COLUMN provider TEXT"],
+    ["session_kind", "ALTER TABLE command_sessions ADD COLUMN session_kind TEXT NOT NULL DEFAULT 'pty'"],
+    ["runner", "ALTER TABLE command_sessions ADD COLUMN runner TEXT"],
+    ["messages", "ALTER TABLE command_sessions ADD COLUMN messages TEXT"],
+    ["queued_messages", "ALTER TABLE command_sessions ADD COLUMN queued_messages TEXT"],
+    ["structured_state", "ALTER TABLE command_sessions ADD COLUMN structured_state TEXT"],
+    ["resumed_from_session_id", "ALTER TABLE command_sessions ADD COLUMN resumed_from_session_id TEXT"],
+    ["resumed_to_session_id", "ALTER TABLE command_sessions ADD COLUMN resumed_to_session_id TEXT"],
+    ["auto_recovered", "ALTER TABLE command_sessions ADD COLUMN auto_recovered INTEGER NOT NULL DEFAULT 0"],
+    ["worktree_enabled", "ALTER TABLE command_sessions ADD COLUMN worktree_enabled INTEGER NOT NULL DEFAULT 0"],
+    ["worktree_info", "ALTER TABLE command_sessions ADD COLUMN worktree_info TEXT"],
+    ["worktree_merge_status", "ALTER TABLE command_sessions ADD COLUMN worktree_merge_status TEXT"],
+    ["worktree_merge_info", "ALTER TABLE command_sessions ADD COLUMN worktree_merge_info TEXT"],
+];
 function ensureCommandSessionSchema(db) {
     const columns = db.prepare("PRAGMA table_info(command_sessions)").all();
     const names = new Set(columns.map((column) => column.name));
-    if (!names.has("archived")) {
-        db.exec("ALTER TABLE command_sessions ADD COLUMN archived INTEGER NOT NULL DEFAULT 0");
-    }
-    if (!names.has("archived_at")) {
-        db.exec("ALTER TABLE command_sessions ADD COLUMN archived_at TEXT");
-    }
-    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'");
-    }
-    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("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");
-    }
-    if (!names.has("resumed_from_session_id")) {
-        db.exec("ALTER TABLE command_sessions ADD COLUMN resumed_from_session_id TEXT");
-    }
-    if (!names.has("resumed_to_session_id")) {
-        db.exec("ALTER TABLE command_sessions ADD COLUMN resumed_to_session_id TEXT");
-    }
-    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");
+    for (const [column, sql] of SCHEMA_MIGRATIONS) {
+        if (!names.has(column)) {
+            db.exec(sql);
+        }
     }
 }