@co0ontty/wand 4.66.0 → 4.67.0-beta.gf935003

package/README.md

@@ -322,6 +322,7 @@ wand/
 ├── android/                      # Android 客户端（submodule）
 ├── ios/                          # iOS 客户端（submodule）
 ├── macos/                        # macOS 客户端（submodule）
+├── 架构图.md                     # 运行时架构与代码边界（mermaid）
 └── docs/                         # 文档与截图
 ```
 

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "835dbaf124ea4532285528a48054bb550d7cdb47",
-  "builtAt": "2026-09-16T09:25:29.444Z",
-  "version": "4.66.0",
-  "channel": "stable"
+  "commit": "f935003c09101e33e46544770329311baa98c26e",
+  "builtAt": "2026-09-17T01:35:10.525Z",
+  "version": "4.67.0-beta.gf935003",
+  "channel": "beta"
 }

package/dist/git-worktree.js

@@ -409,7 +409,16 @@ export async function mergeSessionWorktreeAsync(options) {
 }
 export function prepareSessionWorktree(options) {
     const resolvedCwd = path.resolve(options.cwd);
-    const repoRoot = runGit(["rev-parse", "--show-toplevel"], resolvedCwd);
+    let repoRoot;
+    try {
+        repoRoot = runGit(["rev-parse", "--show-toplevel"], resolvedCwd);
+    }
+    catch (error) {
+        if (/not a git repository/i.test(getGitErrorMessage(error))) {
+            throw new Error("当前目录不是 Git 仓库。请选择 Git 仓库，或关闭“独立 worktree 隔离”后重试。");
+        }
+        throw error;
+    }
     if (!repoRoot || !existsSync(repoRoot)) {
         throw new Error("当前目录不在 git 仓库中，无法启用 worktree 模式。");
     }

package/dist/server-file-routes.js

@@ -182,7 +182,11 @@ export function registerFileRoutes(app, deps) {
             return;
         }
         try {
-            const fileStat = await stat(resolvedPath);
+            const fileStat = await lstat(resolvedPath);
+            if (fileStat.isSymbolicLink()) {
+                res.status(400).json({ error: "无法保存符号链接，请打开目标文件后编辑。" });
+                return;
+            }
             if (fileStat.isDirectory()) {
                 res.status(400).json({ error: "目标是目录，无法写入。" });
                 return;

package/dist/server-session-routes.js

@@ -401,7 +401,8 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         }
         try {
             const tree = currentDirectoryTree();
-            if (!directoryTreeContainsPath(tree.roots, directoryPath)) {
+            const hasWorkspace = storage.listWorkspaces().some((workspace) => workspace.kind !== "global" && normalizeSessionDirectory(workspace.cwd) === directoryPath);
+            if (!directoryTreeContainsPath(tree.roots, directoryPath) && !hasWorkspace) {
                 res.status(404).json({ error: "未找到该会话目录。" });
                 return;
             }

package/dist/server-settings-routes.js

@@ -105,30 +105,36 @@ export function registerSettingsRoutes(app, deps) {
         });
     }));
     app.get("/api/settings/env-preview", (req, res, next) => {
-        if (req.query.reveal === "1")
-            return requireAdmin(req, res, next);
-        next();
-    }, (req, res) => {
-        const inheritEnv = config.inheritEnv !== false;
-        const env = buildChildEnv(inheritEnv, {
-            WAND_MODE: "<runtime>",
-            WAND_AUTO_CONFIRM: "<runtime>",
-            WAND_AUTO_EDIT: "<runtime>",
-        });
         const reveal = req.query.reveal === "1" || req.query.reveal === "true";
-        const sensitivePattern = /(KEY|TOKEN|SECRET|PASSWORD|AUTH|CREDENTIAL|COOKIE|SESSION)/i;
-        const entries = Object.keys(env).sort().map((name) => {
-            const raw = env[name] ?? "";
-            const sensitive = sensitivePattern.test(name);
-            const placeholder = raw.startsWith("<") && raw.endsWith(">");
-            return {
-                name,
-                value: sensitive && !reveal && !placeholder ? "***" : raw,
-                length: raw.length,
-                sensitive,
-            };
-        });
-        res.json({ inheritEnv, total: entries.length, reveal, entries });
+        if (reveal) {
+            return requireAdmin(req, res, (error) => {
+                if (error)
+                    return next(error);
+                sendEnvironmentPreview(true);
+            });
+        }
+        sendEnvironmentPreview(false);
+        function sendEnvironmentPreview(reveal) {
+            const inheritEnv = config.inheritEnv !== false;
+            const env = buildChildEnv(inheritEnv, {
+                WAND_MODE: "<runtime>",
+                WAND_AUTO_CONFIRM: "<runtime>",
+                WAND_AUTO_EDIT: "<runtime>",
+            });
+            const sensitivePattern = /(KEY|TOKEN|SECRET|PASSWORD|AUTH|CREDENTIAL|COOKIE|SESSION)/i;
+            const entries = Object.keys(env).sort().map((name) => {
+                const raw = env[name] ?? "";
+                const sensitive = sensitivePattern.test(name);
+                const placeholder = raw.startsWith("<") && raw.endsWith(">");
+                return {
+                    name,
+                    value: sensitive && !reveal && !placeholder ? "***" : raw,
+                    length: raw.length,
+                    sensitive,
+                };
+            });
+            res.json({ inheritEnv, total: entries.length, reveal, entries });
+        }
     });
     app.post("/api/settings/system-ai/import", requireAdmin, (_req, res) => {
         const imported = discoverCliSystemAiConfigs();

package/dist/server-workspace-routes.js

@@ -485,8 +485,20 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
             groups.set(id, created);
             return created;
         };
+        const tasksByWorkspace = new Map(workspaces.map((workspace) => [
+            workspace.id, storage.listWorkspaceTasks(workspace.id),
+        ]));
+        const sessionsByTask = new Map();
+        const taskSessions = (taskId) => {
+            let snapshots = sessionsByTask.get(taskId);
+            if (!snapshots) {
+                snapshots = storage.listSessionsByWorkspaceTask(taskId);
+                sessionsByTask.set(taskId, snapshots);
+            }
+            return snapshots;
+        };
         const appendTask = (target, workspace, task) => {
-            const allSessions = storage.listSessionsByWorkspaceTask(task.id);
+            const allSessions = taskSessions(task.id);
             const sessions = allSessions
                 .slice(0, sessionLimit ?? undefined)
                 .map((session) => ({
@@ -508,7 +520,7 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
             if (!base)
                 continue;
             const global = isGlobalWorkspace(workspace);
-            for (const task of storage.listWorkspaceTasks(workspace.id).slice(0, taskLimit ?? undefined)) {
+            for (const task of tasksByWorkspace.get(workspace.id).slice(0, taskLimit ?? undefined)) {
                 const taskCwd = taskRuntimeCwd(task, workspace);
                 const target = global && taskCwd
                     && normalizeProjectCwd(taskCwd) !== normalizeProjectCwd(workspace.cwd)
@@ -518,9 +530,10 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
             }
         }
         const taskBoundSessionIds = new Set();
-        for (const workspace of workspaces) {
-            for (const task of storage.listWorkspaceTasks(workspace.id)) {
-                for (const session of storage.listSessionsByWorkspaceTask(task.id))
+        // Membership must include tasks/sessions hidden by the response limits.
+        for (const tasks of tasksByWorkspace.values()) {
+            for (const task of tasks) {
+                for (const session of taskSessions(task.id))
                     taskBoundSessionIds.add(session.id);
             }
         }

package/dist/server.js

@@ -319,8 +319,8 @@ export async function startServer(config, configPath, options = {}) {
     const terminalHost = options.terminalHost ?? await createTerminalHost(configPath);
     const processes = new ProcessManager(config, storage, configDir, terminalHost);
     const structuredLogger = new SessionLogger(configDir, config.shortcutLogMaxBytes);
-    // Only the daemon-backed host keeps structured CLI runs alive across restarts;
-    // the in-process fallback keeps the legacy die-with-server lifecycle.
+    // Production startup requires the daemon-backed host so CLI runs outlive web
+    // restarts. In-process hosts are retained only for explicit test injection.
     const structuredExecHost = terminalHost instanceof TerminalDaemonClient ? terminalHost : undefined;
     const structuredSessions = new StructuredSessionManager(storage, config, structuredLogger, undefined, {}, structuredExecHost);
     const sessionRegistry = new SessionRegistry(processes, structuredSessions, storage);

package/dist/session-registry.js

@@ -1,9 +1,5 @@
 import { cleanupWorktreeSync } from "./git-worktree.js";
 import { inferProviderFromCommand } from "./session-provider.js";
-function slimSnapshot(snapshot) {
-    const { output: _output, messages: _messages, ...slim } = snapshot;
-    return { ...slim, output: "" };
-}
 /** 读取 `hidden_claude_session_ids`；坏数据 / 空值按空集合处理，不抛错。 */
 export function readHiddenSessionIds(storage) {
     const raw = storage.getConfigValue("hidden_claude_session_ids");
@@ -82,9 +78,9 @@ export class SessionRegistry {
             if (!byId.has(snapshot.id))
                 byId.set(snapshot.id, snapshot);
         }
-        for (const snapshot of this.storage.loadSessions()) {
+        for (const snapshot of this.storage.loadSessionsSlim()) {
             if (!byId.has(snapshot.id))
-                byId.set(snapshot.id, slimSnapshot(snapshot));
+                byId.set(snapshot.id, snapshot);
         }
         return Array.from(byId.values()).sort((a, b) => b.startedAt.localeCompare(a.startedAt));
     }

package/dist/storage.d.ts

@@ -229,6 +229,8 @@ export declare class WandStorage {
     getSession(id: string): SessionSnapshot | null;
     getLatestSessionByClaudeSessionId(claudeSessionId: string): SessionSnapshot | null;
     loadSessions(): SessionSnapshot[];
+    /** List durable metadata without reading or parsing output/messages payloads. */
+    loadSessionsSlim(): SessionSnapshot[];
     private mapSessionRow;
     deleteSession(id: string): void;
 }

package/dist/storage.js

@@ -251,8 +251,8 @@ function mapWorktreeMergeFields(row) {
         worktreeMergeInfo: parseWorktreeMergeInfo(row.worktree_merge_info) ?? null,
     };
 }
-function sessionSelectFields() {
-    return `id, session_source, automation_id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, pty_output_seq, archived, archived_at, claude_session_id, messages, queued_messages, queued_message_skills, structured_state
+function sessionSelectFields(slim = false) {
+    return `id, session_source, automation_id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, ${slim ? "'' AS output" : "output"}, pty_output_seq, archived, archived_at, claude_session_id, ${slim ? "NULL AS messages" : "messages"}, queued_messages, queued_message_skills, structured_state
              , resumed_from_session_id, auto_recovered, worktree_enabled, worktree_info, worktree_merge_status, worktree_merge_info, title, description, session_options, workspace_id, workspace_task_id`;
 }
 function mapWorkspaceKind(raw) {
@@ -1149,11 +1149,11 @@ export class WandStorage {
               COALESCE(MAX(ended_at), '') AS ended,
               COALESCE(MAX(title), '') AS title
        FROM command_sessions`).get();
-        const tasks = this.db.prepare(`SELECT COUNT(*) AS count,
-              COALESCE(MAX(created_at), '') AS created,
-              COALESCE(MAX(last_opened_at), '') AS opened,
-              COALESCE(MAX(layout_revision), 0) AS revision
-       FROM workspace_tasks`).get();
+        // Per-task metadata catches edits even when another task owns the maximum
+        // timestamp/revision. Layout payloads are represented by their own revision.
+        const tasks = this.db.prepare(`SELECT id, workspace_id, name, status, cwd, worktree_json, milestone_id,
+              created_at, last_opened_at, layout_revision
+       FROM workspace_tasks ORDER BY id`).all();
         const workspaces = this.db.prepare(`SELECT COUNT(*) AS count, COALESCE(MAX(last_opened_at), '') AS opened FROM workspaces`).get();
         // 名称也进指纹：改名（含工作区/项目名与目录自定义名）后客户端才肯重拉任务列表。
         const names = this.db.prepare(`SELECT
@@ -1725,6 +1725,11 @@ export class WandStorage {
             .all();
         return rows.map((row) => this.mapSessionRow(row));
     }
+    /** List durable metadata without reading or parsing output/messages payloads. */
+    loadSessionsSlim() {
+        const rows = this.db.prepare(`SELECT ${sessionSelectFields(true)} FROM command_sessions ORDER BY started_at DESC`).all();
+        return rows.map((row) => this.mapSessionRow(row));
+    }
     mapSessionRow(row) {
         return mapSessionCore(row);
     }

package/dist/structured-pi-adapter.d.ts

@@ -2,12 +2,17 @@ import { spawn } from "node:child_process";
 import type { StructuredExecHost } from "./structured-exec-host.js";
 import type { StructuredRunnerAdapter, StructuredRunnerContext, StructuredRunnerExecution, StructuredRunnerObserver, StructuredRunnerTurnState } from "./structured-runner.js";
 import type { SessionSnapshot } from "./types.js";
+type PiTurnState = StructuredRunnerTurnState & {
+    pendingSessionId?: string;
+};
+export declare function isMissingPiSession(error: string | null | undefined, sessionId: string | null | undefined): boolean;
 export declare function buildPiArgs(session: SessionSnapshot, prompt: string): string[];
 export declare function piToolName(name: string): string;
-export declare function applyPiEvent(state: StructuredRunnerTurnState, event: Record<string, unknown>): string | null;
+export declare function applyPiEvent(state: PiTurnState, event: Record<string, unknown>): string | null;
 export declare class PiRunner implements StructuredRunnerAdapter {
     private readonly spawnProcess;
     private readonly execHost?;
     constructor(spawnProcess?: typeof spawn, execHost?: StructuredExecHost | undefined);
     start(context: StructuredRunnerContext, observer: StructuredRunnerObserver): StructuredRunnerExecution;
 }
+export {};

package/dist/structured-pi-adapter.js

@@ -2,6 +2,9 @@ import { spawn } from "node:child_process";
 import { startStructuredCli } from "./structured-exec-pump.js";
 import { asRecord } from "./structured-content.js";
 import { thinkingEffortToPiLevel } from "./structured-provider-common.js";
+export function isMissingPiSession(error, sessionId) {
+    return !!sessionId && !!error?.includes(`No session found matching '${sessionId}'`);
+}
 function textContent(value) {
     if (typeof value === "string")
         return value;
@@ -88,9 +91,15 @@ function applyPiAssistantMessage(state, message) {
     return null;
 }
 export function applyPiEvent(state, event) {
+    // Pi announces the ID before it writes a session file. The file is only
+    // created when an assistant message is saved, so this ID is not resumable yet.
     if (event.type === "session" && typeof event.id === "string")
-        state.sessionId = event.id;
+        state.pendingSessionId = event.id;
+    if (event.type === "turn_start" || event.type === "message_start" || event.type === "tool_execution_start") {
+        state.phase = "responding";
+    }
     if (event.type === "message_update") {
+        state.phase = "responding";
         const update = asRecord(event.assistantMessageEvent);
         const delta = typeof update?.delta === "string" ? update.delta : "";
         if (update?.type === "text_delta" && delta) {
@@ -136,13 +145,25 @@ export function applyPiEvent(state, event) {
     }
     if (event.type === "message_end" || event.type === "turn_end") {
         const message = asRecord(event.message);
-        if (message?.role === "assistant")
-            return applyPiAssistantMessage(state, message);
+        if (message?.role === "assistant") {
+            if (state.pendingSessionId)
+                state.sessionId = state.pendingSessionId;
+            const error = applyPiAssistantMessage(state, message);
+            if (event.type === "turn_end") {
+                const content = Array.isArray(message.content) ? message.content : [];
+                const hasToolCall = content.some((part) => asRecord(part)?.type === "toolCall");
+                if (!hasToolCall && message.stopReason !== "toolUse")
+                    state.phase = "background";
+            }
+            return error;
+        }
     }
     if (event.type === "agent_end" && Array.isArray(event.messages)) {
         for (const raw of event.messages) {
             const message = asRecord(raw);
             if (message?.role === "assistant") {
+                if (state.pendingSessionId)
+                    state.sessionId = state.pendingSessionId;
                 const error = applyPiAssistantMessage(state, message);
                 if (error)
                     return error;
@@ -160,7 +181,13 @@ export class PiRunner {
     }
     start(context, observer) {
         const args = buildPiArgs(context.session, context.prompt);
-        const state = { blocks: [], result: "", sessionId: context.session.claudeSessionId, model: context.session.selectedModel ?? undefined };
+        const state = {
+            blocks: [],
+            result: "",
+            sessionId: context.session.claudeSessionId,
+            model: context.session.selectedModel ?? undefined,
+            phase: "responding",
+        };
         let primaryError = null;
         return startStructuredCli({
             sessionId: context.session.id,

package/dist/structured-runner.d.ts

@@ -5,6 +5,8 @@ export interface StructuredRunnerTurnState {
     sessionId: string | null;
     model?: string;
     usage?: ConversationTurn["usage"];
+    /** Provider turn phase when the CLI stays alive after its visible reply. */
+    phase?: "responding" | "background";
 }
 export interface StructuredRunnerContext {
     session: SessionSnapshot;

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

@@ -101,14 +101,19 @@ export declare class StructuredSessionManager {
     private readonly piRunner;
     /** Structured CLI runs that were mid-flight when the previous web process died. */
     private pendingRecoveryIds;
+    private detachedRecoveryPromise;
+    private detachedRecoveryRetryTimer;
+    private detachedRecoveryFailureLogged;
     private disposed;
     constructor(storage: WandStorage, config: WandConfig, logger?: SessionLogger | null, sdkQueryFactory?: typeof sdkQuery, runners?: StructuredSessionManagerRunners, execHost?: StructuredExecHost | undefined);
     private archiveExpiredSessions;
     setEventEmitter(emitEvent: (event: ProcessEvent) => void): void;
     /** Stop every runner and flush terminal state before storage is closed. */
     dispose(): void;
-    /** Called once after startup wiring; safe to skip when no host or candidates. */
+    /** Called once after startup wiring; transient daemon failures retry automatically. */
     recoverDetachedRuns(): Promise<void>;
+    private recoverDetachedRunsOnce;
+    private scheduleDetachedRecovery;
     private resumeDetachedRun;
     private finalizeRecoveredRun;
     private trackStreamEmitTimer;