@co0ontty/wand 4.77.0 → 4.78.0-beta.ga1e4f59

package/dist/storage.js

@@ -7,7 +7,8 @@ import { normalizeSessionDirectory } from "./session-directory-tree.js";
 import { inferProviderFromCommand, inferProviderFromRunner, isSessionProvider, SESSION_PROVIDERS } from "./session-provider.js";
 import { DEFAULT_ITERATION_NAME, DEFAULT_WAND_TASK_AGENT_KIND, DEFAULT_WAND_TASK_PRIORITY, isWandTaskAgentKind, normalizeWandTaskAgentMode } from "./task-types.js";
 import { firstLayoutTabId } from "./layout-tree.js";
-import { AI_TEAM_DEFAULT_MAX_STEPS, isTeamMemberRole, memberAgents } from "./ai-team-types.js";
+import { isUnnamedWorkspaceTaskName } from "./wand-task-sync.js";
+import { AI_TEAM_DEFAULT_MAX_STEPS, AI_TEAM_TERMINAL_RUN_STATUSES, isTeamMemberRole, memberAgents } from "./ai-team-types.js";
 import { isThinkingEffort } from "./structured-provider-common.js";
 import { DEFAULT_PASSWORD_VAULT_ID, DEFAULT_PASSWORD_VAULT_NAME, decryptVaultSecret, encryptVaultSecret, itemMatchesFilter, normalizePasswordItemInput, normalizeVaultName, nowIso, } from "./password-manager.js";
 function safeJsonParse(raw) {
@@ -996,6 +997,35 @@ export function ensureDatabaseFile(dbPath) {
     chmodSync(dbPath, 0o600);
     return created;
 }
+const WAND_TASK_FIELDS = `id, identifier, workspace_id, workspace_task_id, parent_task_id,
+  title, title_source, auto_title_signature, description, status, priority, labels_json,
+  due_date, milestone_id, sort_order, agent_json, created_at, updated_at`;
+// Shared metadata comes from the latest explicitly linked card, including meaningful NULLs.
+// The old container columns remain readable for legacy rows until the startup migration.
+const WORKSPACE_TASK_PROJECTION = `SELECT wt.id,
+  CASE WHEN card.id IS NULL THEN wt.workspace_id
+    ELSE COALESCE(card.workspace_id, '${GLOBAL_WORKSPACE_ID}') END AS workspace_id,
+  CASE WHEN card.id IS NULL THEN wt.name ELSE card.title END AS name,
+  CASE WHEN card.id IS NULL THEN wt.status
+    WHEN card.status IN ('done', 'archived') THEN 'done' ELSE 'active' END AS status,
+  CASE WHEN card.id IS NULL THEN wt.milestone_id ELSE card.milestone_id END AS milestone_id,
+  wt.worktree_json, wt.layout_json, wt.cwd, wt.created_at, wt.last_opened_at, wt.layout_revision,
+  wt.rowid AS _created_order
+  FROM workspace_tasks wt LEFT JOIN wand_tasks card ON card.id = (
+    SELECT id FROM wand_tasks WHERE workspace_task_id = wt.id
+    ORDER BY updated_at DESC, rowid DESC LIMIT 1
+  )`;
+function withoutSessionTab(node, sessionId) {
+    if (node.type === "split")
+        return {
+            ...node,
+            children: [withoutSessionTab(node.children[0], sessionId), withoutSessionTab(node.children[1], sessionId)],
+        };
+    const activeId = node.tabs[node.active]?.id;
+    const tabs = node.tabs.filter((tab) => tab.kind !== "session" || tab.sessionId !== sessionId);
+    const active = tabs.findIndex((tab) => tab.id === activeId);
+    return { ...node, tabs, active: active >= 0 ? active : Math.min(node.active, Math.max(0, tabs.length - 1)) };
+}
 export class WandStorage {
     db;
     dbPath;
@@ -1016,6 +1046,7 @@ export class WandStorage {
         ensureAiTeamSchema(this.db);
         ensureConnectorSchema(this.db);
         this.ensureDefaultPasswordVault();
+        this.migrateTaskRecords();
     }
     directory() {
         return path.dirname(this.dbPath);
@@ -1233,20 +1264,40 @@ export class WandStorage {
         this.db.prepare("UPDATE workspaces SET last_opened_at = ? WHERE id = ?").run(nowIso(), id);
     }
     deleteWorkspace(id, options = {}) {
-        if (options.cascade) {
-            this.db.prepare(`DELETE FROM command_sessions
-         WHERE workspace_id = ?
-            OR workspace_task_id IN (SELECT id FROM workspace_tasks WHERE workspace_id = ?)`).run(id, id);
-        }
-        else {
-            // 解绑：保留会话，同时清空 workspace 与即将级联删除的 task 归属。
-            this.db.prepare(`UPDATE command_sessions
-         SET workspace_id = NULL, workspace_task_id = NULL
-         WHERE workspace_id = ?
-            OR workspace_task_id IN (SELECT id FROM workspace_tasks WHERE workspace_id = ?)`).run(id, id);
-        }
-        this.db.prepare("DELETE FROM workspaces WHERE id = ?").run(id);
-        this.forgetWorkspaceGroupOrder(id);
+        this.transaction(() => {
+            const cards = this.db.prepare(`SELECT ${WAND_TASK_FIELDS} FROM wand_tasks
+        WHERE workspace_task_id IN (SELECT id FROM workspace_tasks WHERE workspace_id = ?)`)
+                .all(id);
+            if (options.cascade) {
+                this.db.prepare(`DELETE FROM command_sessions WHERE workspace_id = ?
+          OR workspace_task_id IN (SELECT id FROM workspace_tasks WHERE workspace_id = ?)`)
+                    .run(id, id);
+            }
+            else {
+                this.db.prepare(`UPDATE command_sessions SET workspace_id = NULL, workspace_task_id = NULL
+          WHERE workspace_id = ? OR workspace_task_id IN
+            (SELECT id FROM workspace_tasks WHERE workspace_id = ?)`)
+                    .run(id, id);
+            }
+            this.db.prepare(`UPDATE wand_tasks SET workspace_task_id = NULL
+        WHERE workspace_task_id IN (SELECT id FROM workspace_tasks WHERE workspace_id = ?)`)
+                .run(id);
+            this.db.prepare("DELETE FROM workspaces WHERE id = ?").run(id);
+            // Direct project removal detaches active cards; their next dispatch still uses the default cwd.
+            // Route-level destructive removal archives cards first, so those cards never gain a container.
+            for (const row of cards) {
+                const card = this.mapWandTaskRow(row);
+                if (card.status === "archived")
+                    continue;
+                const global = this.ensureGlobalWorkspace();
+                const containerId = this.insertWorkspaceTask({
+                    workspaceId: global.id, name: card.title, milestoneId: card.milestoneId,
+                    status: card.status === "done" ? "done" : "active", createdAt: card.createdAt,
+                });
+                this.writeWandTask(this.getWandTask(card.id), { workspaceTaskId: containerId });
+            }
+            this.forgetWorkspaceGroupOrder(id);
+        });
     }
     listSessionsByWorkspace(workspaceId) {
         const rows = this.db
@@ -1264,7 +1315,10 @@ export class WandStorage {
         return row ? { workspaceId: row.workspace_id ?? undefined, workspaceTaskId: row.workspace_task_id ?? undefined } : null;
     }
     setSessionWorkspaceId(sessionId, workspaceId) {
-        this.db.prepare("UPDATE command_sessions SET workspace_id = ? WHERE id = ?").run(workspaceId, sessionId);
+        const binding = this.getSessionWorkspace(sessionId);
+        const task = binding?.workspaceTaskId ? this.getWorkspaceTask(binding.workspaceTaskId) : null;
+        this.db.prepare("UPDATE command_sessions SET workspace_id = ? WHERE id = ?")
+            .run(task?.workspaceId ?? workspaceId, sessionId);
     }
     /** Lightweight count of persisted sessions grouped by workspace. */
     countSessionsByWorkspace() {
@@ -1306,84 +1360,78 @@ export class WandStorage {
         }));
     }
     // ── Workspace tasks（任务 = 命名 + 独立 worktree + 一组标签）──
-    /** 侧栏任务顺序：新创建在前。GET /api/tasks 按此顺序填充目录组。 */
+    /** Both task DTOs read one set of task metadata; containers own only local layout/worktree. */
     listWorkspaceTasks(workspaceId) {
-        const rows = this.db
-            .prepare(`SELECT id, workspace_id, name, worktree_json, layout_json, status, cwd, milestone_id, created_at, last_opened_at, layout_revision
-         FROM workspace_tasks WHERE workspace_id = ?
-         ORDER BY created_at DESC, rowid DESC`)
-            .all(workspaceId);
+        const rows = this.db.prepare(`SELECT * FROM (${WORKSPACE_TASK_PROJECTION}) WHERE workspace_id = ?
+       ORDER BY created_at DESC, _created_order DESC`).all(workspaceId);
         return rows.map(mapWorkspaceTaskRow);
     }
     getWorkspaceTask(id) {
-        const row = this.db
-            .prepare(`SELECT id, workspace_id, name, worktree_json, layout_json, status, cwd, milestone_id, created_at, last_opened_at, layout_revision
-         FROM workspace_tasks WHERE id = ?`)
+        const row = this.db.prepare(`${WORKSPACE_TASK_PROJECTION} WHERE wt.id = ?`)
             .get(id);
         return row ? mapWorkspaceTaskRow(row) : null;
     }
-    createWorkspaceTask(input) {
+    insertWorkspaceTask(input) {
         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;
-        const milestoneId = typeof input.milestoneId === "string" && input.milestoneId ? input.milestoneId : null;
-        this.db
-            .prepare(`INSERT INTO workspace_tasks (id, workspace_id, name, worktree_json, layout_json, status, cwd, milestone_id, created_at, last_opened_at)
-         VALUES (?, ?, ?, ?, NULL, ?, ?, ?, ?, NULL)`)
-            .run(id, input.workspaceId, input.name, input.worktree ? JSON.stringify(input.worktree) : null, status, cwd, milestoneId, createdAt);
-        return {
-            id,
-            workspaceId: input.workspaceId,
-            name: input.name,
-            worktree: input.worktree ?? null,
-            ...(cwd ? { cwd } : {}),
-            milestoneId,
-            layout: null,
-            status,
-            createdAt,
-            lastOpenedAt: null,
-        };
+        this.db.prepare(`INSERT INTO workspace_tasks
+      (id, workspace_id, name, worktree_json, layout_json, status, cwd, milestone_id, created_at, last_opened_at)
+      VALUES (?, ?, ?, ?, NULL, ?, ?, ?, ?, NULL)`)
+            .run(id, input.workspaceId, input.name, input.worktree ? JSON.stringify(input.worktree) : null, input.status ?? "active", input.cwd?.trim() || null, input.milestoneId ?? null, input.createdAt ?? nowIso());
+        return id;
+    }
+    taskMilestoneForWrite(id, workspaceId) {
+        if (!id)
+            return this.ensureDefaultWandMilestone().id;
+        const milestone = this.getWandMilestone(id);
+        if (!milestone)
+            throw new Error("未找到该里程碑。");
+        return workspaceId && milestone.workspaceId && milestone.workspaceId !== workspaceId
+            ? this.ensureDefaultWandMilestone().id : id;
+    }
+    createWorkspaceTask(input) {
+        return this.transaction(() => {
+            const workspace = this.getWorkspace(input.workspaceId);
+            if (!workspace)
+                throw new Error("任务所属工作区不存在。");
+            const projectId = workspace.kind === "global" || workspace.id === GLOBAL_WORKSPACE_ID ? null : workspace.id;
+            const milestoneId = this.taskMilestoneForWrite(input.milestoneId, projectId);
+            const id = this.insertWorkspaceTask({ ...input, milestoneId });
+            this.insertWandTask({
+                ...input.board, workspaceTaskId: id,
+                workspaceId: projectId,
+                title: input.name,
+                titleSource: input.board?.titleSource ?? (isUnnamedWorkspaceTaskName(input.name) ? "auto" : "user"),
+                status: input.status === "done" ? "done" : "todo", milestoneId,
+            });
+            return this.getWorkspaceTask(id);
+        });
     }
     updateWorkspaceTask(id, patch) {
-        const assignments = [];
-        const values = [];
-        if (patch.workspaceId !== undefined) {
-            assignments.push("workspace_id = ?");
-            values.push(patch.workspaceId);
-        }
-        if (patch.name !== undefined) {
-            assignments.push("name = ?");
-            values.push(patch.name);
-        }
-        if (patch.status !== undefined) {
-            assignments.push("status = ?");
-            values.push(patch.status);
-        }
-        if (patch.worktree !== undefined) {
-            assignments.push("worktree_json = ?");
-            values.push(patch.worktree ? JSON.stringify(patch.worktree) : null);
-        }
-        if (patch.milestoneId !== undefined) {
-            assignments.push("milestone_id = ?");
-            values.push(patch.milestoneId || null);
-        }
-        if (assignments.length === 0)
-            return;
-        this.db.prepare(`UPDATE workspace_tasks SET ${assignments.join(", ")} WHERE id = ?`).run(...values, id);
-        const card = this.getWandTaskByWorkspaceTaskId(id);
-        if (card) {
-            // Reverse projection uses direct SQL, so these writers cannot recurse.
-            this.updateWandTask(card.id, {
+        this.transaction(() => {
+            const card = this.getWandTaskByWorkspaceTaskId(id);
+            if (!card)
+                throw new Error("未找到该任务。");
+            if (patch.worktree !== undefined) {
+                this.db.prepare("UPDATE workspace_tasks SET worktree_json = ? WHERE id = ?")
+                    .run(patch.worktree ? JSON.stringify(patch.worktree) : null, id);
+            }
+            this.writeWandTask(card, {
                 ...(patch.name !== undefined ? { title: patch.name, titleSource: "user" } : {}),
                 ...(patch.milestoneId !== undefined ? { milestoneId: patch.milestoneId } : {}),
+                ...(patch.workspaceId !== undefined ? {
+                    workspaceId: patch.workspaceId === GLOBAL_WORKSPACE_ID ? null : patch.workspaceId,
+                } : {}),
                 ...(patch.status !== undefined ? {
                     status: patch.status === "done"
                         ? card.status === "archived" ? "archived" : "done"
                         : card.status === "todo" ? "todo" : "doing",
                 } : {}),
             });
-        }
+        });
+    }
+    archiveWorkspaceTask(id) {
+        const card = this.getWandTaskByWorkspaceTaskId(id);
+        return card ? this.updateWandTask(card.id, { status: "archived" }) : null;
     }
     saveWorkspaceTaskLayout(id, layout, expectedRevision) {
         const current = this.getWorkspaceTask(id);
@@ -1403,13 +1451,17 @@ export class WandStorage {
         this.db.prepare("UPDATE workspace_tasks SET last_opened_at = ? WHERE id = ?").run(nowIso(), id);
     }
     deleteWorkspaceTask(id, options = {}) {
-        if (options.cascade) {
-            this.db.prepare("DELETE FROM command_sessions WHERE workspace_task_id = ?").run(id);
-        }
-        else {
-            this.db.prepare("UPDATE command_sessions SET workspace_task_id = NULL WHERE workspace_task_id = ?").run(id);
-        }
-        this.db.prepare("DELETE FROM workspace_tasks WHERE id = ?").run(id);
+        this.transaction(() => {
+            this.db.prepare(`UPDATE wand_tasks SET workspace_task_id = NULL, status = 'archived', updated_at = ?
+        WHERE workspace_task_id = ?`).run(nowIso(), id);
+            if (options.cascade) {
+                this.db.prepare("DELETE FROM command_sessions WHERE workspace_task_id = ?").run(id);
+            }
+            else {
+                this.db.prepare("UPDATE command_sessions SET workspace_task_id = NULL WHERE workspace_task_id = ?").run(id);
+            }
+            this.db.prepare("DELETE FROM workspace_tasks WHERE id = ?").run(id);
+        });
     }
     tasksAggregateFingerprint() {
         const sessions = this.db.prepare(`SELECT COUNT(*) AS count,
@@ -1421,7 +1473,7 @@ export class WandStorage {
         // 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();
+       FROM (${WORKSPACE_TASK_PROJECTION}) 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
@@ -1438,9 +1490,24 @@ export class WandStorage {
             names,
         });
     }
+    /**
+     * 会话列表团队标记的廉价指纹：运行/步骤状态一变，`/api/tasks` 里的 `teamChat`/`teamStep`
+     * 就跟着变，客户端必须肯重拉。只看聚合值和最近若干条状态，不逐行拼整张表。
+     */
+    teamSessionFingerprint() {
+        const runs = this.db.prepare(`SELECT COUNT(*) AS count,
+              COALESCE((SELECT GROUP_CONCAT(status || ':' || COALESCE(chat_session_id, ''), '|')
+                        FROM (SELECT status, chat_session_id FROM ai_team_runs ORDER BY rowid DESC LIMIT 500)), '') AS statuses
+       FROM ai_team_runs`).get();
+        const steps = this.db.prepare(`SELECT COUNT(*) AS count,
+              COALESCE((SELECT GROUP_CONCAT(status || ':' || COALESCE(session_id, ''), '|')
+                        FROM (SELECT status, session_id FROM ai_team_steps ORDER BY rowid DESC LIMIT 500)), '') AS statuses
+       FROM ai_team_steps`).get();
+        return JSON.stringify({ runs, steps });
+    }
     /** GET /api/wand-tasks 的顺序：新创建在前。客户端按此顺序渲染，不再本地排序。 */
     listWandTasks(workspaceId) {
-        const rows = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, parent_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at
+        const rows = this.db.prepare(`SELECT ${WAND_TASK_FIELDS}
        FROM wand_tasks ${workspaceId === undefined ? "" : "WHERE workspace_id IS ?"}
        ORDER BY created_at DESC, rowid DESC`).all(...(workspaceId === undefined ? [] : [workspaceId]));
         return rows.map((row) => this.mapWandTaskRow(row));
@@ -1468,42 +1535,181 @@ export class WandStorage {
         };
     }
     getWandTask(id) {
-        return this.listWandTasks().find((task) => task.id === id) ?? null;
+        const row = this.db.prepare(`SELECT ${WAND_TASK_FIELDS} FROM wand_tasks WHERE id = ?`)
+            .get(id);
+        return row ? this.mapWandTaskRow(row) : null;
     }
     getWandTaskByWorkspaceTaskId(workspaceTaskId) {
-        const row = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, parent_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at
-       FROM wand_tasks WHERE workspace_task_id = ? ORDER BY updated_at DESC LIMIT 1`).get(workspaceTaskId);
+        const row = this.db.prepare(`SELECT ${WAND_TASK_FIELDS} FROM wand_tasks
+      WHERE workspace_task_id = ? ORDER BY updated_at DESC, rowid DESC LIMIT 1`)
+            .get(workspaceTaskId);
         return row ? this.mapWandTaskRow(row) : null;
     }
-    createWandTask(input) {
+    insertWandTask(input, createdAt = nowIso()) {
         const id = crypto.randomUUID();
-        const now = nowIso();
         const status = input.status ?? "todo";
-        const priority = input.priority ?? DEFAULT_WAND_TASK_PRIORITY;
-        const max = this.db.prepare("SELECT COALESCE(MAX(sort_order), -1) AS value FROM wand_tasks WHERE workspace_id IS ? AND status = ?").get(input.workspaceId ?? null, status);
-        const numberRow = this.db.prepare("SELECT COALESCE(MAX(CAST(substr(identifier, 6) AS INTEGER)), 0) AS value FROM wand_tasks WHERE identifier GLOB 'TASK-[0-9]*'").get();
-        const identifier = `TASK-${(numberRow?.value ?? 0) + 1}`;
-        this.db.prepare(`INSERT INTO wand_tasks (id, identifier, workspace_id, workspace_task_id, parent_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, identifier, input.workspaceId ?? null, input.workspaceTaskId ?? null, input.parentTaskId ?? null, input.title, input.titleSource ?? "user", null, input.description ?? "", status, priority, JSON.stringify(input.labels ?? []), input.dueDate ?? null, input.milestoneId ?? null, (max?.value ?? -1) + 1, input.agent ? JSON.stringify(input.agent) : null, now, now);
+        const max = this.db.prepare(`SELECT COALESCE(MAX(sort_order), -1) AS value FROM wand_tasks
+      WHERE workspace_id IS ? AND status = ?`).get(input.workspaceId ?? null, status);
+        const number = this.db.prepare(`SELECT COALESCE(MAX(CAST(substr(identifier, 6) AS INTEGER)), 0) AS value
+      FROM wand_tasks WHERE identifier GLOB 'TASK-[0-9]*'`).get();
+        this.db.prepare(`INSERT INTO wand_tasks (${WAND_TASK_FIELDS})
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
+            .run(id, `TASK-${number.value + 1}`, input.workspaceId ?? null, input.workspaceTaskId ?? null, input.parentTaskId ?? null, input.title, input.titleSource ?? "user", null, input.description ?? "", status, input.priority ?? DEFAULT_WAND_TASK_PRIORITY, JSON.stringify(input.labels ?? []), input.dueDate ?? null, input.milestoneId ?? null, max.value + 1, input.agent ? JSON.stringify(input.agent) : null, createdAt, createdAt);
         return this.getWandTask(id);
     }
-    updateWandTask(id, patch) {
-        const current = this.getWandTask(id);
-        if (!current)
-            return null;
+    createWandTask(input) {
+        return this.transaction(() => {
+            const linked = input.workspaceTaskId ? this.getWorkspaceTask(input.workspaceTaskId) : null;
+            const workspaceId = input.workspaceId === undefined && linked
+                ? linked.workspaceId === GLOBAL_WORKSPACE_ID ? null : linked.workspaceId
+                : input.workspaceId ?? null;
+            const workspace = workspaceId ? this.getWorkspace(workspaceId) : this.ensureGlobalWorkspace();
+            if (!workspace)
+                throw new Error("任务所属工作区不存在。");
+            const milestoneId = this.taskMilestoneForWrite(input.milestoneId, workspaceId);
+            if (input.workspaceTaskId) {
+                const container = this.getWorkspaceTask(input.workspaceTaskId);
+                if (!container)
+                    throw new Error("未找到该任务。");
+                const existing = this.getWandTaskByWorkspaceTaskId(container.id);
+                // Compatibility for callers which supplied a previously created container.
+                if (existing)
+                    return this.writeWandTask(existing, { ...input, workspaceId, milestoneId });
+            }
+            const workspaceTaskId = input.workspaceTaskId ?? this.insertWorkspaceTask({
+                workspaceId: workspace.id, name: input.title,
+                status: input.status === "done" || input.status === "archived" ? "done" : "active",
+                milestoneId,
+            });
+            return this.insertWandTask({ ...input, workspaceId, workspaceTaskId, milestoneId });
+        });
+    }
+    /** Private canonical writer; callers own the transaction, never a reverse writer. */
+    writeWandTask(current, patch) {
         const next = { ...current, ...patch, updatedAt: nowIso() };
-        this.db.prepare(`UPDATE wand_tasks SET workspace_id = ?, workspace_task_id = ?, parent_task_id = ?, title = ?, title_source = ?, auto_title_signature = ?, description = ?, status = ?, priority = ?, labels_json = ?, due_date = ?, milestone_id = ?, sort_order = ?, agent_json = ?, updated_at = ? WHERE id = ?`).run(next.workspaceId, next.workspaceTaskId, next.parentTaskId, next.title, next.titleSource, next.autoTitleSignature ?? null, next.description, next.status, next.priority, JSON.stringify(next.labels), next.dueDate, next.milestoneId ?? null, next.sortOrder, next.agent ? JSON.stringify(next.agent) : null, next.updatedAt, id);
-        if (next.workspaceTaskId) {
+        if (patch.milestoneId !== undefined || patch.workspaceId !== undefined) {
+            next.milestoneId = this.taskMilestoneForWrite(next.milestoneId, next.workspaceId);
+        }
+        if (!next.workspaceTaskId && next.status !== "archived") {
+            const workspace = next.workspaceId ? this.getWorkspace(next.workspaceId) : this.ensureGlobalWorkspace();
+            if (!workspace)
+                throw new Error("任务所属工作区不存在。");
+            next.workspaceTaskId = this.insertWorkspaceTask({
+                workspaceId: workspace.id, name: next.title, milestoneId: next.milestoneId,
+                status: next.status === "done" ? "done" : "active", createdAt: next.createdAt,
+            });
+        }
+        this.db.prepare(`UPDATE wand_tasks SET workspace_id = ?, workspace_task_id = ?, parent_task_id = ?,
+      title = ?, title_source = ?, auto_title_signature = ?, description = ?, status = ?, priority = ?,
+      labels_json = ?, due_date = ?, milestone_id = ?, sort_order = ?, agent_json = ?, updated_at = ?
+      WHERE id = ?`)
+            .run(next.workspaceId, next.workspaceTaskId, next.parentTaskId, next.title, next.titleSource, next.autoTitleSignature ?? null, next.description, next.status, next.priority, JSON.stringify(next.labels), next.dueDate, next.milestoneId ?? null, next.sortOrder, next.agent ? JSON.stringify(next.agent) : null, next.updatedAt, next.id);
+        if (patch.workspaceId !== undefined && next.workspaceTaskId) {
             const workspaceId = next.workspaceId ?? this.ensureGlobalWorkspace().id;
-            this.db.prepare(`UPDATE workspace_tasks SET name = ?, status = ?, milestone_id = ?, workspace_id = ? WHERE id = ?`)
-                .run(next.title, next.status === "done" || next.status === "archived" ? "done" : "active", next.milestoneId ?? null, workspaceId, next.workspaceTaskId);
+            // The container FK/index and standalone session workspace bucket follow the canonical project.
+            this.db.prepare("UPDATE workspace_tasks SET workspace_id = ? WHERE id = ?")
+                .run(workspaceId, next.workspaceTaskId);
             this.db.prepare("UPDATE command_sessions SET workspace_id = ? WHERE workspace_task_id = ?")
                 .run(workspaceId, next.workspaceTaskId);
         }
         return next;
     }
+    updateWandTask(id, patch) {
+        return this.transaction(() => {
+            const current = this.getWandTask(id);
+            if (!current)
+                return null;
+            return this.writeWandTask(current, patch);
+        });
+    }
+    /** Commit completion archives only the selected completed cards, atomically. */
+    archiveCompletedWandTasks(ids) {
+        return this.transaction(() => {
+            const archived = [];
+            for (const id of new Set(ids)) {
+                const task = this.getWandTask(id);
+                if (task?.status !== "done")
+                    continue;
+                this.writeWandTask(task, { status: "archived" });
+                archived.push(id);
+            }
+            return archived;
+        });
+    }
     deleteWandTask(id) {
-        this.db.prepare("UPDATE wand_tasks SET parent_task_id = NULL WHERE parent_task_id = ?").run(id);
-        this.db.prepare("DELETE FROM wand_tasks WHERE id = ?").run(id);
+        this.transaction(() => {
+            const card = this.getWandTask(id);
+            if (!card)
+                return;
+            this.db.prepare("UPDATE wand_tasks SET parent_task_id = NULL WHERE parent_task_id = ?").run(id);
+            if (card.workspaceTaskId) {
+                this.db.prepare("UPDATE command_sessions SET workspace_task_id = NULL WHERE workspace_task_id = ?")
+                    .run(card.workspaceTaskId);
+                this.db.prepare("DELETE FROM workspace_tasks WHERE id = ?").run(card.workspaceTaskId);
+            }
+            this.db.prepare("DELETE FROM wand_tasks WHERE id = ?").run(id);
+        });
+    }
+    /** One-time id-based reconciliation; normal reads never create tasks or repair membership. */
+    migrateTaskRecords() {
+        if (this.getPreference("pref:taskRecordsVersion", 0) === 1)
+            return;
+        this.transaction(() => {
+            for (const workspace of this.listWorkspaces()) {
+                for (const task of this.listWorkspaceTasks(workspace.id)) {
+                    if (this.getWandTaskByWorkspaceTaskId(task.id))
+                        continue;
+                    this.insertWandTask({
+                        workspaceId: workspace.kind === "global" || workspace.id === GLOBAL_WORKSPACE_ID ? null : workspace.id,
+                        workspaceTaskId: task.id, title: task.name,
+                        titleSource: isUnnamedWorkspaceTaskName(task.name) ? "auto" : "user",
+                        status: task.status === "done" ? "done" : "todo", milestoneId: task.milestoneId,
+                    }, task.createdAt);
+                }
+            }
+            for (const card of this.listWandTasks()) {
+                let container = card.workspaceTaskId ? this.getWorkspaceTask(card.workspaceTaskId) : null;
+                if (!container && card.status !== "archived") {
+                    const workspace = card.workspaceId ? this.getWorkspace(card.workspaceId) : this.ensureGlobalWorkspace();
+                    if (!workspace)
+                        continue;
+                    const id = this.insertWorkspaceTask({
+                        workspaceId: workspace.id, name: card.title, milestoneId: card.milestoneId,
+                        status: card.status === "done" ? "done" : "active", createdAt: card.createdAt,
+                    });
+                    this.writeWandTask(card, { workspaceTaskId: id });
+                    container = this.getWorkspaceTask(id);
+                }
+                if (!container || this.getWandTaskByWorkspaceTaskId(container.id)?.id !== card.id)
+                    continue;
+                this.db.prepare("UPDATE workspace_tasks SET workspace_id = ? WHERE id = ?")
+                    .run(container.workspaceId, container.id);
+                const previouslyBound = new Set(this.legacyWandTaskSessionIds(card.id));
+                for (const sessionId of previouslyBound) {
+                    const session = this.getSessionWorkspace(sessionId);
+                    if (!session || (session.workspaceTaskId && session.workspaceTaskId !== container.id))
+                        continue;
+                    this.db.prepare("UPDATE command_sessions SET workspace_task_id = ?, workspace_id = ? WHERE id = ?")
+                        .run(container.id, container.workspaceId, sessionId);
+                }
+                this.db.prepare("UPDATE command_sessions SET workspace_id = ? WHERE workspace_task_id = ?")
+                    .run(container.workspaceId, container.id);
+                const sessions = this.listSessionsByWorkspaceTaskSlim(container.id);
+                for (const session of sessions) {
+                    this.db.prepare("INSERT OR IGNORE INTO wand_task_sessions (task_id, session_id, bound_at) VALUES (?, ?, ?)")
+                        .run(card.id, session.id, nowIso());
+                }
+                const agentSession = sessions.find((session) => isSessionProvider(session.provider));
+                const newlyAssigned = sessions.some((session) => !previouslyBound.has(session.id));
+                if (agentSession && (!card.agent || newlyAssigned)) {
+                    this.recordTaskSession(agentSession, newlyAssigned);
+                }
+                else if (newlyAssigned && sessions[0]) {
+                    this.recordTaskSession(sessions[0]);
+                }
+            }
+            this.setPreference("pref:taskRecordsVersion", 1);
+        });
     }
     // ── 里程碑（迭代，归属工作区；任务只存 milestoneId）──
     /**
@@ -1664,28 +1870,109 @@ export class WandStorage {
         return Number(result.changes) || 0;
     }
     // ============ 会话 → 任务 / 迭代 ============
-    /** 会话绑定的看板任务 id；没绑或已删除时返回 null。 */
+    /** Live membership has a single owner: command_sessions.workspace_task_id. */
     getWandTaskIdForSession(sessionId) {
-        const row = this.db.prepare("SELECT task_id FROM wand_task_sessions WHERE session_id = ? ORDER BY rowid DESC LIMIT 1").get(sessionId);
-        return row?.task_id || null;
+        const binding = this.getSessionWorkspace(sessionId);
+        if (binding?.workspaceTaskId)
+            return this.getWandTaskByWorkspaceTaskId(binding.workspaceTaskId)?.id ?? null;
+        const row = this.db.prepare(`SELECT links.task_id FROM wand_task_sessions links
+      JOIN wand_tasks card ON card.id = links.task_id
+      WHERE links.session_id = ? AND card.workspace_task_id IS NULL AND card.status = 'archived'
+      ORDER BY links.rowid DESC LIMIT 1`).get(sessionId);
+        return row?.task_id ?? null;
+    }
+    legacyWandTaskSessionIds(taskId) {
+        const rows = this.db.prepare(`SELECT session_id FROM wand_task_sessions
+      WHERE task_id = ? ORDER BY rowid ASC, session_id ASC`).all(taskId);
+        return rows.map((row) => row.session_id);
     }
     listWandTaskSessionIds(taskId) {
-        const rows = this.db.prepare("SELECT session_id FROM wand_task_sessions WHERE task_id = ? ORDER BY rowid ASC, session_id ASC").all(taskId);
-        return rows.map((row) => row.session_id);
+        const task = this.getWandTask(taskId);
+        if (!task)
+            return [];
+        if (!task.workspaceTaskId)
+            return task.status === "archived" ? this.legacyWandTaskSessionIds(taskId) : [];
+        // Binding timestamps are ordering metadata only; stale membership cannot leak into this projection.
+        const rows = this.db.prepare(`SELECT s.id FROM command_sessions s
+      LEFT JOIN wand_task_sessions links ON links.session_id = s.id AND links.task_id = ?
+      WHERE s.workspace_task_id = ? ORDER BY COALESCE(links.bound_at, s.started_at), s.rowid`)
+            .all(task.id, task.workspaceTaskId);
+        return rows.map((row) => row.id);
     }
     listBoundWandTaskSessionIds() {
-        const rows = this.db.prepare("SELECT session_id FROM wand_task_sessions").all();
-        return rows.map((row) => row.session_id);
+        const rows = this.db.prepare(`SELECT s.id FROM command_sessions s
+      WHERE EXISTS (SELECT 1 FROM wand_tasks card WHERE card.workspace_task_id = s.workspace_task_id)
+      ORDER BY s.rowid`).all();
+        return rows.map((row) => row.id);
     }
     bindWandTaskSession(taskId, sessionId) {
-        if (!this.getWandTask(taskId))
+        const task = this.getWandTask(taskId);
+        if (!task?.workspaceTaskId)
             throw new Error("未找到该任务。");
-        if (!this.getSession(sessionId))
-            throw new Error("未找到该会话。");
-        this.db.prepare("DELETE FROM wand_task_sessions WHERE session_id = ? AND task_id != ?").run(sessionId, taskId);
-        this.db.prepare("INSERT OR IGNORE INTO wand_task_sessions (task_id, session_id, bound_at) VALUES (?, ?, ?)").run(taskId, sessionId, nowIso());
+        this.moveSessionToWorkspaceTask(sessionId, task.workspaceTaskId);
+    }
+    unbindWandTaskSession(taskId, sessionId) {
+        if (this.getWandTaskIdForSession(sessionId) === taskId)
+            this.moveSessionToWorkspaceTask(sessionId, null);
+        else
+            this.db.prepare("DELETE FROM wand_task_sessions WHERE task_id = ? AND session_id = ?").run(taskId, sessionId);
+    }
+    /** Atomic exclusive ownership change; cwd, output and execution are untouched. */
+    moveSessionToWorkspaceTask(sessionId, taskId) {
+        this.transaction(() => {
+            const session = this.getSessionWorkspace(sessionId);
+            if (!session)
+                throw new Error("未找到该会话。");
+            const target = taskId ? this.getWorkspaceTask(taskId) : null;
+            if (taskId && !target)
+                throw new Error("未找到目标任务。");
+            if (target && !this.getWorkspace(target.workspaceId))
+                throw new Error("目标工作区不存在。");
+            const source = session.workspaceTaskId ? this.getWorkspaceTask(session.workspaceTaskId) : null;
+            if (source && source.id !== target?.id && source.layout) {
+                const windows = source.layout.windows.map((window) => {
+                    const layout = withoutSessionTab(window.layout, sessionId);
+                    return { ...window, layout, activeTabId: firstLayoutTabId(layout) };
+                });
+                this.saveWorkspaceTaskLayout(source.id, { ...source.layout, windows });
+            }
+            const targetCard = target ? this.getWandTaskByWorkspaceTaskId(target.id) : null;
+            if (target && !targetCard)
+                throw new Error("未找到目标任务。");
+            this.db.prepare("DELETE FROM wand_task_sessions WHERE session_id = ? AND (? IS NULL OR task_id != ?)")
+                .run(sessionId, targetCard?.id ?? null, targetCard?.id ?? null);
+            this.db.prepare("UPDATE command_sessions SET workspace_task_id = ?, workspace_id = ? WHERE id = ?")
+                .run(target?.id ?? null, target?.workspaceId ?? session.workspaceId ?? null, sessionId);
+            if (target) {
+                this.db.prepare("INSERT OR IGNORE INTO wand_task_sessions (task_id, session_id, bound_at) VALUES (?, ?, ?)")
+                    .run(targetCard.id, sessionId, nowIso());
+                if (source?.id !== target.id)
+                    this.recordTaskSession(this.getSessionSlim(sessionId));
+            }
+        });
+    }
+    /** Metadata promotion happens on session creation/move, never on reads or checkpoints. */
+    recordTaskSession(session, newlyAssigned = true) {
+        if (!session.workspaceTaskId)
+            return;
+        const card = this.getWandTaskByWorkspaceTaskId(session.workspaceTaskId);
+        if (!card)
+            return;
+        this.db.prepare("INSERT OR IGNORE INTO wand_task_sessions (task_id, session_id, bound_at) VALUES (?, ?, ?)")
+            .run(card.id, session.id, nowIso());
+        const provider = session.provider;
+        const agent = isSessionProvider(provider) ? {
+            provider,
+            model: session.selectedModel || session.structuredState?.model || "default",
+            thinkingEffort: isThinkingEffort(session.thinkingEffort) ? session.thinkingEffort : "off",
+            mode: normalizeWandTaskAgentMode(provider, session.mode),
+            kind: session.sessionKind === "structured" ? "structured" : "pty",
+        } : null;
+        this.db.prepare(`UPDATE wand_tasks SET agent_json = COALESCE(agent_json, ?),
+      status = CASE WHEN status = 'todo' AND ? THEN 'doing' ELSE status END,
+      updated_at = ? WHERE id = ?`)
+            .run(agent ? JSON.stringify(agent) : null, newlyAssigned ? 1 : 0, nowIso(), card.id);
     }
-    unbindWandTaskSession(taskId, sessionId) { this.db.prepare("DELETE FROM wand_task_sessions WHERE task_id = ? AND session_id = ?").run(taskId, sessionId); }
     listGithubIssueBindings(owner, repo, issueNumber) {
         const rows = this.db.prepare(`SELECT session_id, bound_at FROM github_issue_bindings
        WHERE owner = ? AND repo = ? AND issue_number = ? ORDER BY bound_at ASC`).all(owner, repo, issueNumber);
@@ -1725,7 +2012,7 @@ export class WandStorage {
         return rows.map((row) => this.mapSessionRow(row));
     }
     setSessionWorkspaceTaskId(sessionId, taskId) {
-        this.db.prepare("UPDATE command_sessions SET workspace_task_id = ? WHERE id = ?").run(taskId, sessionId);
+        this.moveSessionToWorkspaceTask(sessionId, taskId);
     }
     /** Get password from database */
     getPassword() {
@@ -2014,8 +2301,9 @@ export class WandStorage {
      * 一次查询建整张表，供 /api/tasks 每请求一次构建；不逐会话查询。
      */
     listAiTeamRunChatMarkers() {
-        const rows = this.db.prepare(`SELECT id, team_json, chat_session_id FROM ai_team_runs
-       WHERE chat_session_id IS NOT NULL AND chat_session_id <> '' ORDER BY created_at DESC`).all();
+        const rows = this.db.prepare(`SELECT r.id, r.team_json, r.chat_session_id, t.name AS current_team_name
+       FROM ai_team_runs r LEFT JOIN ai_teams t ON t.id = r.team_id
+       WHERE r.chat_session_id IS NOT NULL AND r.chat_session_id <> '' ORDER BY r.created_at DESC`).all();
         const markers = new Map();
         for (const row of rows) {
             const chatSessionId = typeof row.chat_session_id === "string" ? row.chat_session_id : "";
@@ -2024,12 +2312,59 @@ export class WandStorage {
             const rawTeam = safeJsonParse(typeof row.team_json === "string" ? row.team_json : null);
             markers.set(chatSessionId, {
                 runId: String(row.id),
-                teamName: String(rawTeam?.name ?? ""),
+                teamName: typeof row.current_team_name === "string" ? row.current_team_name : String(rawTeam?.name ?? ""),
                 memberCount: Array.isArray(rawTeam?.members) ? rawTeam.members.length : 0,
             });
         }
         return markers;
     }
+    /**
+     * 会话列表用的成员步骤标记：session_id → 这一步的身份。
+     * 和 `listAiTeamRunChatMarkers()` 一样一次查询建整张表，供 /api/tasks 每请求一次构建。
+     * 同一个会话被多个步骤复用时取 seq 最大的那一步（最近一次派发）。
+     */
+    listAiTeamStepSessionMarkers() {
+        const rows = this.db.prepare(`SELECT s.id, s.run_id, s.kind, s.seq, s.member_id, s.title, s.status, s.session_id,
+              r.status AS run_status, r.team_json, t.name AS current_team_name, t.members_json AS current_members_json
+       FROM ai_team_steps s
+       JOIN ai_team_runs r ON r.id = s.run_id
+       LEFT JOIN ai_teams t ON t.id = r.team_id
+       WHERE s.session_id IS NOT NULL AND s.session_id <> ''
+       ORDER BY s.seq DESC`).all();
+        const markers = new Map();
+        const currentTeams = new Map();
+        for (const row of rows) {
+            const sessionId = typeof row.session_id === "string" ? row.session_id : "";
+            if (!sessionId || markers.has(sessionId))
+                continue;
+            const runTeam = safeJsonParse(typeof row.team_json === "string" ? row.team_json : null);
+            const runId = String(row.run_id);
+            const memberId = String(row.member_id ?? "");
+            if (!currentTeams.has(runId)) {
+                // ai_teams.members_json 存的是裸成员数组；team_json 存的是整份团队对象。
+                currentTeams.set(runId, safeJsonParse(typeof row.current_members_json === "string" ? row.current_members_json : null));
+            }
+            const memberName = teamMemberName(currentTeams.get(runId), memberId)
+                ?? teamMemberName(runTeam?.members, memberId)
+                ?? memberId;
+            const runStatus = String(row.run_status ?? "");
+            markers.set(sessionId, {
+                runId,
+                stepId: String(row.id),
+                kind: String(row.kind ?? "work") === "leader" ? "leader" : "work",
+                title: String(row.title ?? ""),
+                memberId,
+                memberName,
+                teamName: typeof row.current_team_name === "string" && row.current_team_name
+                    ? row.current_team_name
+                    : String(runTeam?.name ?? ""),
+                stepStatus: String(row.status ?? "queued"),
+                runStatus,
+                runFinished: AI_TEAM_TERMINAL_RUN_STATUSES.includes(runStatus),
+            });
+        }
+        return markers;
+    }
     getAiTeamRun(id) {
         const row = this.db.prepare("SELECT * FROM ai_team_runs WHERE id = ?").get(id);
         return row ? mapAiTeamRunRow(row) : null;
@@ -2178,6 +2513,7 @@ export class WandStorage {
             this.db.prepare("UPDATE agent_activity SET read_at = ? WHERE read_at IS NULL").run(at);
     }
     saveSession(snapshot) {
+        const isNew = !this.getSessionWorkspace(snapshot.id);
         // A single SQLite statement is already atomic. Avoid BEGIN IMMEDIATE in
         // this hot path so streaming checkpoints do not take an unnecessary write
         // lock and saveSession can also participate in a caller-owned transaction.
@@ -2188,6 +2524,14 @@ export class WandStorage {
          ON CONFLICT(id) DO UPDATE SET
            ${sessionPersistAssignments()}`)
             .run(...sessionPersistValues(snapshot));
+        if (isNew) {
+            const task = snapshot.workspaceTaskId ? this.getWorkspaceTask(snapshot.workspaceTaskId) : null;
+            if (task && task.workspaceId !== snapshot.workspaceId) {
+                this.db.prepare("UPDATE command_sessions SET workspace_id = ? WHERE id = ?")
+                    .run(task.workspaceId, snapshot.id);
+            }
+            this.recordTaskSession(snapshot);
+        }
     }
     /** Update runtime/scalar fields without serializing or rewriting messages/output. */
     updateSessionRuntimeMetadata(snapshot) {
@@ -2336,6 +2680,25 @@ function normalizeAiTeamMembers(raw) {
     }
     return members;
 }
+/**
+ * 从裸成员 JSON（`ai_teams.members_json` 是数组、`team_json.members` 是数组）里按 id 取显示名。
+ * 列表只要名字投影，不做读端归一，损坏行也不该把名字整个丢掉。
+ */
+function teamMemberName(members, memberId) {
+    if (!Array.isArray(members))
+        return undefined;
+    for (const member of members) {
+        if (!member || typeof member !== "object")
+            continue;
+        const record = member;
+        if (String(record.id ?? "") !== memberId)
+            continue;
+        const name = typeof record.name === "string" ? record.name.trim() : "";
+        if (name)
+            return name;
+    }
+    return undefined;
+}
 function mapAiTeamRunRow(row) {
     const rawTeam = safeJsonParse(typeof row.team_json === "string" ? row.team_json : null);
     const team = rawTeam ? {