@co0ontty/wand 1.6.2 → 1.9.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);
@@ -78,13 +139,18 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     });
     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 }));
+        console.log("[WAND] POST /api/structured-sessions body:", JSON.stringify({ cwd: body.cwd, mode: body.mode, runner: body.runner, provider: body.provider, worktreeEnabled: body.worktreeEnabled === true, hasPrompt: !!body.prompt }));
         try {
+            if (body.provider && body.provider !== "claude") {
+                res.status(400).json({ error: "结构化会话当前仅支持 Claude provider。" });
+                return;
+            }
             const snapshot = structured.createSession({
                 cwd: body.cwd?.trim() || process.cwd(),
                 mode: normalizeMode(body.mode, defaultMode),
                 prompt: body.prompt,
                 runner: body.runner ?? "claude-cli-print",
+                worktreeEnabled: body.worktreeEnabled === true,
             });
             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);
@@ -112,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)
@@ -148,17 +306,21 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.status(404).json({ error: "未找到该会话，可能已被删除。" });
             return;
         }
+        const transcriptOutput = (snapshot.sessionKind ?? "pty") === "pty"
+            ? processes.getPtyTranscript(snapshot.id) ?? snapshot.output
+            : snapshot.output;
         if (req.query.format === "chat") {
             const allowFallback = (snapshot.sessionKind ?? "pty") === "pty";
+            const fallbackOutput = allowFallback ? transcriptOutput : "";
             const messages = snapshot.messages && snapshot.messages.length > 0
                 ? snapshot.messages
                 : allowFallback
-                    ? parseMessages(snapshot.output)
+                    ? parseMessages(fallbackOutput, snapshot.command)
                     : [];
-            res.json({ ...snapshot, messages });
+            res.json({ ...snapshot, output: transcriptOutput, messages });
         }
         else {
-            res.json(snapshot);
+            res.json({ ...snapshot, output: transcriptOutput });
         }
     });
     app.post("/api/sessions/:id/resume", (req, res) => {
@@ -176,6 +338,10 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 res.status(400).json({ error: "结构化会话不支持 Claude CLI resume。" });
                 return;
             }
+            if (existingSession.provider && existingSession.provider !== "claude") {
+                res.status(400).json({ error: "只有 Claude provider 支持恢复功能。" });
+                return;
+            }
             const claudeSessionId = existingSession.claudeSessionId;
             if (!claudeSessionId) {
                 res.status(400).json({ error: "此会话没有 Claude 会话 ID，无法恢复。" });
@@ -207,6 +373,10 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             }
             const existingSession = storage.getLatestSessionByClaudeSessionId(claudeSessionId);
             if (existingSession) {
+                if (existingSession.provider && existingSession.provider !== "claude") {
+                    res.status(400).json({ error: "只有 Claude provider 支持按 Claude Session ID 恢复。" });
+                    return;
+                }
                 const command = existingSession.command.trim();
                 if ((existingSession.sessionKind ?? "pty") !== "pty") {
                     res.status(400).json({ error: "结构化会话不支持按 Claude Session ID 恢复。" });
@@ -284,7 +454,12 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/sessions/:id/approve-permission", (req, res) => {
         try {
             if (structured.get(req.params.id)) {
-                res.json(structured.approvePermission(req.params.id));
+                res.status(400).json({ error: "结构化会话不需要终端权限操作。" });
+                return;
+            }
+            const snapshot = processes.get(req.params.id);
+            if (snapshot?.provider === "codex") {
+                res.status(400).json({ error: "Codex provider 不支持权限批准操作。" });
                 return;
             }
             res.json(processes.approvePermission(req.params.id));
@@ -296,7 +471,12 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/sessions/:id/deny-permission", (req, res) => {
         try {
             if (structured.get(req.params.id)) {
-                res.json(structured.denyPermission(req.params.id));
+                res.status(400).json({ error: "结构化会话不需要终端权限操作。" });
+                return;
+            }
+            const snapshot = processes.get(req.params.id);
+            if (snapshot?.provider === "codex") {
+                res.status(400).json({ error: "Codex provider 不支持权限拒绝操作。" });
                 return;
             }
             res.json(processes.denyPermission(req.params.id));
@@ -308,7 +488,12 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/sessions/:id/toggle-auto-approve", (req, res) => {
         try {
             if (structured.get(req.params.id)) {
-                res.json(structured.toggleAutoApprove(req.params.id));
+                res.status(400).json({ error: "结构化会话不需要切换终端自动批准。" });
+                return;
+            }
+            const snapshot = processes.get(req.params.id);
+            if (snapshot?.provider === "codex") {
+                res.status(400).json({ error: "Codex provider 不支持自动批准切换。" });
                 return;
             }
             res.json(processes.toggleAutoApprove(req.params.id));

package/dist/server.js

@@ -519,6 +519,40 @@ export async function startServer(config, configPath) {
                 changed = true;
             }
         }
+        if (body.uiPreferences && typeof body.uiPreferences === "object") {
+            const defaultPanelStateInput = body.uiPreferences.defaultPanelState;
+            if (defaultPanelStateInput && typeof defaultPanelStateInput === "object") {
+                const nextDefaultPanelState = {
+                    ...config.uiPreferences?.defaultPanelState,
+                };
+                let panelChanged = false;
+                const panelFields = [
+                    "sessionsDrawerOpen",
+                    "filePanelOpen",
+                    "shortcutsExpanded",
+                    "claudeHistoryExpanded",
+                    "chatMessageExpanded",
+                    "structuredThinkingExpanded",
+                    "structuredToolGroupExpanded",
+                    "structuredInlineToolExpanded",
+                    "structuredTerminalExpanded",
+                    "structuredToolCardExpanded"
+                ];
+                for (const field of panelFields) {
+                    if (field in defaultPanelStateInput && typeof defaultPanelStateInput[field] === "boolean") {
+                        nextDefaultPanelState[field] = defaultPanelStateInput[field];
+                        panelChanged = true;
+                    }
+                }
+                if (panelChanged) {
+                    config.uiPreferences = {
+                        ...config.uiPreferences,
+                        defaultPanelState: nextDefaultPanelState,
+                    };
+                    changed = true;
+                }
+            }
+        }
         if (!changed) {
             res.status(400).json({ error: "没有可更新的配置字段。" });
             return;
@@ -858,7 +892,10 @@ export async function startServer(config, configPath) {
         }
         const initialInput = body.initialInput?.trim();
         try {
-            const snapshot = processes.start(body.command, body.cwd, normalizeMode(body.mode, config.defaultMode), initialInput || undefined);
+            const snapshot = processes.start(body.command, body.cwd, normalizeMode(body.mode, config.defaultMode), initialInput || undefined, {
+                worktreeEnabled: body.worktreeEnabled === true,
+                provider: body.provider,
+            });
             res.status(201).json(snapshot);
         }
         catch (error) {

package/dist/session-logger.d.ts

@@ -44,6 +44,8 @@ export declare class SessionLogger {
     private rotatePtyLog;
     /** Append raw PTY output chunk */
     appendPtyOutput(sessionId: string, chunk: string): void;
+    /** Read the full PTY transcript including rotated logs, oldest first. */
+    readPtyOutput(sessionId: string): string | null;
     /** Append a native mode NDJSON event */
     appendStreamEvent(sessionId: string, event: unknown): void;
     /** Save the current structured messages snapshot */

package/dist/session-logger.js

@@ -89,6 +89,29 @@ export class SessionLogger {
             // Non-critical — don't let logging failures affect main flow
         }
     }
+    /** Read the full PTY transcript including rotated logs, oldest first. */
+    readPtyOutput(sessionId) {
+        try {
+            const dir = this.ensureDir(sessionId);
+            const parts = [];
+            for (let index = PTY_LOG_MAX_ROTATIONS; index >= 1; index -= 1) {
+                const rotatedPath = path.join(dir, `pty-output.log.${index}`);
+                if (existsSync(rotatedPath)) {
+                    parts.push(readFileSync(rotatedPath, "utf8"));
+                }
+            }
+            const currentPath = path.join(dir, "pty-output.log");
+            if (existsSync(currentPath)) {
+                parts.push(readFileSync(currentPath, "utf8"));
+            }
+            if (parts.length === 0)
+                return null;
+            return parts.join("");
+        }
+        catch {
+            return null;
+        }
+    }
     /** Append a native mode NDJSON event */
     appendStreamEvent(sessionId, event) {
         try {

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