@co0ontty/wand 4.60.0 → 4.61.0

package/dist/storage.js

@@ -34,6 +34,19 @@ export function parseWandTaskAgent(raw) {
         return null;
     return { provider, model: model.trim(), thinkingEffort };
 }
+/** `wand_milestones` 行 → 领域对象；名字必须非空，脏行直接跳过。 */
+function mapWandMilestoneRow(row) {
+    const name = typeof row.name === "string" ? row.name.trim() : "";
+    if (!name)
+        return null;
+    return {
+        id: String(row.id),
+        name,
+        dueDate: typeof row.due_date === "string" && row.due_date ? row.due_date : null,
+        createdAt: String(row.created_at),
+        updatedAt: String(row.updated_at),
+    };
+}
 const SESSION_OPTIONS_SCHEMA_VERSION = 1;
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -330,6 +343,7 @@ function mapWorkspaceTaskRow(row) {
         name: row.name,
         worktree: mapWorkspaceTaskWorktree(row.worktree_json),
         ...(cwd ? { cwd } : {}),
+        milestoneId: typeof row.milestone_id === "string" && row.milestone_id ? row.milestone_id : null,
         layout: mapWorkspaceTaskLayout(row.layout_json),
         status: (row.status === "done" ? "done" : "active"),
         createdAt: row.created_at,
@@ -606,6 +620,7 @@ const INIT_SQL = `
     cwd TEXT NOT NULL,
     status TEXT NOT NULL,
     task_id TEXT,
+    milestone_id TEXT,
     base_ref TEXT,
     shared_directories TEXT NOT NULL DEFAULT '[]',
     copy_paths TEXT NOT NULL DEFAULT '[]',
@@ -686,6 +701,7 @@ const INIT_SQL = `
     layout_json TEXT,
     status TEXT NOT NULL DEFAULT 'active',
     cwd TEXT,
+    milestone_id TEXT,
     created_at TEXT NOT NULL,
     last_opened_at TEXT,
     layout_revision INTEGER NOT NULL DEFAULT 0,
@@ -706,6 +722,15 @@ const INIT_SQL = `
   );
   CREATE INDEX IF NOT EXISTS idx_github_issue_bindings_session ON github_issue_bindings(session_id);
 
+  CREATE TABLE IF NOT EXISTS wand_milestones (
+    id TEXT PRIMARY KEY,
+    name TEXT NOT NULL,
+    due_date TEXT,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL
+  );
+  CREATE INDEX IF NOT EXISTS idx_wand_milestones_created ON wand_milestones(created_at DESC);
+
   CREATE TABLE IF NOT EXISTS wand_tasks (
     id TEXT PRIMARY KEY,
     identifier TEXT,
@@ -716,6 +741,7 @@ const INIT_SQL = `
     priority TEXT NOT NULL DEFAULT 'none',
     labels_json TEXT NOT NULL DEFAULT '[]',
     due_date TEXT,
+    milestone_id TEXT,
     sort_order INTEGER NOT NULL DEFAULT 0,
     agent_json TEXT,
     workspace_task_id TEXT,
@@ -750,6 +776,9 @@ function ensureWandTaskSchema(db) {
     // 标题来源：'user' = 用户手写，'auto' = 由描述自动生成。只加列，历史行保持 NULL（读取时视为 user）。
     if (columns.length > 0 && !names.has("title_source"))
         db.exec("ALTER TABLE wand_tasks ADD COLUMN title_source TEXT");
+    // 里程碑：只加列，历史行保持 NULL；里程碑本体在 wand_milestones（INIT_SQL 建表）。
+    if (columns.length > 0 && !names.has("milestone_id"))
+        db.exec("ALTER TABLE wand_tasks ADD COLUMN milestone_id TEXT");
     if (columns.length > 0) {
         // Index creation must wait until the column exists on legacy databases.
         // INIT_SQL cannot create it: CREATE TABLE IF NOT EXISTS is a no-op on old
@@ -774,6 +803,10 @@ function ensureWorkspaceSchema(db) {
     if (taskColumns.length > 0 && !taskNames.has("layout_revision")) {
         db.exec("ALTER TABLE workspace_tasks ADD COLUMN layout_revision INTEGER NOT NULL DEFAULT 0");
     }
+    // 侧栏任务也记里程碑：建任务时把它带到看板卡片上，命名任务与未命名任务保持一致。
+    if (taskColumns.length > 0 && !taskNames.has("milestone_id")) {
+        db.exec("ALTER TABLE workspace_tasks ADD COLUMN milestone_id TEXT");
+    }
 }
 function ensureConnectorSchema(db) {
     // The table is created by INIT_SQL for new databases; this repairs an
@@ -809,6 +842,10 @@ export function ensureDatabaseFile(dbPath) {
         if (missionColumns.length > 0 && !missionColumns.some((column) => column.name === "task_id")) {
             db.exec("ALTER TABLE missions ADD COLUMN task_id TEXT");
         }
+        // 并行任务的里程碑与看板共用同一份列表；只加列，历史行保持 NULL。
+        if (missionColumns.length > 0 && !missionColumns.some((column) => column.name === "milestone_id")) {
+            db.exec("ALTER TABLE missions ADD COLUMN milestone_id TEXT");
+        }
     }
     db.close();
     chmodSync(dbPath, 0o600);
@@ -1056,17 +1093,18 @@ export class WandStorage {
         }));
     }
     // ── Workspace tasks（任务 = 命名 + 独立 worktree + 一组标签）──
+    /** 侧栏任务顺序：新创建在前。GET /api/tasks 按此顺序填充目录组。 */
     listWorkspaceTasks(workspaceId) {
         const rows = this.db
-            .prepare(`SELECT id, workspace_id, name, worktree_json, layout_json, status, cwd, created_at, last_opened_at, layout_revision
+            .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, id DESC`)
+         ORDER BY created_at DESC, rowid 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, created_at, last_opened_at, layout_revision
+            .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 = ?`)
             .get(id);
         return row ? mapWorkspaceTaskRow(row) : null;
@@ -1076,16 +1114,18 @@ export class WandStorage {
         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, created_at, last_opened_at)
-         VALUES (?, ?, ?, ?, NULL, ?, ?, ?, NULL)`)
-            .run(id, input.workspaceId, input.name, input.worktree ? JSON.stringify(input.worktree) : null, status, cwd, createdAt);
+            .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,
@@ -1107,6 +1147,10 @@ export class WandStorage {
             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);
@@ -1149,16 +1193,24 @@ export class WandStorage {
               COALESCE(MAX(layout_revision), 0) AS revision
        FROM workspace_tasks`).get();
         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
+         COALESCE((SELECT GROUP_CONCAT(id || ':' || name || ':' || cwd, '|')
+                   FROM (SELECT id, name, cwd FROM workspaces ORDER BY id)), '') AS workspaceNames,
+         COALESCE((SELECT GROUP_CONCAT(path || ':' || name || ':' || updated_at, '|')
+                   FROM (SELECT path, name, updated_at FROM session_directory_names ORDER BY path)), '') AS directoryNames`).get();
         return JSON.stringify({
             sessions,
             tasks,
             workspaces,
+            names,
         });
     }
+    /** GET /api/wand-tasks 的顺序：新创建在前。客户端按此顺序渲染，不再本地排序。 */
     listWandTasks(workspaceId) {
-        const rows = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, title, title_source, description, status, priority, labels_json, due_date, sort_order, agent_json, created_at, updated_at
+        const rows = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, title, title_source, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at
        FROM wand_tasks ${workspaceId === undefined ? "" : "WHERE workspace_id IS ?"}
-       ORDER BY status, sort_order, updated_at DESC`).all(...(workspaceId === undefined ? [] : [workspaceId]));
+       ORDER BY created_at DESC, rowid DESC`).all(...(workspaceId === undefined ? [] : [workspaceId]));
         return rows.map((row) => this.mapWandTaskRow(row));
     }
     mapWandTaskRow(row) {
@@ -1170,10 +1222,11 @@ export class WandStorage {
             title: String(row.title),
             titleSource: row.title_source === "auto" ? "auto" : "user",
             description: String(row.description ?? ""),
-            status: row.status === "doing" || row.status === "done" ? row.status : "todo",
+            status: row.status === "doing" || row.status === "done" || row.status === "archived" ? row.status : "todo",
             priority: row.priority === "low" || row.priority === "medium" || row.priority === "high" || row.priority === "urgent" ? row.priority : "none",
             labels: (() => { const parsed = safeJsonParse(String(row.labels_json ?? "[]")); return Array.isArray(parsed) ? parsed.filter((item) => typeof item === "string") : []; })(),
             dueDate: typeof row.due_date === "string" ? row.due_date : null,
+            milestoneId: typeof row.milestone_id === "string" && row.milestone_id ? row.milestone_id : null,
             sortOrder: Number(row.sort_order) || 0,
             agent: parseWandTaskAgent(row.agent_json),
             createdAt: String(row.created_at),
@@ -1184,12 +1237,12 @@ export class WandStorage {
         return this.listWandTasks().find((task) => task.id === id) ?? null;
     }
     getWandTaskByWorkspaceTaskId(workspaceTaskId) {
-        const row = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, title, title_source, description, status, priority, labels_json, due_date, sort_order, agent_json, created_at, updated_at
+        const row = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, title, title_source, 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);
         return row ? this.mapWandTaskRow(row) : null;
     }
     findUnlinkedWandTask(workspaceId, title) {
-        const row = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, title, title_source, description, status, priority, labels_json, due_date, sort_order, agent_json, created_at, updated_at
+        const row = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, title, title_source, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at
        FROM wand_tasks
        WHERE workspace_id IS ? AND title = ? AND (workspace_task_id IS NULL OR workspace_task_id = '')
        ORDER BY updated_at DESC LIMIT 1`).get(workspaceId, title);
@@ -1203,7 +1256,7 @@ export class WandStorage {
         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, title, title_source, description, status, priority, labels_json, due_date, sort_order, agent_json, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, identifier, input.workspaceId ?? null, input.workspaceTaskId ?? null, input.title, input.titleSource ?? "user", input.description ?? "", status, priority, JSON.stringify(input.labels ?? []), input.dueDate ?? null, (max?.value ?? -1) + 1, input.agent ? JSON.stringify(input.agent) : null, now, now);
+        this.db.prepare(`INSERT INTO wand_tasks (id, identifier, workspace_id, workspace_task_id, title, title_source, 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.title, input.titleSource ?? "user", 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);
         return this.getWandTask(id);
     }
     updateWandTask(id, patch) {
@@ -1211,10 +1264,51 @@ export class WandStorage {
         if (!current)
             return null;
         const next = { ...current, ...patch, updatedAt: nowIso() };
-        this.db.prepare(`UPDATE wand_tasks SET workspace_id = ?, workspace_task_id = ?, title = ?, title_source = ?, description = ?, status = ?, priority = ?, labels_json = ?, due_date = ?, sort_order = ?, agent_json = ?, updated_at = ? WHERE id = ?`).run(next.workspaceId, next.workspaceTaskId, next.title, next.titleSource, next.description, next.status, next.priority, JSON.stringify(next.labels), next.dueDate, next.sortOrder, next.agent ? JSON.stringify(next.agent) : null, next.updatedAt, id);
+        this.db.prepare(`UPDATE wand_tasks SET workspace_id = ?, workspace_task_id = ?, title = ?, title_source = ?, description = ?, status = ?, priority = ?, labels_json = ?, due_date = ?, milestone_id = ?, sort_order = ?, agent_json = ?, updated_at = ? WHERE id = ?`).run(next.workspaceId, next.workspaceTaskId, next.title, next.titleSource, 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);
         return next;
     }
     deleteWandTask(id) { this.db.prepare("DELETE FROM wand_tasks WHERE id = ?").run(id); }
+    // ── 里程碑（跨项目全局列表；任务只存 milestoneId）──
+    listWandMilestones() {
+        const rows = this.db.prepare(`SELECT id, name, due_date, created_at, updated_at FROM wand_milestones ORDER BY created_at DESC, rowid DESC`).all();
+        return rows.map(mapWandMilestoneRow).filter((item) => item !== null);
+    }
+    getWandMilestone(id) {
+        const row = this.db.prepare(`SELECT id, name, due_date, created_at, updated_at FROM wand_milestones WHERE id = ?`).get(id);
+        return row ? mapWandMilestoneRow(row) : null;
+    }
+    createWandMilestone(input) {
+        const id = crypto.randomUUID();
+        const now = nowIso();
+        this.db.prepare(`INSERT INTO wand_milestones (id, name, due_date, created_at, updated_at) VALUES (?, ?, ?, ?, ?)`).run(id, input.name, input.dueDate ?? null, now, now);
+        return this.getWandMilestone(id);
+    }
+    updateWandMilestone(id, patch) {
+        const current = this.getWandMilestone(id);
+        if (!current)
+            return null;
+        const next = {
+            name: patch.name ?? current.name,
+            dueDate: patch.dueDate === undefined ? current.dueDate : patch.dueDate,
+            updatedAt: nowIso(),
+        };
+        this.db.prepare(`UPDATE wand_milestones SET name = ?, due_date = ?, updated_at = ? WHERE id = ?`).run(next.name, next.dueDate, next.updatedAt, id);
+        return this.getWandMilestone(id);
+    }
+    /** 删除里程碑只解绑任务（milestone_id 置空），绝不删除任务。 */
+    deleteWandMilestone(id) {
+        const removed = this.db.prepare("DELETE FROM wand_milestones WHERE id = ?").run(id);
+        if (Number(removed.changes) === 0)
+            return false;
+        this.db.prepare("UPDATE wand_tasks SET milestone_id = NULL WHERE milestone_id = ?").run(id);
+        this.db.prepare("UPDATE workspace_tasks SET milestone_id = NULL WHERE milestone_id = ?").run(id);
+        return true;
+    }
+    /** 各里程碑下的任务数（看板卡片），用于下拉里的数量提示。 */
+    countWandTasksByMilestone() {
+        const rows = this.db.prepare(`SELECT milestone_id, COUNT(*) AS count FROM wand_tasks WHERE milestone_id IS NOT NULL GROUP BY milestone_id`).all();
+        return Object.fromEntries(rows.map((row) => [row.milestone_id, Number(row.count) || 0]));
+    }
     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);
@@ -1498,13 +1592,14 @@ 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, task_id
-       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+         id, title, prompt, cwd, status, base_ref, shared_directories, copy_paths, created_at, updated_at, task_id, milestone_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, 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);
+         updated_at = excluded.updated_at, task_id = excluded.task_id,
+         milestone_id = excluded.milestone_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, mission.milestoneId ?? null);
     }
     getMission(id) {
         const row = this.db.prepare("SELECT * FROM missions WHERE id = ?").get(id);
@@ -1688,6 +1783,7 @@ function mapMissionRow(row) {
             copyPaths: safeJsonParse(typeof row.copy_paths === "string" ? row.copy_paths : null) ?? [],
         },
         taskId: typeof row.task_id === "string" ? row.task_id : null,
+        milestoneId: typeof row.milestone_id === "string" && row.milestone_id ? row.milestone_id : null,
         createdAt: String(row.created_at),
         updatedAt: String(row.updated_at),
     };

package/dist/structured-session-manager.js

@@ -283,6 +283,27 @@ function buildIncrementalStructuredPayload(snapshot, cardDefaults) {
         messageCount: messages.length,
     };
 }
+function isoNow() {
+    return new Date().toISOString();
+}
+function upsertAssistantMessage(messages, turn, complete = false) {
+    const msgs = [...(messages ?? [])];
+    const last = msgs[msgs.length - 1];
+    const createdAt = (last?.role === "assistant" ? last.createdAt : undefined) ?? turn.createdAt ?? isoNow();
+    const next = {
+        ...turn,
+        createdAt,
+    };
+    if (complete)
+        next.completedAt = isoNow();
+    else if (last?.role === "assistant" && last.completedAt)
+        next.completedAt = last.completedAt;
+    if (last?.role === "assistant")
+        msgs[msgs.length - 1] = next;
+    else
+        msgs.push(next);
+    return msgs;
+}
 export class StructuredSessionManager {
     storage;
     config;
@@ -570,11 +591,7 @@ export class StructuredSessionManager {
                 content: this.compactContentBlocks([...turnState.blocks], turnState.result),
                 usage: turnState.usage,
             };
-            const messages = [...(current.messages ?? [])];
-            if (messages[messages.length - 1]?.role === "assistant")
-                messages[messages.length - 1] = turn;
-            else
-                messages.push(turn);
+            const messages = upsertAssistantMessage(current.messages, turn);
             const patched = {
                 ...current,
                 claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
@@ -1111,9 +1128,11 @@ export class StructuredSessionManager {
         // child 是被 SIGTERM 主动 kill 的，正在等用户回答）。如果有，把这次的输入打包
         // 成 tool_result 注入到 messages，让 UI 把卡片渲染为 answered。
         const pendingAsk = findUnpairedAskUserQuestion(session.messages ?? []);
+        const userTurnAt = isoNow();
         const userTurn = pendingAsk
             ? {
                 role: "user",
+                createdAt: userTurnAt,
                 content: [
                     {
                         type: "tool_result",
@@ -1125,6 +1144,7 @@ export class StructuredSessionManager {
             }
             : {
                 role: "user",
+                createdAt: userTurnAt,
                 content: [{ type: "text", text: prompt }],
             };
         const requestId = randomUUID();
@@ -1827,11 +1847,7 @@ export class StructuredSessionManager {
                 content: this.compactContentBlocks([...turnState.blocks], turnState.result),
                 usage: turnState.usage,
             };
-            const messages = [...(current.messages ?? [])];
-            if (messages[messages.length - 1]?.role === "assistant")
-                messages[messages.length - 1] = turn;
-            else
-                messages.push(turn);
+            const messages = upsertAssistantMessage(current.messages, turn);
             const patched = {
                 ...current,
                 claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
@@ -1986,11 +2002,7 @@ export class StructuredSessionManager {
                 content: this.compactContentBlocks([...turnState.blocks], turnState.result),
                 usage: turnState.usage,
             };
-            const messages = [...(current.messages ?? [])];
-            if (messages.at(-1)?.role === "assistant")
-                messages[messages.length - 1] = turn;
-            else
-                messages.push(turn);
+            const messages = upsertAssistantMessage(current.messages, turn);
             const patched = {
                 ...current,
                 claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
@@ -2133,11 +2145,7 @@ export class StructuredSessionManager {
                 content: this.compactContentBlocks([...turnState.blocks], turnState.result),
                 usage: turnState.usage,
             };
-            const messages = [...(current.messages ?? [])];
-            if (messages[messages.length - 1]?.role === "assistant")
-                messages[messages.length - 1] = turn;
-            else
-                messages.push(turn);
+            const messages = upsertAssistantMessage(current.messages, turn);
             const patched = {
                 ...current,
                 claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
@@ -2300,17 +2308,14 @@ export class StructuredSessionManager {
             if (!current)
                 return;
             const hasAssistantContent = turnState.blocks.length > 0 || !!turnState.result;
-            const messages = [...(current.messages ?? [])];
+            let messages = [...(current.messages ?? [])];
             if (hasAssistantContent) {
                 const turn = {
                     role: "assistant",
                     content: this.compactContentBlocks([...turnState.blocks], turnState.result),
                     usage: turnState.usage,
                 };
-                if (messages[messages.length - 1]?.role === "assistant")
-                    messages[messages.length - 1] = turn;
-                else
-                    messages.push(turn);
+                messages = upsertAssistantMessage(current.messages, turn);
             }
             const patched = {
                 ...current,
@@ -2666,12 +2671,7 @@ export class StructuredSessionManager {
                 content: this.compactContentBlocks([...turnState.blocks], turnState.result),
                 usage: turnState.usage,
             };
-            const msgs = [...(current.messages ?? [])];
-            const lastMsg = msgs[msgs.length - 1];
-            if (lastMsg && lastMsg.role === "assistant")
-                msgs[msgs.length - 1] = inProgressTurn;
-            else
-                msgs.push(inProgressTurn);
+            const msgs = upsertAssistantMessage(current.messages, inProgressTurn);
             const patched = {
                 ...current,
                 claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
@@ -3009,13 +3009,7 @@ export class StructuredSessionManager {
             content: this.compactContentBlocks([...turnState.blocks], turnState.result),
             usage: turnState.usage,
         };
-        const msgs = [...(current.messages ?? [])];
-        const lastMsg = msgs[msgs.length - 1];
-        if (lastMsg && lastMsg.role === "assistant")
-            msgs[msgs.length - 1] = assistantTurn;
-        else
-            msgs.push(assistantTurn);
-        return msgs;
+        return upsertAssistantMessage(current.messages, assistantTurn, true);
     }
     resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt) {
         if (interruptPrompt && !this.preserveQueueOnInterrupt.has(sessionId))
@@ -3066,12 +3060,7 @@ export class StructuredSessionManager {
             role: "assistant",
             content: [{ type: "text", text: `结构化会话执行失败：${errorText}` }],
         };
-        const msgs = [...(current.messages ?? [])];
-        const lastMsg = msgs[msgs.length - 1];
-        if (lastMsg && lastMsg.role === "assistant")
-            msgs[msgs.length - 1] = failureTurn;
-        else
-            msgs.push(failureTurn);
+        const msgs = upsertAssistantMessage(current.messages, failureTurn, true);
         return {
             ...current,
             status: "failed",

package/dist/task-types.d.ts

@@ -1,4 +1,6 @@
-export type WandTaskStatus = "todo" | "doing" | "done";
+export type WandTaskStatus = "todo" | "doing" | "done" | "archived";
+/** 已确认或已归档：不再算未完成，也不会被未分组会话同步重新打开。 */
+export declare function isClosedWandTaskStatus(status: WandTaskStatus): boolean;
 export type WandTaskPriority = "none" | "low" | "medium" | "high" | "urgent";
 /** 任务派发时选择的 CLI 工具；空串表示尚未指定。 */
 export type WandTaskAgentProvider = "claude" | "codex" | "opencode" | "grok" | "qoder" | "pi";
@@ -13,6 +15,20 @@ export interface WandTaskAgent {
 }
 /** 任务标题来源；标题是可选字段，留空时由服务端按描述自动生成。 */
 export type WandTaskTitleSource = "user" | "auto";
+/** 里程碑名上限；所有任务面板的新增入口共用同一约束。 */
+export declare const WAND_MILESTONE_NAME_MAX_LENGTH = 60;
+/**
+ * 里程碑：跨项目的全局列表（不是每个目录一份），创建任务时从中选择或新增。
+ * 任务只保存 milestoneId，删除里程碑时只解绑任务、不删除任务。
+ */
+export interface WandTaskMilestone {
+    id: string;
+    name: string;
+    /** YYYY-MM-DD，可为空。 */
+    dueDate: string | null;
+    createdAt: string;
+    updatedAt: string;
+}
 export interface WandTask {
     id: string;
     workspaceId: string | null;
@@ -27,6 +43,8 @@ export interface WandTask {
     priority: WandTaskPriority;
     labels: string[];
     dueDate: string | null;
+    /** 所属里程碑；null 表示未归入任何里程碑。 */
+    milestoneId: string | null;
     sortOrder: number;
     /** 该任务绑定的执行 Agent；null 表示还没指定。 */
     agent: WandTaskAgent | null;

package/dist/task-types.js

@@ -1 +1,6 @@
-export {};
+/** 已确认或已归档：不再算未完成，也不会被未分组会话同步重新打开。 */
+export function isClosedWandTaskStatus(status) {
+    return status === "done" || status === "archived";
+}
+/** 里程碑名上限；所有任务面板的新增入口共用同一约束。 */
+export const WAND_MILESTONE_NAME_MAX_LENGTH = 60;

package/dist/types.d.ts

@@ -495,6 +495,10 @@ export type ContentBlock = TextBlock | ThinkingBlock | ToolUseBlock | ToolResult
 export interface ConversationTurn {
     role: "user" | "assistant";
     content: ContentBlock[];
+    /** ISO time when this turn was first recorded (user send / assistant start). */
+    createdAt?: string;
+    /** ISO time when an assistant turn finished streaming. */
+    completedAt?: string;
     /** Optional usage metadata when available from the underlying tool. */
     usage?: {
         inputTokens?: number;
@@ -691,6 +695,8 @@ export interface WorkspaceTask {
     worktree: WorkspaceTaskWorktree | null;
     /** Optional directory override; empty/undefined falls back to the workspace cwd. */
     cwd?: string;
+    /** 归属里程碑（全局列表）；null = 未归入。建任务时同步到看板卡片。 */
+    milestoneId?: string | null;
     /** 该任务的工作窗口 Tabs；每个窗口内部可含一棵分屏树。 */
     layout: TaskWindowLayout | null;
     status: WorkspaceTaskStatus;

package/dist/wand-task-sync.d.ts

@@ -1,5 +1,5 @@
 import type { WandStorage } from "./storage.js";
-import type { WandTask } from "./task-types.js";
+import { type WandTask } from "./task-types.js";
 import type { SessionSnapshot, Workspace, WorkspaceTask } from "./types.js";
 export declare function isUnnamedWorkspaceTaskName(name: string): boolean;
 /** 从未分组会话的标题 / 描述 / 首条用户消息里抽出看板标题。 */
@@ -11,7 +11,9 @@ export declare function ensureBoardTaskForWorkspaceTask(storage: WandStorage, ta
  * 幂等，打开看板列表时调用。
  */
 export declare function syncUngroupedSessionsToBoard(storage: WandStorage): void;
-/** 看板归档：卡片进入已完成，并同步把关联的侧栏工作任务标成 done（不删会话）。 */
+/** 看板确认/归档时，把关联的侧栏工作任务标成 done（不删会话）。 */
+export declare function syncClosedBoardTask(storage: WandStorage, task: WandTask): void;
+/** 看板归档：卡片进入归档目录，并同步把关联的侧栏工作任务标成 done（不删会话）。 */
 export declare function archiveBoardTask(storage: WandStorage, id: string): WandTask | null;
-/** 侧栏工作任务完成/删除时，把对应看板卡片标成已完成。 */
+/** 侧栏工作任务完成/删除时，把对应看板卡片标成已完成；已归档的保持归档。 */
 export declare function archiveBoardTaskForWorkspaceTask(storage: WandStorage, workspaceTaskId: string): void;

package/dist/wand-task-sync.js

@@ -1,4 +1,5 @@
 import { provisionalTaskTitleFromDescription } from "./task-title.js";
+import { isClosedWandTaskStatus } from "./task-types.js";
 const UNNAMED_TASK_NAME = "未命名任务";
 function boardDescriptionFor(task, workspace) {
     const lines = [`项目：${workspace.name}`];
@@ -92,7 +93,7 @@ function promoteUngroupedCard(storage, card, patch) {
         title: nextTitle,
         titleSource: nextTitle !== card.title ? "auto" : card.titleSource,
         description: nextDescription,
-        status: card.status === "done" ? "done" : "doing",
+        status: isClosedWandTaskStatus(card.status) ? card.status : "doing",
         workspaceId: patch.workspaceId !== undefined ? patch.workspaceId : card.workspaceId,
         workspaceTaskId: patch.workspaceTaskId !== undefined ? patch.workspaceTaskId : card.workspaceTaskId,
     }) ?? card;
@@ -110,6 +111,7 @@ export function ensureBoardTaskForWorkspaceTask(storage, task, workspace) {
         return storage.updateWandTask(reusable.id, {
             workspaceTaskId: task.id,
             workspaceId: workspace.id,
+            ...(task.milestoneId ? { milestoneId: task.milestoneId } : {}),
         }) ?? reusable;
     }
     return storage.createWandTask({
@@ -118,6 +120,7 @@ export function ensureBoardTaskForWorkspaceTask(storage, task, workspace) {
         title: task.name,
         description: boardDescriptionFor(task, workspace),
         status: task.status === "done" ? "done" : "todo",
+        milestoneId: task.milestoneId ?? null,
     });
 }
 /**
@@ -147,6 +150,8 @@ export function syncUngroupedSessionsToBoard(storage) {
                     titleSource: "auto",
                     description,
                     status: "doing",
+                    // 未命名任务建立板卡时才补上：建任务时选的里程碑不能丢。
+                    milestoneId: task.milestoneId ?? null,
                 });
                 boardTasks.push(card);
             }
@@ -157,6 +162,9 @@ export function syncUngroupedSessionsToBoard(storage) {
                     workspaceId: workspace.id,
                     workspaceTaskId: task.id,
                 });
+                if (!card.milestoneId && task.milestoneId) {
+                    card = storage.updateWandTask(card.id, { milestoneId: task.milestoneId }) ?? card;
+                }
             }
             bindSessions(storage, card.id, sessions.map((session) => session.id));
             for (const session of sessions)
@@ -182,7 +190,7 @@ export function syncUngroupedSessionsToBoard(storage) {
             });
             boardTasks.push(card);
         }
-        else if (card.status !== "done") {
+        else if (!isClosedWandTaskStatus(card.status)) {
             card = promoteUngroupedCard(storage, card, {
                 title,
                 description: boardDescriptionFromSession(session),
@@ -193,24 +201,34 @@ export function syncUngroupedSessionsToBoard(storage) {
         bound.add(session.id);
     }
 }
-/** 看板归档：卡片进入已完成，并同步把关联的侧栏工作任务标成 done（不删会话）。 */
+function closeLinkedWorkspaceTask(storage, workspaceTaskId) {
+    if (!workspaceTaskId)
+        return;
+    const workspaceTask = storage.getWorkspaceTask(workspaceTaskId);
+    if (workspaceTask && workspaceTask.status !== "done") {
+        storage.updateWorkspaceTask(workspaceTask.id, { status: "done" });
+    }
+}
+/** 看板确认/归档时，把关联的侧栏工作任务标成 done（不删会话）。 */
+export function syncClosedBoardTask(storage, task) {
+    if (!isClosedWandTaskStatus(task.status))
+        return;
+    closeLinkedWorkspaceTask(storage, task.workspaceTaskId);
+}
+/** 看板归档：卡片进入归档目录，并同步把关联的侧栏工作任务标成 done（不删会话）。 */
 export function archiveBoardTask(storage, id) {
     const current = storage.getWandTask(id);
     if (!current)
         return null;
-    const archived = storage.updateWandTask(id, { status: "done" });
-    if (current.workspaceTaskId) {
-        const workspaceTask = storage.getWorkspaceTask(current.workspaceTaskId);
-        if (workspaceTask && workspaceTask.status !== "done") {
-            storage.updateWorkspaceTask(workspaceTask.id, { status: "done" });
-        }
-    }
+    const archived = storage.updateWandTask(id, { status: "archived" });
+    if (archived)
+        closeLinkedWorkspaceTask(storage, archived.workspaceTaskId);
     return archived;
 }
-/** 侧栏工作任务完成/删除时，把对应看板卡片标成已完成。 */
+/** 侧栏工作任务完成/删除时，把对应看板卡片标成已完成；已归档的保持归档。 */
 export function archiveBoardTaskForWorkspaceTask(storage, workspaceTaskId) {
     const linked = storage.getWandTaskByWorkspaceTaskId(workspaceTaskId);
-    if (!linked || linked.status === "done")
+    if (!linked || isClosedWandTaskStatus(linked.status))
         return;
     storage.updateWandTask(linked.id, { status: "done" });
 }