@co0ontty/wand 1.43.7 → 1.44.0

package/dist/server-session-routes.js

@@ -146,12 +146,10 @@ function isMergeActionAllowed(snapshot) {
 export function registerSessionRoutes(app, processes, structured, storage, defaultMode, config, onSessionCreated) {
     app.get("/api/sessions", (_req, res) => {
         const all = listAllSessionsSlim(processes, structured);
-        console.log("[WAND] GET /api/sessions count:", all.length, "sessions:", all.map(s => ({ id: s.id.substring(0, 8), kind: s.sessionKind, runner: s.runner, status: s.status })));
         res.json(all);
     });
     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, provider: body.provider, worktreeEnabled: body.worktreeEnabled === true, hasPrompt: !!body.prompt, model: body.model, thinkingEffort: body.thinkingEffort }));
         try {
             if (body.provider && body.provider !== "claude" && body.provider !== "codex") {
                 res.status(400).json({ error: "结构化会话当前仅支持 Claude 或 Codex provider。" });
@@ -169,7 +167,6 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                     ? body.thinkingEffort
                     : undefined,
             });
-            console.log("[WAND] structured session created:", JSON.stringify({ id: snapshot.id, sessionKind: snapshot.sessionKind, runner: snapshot.runner, status: snapshot.status }));
             onSessionCreated?.(body.cwd ?? snapshot.cwd);
             const prompt = body.prompt?.trim();
             if (prompt) {
@@ -244,7 +241,6 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         // 让退出 handler 不要把剩余 queuedMessages 清空（默认行为是清空）。
         const preserveQueue = !!req.body?.preserveQueue;
         const idempotencyKey = typeof req.body?.idempotencyKey === "string" ? req.body.idempotencyKey : undefined;
-        console.log("[WAND] POST /api/structured-sessions/:id/messages id:", req.params.id, "input:", input.substring(0, 50), "interrupt:", interrupt, "preserveQueue:", preserveQueue, "idempotencyKey:", idempotencyKey);
         try {
             const snapshot = await structured.sendMessage(req.params.id, input, { interrupt, preserveQueue, idempotencyKey });
             res.json(snapshot);
@@ -430,6 +426,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 tag: typeof body.tag === "string" ? body.tag : undefined,
                 autoTag: !!body.autoTag,
                 push: !!body.push,
+                submodule: !!body.submodule,
             });
             res.json(result);
         }
@@ -510,6 +507,8 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 cwd: snapshot.cwd,
                 pushCommits: body.pushCommits !== false,
                 pushTags: !!body.pushTags,
+                submodule: !!body.submodule,
+                tagName: typeof body.tag === "string" ? body.tag : undefined,
             });
             res.json(result);
         }
@@ -591,10 +590,8 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/sessions/:id/resume", (req, res) => {
         const sessionId = req.params.id;
         const body = req.body;
-        console.log("[WAND] POST /api/sessions/:id/resume sessionId:", sessionId);
         try {
             const existingSession = processes.get(sessionId) || storage.getSession(sessionId);
-            console.log("[WAND] resume lookup: found:", !!existingSession, "sessionKind:", existingSession?.sessionKind, "claudeSessionId:", existingSession?.claudeSessionId);
             if (!existingSession) {
                 res.status(404).json({ error: "会话不存在。" });
                 return;
@@ -644,7 +641,6 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/claude-sessions/:claudeSessionId/resume", (req, res) => {
         const claudeSessionId = String(req.params.claudeSessionId || "").trim();
         const body = req.body;
-        console.log("[WAND] POST /api/claude-sessions/:claudeSessionId/resume claudeSessionId:", claudeSessionId, "cwd:", body.cwd);
         try {
             if (!claudeSessionId) {
                 res.status(400).json({ error: "Claude 会话 ID 不能为空。" });
@@ -722,7 +718,6 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     app.post("/api/codex-sessions/:threadId/resume", express.json(), async (req, res) => {
         const threadId = String(req.params.threadId || "").trim();
         const body = req.body;
-        console.log("[WAND] POST /api/codex-sessions/:threadId/resume threadId:", threadId, "cwd:", body.cwd);
         try {
             if (!threadId) {
                 res.status(400).json({ error: "Codex 会话 ID 不能为空。" });

package/dist/server.js

@@ -1,4 +1,5 @@
 import crypto from "node:crypto";
+import { compareSemver, extractSemver } from "./version-utils.js";
 import compression from "compression";
 import express from "express";
 import { createReadStream, existsSync, readFileSync, writeFileSync } from "node:fs";
@@ -70,56 +71,6 @@ async function checkNpmLatestVersion(forceRefresh = false) {
         updateAvailable: latest !== PKG_VERSION && compareSemver(latest, PKG_VERSION) > 0,
     };
 }
-function compareSemver(a, b) {
-    const parse = (v) => {
-        const [main, ...rest] = v.split("-");
-        const pre = rest.join("-");
-        const mainParts = main.split(".").map((n) => Number(n) || 0);
-        return { mainParts, pre };
-    };
-    const pa = parse(a);
-    const pb = parse(b);
-    for (let i = 0; i < 3; i++) {
-        const diff = (pa.mainParts[i] || 0) - (pb.mainParts[i] || 0);
-        if (diff !== 0)
-            return diff;
-    }
-    // Main version equal — apply semver prerelease rule: no prerelease > with prerelease.
-    if (!pa.pre && pb.pre)
-        return 1;
-    if (pa.pre && !pb.pre)
-        return -1;
-    if (!pa.pre && !pb.pre)
-        return 0;
-    // Both have prerelease: 按 . 分段比较 (数字段数值比, 非数字段字典序), 贴近标准 semver,
-    // 避免跨月/跨年的 debug.MMDDHHMM 后缀因纯字典序而排反。
-    const segA = pa.pre.split(".");
-    const segB = pb.pre.split(".");
-    const segLen = Math.max(segA.length, segB.length);
-    for (let i = 0; i < segLen; i++) {
-        const sa = segA[i];
-        const sb = segB[i];
-        if (sa === undefined)
-            return -1; // 段少者更小
-        if (sb === undefined)
-            return 1;
-        const na = Number(sa);
-        const nb = Number(sb);
-        const aIsNum = sa !== "" && !Number.isNaN(na);
-        const bIsNum = sb !== "" && !Number.isNaN(nb);
-        if (aIsNum && bIsNum) {
-            if (na !== nb)
-                return na < nb ? -1 : 1;
-        }
-        else if (aIsNum !== bIsNum) {
-            return aIsNum ? -1 : 1; // 数字段 < 非数字段
-        }
-        else if (sa !== sb) {
-            return sa < sb ? -1 : 1;
-        }
-    }
-    return 0;
-}
 /** 读取 dist/build-info.json（由 scripts/stamp-build-info.js 在 build 时生成）。 */
 function readBuildInfo() {
     try {
@@ -382,15 +333,6 @@ async function buildStructuredChatPersonaPayload(configPath, config) {
     return { user, assistant };
 }
 // ── Git helpers ──
-async function isGitRepo(dirPath) {
-    try {
-        await execAsync("git rev-parse --is-inside-work-tree", { cwd: dirPath });
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
 async function getGitRepoRoot(dirPath) {
     try {
         const { stdout } = await execAsync("git rev-parse --show-toplevel", { cwd: dirPath });
@@ -576,10 +518,6 @@ function normalizeMode(input, fallback) {
     return isExecutionMode(input) ? input : fallback;
 }
 /** Match a semver-looking token in a file name (with optional pre-release / build metadata). */
-function extractSemverFromName(name) {
-    const match = name.match(/(\d+\.\d+\.\d+(?:[-+][A-Za-z0-9.-]+)?)/);
-    return match ? match[1] : null;
-}
 function resolveAndroidApkDir(configDir, config) {
     const configuredDir = config.android?.apkDir?.trim();
     if (!configuredDir) {
@@ -588,7 +526,7 @@ function resolveAndroidApkDir(configDir, config) {
     return path.isAbsolute(configuredDir) ? configuredDir : path.resolve(configDir, configuredDir);
 }
 function extractAndroidApkVersion(fileName) {
-    return extractSemverFromName(fileName.replace(/\.apk$/i, ""));
+    return extractSemver(fileName.replace(/\.apk$/i, ""));
 }
 async function resolveAndroidApkAsset(configDir, config) {
     if (config.android?.enabled !== true)
@@ -666,7 +604,7 @@ function resolveMacosDmgDir(configDir, config) {
     return path.isAbsolute(configuredDir) ? configuredDir : path.resolve(configDir, configuredDir);
 }
 function extractMacosDmgVersion(fileName) {
-    return extractSemverFromName(fileName.replace(/\.dmg$/i, ""));
+    return extractSemver(fileName.replace(/\.dmg$/i, ""));
 }
 async function resolveMacosDmgAsset(configDir, config) {
     if (config.macos?.enabled !== true)

package/dist/storage.d.ts

@@ -32,7 +32,6 @@ export declare class WandStorage {
     getAppSecret(): string | null;
     /** Persist appSecret in database (DB is the authoritative source after first migration) */
     setAppSecret(value: string): void;
-    hasAppSecret(): boolean;
     saveAuthSession(token: string, expiresAt: number): void;
     getAuthSession(token: string): PersistedAuthSession | null;
     deleteAuthSession(token: string): void;

package/dist/storage.js

@@ -310,9 +310,6 @@ export class WandStorage {
     setAppSecret(value) {
         this.setConfigValue("appSecret", value);
     }
-    hasAppSecret() {
-        return this.getAppSecret() !== null;
-    }
     // ============ Auth Session Methods ============
     saveAuthSession(token, expiresAt) {
         this.db

package/dist/structured-session-manager.d.ts

@@ -88,10 +88,6 @@ export declare class StructuredSessionManager {
         idempotencyKey?: string;
         preserveQueue?: boolean;
     }): Promise<SessionSnapshot>;
-    /** Approve a pending permission request. */
-    approvePermission(sessionId: string): SessionSnapshot;
-    /** Deny a pending permission request. */
-    denyPermission(sessionId: string): SessionSnapshot;
     /**
      * Reorder the pending queued messages. `order` is a permutation of the current
      * indices, e.g. `[2, 0, 1]` means "move the third queued message to the front,
@@ -125,7 +121,6 @@ export declare class StructuredSessionManager {
     private emitStructuredSnapshot;
     private flushNextQueuedMessage;
     private emit;
-    private resolvePermission;
     private incrementApprovalStats;
     private buildCodexArgs;
     private runCodexStreaming;

package/dist/structured-session-manager.js

@@ -7,8 +7,8 @@ import path from "node:path";
 import { query as sdkQuery } from "@anthropic-ai/claude-agent-sdk";
 import { prepareSessionWorktree } from "./git-worktree.js";
 import { truncateMessagesForTransport } from "./message-truncator.js";
-import { buildChildEnv } from "./env-utils.js";
-import { buildLanguageDirective } from "./language-prompt.js";
+import { buildChildEnv, isRunningAsRoot } from "./env-utils.js";
+import { buildLanguageDirective, buildManagedAutonomyDirective } from "./language-prompt.js";
 function defaultStructuredRunner(provider) {
     return provider === "codex" ? "codex-cli-exec" : "claude-cli-print";
 }
@@ -169,9 +169,6 @@ const STREAM_EMIT_DEBOUNCE_MS = 16;
  *  authoritative final snapshot. */
 const STREAM_SAVE_THROTTLE_MS = 200;
 const ARCHIVE_AFTER_MS = 1000 * 60 * 60 * 24;
-function isRunningAsRoot() {
-    return process.getuid?.() === 0 || process.geteuid?.() === 0;
-}
 /**
  * 检测当前系统是否使用 musl libc（Alpine Linux 等）。
  * Node.js 进程报告中 glibcVersionRuntime 仅在 glibc 系统存在；musl 系统为 undefined。
@@ -385,9 +382,7 @@ function buildAppendSystemPromptParts(language, mode) {
     const isChinese = trimmedLanguage === "中文";
     const parts = [];
     if (mode === "managed") {
-        parts.push(isChinese
-            ? "你正在完全托管的自主模式下运行。用户可能无法及时回复问题或确认。你必须独立做出所有决策——自行选择最佳方案，而不是向用户询问偏好、确认或澄清。如果有多种可行方案，选择你认为最合适的并继续执行。除非任务本身存在根本性的歧义且无法合理推断，否则不要等待用户输入。果断行动，自主决策。"
-            : "You are running in a fully managed, autonomous mode. The user may not be available to respond to questions or confirmations in a timely manner. You MUST make all decisions independently — choose the best approach yourself instead of asking the user for preferences, confirmations, or clarifications. If multiple approaches are viable, pick the one you judge most appropriate and proceed. Never block on user input unless the task is fundamentally ambiguous and cannot be reasonably inferred. Be decisive and self-directed.");
+        parts.push(buildManagedAutonomyDirective(isChinese));
     }
     if (trimmedLanguage) {
         const directive = buildLanguageDirective(trimmedLanguage);
@@ -610,7 +605,6 @@ export class StructuredSessionManager {
         if (opts?.idempotencyKey) {
             const mapKey = `${id}:${opts.idempotencyKey}`;
             if (this.seenIdempotencyKeys.has(mapKey)) {
-                console.log("[WAND] sendMessage: duplicate idempotency key rejected", { id, key: opts.idempotencyKey });
                 const err = new Error("检测到重复发送，已拦截。");
                 err.code = "duplicate_idempotency_key";
                 throw err;
@@ -773,17 +767,6 @@ export class StructuredSessionManager {
             throw error;
         }
     }
-    // ---------------------------------------------------------------------------
-    // Permission resolution (called from server routes)
-    // ---------------------------------------------------------------------------
-    /** Approve a pending permission request. */
-    approvePermission(sessionId) {
-        return this.resolvePermission(sessionId, true);
-    }
-    /** Deny a pending permission request. */
-    denyPermission(sessionId) {
-        return this.resolvePermission(sessionId, false);
-    }
     /**
      * Reorder the pending queued messages. `order` is a permutation of the current
      * indices, e.g. `[2, 0, 1]` means "move the third queued message to the front,
@@ -1055,31 +1038,6 @@ export class StructuredSessionManager {
             this.emitEvent(event);
         }
     }
-    resolvePermission(sessionId, approved) {
-        const session = this.requireSession(sessionId);
-        const scope = session.pendingEscalation?.scope;
-        if (approved && scope) {
-            this.incrementApprovalStats(session, scope);
-        }
-        const updated = {
-            ...session,
-            pendingEscalation: null,
-            permissionBlocked: false,
-            lastEscalationResult: session.pendingEscalation ? {
-                requestId: session.pendingEscalation.requestId,
-                resolution: approved ? "approve_once" : "deny",
-                reason: approved ? "user_approved" : "user_denied",
-            } : session.lastEscalationResult ?? null,
-        };
-        this.sessions.set(sessionId, updated);
-        this.storage.saveSession(updated);
-        this.emit({
-            type: "status",
-            sessionId,
-            data: { permissionBlocked: false, approvalStats: updated.approvalStats, sessionKind: "structured" },
-        });
-        return updated;
-    }
     incrementApprovalStats(session, scope) {
         const prev = session.approvalStats ?? { tool: 0, command: 0, file: 0, total: 0 };
         const stats = { ...prev };
@@ -2417,7 +2375,7 @@ export class StructuredSessionManager {
             output: turnState.result,
             claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
             messages: msgs,
-            queuedMessages: interruptPrompt ? [] : current.queuedMessages,
+            queuedMessages: interruptPrompt && !this.preserveQueueOnInterrupt.has(sessionId) ? [] : current.queuedMessages,
             pendingEscalation: null,
             permissionBlocked: false,
             structuredState: {
@@ -2437,6 +2395,8 @@ export class StructuredSessionManager {
             return;
         if (interruptPrompt) {
             this.interruptedWith.delete(sessionId);
+            // 与 codex/cli runner 对齐：清掉"保留队列"标记，避免 stale flag 影响下一次普通 interrupt。
+            this.preserveQueueOnInterrupt.delete(sessionId);
             setImmediate(() => {
                 this.sendMessage(sessionId, interruptPrompt).catch((err) => {
                     console.error("[WAND] sdk interrupt-and-send failed:", err);

package/dist/tui/commands.js

@@ -5,11 +5,13 @@
  * 命令本身不直接写 stdout / stderr —— TUI 模式下 stderr 已经被 log-bus 劫持。
  */
 import { spawn, spawnSync } from "node:child_process";
+import { compareSemver } from "../version-utils.js";
 import { existsSync, mkdirSync, writeFileSync, unlinkSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import process from "node:process";
 import { installPackageGloballySync, resolveGlobalWandCli } from "../npm-update-utils.js";
+import { whichSync } from "../path-repair.js";
 import { computeRelaunch } from "../relaunch.js";
 const PACKAGE_NAME = "@co0ontty/wand";
 // ─── 重启 ────────────────────────────────────────────────────────────────
@@ -440,9 +442,9 @@ function resolveWandBin(ctx) {
     const argv1 = process.argv[1];
     if (argv1 && existsSync(argv1))
         return argv1;
-    const which = spawnSync("which", ["wand"], { encoding: "utf8" });
-    if (which.status === 0 && which.stdout)
-        return which.stdout.trim();
+    const found = whichSync("wand");
+    if (found)
+        return found;
     return "wand";
 }
 /**
@@ -676,16 +678,4 @@ function uninstallLaunchdService(scope) {
 function errMsg(err) {
     return err instanceof Error ? err.message : String(err);
 }
-/** 简易语义化版本比较；返回正数 = a > b。 */
-function compareSemver(a, b) {
-    const pa = a.replace(/^v/, "").split(/[.\-+]/).map((s) => Number.parseInt(s, 10));
-    const pb = b.replace(/^v/, "").split(/[.\-+]/).map((s) => Number.parseInt(s, 10));
-    const len = Math.max(pa.length, pb.length);
-    for (let i = 0; i < len; i++) {
-        const x = Number.isFinite(pa[i]) ? pa[i] : 0;
-        const y = Number.isFinite(pb[i]) ? pb[i] : 0;
-        if (x !== y)
-            return x - y;
-    }
-    return 0;
-}
+// compareSemver 已统一到 ../version-utils.ts

package/dist/types.d.ts

@@ -198,6 +198,8 @@ export interface GitStatusResult {
     };
     /** Most recent tag reachable from HEAD (`git describe --tags --abbrev=0`), if any. */
     latestTag?: string;
+    /** True 当仓库声明了 submodule（任一改动条目为 submodule）。前端据此决定是否渲染 Submodule 球。 */
+    hasSubmodule?: boolean;
     error?: string;
 }
 export interface QuickCommitResult {

package/dist/version-utils.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 语义化版本工具：单一真源，供 server / tui / path-repair / models 共用，
+ * 避免各处各写一份比较/提取逻辑导致 debug.MMDDHHMM 后缀排序不一致。
+ */
+/** 从任意文本中提取 X.Y.Z[-/+后缀] 形式的版本号（带捕获组）。 */
+export declare const SEMVER_PATTERN: RegExp;
+/** 提取文本中的第一个语义化版本号，没有则返回 null。 */
+export declare function extractSemver(text: string): string | null;
+/**
+ * 比较两个语义化版本号，返回正数 = a > b，负数 = a < b，0 = 相等。
+ * - 容忍前导 `v`（如 nvm/fnm 的 v18.0.0 目录名）。
+ * - 主版本逐段数值比较；相等时按 semver 规则：无 prerelease > 有 prerelease。
+ * - 两者都有 prerelease 时按 `.` 分段比较（数字段数值比、非数字段字典序），
+ *   贴近标准 semver，避免 debug.MMDDHHMM 后缀因纯字典序而跨月/跨年排反。
+ */
+export declare function compareSemver(a: string, b: string): number;

package/dist/version-utils.js

@@ -0,0 +1,66 @@
+/**
+ * 语义化版本工具：单一真源，供 server / tui / path-repair / models 共用，
+ * 避免各处各写一份比较/提取逻辑导致 debug.MMDDHHMM 后缀排序不一致。
+ */
+/** 从任意文本中提取 X.Y.Z[-/+后缀] 形式的版本号（带捕获组）。 */
+export const SEMVER_PATTERN = /(\d+\.\d+\.\d+(?:[-+][A-Za-z0-9.-]+)?)/;
+/** 提取文本中的第一个语义化版本号，没有则返回 null。 */
+export function extractSemver(text) {
+    const match = text.match(SEMVER_PATTERN);
+    return match ? match[1] : null;
+}
+/**
+ * 比较两个语义化版本号，返回正数 = a > b，负数 = a < b，0 = 相等。
+ * - 容忍前导 `v`（如 nvm/fnm 的 v18.0.0 目录名）。
+ * - 主版本逐段数值比较；相等时按 semver 规则：无 prerelease > 有 prerelease。
+ * - 两者都有 prerelease 时按 `.` 分段比较（数字段数值比、非数字段字典序），
+ *   贴近标准 semver，避免 debug.MMDDHHMM 后缀因纯字典序而跨月/跨年排反。
+ */
+export function compareSemver(a, b) {
+    const parse = (v) => {
+        const [main, ...rest] = v.replace(/^v/, "").split("-");
+        const pre = rest.join("-");
+        const mainParts = main.split(".").map((n) => Number(n) || 0);
+        return { mainParts, pre };
+    };
+    const pa = parse(a);
+    const pb = parse(b);
+    for (let i = 0; i < 3; i++) {
+        const diff = (pa.mainParts[i] || 0) - (pb.mainParts[i] || 0);
+        if (diff !== 0)
+            return diff;
+    }
+    // Main version equal — apply semver prerelease rule: no prerelease > with prerelease.
+    if (!pa.pre && pb.pre)
+        return 1;
+    if (pa.pre && !pb.pre)
+        return -1;
+    if (!pa.pre && !pb.pre)
+        return 0;
+    const segA = pa.pre.split(".");
+    const segB = pb.pre.split(".");
+    const segLen = Math.max(segA.length, segB.length);
+    for (let i = 0; i < segLen; i++) {
+        const sa = segA[i];
+        const sb = segB[i];
+        if (sa === undefined)
+            return -1; // 段少者更小
+        if (sb === undefined)
+            return 1;
+        const na = Number(sa);
+        const nb = Number(sb);
+        const aIsNum = sa !== "" && !Number.isNaN(na);
+        const bIsNum = sb !== "" && !Number.isNaN(nb);
+        if (aIsNum && bIsNum) {
+            if (na !== nb)
+                return na < nb ? -1 : 1;
+        }
+        else if (aIsNum !== bIsNum) {
+            return aIsNum ? -1 : 1; // 数字段 < 非数字段
+        }
+        else if (sa !== sb) {
+            return sa < sb ? -1 : 1;
+        }
+    }
+    return 0;
+}