@co0ontty/wand 4.53.0 → 4.54.0

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "dd763b29e0d0810f30a090302594ebe40a2e0c78",
-  "builtAt": "2026-09-06T07:59:01.447Z",
-  "version": "4.53.0",
+  "commit": "cb99d899728b5b5a2570b5bec4fce6882449ddb8",
+  "builtAt": "2026-09-07T01:21:35.988Z",
+  "version": "4.54.0",
   "channel": "stable"
 }

package/dist/git-quick-commit.js

@@ -1208,7 +1208,7 @@ async function runQuickCommitFallbackCli(opts, priorError) {
         });
     }
     else if (provider === "opencode") {
-        const args = ["run", "--format", "json", "--dangerously-skip-permissions"];
+        const args = ["run", "--format", "json", "--auto"];
         const model = opts.model?.trim();
         if (model && model !== "default")
             args.push("--model", model);

package/dist/process-manager.js

@@ -14,7 +14,7 @@ import { buildLanguageDirective, buildManagedAutonomyDirective } from "./languag
 import { prepareSessionWorktree } from "./git-worktree.js";
 import { getProviderCommandSessionId, getProviderResumeCommandSessionId } from "./resume-policy.js";
 import { normalizeThinkingEffort, thinkingEffortToClaudeCliEffort, thinkingEffortToClaudeSlashEffort, thinkingEffortToCodexReasoningEffort, thinkingEffortToOpenCodeVariant, thinkingEffortToPiLevel } from "./structured-provider-common.js";
-import { provisionalSessionTopic, SessionTopicCoordinator, sessionTopicBlocklistForSnapshot, shouldAcceptGeneratedSessionTitle, shouldGenerateSessionTopicFromPtyInput, } from "./session-topic.js";
+import { consumePtyInputForTopic, createPtyTopicLineBuffer, provisionalSessionTopic, SessionTopicCoordinator, sessionTopicBlocklistForSnapshot, shouldAcceptGeneratedSessionTitle, } from "./session-topic.js";
 import { getErrorMessage } from "./error-utils.js";
 import { resolveSystemAiContext } from "./session-ai-context.js";
 import { resolveSessionCwd } from "./session-cwd.js";
@@ -1497,8 +1497,11 @@ export class ProcessManager extends EventEmitter {
             console.error(`[ProcessManager] Rejecting input: session ${id} has no PTY`);
             throw new SessionInputError("Session is not running.", "SESSION_NO_PTY", id, record.status);
         }
-        if (shouldGenerateSessionTopicFromPtyInput(view, shortcutKey))
-            this.maybeGenerateSessionTopic(id, input);
+        if (!record.ptyTopicDraft)
+            record.ptyTopicDraft = createPtyTopicLineBuffer();
+        const topicInput = consumePtyInputForTopic(record.ptyTopicDraft, input, view, shortcutKey);
+        if (topicInput)
+            this.maybeGenerateSessionTopic(id, topicInput);
         // Log shortcut key interactions for auto-confirm and mode analysis
         if (shortcutKey) {
             const outputLines = record.output.split("\n");

package/dist/server-session-routes.js

@@ -508,7 +508,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         const body = req.body;
         try {
             if (body.provider && body.provider !== "claude" && body.provider !== "codex" && body.provider !== "opencode" && body.provider !== "grok" && body.provider !== "qoder" && body.provider !== "pi") {
-                res.status(400).json({ error: "结构化会话当前仅支持 Claude、Codex、OpenCode、Grok 或 Qoder provider。" });
+                res.status(400).json({ error: "结构化会话当前仅支持 Claude、Codex、OpenCode、Grok、Qoder 或 Pi provider。" });
                 return;
             }
             const provider = body.provider === "codex" || body.provider === "opencode" || body.provider === "grok" || body.provider === "qoder" || body.provider === "pi" ? body.provider : "claude";

package/dist/server-workspace-routes.d.ts

@@ -1,7 +1,7 @@
 import type { Express } from "express";
 import type { SessionRegistry } from "./session-registry.js";
 import type { WandStorage } from "./storage.js";
-import type { LayoutNode, TaskWindowLayout } from "./types.js";
+import { type LayoutNode, type TaskWindowLayout } from "./types.js";
 /** 校验并清洗前端提交的布局树；非法输入返回 null（空工作空间）。 */
 export declare function sanitizeLayout(value: unknown): LayoutNode | null;
 /** 校验任务级工作窗口集合；旧版单棵布局会兼容升级成一个 window。 */

package/dist/server-workspace-routes.js

@@ -7,6 +7,7 @@ import { expandHomePath } from "./middleware/path-safety.js";
 import { checkSessionWorktreeMergeabilityAsync, cleanupWorktreeSync, prepareSessionWorktree, resolveWorktreeTargetBranchAsync, } from "./git-worktree.js";
 import { collectSessionTopicBlocklist } from "./session-topic.js";
 import { resolveSessionDisplayTitle } from "./session-transport.js";
+import { GLOBAL_WORKSPACE_ID } from "./types.js";
 import { attachUnboundSessionsToWorkspace, backfillSessionWorkspaces, } from "./workspace-binding.js";
 const PROVIDERS = new Set(["claude", "codex", "opencode", "grok", "qoder", "pi"]);
 function workspaceSessionTitle(session, names = {}) {
@@ -62,6 +63,52 @@ function deleteSessions(storage, sessions, sessionIds) {
             storage.deleteSession(sessionId);
     }
 }
+function isGlobalWorkspace(workspace) {
+    return workspace.kind === "global" || workspace.id === GLOBAL_WORKSPACE_ID;
+}
+function taskRuntimeCwd(task, workspace) {
+    return task.worktree?.path ?? task.cwd ?? workspace?.cwd ?? "";
+}
+function createTaskForWorkspace(storage, workspace, body) {
+    const name = typeof body.name === "string" ? body.name.trim() : "";
+    if (!name)
+        throw new Error("请输入任务名称。");
+    let mountedCwd;
+    if (body.cwd !== undefined && body.cwd !== null && String(body.cwd).trim()) {
+        mountedCwd = resolveWorkspaceCwd(body.cwd);
+    }
+    const baseRef = typeof body.baseRef === "string" && body.baseRef.trim() ? body.baseRef.trim() : undefined;
+    const runCwd = mountedCwd ?? workspace.cwd;
+    const wantWorktree = body.worktree === true || (body.worktree !== false && !isGlobalWorkspace(workspace));
+    let worktree = null;
+    let worktreeError;
+    if (wantWorktree) {
+        try {
+            const setup = prepareSessionWorktree({
+                cwd: runCwd,
+                sessionId: crypto.randomUUID(),
+                spec: { taskName: name, baseRef },
+            });
+            worktree = setup.worktree;
+        }
+        catch (error) {
+            worktreeError = getErrorMessage(error, "无法创建 worktree，将在项目目录直接运行。");
+        }
+    }
+    const storedCwd = mountedCwd && mountedCwd !== workspace.cwd ? mountedCwd : undefined;
+    const task = storage.createWorkspaceTask({
+        workspaceId: workspace.id,
+        name,
+        worktree,
+        cwd: storedCwd,
+    });
+    return {
+        task,
+        cwd: taskRuntimeCwd(task, workspace),
+        isolated: worktree !== null,
+        worktreeError,
+    };
+}
 function workspaceWithCounts(storage, workspace, sessionCounts) {
     const worktreeCount = storage.listWorkspaceTasks(workspace.id)
         .filter((task) => task.worktree !== null)
@@ -185,7 +232,9 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
     app.get("/api/workspaces", (_req, res) => {
         backfillSessionWorkspaces(storage);
         const sessionCounts = storage.countSessionsByWorkspace();
-        res.json(storage.listWorkspaces().map((workspace) => workspaceWithCounts(storage, workspace, sessionCounts)));
+        res.json(storage.listWorkspaces()
+            .filter((workspace) => !isGlobalWorkspace(workspace))
+            .map((workspace) => workspaceWithCounts(storage, workspace, sessionCounts)));
     });
     // 新建项目：名称 + 目录 + 默认 IDE，不启动会话
     app.post("/api/workspaces", asyncRoute(async (req, res) => {
@@ -264,6 +313,10 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
             res.status(404).json({ error: "未找到该项目。" });
             return;
         }
+        if (isGlobalWorkspace(existing)) {
+            res.status(400).json({ error: "不能删除全局任务空间。" });
+            return;
+        }
         const tasks = storage.listWorkspaceTasks(existing.id);
         if (cascade) {
             deleteSessions(storage, sessions, [
@@ -298,6 +351,22 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
         res.json({ ok: true, layout });
     });
     // ── 任务（Task = 命名 + 独立 worktree + 一组标签）──
+    // 不依赖项目的独立任务：挂到隐藏的全局空间，目录可省略（使用全局临时目录）。
+    app.post("/api/tasks", asyncRoute(async (req, res) => {
+        const workspace = storage.ensureGlobalWorkspace();
+        try {
+            const created = createTaskForWorkspace(storage, workspace, req.body);
+            res.status(201).json({
+                ...created.task,
+                cwd: created.cwd,
+                isolated: created.isolated,
+                worktreeError: created.worktreeError,
+            });
+        }
+        catch (error) {
+            res.status(400).json({ error: getErrorMessage(error, "创建任务失败。") });
+        }
+    }));
     // 目录组为一级容器的任务聚合列表，供侧栏「任务」视图一次拉全。
     app.get("/api/tasks", (req, res) => {
         // 查询参数：workspaceId 过滤单目录；limit 截断每目录任务数；
@@ -317,10 +386,12 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
             : workspaces;
         const groups = new Map();
         for (const workspace of visibleWorkspaces) {
+            const global = isGlobalWorkspace(workspace);
             groups.set(workspace.id, {
                 workspaceId: workspace.id,
-                workspaceName: workspace.name,
+                workspaceName: global ? "全局" : workspace.name,
                 workspaceCwd: workspace.cwd,
+                ...(global ? { global: true } : {}),
                 tasks: storage.listWorkspaceTasks(workspace.id)
                     .slice(0, taskLimit ?? undefined)
                     .map((task) => {
@@ -328,12 +399,12 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
                     const sessions = allSessions
                         .slice(0, sessionLimit ?? undefined)
                         .map((session) => ({
-                        ...summarize(session, { taskName: task.name, workspaceName: workspace.name }),
+                        ...summarize(session, { taskName: task.name, workspaceName: global ? undefined : workspace.name }),
                         workspaceTaskId: task.id,
                     }));
                     return {
                         ...task,
-                        cwd: task.worktree?.path ?? workspace.cwd,
+                        cwd: taskRuntimeCwd(task, workspace),
                         isolated: task.worktree !== null,
                         sessions,
                         totalSessions: allSessions.length,
@@ -356,7 +427,8 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
             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);
+                const cwdMatches = [...groups.values()].filter((candidate) => !candidate.synthetic && candidate.workspaceCwd === resolved);
+                group = cwdMatches.find((candidate) => !candidate.global) ?? cwdMatches[0];
             }
             // 过滤模式下不创建合成组：不属于目标目录的会话直接排除。
             if (!group && resolved && !workspaceFilter) {
@@ -382,7 +454,9 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
                 workspaceName: group.workspaceName,
             }));
         }
-        const payload = [...groups.values()];
+        const payload = [...groups.values()]
+            .filter((group) => !group.global || group.tasks.length > 0 || group.standaloneSessions.length > 0)
+            .sort((left, right) => Number(Boolean(right.global)) - Number(Boolean(left.global)));
         const revision = tasksRevision(payload);
         if (typeof req.query.revision === "string") {
             if (req.query.revision === revision) {
@@ -487,38 +561,18 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
             res.status(404).json({ error: "未找到该项目。" });
             return;
         }
-        const body = req.body;
-        const name = typeof body.name === "string" ? body.name.trim() : "";
-        if (!name) {
-            res.status(400).json({ error: "请输入任务名称。" });
-            return;
+        try {
+            const created = createTaskForWorkspace(storage, workspace, req.body);
+            res.status(201).json({
+                ...created.task,
+                cwd: created.cwd,
+                isolated: created.isolated,
+                worktreeError: created.worktreeError,
+            });
         }
-        const baseRef = typeof body.baseRef === "string" && body.baseRef.trim() ? body.baseRef.trim() : undefined;
-        const wantWorktree = body.worktree !== false;
-        let worktree = null;
-        let worktreeError;
-        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，将在项目目录直接运行。");
-            }
+        catch (error) {
+            res.status(400).json({ error: getErrorMessage(error, "创建任务失败。") });
         }
-        const task = storage.createWorkspaceTask({ workspaceId: workspace.id, name, worktree });
-        res.status(201).json({
-            ...task,
-            cwd: worktree?.path ?? workspace.cwd,
-            isolated: worktree !== null,
-            worktreeError,
-        });
     }));
     // 任务详情：meta + 该任务下的会话；访问即更新 lastOpenedAt
     app.get("/api/workspace-tasks/:taskId", (req, res) => {
@@ -531,7 +585,7 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
         const workspace = storage.getWorkspace(task.workspaceId);
         res.json({
             ...task,
-            cwd: task.worktree?.path ?? workspace?.cwd ?? "",
+            cwd: taskRuntimeCwd(task, workspace),
             sessions: storage.listSessionsByWorkspaceTask(task.id).map((session) => ({
                 ...workspaceSessionSummary(session, {
                     taskName: task.name,

package/dist/session-topic.d.ts

@@ -1,10 +1,22 @@
 import { type QuickCommitAiOptions } from "./git-quick-commit.js";
 import type { ConversationTurn } from "./types.js";
 /**
- * PTY 终端视图里，只有底部输入框整段提交（shortcutKey=enter_text）才总结标题。
- * 逐键 pty_input / 方向键 / 单独回车不能触发，避免把按键当主题。
+ * PTY 底部输入框整段提交（shortcutKey=enter_text）会总结标题。
+ * 终端直通键入没有这个标记：服务端把可打印字符拼成一行，回车后再总结。
+ * 方向键 / 单独回车 / y/n / 控制序列不能触发，避免把按键当主题。
  */
 export declare function shouldGenerateSessionTopicFromPtyInput(view?: "chat" | "terminal", shortcutKey?: string): boolean;
+export interface PtyTopicLineBuffer {
+    text: string;
+}
+export declare function createPtyTopicLineBuffer(): PtyTopicLineBuffer;
+/** Raw TTY lines that are almost certainly not a user prompt. */
+export declare function isPtyTypedTopicCandidate(prompt: string): boolean;
+/**
+ * Decide whether this PTY write completes a user prompt worth summarizing.
+ * Mutates `buffer` so keystroke-by-keystroke terminal input can be assembled.
+ */
+export declare function consumePtyInputForTopic(buffer: PtyTopicLineBuffer, input: string, view?: "chat" | "terminal", shortcutKey?: string): string | null;
 export interface SessionTopic {
     title: string;
     description: string;

package/dist/session-topic.js

@@ -1,12 +1,117 @@
 import { callConfiguredAiText } from "./git-quick-commit.js";
+import { skipAnsiSequence } from "./pty-text-utils.js";
 const MAX_PROMPT_LENGTH = 12_000;
+const PTY_TOPIC_DRAFT_MAX = 4_000;
 /**
- * PTY 终端视图里，只有底部输入框整段提交（shortcutKey=enter_text）才总结标题。
- * 逐键 pty_input / 方向键 / 单独回车不能触发，避免把按键当主题。
+ * PTY 底部输入框整段提交（shortcutKey=enter_text）会总结标题。
+ * 终端直通键入没有这个标记：服务端把可打印字符拼成一行，回车后再总结。
+ * 方向键 / 单独回车 / y/n / 控制序列不能触发，避免把按键当主题。
  */
 export function shouldGenerateSessionTopicFromPtyInput(view, shortcutKey) {
     return view !== "terminal" || shortcutKey === "enter_text";
 }
+export function createPtyTopicLineBuffer() {
+    return { text: "" };
+}
+function stripTrailingNewlines(input) {
+    return input.replace(/[\r\n]+$/g, "").trim();
+}
+function popCodePoint(text) {
+    const chars = Array.from(text);
+    chars.pop();
+    return chars.join("");
+}
+/** Raw TTY lines that are almost certainly not a user prompt. */
+export function isPtyTypedTopicCandidate(prompt) {
+    if (!prompt)
+        return false;
+    if (/^[yn]$/i.test(prompt))
+        return false;
+    if (/^\d+$/.test(prompt))
+        return false;
+    if (/^\/[a-z][\w-]*$/i.test(prompt))
+        return false;
+    if (/[\u3400-\u9fff]/.test(prompt))
+        return true;
+    if (/\s/.test(prompt) && prompt.length >= 2)
+        return true;
+    return prompt.length >= 8;
+}
+function flushPtyTopicDraft(buffer) {
+    const prompt = buffer.text.replace(/\s+/g, " ").trim();
+    buffer.text = "";
+    return isPtyTypedTopicCandidate(prompt) ? prompt : null;
+}
+function consumeRawPtyTopicLine(buffer, input) {
+    let submitted = null;
+    let i = 0;
+    while (i < input.length) {
+        const code = input.charCodeAt(i);
+        if (code === 0x1b) {
+            i = skipAnsiSequence(input, i);
+            continue;
+        }
+        if (code === 0x0d) {
+            const flushed = flushPtyTopicDraft(buffer);
+            if (flushed && !submitted)
+                submitted = flushed;
+            i += input.charCodeAt(i + 1) === 0x0a ? 2 : 1;
+            continue;
+        }
+        if (code === 0x08 || code === 0x7f) {
+            buffer.text = popCodePoint(buffer.text);
+            i += 1;
+            continue;
+        }
+        if (code === 0x03 || code === 0x15) {
+            buffer.text = "";
+            i += 1;
+            continue;
+        }
+        if (code === 0x0a) {
+            if (buffer.text)
+                buffer.text += "\n";
+            i += 1;
+            continue;
+        }
+        if (code < 32) {
+            i += 1;
+            continue;
+        }
+        const point = input.codePointAt(i) ?? code;
+        buffer.text += String.fromCodePoint(point);
+        i += point > 0xffff ? 2 : 1;
+        if (buffer.text.length > PTY_TOPIC_DRAFT_MAX) {
+            buffer.text = buffer.text.slice(-PTY_TOPIC_DRAFT_MAX);
+        }
+    }
+    return submitted;
+}
+/**
+ * Decide whether this PTY write completes a user prompt worth summarizing.
+ * Mutates `buffer` so keystroke-by-keystroke terminal input can be assembled.
+ */
+export function consumePtyInputForTopic(buffer, input, view, shortcutKey) {
+    if (view !== "terminal") {
+        buffer.text = "";
+        const prompt = stripTrailingNewlines(input);
+        return prompt && shouldGenerateSessionTopicFromPtyInput(view, shortcutKey) ? prompt : null;
+    }
+    if (shortcutKey === "enter_text") {
+        buffer.text = "";
+        return stripTrailingNewlines(input) || null;
+    }
+    if (shortcutKey) {
+        if (shortcutKey === "ctrl_c"
+            || shortcutKey === "ctrl_u"
+            || shortcutKey === "ctrl_d"
+            || shortcutKey === "escape") {
+            buffer.text = "";
+        }
+        return null;
+    }
+    return consumeRawPtyTopicLine(buffer, input);
+}
 const TITLE_MAX_LENGTH = 24;
 const DESCRIPTION_MAX_LENGTH = 120;
 function cleanTopicText(value, maxLength) {

package/dist/storage.d.ts

@@ -1,4 +1,4 @@
-import { SessionSnapshot, ConversationTurn, StructuredSessionState, Workspace, LayoutNode, TaskWindowLayout, WorkspaceDefaultProvider, WorkspaceTask, WorkspaceTaskWorktree, WorkspaceTaskStatus } from "./types.js";
+import { SessionSnapshot, ConversationTurn, StructuredSessionState, Workspace, LayoutNode, TaskWindowLayout, WorkspaceDefaultProvider, WorkspaceKind, WorkspaceTask, WorkspaceTaskWorktree, WorkspaceTaskStatus } from "./types.js";
 import type { AgentActivityItem, Mission, MissionAttempt, MissionReviewComment, MissionReviewStatus, MissionStatus } from "./mission-types.js";
 import { type PasswordVault, type PasswordVaultItem, type PasswordVaultItemFilter, type PasswordVaultItemInput } from "./password-manager.js";
 type AuthPrincipalKind = "browser-admin" | "connected-app";
@@ -16,7 +16,9 @@ export declare function resolveDatabasePath(configPath: string): string;
 export declare function ensureDatabaseFile(dbPath: string): boolean;
 export declare class WandStorage {
     private readonly db;
+    private readonly dbPath;
     constructor(dbPath: string);
+    directory(): string;
     close(): void;
     /**
      * Run a synchronous group of storage operations atomically. Calls must not
@@ -42,10 +44,13 @@ export declare class WandStorage {
     listWorkspaces(): Workspace[];
     getWorkspace(id: string): Workspace | null;
     createWorkspace(input: {
+        id?: string;
         name: string;
         cwd: string;
+        kind?: WorkspaceKind;
         defaultProvider?: WorkspaceDefaultProvider;
     }): Workspace;
+    ensureGlobalWorkspace(): Workspace;
     updateWorkspace(id: string, patch: {
         name?: string;
         cwd?: string;
@@ -73,6 +78,7 @@ export declare class WandStorage {
         workspaceId: string;
         name: string;
         worktree?: WorkspaceTaskWorktree | null;
+        cwd?: string | null;
         status?: WorkspaceTaskStatus;
     }): WorkspaceTask;
     updateWorkspaceTask(id: string, patch: {

package/dist/storage.js

@@ -2,6 +2,7 @@ import crypto from "node:crypto";
 import { chmodSync, existsSync, mkdirSync } from "node:fs";
 import path from "node:path";
 import { DatabaseSync } from "node:sqlite";
+import { GLOBAL_WORKSPACE_ID } from "./types.js";
 import { normalizeSessionDirectory } from "./session-directory-tree.js";
 import { DEFAULT_PASSWORD_VAULT_ID, DEFAULT_PASSWORD_VAULT_NAME, decryptVaultSecret, encryptVaultSecret, itemMatchesFilter, normalizePasswordItemInput, normalizeVaultName, nowIso, } from "./password-manager.js";
 function safeJsonParse(raw) {
@@ -257,11 +258,15 @@ 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
              , 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) {
+    return raw === "global" ? "global" : "project";
+}
 function mapWorkspaceRow(row) {
     return {
         id: row.id,
         name: row.name,
         cwd: row.cwd,
+        kind: mapWorkspaceKind(row.kind),
         defaultProvider: (row.default_provider ?? undefined),
         layout: row.layout_json ? safeJsonParse(row.layout_json) ?? null : null,
         createdAt: row.created_at,
@@ -299,11 +304,13 @@ function mapWorkspaceTaskLayout(raw) {
     return null;
 }
 function mapWorkspaceTaskRow(row) {
+    const cwd = typeof row.cwd === "string" && row.cwd.trim() ? row.cwd : undefined;
     return {
         id: row.id,
         workspaceId: row.workspace_id,
         name: row.name,
         worktree: mapWorkspaceTaskWorktree(row.worktree_json),
+        ...(cwd ? { cwd } : {}),
         layout: mapWorkspaceTaskLayout(row.layout_json),
         status: (row.status === "done" ? "done" : "active"),
         createdAt: row.created_at,
@@ -631,6 +638,7 @@ const INIT_SQL = `
     id TEXT PRIMARY KEY,
     name TEXT NOT NULL,
     cwd TEXT NOT NULL,
+    kind TEXT NOT NULL DEFAULT 'project',
     default_provider TEXT,
     layout_json TEXT,
     created_at TEXT NOT NULL,
@@ -647,6 +655,7 @@ const INIT_SQL = `
     worktree_json TEXT,
     layout_json TEXT,
     status TEXT NOT NULL DEFAULT 'active',
+    cwd TEXT,
     created_at TEXT NOT NULL,
     last_opened_at TEXT,
     FOREIGN KEY (workspace_id) REFERENCES workspaces(id) ON DELETE CASCADE
@@ -655,6 +664,18 @@ const INIT_SQL = `
   CREATE INDEX IF NOT EXISTS idx_workspace_tasks_workspace ON workspace_tasks(workspace_id);
   CREATE INDEX IF NOT EXISTS idx_workspace_tasks_last_opened ON workspace_tasks(last_opened_at);
 `;
+function ensureWorkspaceSchema(db) {
+    const workspaceColumns = db.prepare("PRAGMA table_info(workspaces)").all();
+    const workspaceNames = new Set(workspaceColumns.map((column) => column.name));
+    if (workspaceColumns.length > 0 && !workspaceNames.has("kind")) {
+        db.exec("ALTER TABLE workspaces ADD COLUMN kind TEXT NOT NULL DEFAULT 'project'");
+    }
+    const taskColumns = db.prepare("PRAGMA table_info(workspace_tasks)").all();
+    const taskNames = new Set(taskColumns.map((column) => column.name));
+    if (taskColumns.length > 0 && !taskNames.has("cwd")) {
+        db.exec("ALTER TABLE workspace_tasks ADD COLUMN cwd TEXT");
+    }
+}
 export function ensureDatabaseFile(dbPath) {
     const dir = path.dirname(dbPath);
     mkdirSync(dir, { recursive: true, mode: 0o700 });
@@ -664,6 +685,7 @@ export function ensureDatabaseFile(dbPath) {
     db.exec(INIT_SQL);
     ensureAuthSessionSchema(db);
     ensureCommandSessionSchema(db);
+    ensureWorkspaceSchema(db);
     {
         const missionColumns = db.prepare("PRAGMA table_info(missions)").all();
         if (missionColumns.length > 0 && !missionColumns.some((column) => column.name === "task_id")) {
@@ -676,17 +698,23 @@ export function ensureDatabaseFile(dbPath) {
 }
 export class WandStorage {
     db;
+    dbPath;
     constructor(dbPath) {
         const dir = path.dirname(dbPath);
         mkdirSync(dir, { recursive: true, mode: 0o700 });
         chmodSync(dir, 0o700);
+        this.dbPath = dbPath;
         this.db = new DatabaseSync(dbPath);
         chmodSync(dbPath, 0o600);
         this.db.exec(INIT_SQL);
         ensureAuthSessionSchema(this.db);
         ensureCommandSessionSchema(this.db);
+        ensureWorkspaceSchema(this.db);
         this.ensureDefaultPasswordVault();
     }
+    directory() {
+        return path.dirname(this.dbPath);
+    }
     close() {
         this.db.close();
     }
@@ -786,33 +814,49 @@ export class WandStorage {
     // ============ Workspaces（多标签 / 分屏项目）============
     listWorkspaces() {
         const rows = this.db
-            .prepare("SELECT id, name, cwd, default_provider, layout_json, created_at, last_opened_at FROM workspaces ORDER BY COALESCE(last_opened_at, created_at) DESC")
+            .prepare("SELECT id, name, cwd, kind, default_provider, layout_json, created_at, last_opened_at FROM workspaces ORDER BY COALESCE(last_opened_at, created_at) DESC")
             .all();
         return rows.map(mapWorkspaceRow);
     }
     getWorkspace(id) {
         const row = this.db
-            .prepare("SELECT id, name, cwd, default_provider, layout_json, created_at, last_opened_at FROM workspaces WHERE id = ?")
+            .prepare("SELECT id, name, cwd, kind, default_provider, layout_json, created_at, last_opened_at FROM workspaces WHERE id = ?")
             .get(id);
         return row ? mapWorkspaceRow(row) : null;
     }
     createWorkspace(input) {
-        const id = crypto.randomUUID();
+        const id = input.id?.trim() || crypto.randomUUID();
+        const kind = input.kind === "global" ? "global" : "project";
         const createdAt = nowIso();
         this.db
-            .prepare(`INSERT INTO workspaces (id, name, cwd, default_provider, layout_json, created_at, last_opened_at)
-         VALUES (?, ?, ?, ?, NULL, ?, NULL)`)
-            .run(id, input.name, input.cwd, input.defaultProvider ?? null, createdAt);
+            .prepare(`INSERT INTO workspaces (id, name, cwd, kind, default_provider, layout_json, created_at, last_opened_at)
+         VALUES (?, ?, ?, ?, ?, NULL, ?, NULL)`)
+            .run(id, input.name, input.cwd, kind, input.defaultProvider ?? null, createdAt);
         return {
             id,
             name: input.name,
             cwd: input.cwd,
+            kind,
             defaultProvider: input.defaultProvider,
             layout: null,
             createdAt,
             lastOpenedAt: null,
         };
     }
+    ensureGlobalWorkspace() {
+        const existing = this.getWorkspace(GLOBAL_WORKSPACE_ID)
+            ?? this.listWorkspaces().find((workspace) => workspace.kind === "global");
+        if (existing)
+            return existing;
+        const scratch = path.join(this.directory(), "scratch");
+        mkdirSync(scratch, { recursive: true, mode: 0o700 });
+        return this.createWorkspace({
+            id: GLOBAL_WORKSPACE_ID,
+            name: "全局任务",
+            cwd: scratch,
+            kind: "global",
+        });
+    }
     updateWorkspace(id, patch) {
         const assignments = [];
         const values = [];
@@ -894,7 +938,7 @@ export class WandStorage {
     // ── Workspace tasks（任务 = 命名 + 独立 worktree + 一组标签）──
     listWorkspaceTasks(workspaceId) {
         const rows = this.db
-            .prepare(`SELECT id, workspace_id, name, worktree_json, layout_json, status, created_at, last_opened_at
+            .prepare(`SELECT id, workspace_id, name, worktree_json, layout_json, status, cwd, created_at, last_opened_at
          FROM workspace_tasks WHERE workspace_id = ?
          ORDER BY COALESCE(last_opened_at, created_at) DESC`)
             .all(workspaceId);
@@ -902,7 +946,7 @@ export class WandStorage {
     }
     getWorkspaceTask(id) {
         const row = this.db
-            .prepare(`SELECT id, workspace_id, name, worktree_json, layout_json, status, created_at, last_opened_at
+            .prepare(`SELECT id, workspace_id, name, worktree_json, layout_json, status, cwd, created_at, last_opened_at
          FROM workspace_tasks WHERE id = ?`)
             .get(id);
         return row ? mapWorkspaceTaskRow(row) : null;
@@ -911,15 +955,17 @@ export class WandStorage {
         const id = crypto.randomUUID();
         const createdAt = nowIso();
         const status = input.status ?? "active";
+        const cwd = typeof input.cwd === "string" && input.cwd.trim() ? input.cwd.trim() : null;
         this.db
-            .prepare(`INSERT INTO workspace_tasks (id, workspace_id, name, worktree_json, layout_json, status, created_at, last_opened_at)
-         VALUES (?, ?, ?, ?, NULL, ?, ?, NULL)`)
-            .run(id, input.workspaceId, input.name, input.worktree ? JSON.stringify(input.worktree) : null, status, createdAt);
+            .prepare(`INSERT INTO workspace_tasks (id, workspace_id, name, worktree_json, layout_json, status, cwd, created_at, last_opened_at)
+         VALUES (?, ?, ?, ?, NULL, ?, ?, ?, NULL)`)
+            .run(id, input.workspaceId, input.name, input.worktree ? JSON.stringify(input.worktree) : null, status, cwd, createdAt);
         return {
             id,
             workspaceId: input.workspaceId,
             name: input.name,
             worktree: input.worktree ?? null,
+            ...(cwd ? { cwd } : {}),
             layout: null,
             status,
             createdAt,