@co0ontty/wand 1.1.7 → 1.2.2

package/dist/server.js

@@ -21,6 +21,8 @@ const PKG_REPO_URL = "https://github.com/co0ontty/wand";
 let cachedLatestVersion = null;
 let cacheTimestamp = 0;
 const CACHE_TTL_MS = 10 * 60 * 1000; // 10 minutes
+/** Cached update result broadcast to new clients on connect. */
+let cachedUpdateInfo = null;
 async function checkNpmLatestVersion(forceRefresh = false) {
     const now = Date.now();
     if (forceRefresh || !cachedLatestVersion || (now - cacheTimestamp > CACHE_TTL_MS)) {
@@ -54,11 +56,11 @@ import { ensureAvatarSeed, getAvatarSvg } from "./avatar.js";
 import { createSession, revokeSession, setAuthStorage, validateSession } from "./auth.js";
 import { ensureCertificates } from "./cert.js";
 import { isExecutionMode, resolveConfigDir, saveConfig } from "./config.js";
-import { ProcessManager, SessionInputError } from "./process-manager.js";
+import { ProcessManager } from "./process-manager.js";
+import { generatePwaManifest, generateServiceWorker } from "./pwa.js";
+import { registerClaudeHistoryRoutes, registerSessionRoutes } from "./server-session-routes.js";
 import { resolveDatabasePath, WandStorage } from "./storage.js";
 import { renderApp } from "./web-ui/index.js";
-import { parseMessages } from "./message-parser.js";
-import { generatePwaManifest, generateServiceWorker } from "./pwa.js";
 import { WsBroadcastManager } from "./ws-broadcast.js";
 import { checkRateLimit, recordFailedLogin, resetRateLimit } from "./middleware/rate-limit.js";
 import { isPathWithinBase, isBlockedFolderPath, normalizeFolderPath } from "./middleware/path-safety.js";
@@ -66,35 +68,6 @@ import { isPathWithinBase, isBlockedFolderPath, normalizeFolderPath } from "./mi
 function getErrorMessage(error, fallback) {
     return error instanceof Error ? error.message : fallback;
 }
-function getInputErrorResponse(error, sessionId) {
-    if (error instanceof SessionInputError) {
-        const statusCode = error.code === "SESSION_NOT_FOUND" ? 404 : 409;
-        return {
-            statusCode,
-            payload: {
-                error: error.message,
-                errorCode: error.code,
-                sessionId,
-                sessionStatus: error.sessionStatus ?? null,
-            },
-        };
-    }
-    return {
-        statusCode: 400,
-        payload: {
-            error: getErrorMessage(error, "会话已结束，请启动新会话。"),
-            errorCode: "INPUT_SEND_FAILED",
-            sessionId,
-            sessionStatus: null,
-        },
-    };
-}
-function getInputDebugMeta(error) {
-    if (error instanceof Error) {
-        return { name: error.name, message: error.message, stack: error.stack };
-    }
-    return { error };
-}
 // ── Git helpers ──
 async function isGitRepo(dirPath) {
     try {
@@ -384,6 +357,9 @@ export async function startServer(config, configPath) {
             defaultMode: config.defaultMode,
             defaultCwd: config.defaultCwd,
             commandPresets: config.commandPresets,
+            updateAvailable: cachedUpdateInfo?.updateAvailable ?? false,
+            latestVersion: cachedUpdateInfo?.latest ?? null,
+            currentVersion: PKG_VERSION,
         });
     });
     // ── Settings endpoints ──
@@ -504,152 +480,8 @@ export async function startServer(config, configPath) {
             updateInFlight = false;
         }
     });
-    app.get("/api/sessions", (_req, res) => {
-        res.json(processes.list());
-    });
-    app.get("/api/claude-history", (_req, res) => {
-        try {
-            const sessions = processes.listClaudeHistorySessions();
-            const hidden = getHiddenClaudeSessionIds(storage);
-            const filtered = hidden.size > 0
-                ? sessions.filter((s) => !s.claudeSessionId || !hidden.has(s.claudeSessionId))
-                : sessions;
-            res.json(filtered);
-        }
-        catch (error) {
-            res.status(500).json({ error: getErrorMessage(error, "无法扫描 Claude 历史会话。") });
-        }
-    });
-    app.delete("/api/claude-history/:claudeSessionId", (req, res) => {
-        const claudeSessionId = req.params.claudeSessionId?.trim();
-        if (!claudeSessionId) {
-            res.status(400).json({ error: "会话 ID 不能为空。" });
-            return;
-        }
-        const session = processes.listClaudeHistorySessions()
-            .find((s) => s.claudeSessionId === claudeSessionId);
-        if (session) {
-            processes.deleteClaudeHistoryFiles([{ claudeSessionId, cwd: session.cwd }]);
-            removeFromHiddenClaudeSessionIds(storage, [claudeSessionId]);
-        }
-        else {
-            const hidden = getHiddenClaudeSessionIds(storage);
-            if (!hidden.has(claudeSessionId)) {
-                hidden.add(claudeSessionId);
-                saveHiddenClaudeSessionIds(storage, hidden);
-            }
-        }
-        res.json({ ok: true });
-    });
-    app.delete("/api/claude-history", (req, res) => {
-        const cwd = typeof req.query.cwd === "string" ? req.query.cwd.trim() : "";
-        if (!cwd) {
-            res.status(400).json({ error: "目录不能为空。" });
-            return;
-        }
-        try {
-            const sessions = processes.listClaudeHistorySessions();
-            const toDelete = [];
-            for (const session of sessions) {
-                if (session.claudeSessionId && session.cwd === cwd) {
-                    toDelete.push({ claudeSessionId: session.claudeSessionId, cwd: session.cwd });
-                }
-            }
-            const deleted = processes.deleteClaudeHistoryFiles(toDelete);
-            removeFromHiddenClaudeSessionIds(storage, toDelete.map((s) => s.claudeSessionId));
-            res.json({ ok: true, deleted });
-        }
-        catch (error) {
-            res.status(500).json({ error: getErrorMessage(error, "无法删除该目录下的历史会话。") });
-        }
-    });
-    app.post("/api/claude-history/batch-delete", express.json(), (req, res) => {
-        const claudeSessionIds = Array.isArray(req.body?.claudeSessionIds)
-            ? req.body.claudeSessionIds.filter((value) => typeof value === "string" && value.trim().length > 0)
-            : [];
-        if (claudeSessionIds.length === 0) {
-            res.status(400).json({ error: "至少提供一个历史会话 ID。" });
-            return;
-        }
-        try {
-            const allSessions = processes.listClaudeHistorySessions();
-            const sessionMap = new Map();
-            for (const s of allSessions) {
-                if (s.claudeSessionId)
-                    sessionMap.set(s.claudeSessionId, s.cwd);
-            }
-            const toDelete = [];
-            const toHide = [];
-            for (const id of claudeSessionIds) {
-                const cwd = sessionMap.get(id);
-                if (cwd) {
-                    toDelete.push({ claudeSessionId: id, cwd });
-                }
-                else {
-                    toHide.push(id);
-                }
-            }
-            const deleted = processes.deleteClaudeHistoryFiles(toDelete);
-            removeFromHiddenClaudeSessionIds(storage, toDelete.map((s) => s.claudeSessionId));
-            if (toHide.length > 0) {
-                const hidden = getHiddenClaudeSessionIds(storage);
-                let added = 0;
-                for (const id of toHide) {
-                    if (!hidden.has(id)) {
-                        hidden.add(id);
-                        added++;
-                    }
-                }
-                if (added > 0)
-                    saveHiddenClaudeSessionIds(storage, hidden);
-            }
-            res.json({ ok: true, deleted: deleted + toHide.length });
-        }
-        catch (error) {
-            res.status(500).json({ error: getErrorMessage(error, "无法批量删除历史会话。") });
-        }
-    });
-    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)
-            : [];
-        if (sessionIds.length === 0) {
-            res.status(400).json({ error: "至少提供一个会话 ID。" });
-            return;
-        }
-        let deleted = 0;
-        const failed = [];
-        for (const sessionId of sessionIds) {
-            try {
-                processes.delete(sessionId);
-                deleted += 1;
-            }
-            catch {
-                failed.push(sessionId);
-            }
-        }
-        if (deleted === 0 && failed.length > 0) {
-            res.status(400).json({ error: "无法批量删除会话。", failed });
-            return;
-        }
-        res.json({ ok: true, deleted, failed });
-    });
-    app.get("/api/sessions/:id", (req, res) => {
-        const snapshot = processes.get(req.params.id);
-        if (!snapshot) {
-            res.status(404).json({ error: "未找到该会话，可能已被删除。" });
-            return;
-        }
-        if (req.query.format === "chat") {
-            const messages = snapshot.messages && snapshot.messages.length > 0
-                ? snapshot.messages
-                : parseMessages(snapshot.output);
-            res.json({ ...snapshot, messages });
-        }
-        else {
-            res.json(snapshot);
-        }
-    });
+    registerSessionRoutes(app, processes, storage, config.defaultMode);
+    registerClaudeHistoryRoutes(app, processes, storage);
     // ── Path suggestion ──
     app.get("/api/path-suggestions", async (req, res) => {
         const query = typeof req.query.q === "string" ? req.query.q : "";
@@ -977,156 +809,6 @@ export async function startServer(config, configPath) {
             res.status(400).json({ error: getErrorMessage(error, "无法启动命令。请检查命令是否安装。") });
         }
     });
-    app.post("/api/sessions/:id/resume", (req, res) => {
-        const sessionId = req.params.id;
-        const body = req.body;
-        try {
-            const existingSession = processes.get(sessionId) || storage.getSession(sessionId);
-            if (!existingSession) {
-                res.status(404).json({ error: "会话不存在。" });
-                return;
-            }
-            const claudeSessionId = existingSession.claudeSessionId;
-            if (!claudeSessionId) {
-                res.status(400).json({ error: "此会话没有 Claude 会话 ID，无法恢复。" });
-                return;
-            }
-            const command = existingSession.command.trim();
-            if (!/^claude\b/.test(command)) {
-                res.status(400).json({ error: "只有 Claude 命令支持恢复功能。" });
-                return;
-            }
-            const newMode = body.mode
-                ? normalizeMode(body.mode, config.defaultMode)
-                : normalizeMode(existingSession.mode, config.defaultMode);
-            const resumeCommand = `${command} --resume ${claudeSessionId}`;
-            const newSnapshot = processes.start(resumeCommand, existingSession.cwd, newMode, undefined, { resumedFromSessionId: sessionId });
-            storage.saveSession({ ...existingSession, resumedToSessionId: newSnapshot.id });
-            res.status(201).json({ resumedFromSessionId: sessionId, ...newSnapshot });
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法恢复会话。") });
-        }
-    });
-    app.post("/api/claude-sessions/:claudeSessionId/resume", (req, res) => {
-        const claudeSessionId = String(req.params.claudeSessionId || "").trim();
-        const body = req.body;
-        try {
-            if (!claudeSessionId) {
-                res.status(400).json({ error: "Claude 会话 ID 不能为空。" });
-                return;
-            }
-            const existingSession = storage.getLatestSessionByClaudeSessionId(claudeSessionId);
-            if (existingSession) {
-                const command = existingSession.command.trim();
-                if (!/^claude\b/.test(command)) {
-                    res.status(400).json({ error: "只有 Claude 命令支持按 Claude Session ID 恢复。" });
-                    return;
-                }
-                if (!existingSession.cwd || !processes.hasClaudeSessionFile(existingSession.cwd, claudeSessionId)) {
-                    res.status(400).json({ error: "对应的 Claude 历史会话文件不存在，无法恢复。" });
-                    return;
-                }
-                const newMode = body.mode
-                    ? normalizeMode(body.mode, config.defaultMode)
-                    : normalizeMode(existingSession.mode, config.defaultMode);
-                const resumeCommand = `${command} --resume ${claudeSessionId}`;
-                const newSnapshot = processes.start(resumeCommand, existingSession.cwd, newMode, undefined, { resumedFromSessionId: existingSession.id });
-                storage.saveSession({ ...existingSession, resumedToSessionId: newSnapshot.id });
-                res.status(201).json({ resumedFromSessionId: existingSession.id, resumedClaudeSessionId: claudeSessionId, ...newSnapshot });
-            }
-            else {
-                // No existing wand session — resume directly with cwd from request body
-                const cwd = body.cwd?.trim();
-                if (!cwd) {
-                    res.status(400).json({ error: "未找到对应的会话记录，请提供工作目录 (cwd)。" });
-                    return;
-                }
-                const newMode = normalizeMode(body.mode, config.defaultMode);
-                const resumeCommand = `claude --resume ${claudeSessionId}`;
-                const newSnapshot = processes.start(resumeCommand, cwd, newMode);
-                res.status(201).json({ resumedClaudeSessionId: claudeSessionId, ...newSnapshot });
-            }
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法按 Claude 会话 ID 恢复会话。") });
-        }
-    });
-    app.post("/api/sessions/:id/input", (req, res) => {
-        const body = req.body;
-        const sessionId = req.params.id;
-        const input = body.input ?? "";
-        const view = body.view;
-        const shortcutKey = body.shortcutKey;
-        console.error("[wand] Input request received", { sessionId, inputLength: input.length, view: view ?? "chat" });
-        try {
-            const snapshot = processes.sendInput(sessionId, input, view, shortcutKey);
-            console.error("[wand] Input request succeeded", { sessionId, status: snapshot.status, inputLength: input.length, view: view ?? "chat" });
-            res.json(snapshot);
-        }
-        catch (error) {
-            const response = getInputErrorResponse(error, sessionId);
-            console.error("[wand] Input request failed", {
-                sessionId, inputLength: input.length, view: view ?? "chat",
-                responseStatus: response.statusCode, responsePayload: response.payload,
-                error: getInputDebugMeta(error),
-            });
-            res.status(response.statusCode).json(response.payload);
-        }
-    });
-    app.post("/api/sessions/:id/resize", (req, res) => {
-        const body = req.body;
-        try {
-            const snapshot = processes.resize(req.params.id, body.cols ?? 0, body.rows ?? 0);
-            res.json(snapshot);
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法调整终端大小。") });
-        }
-    });
-    app.post("/api/sessions/:id/approve-permission", (req, res) => {
-        try {
-            res.json(processes.approvePermission(req.params.id));
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法批准该授权请求。") });
-        }
-    });
-    app.post("/api/sessions/:id/deny-permission", (req, res) => {
-        try {
-            res.json(processes.denyPermission(req.params.id));
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法拒绝该授权请求。") });
-        }
-    });
-    app.post("/api/sessions/:id/escalations/:requestId/resolve", (req, res) => {
-        try {
-            const { requestId } = req.params;
-            const body = req.body;
-            res.json(processes.resolveEscalation(req.params.id, requestId, body.resolution));
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法处理该授权请求。") });
-        }
-    });
-    app.post("/api/sessions/:id/stop", (req, res) => {
-        try {
-            res.json(processes.stop(req.params.id));
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法停止会话。") });
-        }
-    });
-    app.delete("/api/sessions/:id", (req, res) => {
-        try {
-            processes.delete(req.params.id);
-            res.json({ ok: true });
-        }
-        catch (error) {
-            res.status(400).json({ error: getErrorMessage(error, "无法删除会话。") });
-        }
-    });
     // ── WebSocket broadcast layer ──
     const server = useHttps
         ? (() => {
@@ -1163,9 +845,16 @@ export async function startServer(config, configPath) {
     // Start configured background sessions after the server is already reachable.
     processes.runStartupCommands();
     // Background update check on startup
-    checkNpmLatestVersion().then(({ current, latest, updateAvailable }) => {
-        if (updateAvailable) {
-            process.stdout.write(`[wand] 发现新版本 ${latest}（当前 ${current}）。运行 npm install -g ${PKG_NAME}@latest 进行更新。\n`);
+    checkNpmLatestVersion().then((info) => {
+        cachedUpdateInfo = info;
+        if (info.updateAvailable) {
+            process.stdout.write(`[wand] 发现新版本 ${info.latest}（当前 ${info.current}）。运行 npm install -g ${PKG_NAME}@latest 进行更新。\n`);
+            // Broadcast update notification to all connected WS clients
+            wsManager.emitEvent({
+                type: "notification",
+                sessionId: "__system__",
+                data: { kind: "update", current: info.current, latest: info.latest },
+            });
         }
     }).catch(() => { });
 }