@co0ontty/wand 4.68.1 → 4.69.0

package/dist/storage.js

@@ -347,8 +347,8 @@ function sessionPersistAssignments() {
              title = excluded.title,
              description = excluded.description,
              session_options = excluded.session_options,
-             workspace_id = excluded.workspace_id,
-             workspace_task_id = excluded.workspace_task_id`;
+             workspace_id = command_sessions.workspace_id,
+             workspace_task_id = command_sessions.workspace_task_id`;
 }
 function sessionRuntimeMetadataAssignments() {
     return `session_source = ?, automation_id = ?,
@@ -708,6 +708,7 @@ const INIT_SQL = `
     agent_json TEXT,
     workspace_task_id TEXT,
     title_source TEXT,
+    auto_title_signature TEXT,
     created_at TEXT NOT NULL,
     updated_at TEXT NOT NULL,
     FOREIGN KEY (workspace_id) REFERENCES workspaces(id) ON DELETE SET NULL
@@ -735,9 +736,12 @@ function ensureWandTaskSchema(db) {
         db.exec("ALTER TABLE wand_tasks ADD COLUMN agent_json TEXT");
     if (columns.length > 0 && !names.has("workspace_task_id"))
         db.exec("ALTER TABLE wand_tasks ADD COLUMN workspace_task_id TEXT");
-    // 标题来源：'user' = 用户手写，'auto' = 由描述自动生成。只加列，历史行保持 NULL（读取时视为 user）。
+    // 标题来源：'user' = 用户手写，'auto' = 由描述/会话内容自动生成。只加列，历史行保持 NULL（读取时视为 user）。
     if (columns.length > 0 && !names.has("title_source"))
         db.exec("ALTER TABLE wand_tasks ADD COLUMN title_source TEXT");
+    // 自动标题最近一次的输入指纹：内容没变就不再重复总结（也避免自动标题来回震荡）。只加列。
+    if (columns.length > 0 && !names.has("auto_title_signature"))
+        db.exec("ALTER TABLE wand_tasks ADD COLUMN auto_title_signature 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");
@@ -1028,6 +1032,11 @@ export class WandStorage {
         return rows.map((row) => this.mapSessionRow(row));
     }
     /** 显式更新某会话的工作空间归属（用于创建时绑定）。 */
+    getSessionWorkspace(sessionId) {
+        const row = this.db.prepare("SELECT workspace_id, workspace_task_id FROM command_sessions WHERE id = ?")
+            .get(sessionId);
+        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);
     }
@@ -1097,6 +1106,10 @@ export class WandStorage {
     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);
@@ -1116,6 +1129,19 @@ export class WandStorage {
         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, {
+                ...(patch.name !== undefined ? { title: patch.name, titleSource: "user" } : {}),
+                ...(patch.milestoneId !== undefined ? { milestoneId: patch.milestoneId } : {}),
+                ...(patch.status !== undefined ? {
+                    status: patch.status === "done"
+                        ? card.status === "archived" ? "archived" : "done"
+                        : card.status === "todo" ? "todo" : "doing",
+                } : {}),
+            });
+        }
     }
     saveWorkspaceTaskLayout(id, layout, expectedRevision) {
         const current = this.getWorkspaceTask(id);
@@ -1161,8 +1187,10 @@ export class WandStorage {
                    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();
+        const membership = this.db.prepare("SELECT id, workspace_id, workspace_task_id FROM command_sessions ORDER BY id").all();
         return JSON.stringify({
             sessions,
+            membership,
             tasks,
             workspaces,
             names,
@@ -1170,7 +1198,7 @@ export class WandStorage {
     }
     /** 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, milestone_id, sort_order, agent_json, created_at, updated_at
+        const rows = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_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 ${workspaceId === undefined ? "" : "WHERE workspace_id IS ?"}
        ORDER BY created_at DESC, rowid DESC`).all(...(workspaceId === undefined ? [] : [workspaceId]));
         return rows.map((row) => this.mapWandTaskRow(row));
@@ -1183,6 +1211,7 @@ export class WandStorage {
             workspaceTaskId: typeof row.workspace_task_id === "string" && row.workspace_task_id ? row.workspace_task_id : null,
             title: String(row.title),
             titleSource: row.title_source === "auto" ? "auto" : "user",
+            autoTitleSignature: typeof row.auto_title_signature === "string" && row.auto_title_signature ? row.auto_title_signature : null,
             description: String(row.description ?? ""),
             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",
@@ -1199,17 +1228,10 @@ 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, milestone_id, sort_order, agent_json, created_at, updated_at
+        const row = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_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);
         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, 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);
-        return row ? this.mapWandTaskRow(row) : null;
-    }
     createWandTask(input) {
         const id = crypto.randomUUID();
         const now = nowIso();
@@ -1218,7 +1240,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, 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);
+        this.db.prepare(`INSERT INTO wand_tasks (id, identifier, workspace_id, workspace_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.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);
         return this.getWandTask(id);
     }
     updateWandTask(id, patch) {
@@ -1226,7 +1248,14 @@ 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 = ?, 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);
+        this.db.prepare(`UPDATE wand_tasks SET workspace_id = ?, workspace_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.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) {
+            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);
+            this.db.prepare("UPDATE command_sessions SET workspace_id = ? WHERE workspace_task_id = ?")
+                .run(workspaceId, next.workspaceTaskId);
+        }
         return next;
     }
     deleteWandTask(id) { this.db.prepare("DELETE FROM wand_tasks WHERE id = ?").run(id); }
@@ -1284,6 +1313,7 @@ export class WandStorage {
             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());
     }
     unbindWandTaskSession(taskId, sessionId) { this.db.prepare("DELETE FROM wand_task_sessions WHERE task_id = ? AND session_id = ?").run(taskId, sessionId); }

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

@@ -129,6 +129,7 @@ export declare class StructuredSessionManager {
     /** Return lightweight snapshots for the session list (no output/messages). */
     listSlim(): SessionSnapshot[];
     get(id: string): SessionSnapshot | null;
+    setSessionWorkspace(id: string, membership: Pick<SessionSnapshot, "workspaceId" | "workspaceTaskId">): void;
     setSessionTopic(id: string, title: string, description: string): SessionSnapshot;
     private setSessionTopicGenerating;
     /**

package/dist/structured-session-manager.js

@@ -931,6 +931,11 @@ export class StructuredSessionManager {
         const s = this.sessions.get(id);
         return s ? withSummary(s) : null;
     }
+    setSessionWorkspace(id, membership) {
+        const updated = { ...this.requireSession(id), ...membership };
+        this.sessions.set(id, updated);
+        this.emitStructuredSnapshot(updated);
+    }
     setSessionTopic(id, title, description) {
         const current = this.requireSession(id);
         const updated = { ...current, title, description, summary: description };

package/dist/task-types.d.ts

@@ -58,8 +58,13 @@ export interface WandTask {
     workspaceTaskId: string | null;
     identifier: string;
     title: string;
-    /** 'user' = 用户自己填的标题；'auto' = 用户留空后按描述自动生成。 */
+    /** 'user' = 用户自己填的标题；'auto' = 用户留空后按描述/会话内容自动生成。 */
     titleSource: WandTaskTitleSource;
+    /**
+     * 最近一次自动命名用到的输入指纹（描述 + 所有会话摘要）；内容没变就不再重复总结。
+     * 标题来源为 user 或从未自动命名过时为 null。
+     */
+    autoTitleSignature: string | null;
     description: string;
     status: WandTaskStatus;
     priority: WandTaskPriority;

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

@@ -1,19 +1,40 @@
 import type { WandStorage } from "./storage.js";
-import { type WandTask } from "./task-types.js";
+import { type WandTask, type WandTaskTitleSource } from "./task-types.js";
 import type { SessionSnapshot, Workspace, WorkspaceTask } from "./types.js";
+/** 未命名任务的占位名；服务端新建时写入，自动命名成功后被真实标题覆盖。 */
+export declare const UNNAMED_WORKSPACE_TASK_NAME = "\u672A\u547D\u540D\u4EFB\u52A1";
 export declare function isUnnamedWorkspaceTaskName(name: string): boolean;
-/** 从未分组会话的标题 / 描述 / 首条用户消息里抽出看板标题。 */
+/** Legacy title helper; prompts name sessions, not their containing task. */
 export declare function boardTitleFromSession(session: SessionSnapshot): string;
-/** 侧栏工作任务与看板卡片对账：已关联则复用，同项目同名未关联则挂上，否则新建。 */
-export declare function ensureBoardTaskForWorkspaceTask(storage: WandStorage, task: WorkspaceTask, workspace: Workspace): WandTask | null;
 /**
- * 把历史未分组会话补到看板：用会话标题/首条消息当标题，绑上会话，放进「进行中」。
- * 幂等，打开看板列表时调用。
+ * 自动命名只覆盖「还没有人为名字」的任务：标题来源是 auto，或仍是占位名的历史卡片
+ * （老版本把未命名任务写成了 titleSource=user）。用户在面板 / 侧栏改过名后此处为 false。
  */
+export declare function isAutoNameableBoardTask(card: Pick<WandTask, "title" | "titleSource">): boolean;
+/**
+ * 自动命名的输入：任务描述（去掉「项目：/ 目录：/ 分支：」同步元信息）+ 每个会话的可读摘要。
+ * 为空表示这个任务还没有可命名的内容，调用方应保留占位标题。
+ */
+export declare function taskAutoNameSourceText(storage: WandStorage, card: WandTask): string;
+/** 输入指纹：内容没变就没必要再总结一次，也避免自动标题与模型结果来回震荡。 */
+export declare function taskAutoNameSignature(source: string): string;
+/** Identity is the task id, never its title. Same-named tasks stay independent. */
+export declare function ensureBoardTaskForWorkspaceTask(storage: WandStorage, task: WorkspaceTask, workspace: Workspace, options?: {
+    titleSource?: WandTaskTitleSource;
+}): WandTask;
+/** A board task always has a sidebar container, even before its first session. */
+export declare function ensureWorkspaceTaskForBoardTask(storage: WandStorage, card: WandTask): WorkspaceTask;
+/** Atomic exclusive ownership change. Never changes cwd, messages, or execution state. */
+export declare function moveSessionToWorkspaceTask(storage: WandStorage, sessionId: string, taskId: string | null): void;
+/** Reconcile legacy records by explicit ids. Unassigned sessions remain unassigned. */
+export declare function syncSidebarTasksFromBoard(storage: WandStorage): void;
 export declare function syncUngroupedSessionsToBoard(storage: WandStorage): void;
-/** 看板确认/归档时，把关联的侧栏工作任务标成 done（不删会话）。 */
+/** Status and title projection is centralized in the storage writer. */
 export declare function syncClosedBoardTask(storage: WandStorage, task: WandTask): void;
-/** 看板归档：卡片进入归档目录，并同步把关联的侧栏工作任务标成 done（不删会话）。 */
 export declare function archiveBoardTask(storage: WandStorage, id: string): WandTask | null;
-/** 侧栏工作任务完成/删除时，把对应看板卡片标成已完成；已归档的保持归档。 */
+/**
+ * 归档侧栏任务是软删除：终端继续运行、worktree 与布局都保留，只有看板卡片进入
+ * 归档文件夹、侧栏不再显示。恢复方式是看板里把卡片拖回任一列（或右键恢复）。
+ */
+export declare function archiveWorkspaceTask(storage: WandStorage, task: WorkspaceTask): WandTask | null;
 export declare function archiveBoardTaskForWorkspaceTask(storage: WandStorage, workspaceTaskId: string): void;