@co0ontty/wand 4.47.0 → 4.48.0

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "8f7762a1d3d16afbb54650544c054f7e26df7c07",
-  "builtAt": "2026-08-23T03:26:15.182Z",
-  "version": "4.47.0",
+  "commit": "2c450db11f34504be1a3e73354679a0231a91c43",
+  "builtAt": "2026-08-23T13:37:45.889Z",
+  "version": "4.48.0",
   "channel": "stable"
 }

package/dist/config.d.ts

@@ -7,7 +7,7 @@ import type { WandStorage } from "./storage.js";
  * 升级路径：老 JSON 里仍存有这些字段时，首次启动会被搬到 DB（见 migrateLegacyPreferencesToDb），
  * 然后下一次 saveConfig 写回 JSON 时它们会被剥离（见 stripPreferenceFields）。
  */
-export declare const PREFERENCE_KEYS: readonly ["defaultProvider", "defaultSessionKind", "defaultMode", "defaultCwd", "defaultModel", "defaultCodexModel", "defaultOpenCodeModel", "defaultGrokModel", "defaultQoderModel", "defaultPiModel", "commitCli", "commitModel", "commitAiSource", "systemAi", "defaultThinkingEffort", "structuredRunner", "language", "cardDefaults", "inheritEnv"];
+export declare const PREFERENCE_KEYS: readonly ["defaultProvider", "defaultSessionKind", "defaultTaskWorktree", "defaultMode", "defaultCwd", "defaultModel", "defaultCodexModel", "defaultOpenCodeModel", "defaultGrokModel", "defaultQoderModel", "defaultPiModel", "commitCli", "commitModel", "commitAiSource", "systemAi", "defaultThinkingEffort", "structuredRunner", "language", "cardDefaults", "inheritEnv"];
 export type PreferenceKey = (typeof PREFERENCE_KEYS)[number];
 export declare function isPreferenceKey(key: string): key is PreferenceKey;
 export declare const defaultConfig: () => WandConfig;

package/dist/config.js

@@ -24,6 +24,7 @@ const DEFAULT_CONFIG_FILE = "config.json";
 export const PREFERENCE_KEYS = [
     "defaultProvider",
     "defaultSessionKind",
+    "defaultTaskWorktree",
     "defaultMode",
     "defaultCwd",
     "defaultModel",
@@ -56,6 +57,7 @@ export const defaultConfig = () => ({
     password: "change-me",
     defaultProvider: "claude",
     defaultSessionKind: "structured",
+    defaultTaskWorktree: true,
     // 非 root 启动时才有资格用 Claude 的 permission-bypass（root 会被 Claude CLI 拒绝），
     // 所以这种环境下把默认执行模式抬到「托管」——开箱即得自动确认权限的全自主体验。
     // root 启动则保守回落到「default」（托管在 root 下也只能降级成 acceptEdits）。
@@ -296,6 +298,11 @@ export function applyStoragePreferences(config, storage) {
         if (v === "pty" || v === "structured")
             config.defaultSessionKind = v;
     }
+    if (storage.hasPreference(preferenceStorageKey("defaultTaskWorktree"))) {
+        const v = storage.getPreference(preferenceStorageKey("defaultTaskWorktree"), defaults.defaultTaskWorktree ?? true);
+        if (typeof v === "boolean")
+            config.defaultTaskWorktree = v;
+    }
     if (storage.hasPreference(preferenceStorageKey("defaultMode"))) {
         const v = storage.getPreference(preferenceStorageKey("defaultMode"), defaults.defaultMode);
         if (isExecutionMode(v))
@@ -399,6 +406,13 @@ export function writePreferenceToStorage(config, storage, key, value, options =
             config.defaultSessionKind = value;
             break;
         }
+        case "defaultTaskWorktree": {
+            if (typeof value !== "boolean")
+                throw new Error("defaultTaskWorktree 必须是布尔值。");
+            storage.setPreference(dbKey, value);
+            config.defaultTaskWorktree = value;
+            break;
+        }
         case "defaultMode": {
             if (!isExecutionMode(value))
                 throw new Error(`无效执行模式: ${value}`);
@@ -691,6 +705,7 @@ function mergeWithDefaults(input) {
         cardDefaults: normalizeCardDefaults(input.cardDefaults),
         defaultProvider: input.defaultProvider === "codex" || input.defaultProvider === "opencode" || input.defaultProvider === "grok" || input.defaultProvider === "qoder" || input.defaultProvider === "pi" ? input.defaultProvider : "claude",
         defaultSessionKind: input.defaultSessionKind === "pty" ? "pty" : "structured",
+        defaultTaskWorktree: typeof input.defaultTaskWorktree === "boolean" ? input.defaultTaskWorktree : defaults.defaultTaskWorktree,
         defaultModel: typeof input.defaultModel === "string" ? input.defaultModel.trim() : defaults.defaultModel,
         defaultCodexModel: typeof input.defaultCodexModel === "string" ? input.defaultCodexModel.trim() : defaults.defaultCodexModel,
         defaultOpenCodeModel: typeof input.defaultOpenCodeModel === "string" ? input.defaultOpenCodeModel.trim() : defaults.defaultOpenCodeModel,

package/dist/mission-types.d.ts

@@ -14,6 +14,8 @@ export interface Mission {
     prompt: string;
     cwd: string;
     status: MissionStatus;
+    /** 可选关联的任务（workspace task）：派发的 attempt 会话绑定该任务。 */
+    taskId?: string | null;
     worktree: MissionWorktreeOptions;
     createdAt: string;
     updatedAt: string;
@@ -78,6 +80,8 @@ export interface CreateMissionInput {
     title?: string;
     cwd: string;
     providers: SessionProvider[];
+    /** 关联到指定 workspace task；派发会话将绑定 workspaceTaskId。 */
+    taskId?: string;
     baseRef?: string;
     sharedDirectories?: string[];
     copyPaths?: string[];

package/dist/missions.js

@@ -133,6 +133,7 @@ export class Missions {
             prompt,
             cwd,
             status: "dispatching",
+            taskId: input.taskId?.trim() || null,
             worktree: {
                 baseRef: input.baseRef?.trim() || undefined,
                 sharedDirectories: normalizeStringList(input.sharedDirectories, "sharedDirectories"),
@@ -253,13 +254,20 @@ export class Missions {
                 cwd: mission.cwd,
                 mode: "agent",
                 provider,
-                worktreeEnabled: true,
-                worktreeSpec: {
-                    baseRef: mission.worktree.baseRef,
-                    taskName: `${mission.title}-${provider}`,
-                    sharedDirectories: mission.worktree.sharedDirectories,
-                    copyPaths: mission.worktree.copyPaths,
-                },
+                // 关联任务的派发直接落在任务目录（不再叠加一层隔离），
+                // 会话绑定 workspaceTaskId，出现在该任务下。
+                worktreeEnabled: mission.taskId ? false : true,
+                ...(mission.taskId ? { workspaceTaskId: mission.taskId } : {}),
+                ...(!mission.taskId
+                    ? {
+                        worktreeSpec: {
+                            baseRef: mission.worktree.baseRef,
+                            taskName: `${mission.title}-${provider}`,
+                            sharedDirectories: mission.worktree.sharedDirectories,
+                            copyPaths: mission.worktree.copyPaths,
+                        },
+                    }
+                    : {}),
                 sessionSource: "automation",
                 automationId: mission.id,
             });

package/dist/server-file-routes.js

@@ -428,10 +428,10 @@ export function registerFileRoutes(app, deps) {
     app.get("/api/quick-paths", asyncRoute(async (_req, res) => {
         const home = process.env.HOME || process.env.USERPROFILE || "/home";
         res.json([
-            { path: "/tmp", name: "临时目录", icon: "🗑️" },
-            { path: home, name: "主目录", icon: "🏠" },
-            { path: process.cwd(), name: "当前目录", icon: "📂" },
-            { path: "/", name: "根目录", icon: "📁" },
+            { path: "/tmp", name: "临时目录", icon: "folder" },
+            { path: home, name: "主目录", icon: "home" },
+            { path: process.cwd(), name: "当前目录", icon: "folder" },
+            { path: "/", name: "根目录", icon: "folder" },
         ]);
     }));
     app.get("/api/recent-paths", (_req, res) => {

package/dist/server-session-routes.js

@@ -667,8 +667,9 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             res.status(400).json({ error: "下标无效。" });
             return;
         }
+        const expectedText = typeof req.body?.expectedText === "string" ? req.body.expectedText : undefined;
         try {
-            const snapshot = structured.deleteQueuedMessage(req.params.id, index);
+            const snapshot = structured.deleteQueuedMessage(req.params.id, index, expectedText);
             res.json(sessionResponseDTO(snapshot));
         }
         catch (error) {

package/dist/server-workspace-routes.js

@@ -267,6 +267,99 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
         res.json({ ok: true, layout });
     });
     // ── 任务（Task = 命名 + 独立 worktree + 一组标签）──
+    // 目录组为一级容器的任务聚合列表，供侧栏「任务」视图一次拉全。
+    app.get("/api/tasks", (req, res) => {
+        // 查询参数：workspaceId 过滤单目录；limit 截断每目录任务数；
+        // maxSessions 截断每任务内嵌会话数（大数据量时控制响应体积）。
+        const workspaceFilter = typeof req.query.workspaceId === "string" ? req.query.workspaceId : "";
+        const parseBoundedCount = (raw) => {
+            const value = Number(raw);
+            return Number.isFinite(value) && value > 0 ? Math.min(Math.floor(value), 500) : null;
+        };
+        const taskLimit = parseBoundedCount(req.query.limit);
+        const sessionLimit = parseBoundedCount(req.query.maxSessions);
+        backfillSessionWorkspaces(storage);
+        const workspaces = storage.listWorkspaces();
+        const summarize = (session) => ({
+            id: session.id,
+            provider: session.provider,
+            sessionKind: session.sessionKind,
+            runner: session.runner,
+            title: resolveSessionDisplayTitle(session),
+            status: session.status,
+            cwd: session.cwd,
+            startedAt: session.startedAt,
+        });
+        const visibleWorkspaces = workspaceFilter
+            ? workspaces.filter((workspace) => workspace.id === workspaceFilter)
+            : workspaces;
+        const groups = new Map();
+        for (const workspace of visibleWorkspaces) {
+            groups.set(workspace.id, {
+                workspaceId: workspace.id,
+                workspaceName: workspace.name,
+                workspaceCwd: workspace.cwd,
+                tasks: storage.listWorkspaceTasks(workspace.id)
+                    .slice(0, taskLimit ?? undefined)
+                    .map((task) => {
+                    const allSessions = storage.listSessionsByWorkspaceTask(task.id);
+                    const sessions = allSessions
+                        .slice(0, sessionLimit ?? undefined)
+                        .map((session) => ({
+                        ...summarize(session),
+                        workspaceTaskId: task.id,
+                    }));
+                    return {
+                        ...task,
+                        cwd: task.worktree?.path ?? workspace.cwd,
+                        isolated: task.worktree !== null,
+                        sessions,
+                        totalSessions: allSessions.length,
+                    };
+                }),
+                standaloneSessions: [],
+            });
+        }
+        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))
+                    taskBoundSessionIds.add(session.id);
+            }
+        }
+        for (const session of storage.loadSessions()) {
+            if (taskBoundSessionIds.has(session.id))
+                continue;
+            const direct = session.workspaceId ? groups.get(session.workspaceId) : undefined;
+            let group = direct && !direct.synthetic ? direct : undefined;
+            const resolved = session.cwd ? path.resolve(session.cwd) : "";
+            if (!group && resolved) {
+                group = [...groups.values()].find((candidate) => !candidate.synthetic && candidate.workspaceCwd === resolved);
+            }
+            // 过滤模式下不创建合成组：不属于目标目录的会话直接排除。
+            if (!group && resolved && !workspaceFilter) {
+                const id = `cwd:${resolved}`;
+                let synthetic = groups.get(id);
+                if (!synthetic) {
+                    synthetic = {
+                        workspaceId: id,
+                        workspaceName: resolved.split("/").filter(Boolean).at(-1) || resolved,
+                        workspaceCwd: resolved,
+                        synthetic: true,
+                        tasks: [],
+                        standaloneSessions: [],
+                    };
+                    groups.set(id, synthetic);
+                }
+                group = synthetic;
+            }
+            // workspaceId 过滤时，不属于目标目录组的会话直接排除（含合成组）。
+            if (workspaceFilter && group?.workspaceId !== workspaceFilter)
+                continue;
+            group?.standaloneSessions.push(summarize(session));
+        }
+        res.json([...groups.values()]);
+    });
     // 列出某工作空间下的任务
     app.get("/api/workspaces/:id/tasks", (req, res) => {
         const workspace = storage.getWorkspace(req.params.id);
@@ -352,7 +445,8 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
             worktrees,
         });
     }));
-    // 新建任务：命名 + 创建独立 worktree（非 git 仓库时退化为直接用项目目录）
+    // 新建任务：命名 + 可选独立 worktree（默认尝试创建，非 git 仓库时退化为直接用项目目录；
+    // 显式传 worktree:false 时跳过隔离，会话直接跑在项目目录）。
     app.post("/api/workspaces/:id/tasks", asyncRoute(async (req, res) => {
         const workspace = storage.getWorkspace(req.params.id);
         if (!workspace) {
@@ -366,20 +460,23 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
             return;
         }
         const baseRef = typeof body.baseRef === "string" && body.baseRef.trim() ? body.baseRef.trim() : undefined;
+        const wantWorktree = body.worktree !== false;
         let worktree = null;
         let worktreeError;
-        try {
-            const setup = prepareSessionWorktree({
-                cwd: workspace.cwd,
-                // 用随机短 id 作分支后缀，避免同名任务撞分支。
-                sessionId: crypto.randomUUID(),
-                spec: { taskName: name, baseRef },
-            });
-            worktree = setup.worktree;
-        }
-        catch (error) {
-            // 非 git 仓库 / 基线不存在：任务照常创建，但无 worktree 隔离。
-            worktreeError = getErrorMessage(error, "无法创建 worktree，将在项目目录直接运行。");
+        if (wantWorktree) {
+            try {
+                const setup = prepareSessionWorktree({
+                    cwd: workspace.cwd,
+                    // 用随机短 id 作分支后缀，避免同名任务撞分支。
+                    sessionId: crypto.randomUUID(),
+                    spec: { taskName: name, baseRef },
+                });
+                worktree = setup.worktree;
+            }
+            catch (error) {
+                // 非 git 仓库 / 基线不存在：任务照常创建，但无 worktree 隔离。
+                worktreeError = getErrorMessage(error, "无法创建 worktree，将在项目目录直接运行。");
+            }
         }
         const task = storage.createWorkspaceTask({ workspaceId: workspace.id, name, worktree });
         res.status(201).json({

package/dist/server.js

@@ -213,6 +213,7 @@ const CONNECTED_APP_PREFERENCE_KEYS = new Set([
     "defaultThinkingEffort",
     "defaultProvider",
     "defaultSessionKind",
+    "defaultTaskWorktree",
 ]);
 function requireAdminOrSessionPreferences(req, res, next) {
     const principal = requestPrincipals.get(req);
@@ -763,6 +764,7 @@ export async function startServer(config, configPath, options = {}) {
             port: config.port,
             defaultProvider: config.defaultProvider ?? "claude",
             defaultSessionKind: config.defaultSessionKind ?? "structured",
+            defaultTaskWorktree: config.defaultTaskWorktree !== false,
             defaultMode: config.defaultMode,
             defaultCwd: config.defaultCwd,
             defaultModel: defaultModels.claude,

package/dist/storage.js

@@ -568,6 +568,7 @@ const INIT_SQL = `
     prompt TEXT NOT NULL,
     cwd TEXT NOT NULL,
     status TEXT NOT NULL,
+    task_id TEXT,
     base_ref TEXT,
     shared_directories TEXT NOT NULL DEFAULT '[]',
     copy_paths TEXT NOT NULL DEFAULT '[]',
@@ -663,6 +664,12 @@ export function ensureDatabaseFile(dbPath) {
     db.exec(INIT_SQL);
     ensureAuthSessionSchema(db);
     ensureCommandSessionSchema(db);
+    {
+        const missionColumns = db.prepare("PRAGMA table_info(missions)").all();
+        if (missionColumns.length > 0 && !missionColumns.some((column) => column.name === "task_id")) {
+            db.exec("ALTER TABLE missions ADD COLUMN task_id TEXT");
+        }
+    }
     db.close();
     chmodSync(dbPath, 0o600);
     return created;
@@ -1147,13 +1154,13 @@ export class WandStorage {
     // ============ Missions ============
     saveMission(mission) {
         this.db.prepare(`INSERT INTO missions (
-         id, title, prompt, cwd, status, base_ref, shared_directories, copy_paths, created_at, updated_at
-       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+         id, title, prompt, cwd, status, base_ref, shared_directories, copy_paths, created_at, updated_at, task_id
+       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
        ON CONFLICT(id) DO UPDATE SET
          title = excluded.title, prompt = excluded.prompt, cwd = excluded.cwd,
          status = excluded.status, base_ref = excluded.base_ref,
          shared_directories = excluded.shared_directories, copy_paths = excluded.copy_paths,
-         updated_at = excluded.updated_at`).run(mission.id, mission.title, mission.prompt, mission.cwd, mission.status, mission.worktree.baseRef ?? null, JSON.stringify(mission.worktree.sharedDirectories ?? []), JSON.stringify(mission.worktree.copyPaths ?? []), mission.createdAt, mission.updatedAt);
+         updated_at = excluded.updated_at, task_id = excluded.task_id`).run(mission.id, mission.title, mission.prompt, mission.cwd, mission.status, mission.worktree.baseRef ?? null, JSON.stringify(mission.worktree.sharedDirectories ?? []), JSON.stringify(mission.worktree.copyPaths ?? []), mission.createdAt, mission.updatedAt, mission.taskId ?? null);
     }
     getMission(id) {
         const row = this.db.prepare("SELECT * FROM missions WHERE id = ?").get(id);
@@ -1336,6 +1343,7 @@ function mapMissionRow(row) {
             sharedDirectories: safeJsonParse(typeof row.shared_directories === "string" ? row.shared_directories : null) ?? [],
             copyPaths: safeJsonParse(typeof row.copy_paths === "string" ? row.copy_paths : null) ?? [],
         },
+        taskId: typeof row.task_id === "string" ? row.task_id : null,
         createdAt: String(row.created_at),
         updatedAt: String(row.updated_at),
     };

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

@@ -145,8 +145,8 @@ export declare class StructuredSessionManager {
      * 本身，flushNext 在另一段时序里读 sessions.get(...) 当前快照，已经天然安全。
      */
     reorderQueuedMessages(sessionId: string, order: number[]): SessionSnapshot;
-    /** Remove a single queued message by index. */
-    deleteQueuedMessage(sessionId: string, index: number): SessionSnapshot;
+    /** Remove a single queued message only while index and text still identify the same item. */
+    deleteQueuedMessage(sessionId: string, index: number, expectedText?: string): SessionSnapshot;
     /**
      * Remove one queued message by index before sending it. Keeping this operation
      * on the server prevents clients from re-sending the text while the original

package/dist/structured-session-manager.js

@@ -1255,13 +1255,16 @@ export class StructuredSessionManager {
         this.emitStructuredSnapshot(updated);
         return updated;
     }
-    /** Remove a single queued message by index. */
-    deleteQueuedMessage(sessionId, index) {
+    /** Remove a single queued message only while index and text still identify the same item. */
+    deleteQueuedMessage(sessionId, index, expectedText) {
         const session = this.requireSession(sessionId);
         const queue = session.queuedMessages ?? [];
         if (!Number.isInteger(index) || index < 0 || index >= queue.length) {
             throw new Error("队列中没有该条消息（可能已被处理）。");
         }
+        if (expectedText !== undefined && queue[index] !== expectedText) {
+            throw new Error("排队消息已变化，请按最新顺序重试。");
+        }
         const next = queue.slice(0, index).concat(queue.slice(index + 1));
         const skills = session.queuedMessageSkills ?? [];
         const updated = {

package/dist/types.d.ts

@@ -94,6 +94,8 @@ export interface WandConfig {
     defaultProvider?: SessionProvider;
     /** 新建会话时默认使用的承载类型。 */
     defaultSessionKind?: SessionKind;
+    /** 新建任务时是否默认开启独立 worktree。 */
+    defaultTaskWorktree?: boolean;
     defaultMode: ExecutionMode;
     shell: string;
     defaultCwd: string;