@co0ontty/wand 4.57.0 → 4.58.0

package/dist/server-mission-routes.js

@@ -1,9 +1,15 @@
+import { asyncRoute } from "./express-async.js";
 import { getErrorMessage } from "./error-utils.js";
 function sendMissionError(res, error) {
     const message = getErrorMessage(error, "任务操作失败。");
     const missing = /^(任务不存在|任务 attempt 不存在)|没有关联会话|当前不可用/.test(message);
     res.status(missing ? 404 : 400).json({ error: message });
 }
+function commentIdsFrom(body) {
+    if (!body || typeof body !== "object" || !Array.isArray(body.commentIds))
+        return [];
+    return body.commentIds.filter((id) => typeof id === "string");
+}
 export function registerMissionRoutes(app, missions) {
     app.get("/api/inbox", (_req, res) => {
         res.json({ items: missions.inbox() });
@@ -56,23 +62,18 @@ export function registerMissionRoutes(app, missions) {
             sendMissionError(res, error);
         }
     });
-    app.post("/api/missions/:missionId/attempts/:attemptId/review/send", (req, res) => {
+    app.post("/api/missions/:missionId/attempts/:attemptId/review/send", asyncRoute(async (req, res) => {
         try {
-            const commentIds = Array.isArray(req.body?.commentIds)
-                ? req.body.commentIds.filter((id) => typeof id === "string")
-                : undefined;
-            res.status(202).json({ comments: missions.sendReview(req.params.missionId, req.params.attemptId, commentIds) });
+            const commentIds = Array.isArray(req.body?.commentIds) ? commentIdsFrom(req.body) : undefined;
+            res.status(202).json({ comments: await missions.sendReview(req.params.missionId, req.params.attemptId, commentIds) });
         }
         catch (error) {
             sendMissionError(res, error);
         }
-    });
+    }));
     app.post("/api/missions/:missionId/attempts/:attemptId/review/resolve", (req, res) => {
         try {
-            const commentIds = Array.isArray(req.body?.commentIds)
-                ? req.body.commentIds.filter((id) => typeof id === "string")
-                : [];
-            res.json({ comments: missions.resolveReview(req.params.missionId, req.params.attemptId, commentIds) });
+            res.json({ comments: missions.resolveReview(req.params.missionId, req.params.attemptId, commentIdsFrom(req.body)) });
         }
         catch (error) {
             sendMissionError(res, error);

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

@@ -1,4 +1,16 @@
 import type { Express, RequestHandler } from "express";
-import type { WandStorage } from "./storage.js";
+import { type WandStorage } from "./storage.js";
 import type { SessionRegistry } from "./session-registry.js";
-export declare function registerTaskRoutes(app: Express, storage: WandStorage, sessions?: SessionRegistry, requireAdmin?: RequestHandler): void;
+import type { StructuredSessionManager } from "./structured-session-manager.js";
+import type { WandTaskAgent } from "./task-types.js";
+import type { WandConfig } from "./types.js";
+export interface TaskRouteDependencies {
+    storage: WandStorage;
+    sessions?: SessionRegistry;
+    structured?: StructuredSessionManager;
+    config?: WandConfig;
+    requireAdmin?: RequestHandler;
+}
+/** 任务派发配置：provider / model / thinkingEffort 三者必须同时给出且合法。 */
+export declare function parseTaskAgent(value: unknown): WandTaskAgent | null;
+export declare function registerTaskRoutes(app: Express, deps: TaskRouteDependencies | WandStorage, sessionsLegacy?: SessionRegistry, requireAdminLegacy?: RequestHandler): void;

package/dist/server-task-routes.js

@@ -1,99 +1,263 @@
+import { getDefaultModelForProvider } from "./config.js";
 import { asyncRoute } from "./express-async.js";
 import { getErrorMessage } from "./error-utils.js";
+import { parseWandTaskAgent } from "./storage.js";
+import { archiveBoardTask } from "./wand-task-sync.js";
 const STATUSES = new Set(["todo", "doing", "done"]);
 const PRIORITIES = new Set(["none", "low", "medium", "high", "urgent"]);
-function dateValue(value) { if (value === undefined)
-    return undefined; if (value === null || value === "")
-    return null; if (typeof value !== "string" || !/^\d{4}-\d{2}-\d{2}$/.test(value.trim()))
-    throw new Error("截止日期必须使用 YYYY-MM-DD 格式。"); return value.trim(); }
-function bodyObject(value) { if (!value || typeof value !== "object" || Array.isArray(value))
-    throw new Error("请求体必须是对象。"); return value; }
-function text(value) { return typeof value === "string" ? value.trim() : ""; }
-function taskDto(storage, task) { if (!task)
-    return null; return { ...task, sessionIds: storage.listWandTaskSessionIds(task.id) }; }
-export function registerTaskRoutes(app, storage, sessions, requireAdmin) {
-    const guard = requireAdmin ?? ((_req, _res, next) => next());
-    app.get("/api/wand-tasks", guard, (req, res) => res.json(storage.listWandTasks(typeof req.query.workspaceId === "string" ? req.query.workspaceId : undefined).map((task) => taskDto(storage, task))));
-    app.post("/api/wand-tasks", guard, (req, res) => { try {
-        const body = bodyObject(req.body);
-        const title = text(body.title);
-        if (!title)
-            throw new Error("任务标题不能为空。");
-        const workspaceId = body.workspaceId === null ? null : text(body.workspaceId) || null;
-        if (workspaceId && !storage.getWorkspace(workspaceId))
-            throw new Error("项目不存在。");
-        const status = STATUSES.has(body.status) ? body.status : "todo";
-        const priority = PRIORITIES.has(body.priority) ? body.priority : "none";
-        const labels = Array.isArray(body.labels) ? body.labels.filter((item) => typeof item === "string").map((item) => item.trim()).filter(Boolean).slice(0, 20) : [];
-        const task = storage.createWandTask({ workspaceId, title, description: text(body.description), status, priority, labels, dueDate: dateValue(body.dueDate) ?? null });
-        res.status(201).json(taskDto(storage, task));
+const AGENT_PROVIDERS = new Set(["claude", "codex", "opencode", "grok", "qoder", "pi"]);
+const AGENT_EFFORTS = new Set(["off", "standard", "deep", "max"]);
+function dateValue(value) {
+    if (value === undefined)
+        return undefined;
+    if (value === null || value === "")
+        return null;
+    if (typeof value !== "string" || !/^\d{4}-\d{2}-\d{2}$/.test(value.trim())) {
+        throw new Error("截止日期必须使用 YYYY-MM-DD 格式。");
     }
-    catch (error) {
-        res.status(400).json({ error: getErrorMessage(error, "无法创建任务。") });
-    } });
-    app.patch("/api/wand-tasks/:id", guard, (req, res) => { try {
-        const body = bodyObject(req.body);
-        const patch = {};
-        if (body.title !== undefined) {
-            const value = text(body.title);
-            if (!value)
+    return value.trim();
+}
+function bodyObject(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        throw new Error("请求体必须是对象。");
+    return value;
+}
+function text(value) {
+    return typeof value === "string" ? value.trim() : "";
+}
+function labelsFrom(value) {
+    if (!Array.isArray(value))
+        return [];
+    return value.filter((item) => typeof item === "string").map((item) => item.trim()).filter(Boolean).slice(0, 20);
+}
+/** 任务派发配置：provider / model / thinkingEffort 三者必须同时给出且合法。 */
+export function parseTaskAgent(value) {
+    if (value === null)
+        return null;
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        throw new Error("Agent 配置必须是对象。");
+    const body = value;
+    const provider = text(body.provider);
+    if (!AGENT_PROVIDERS.has(provider))
+        throw new Error("请选择有效的 CLI 工具。");
+    const model = text(body.model) || "default";
+    if (model.length > 128)
+        throw new Error("模型名称过长。");
+    const thinkingEffort = (text(body.thinkingEffort) || "off");
+    if (!AGENT_EFFORTS.has(thinkingEffort))
+        throw new Error("思考深度无效。");
+    return { provider, model, thinkingEffort };
+}
+function taskDto({ storage, sessions }, task) {
+    if (!task)
+        return null;
+    const workspace = task.workspaceId ? storage.getWorkspace(task.workspaceId) : null;
+    const sessionIds = storage.listWandTaskSessionIds(task.id);
+    return {
+        ...task,
+        sessionIds,
+        sessions: sessionIds.flatMap((id) => {
+            const session = sessions?.getLatest(id) ?? storage.getSession(id);
+            return session ? [taskSessionSummary(session)] : [];
+        }),
+        workspace: workspace
+            ? { id: workspace.id, name: workspace.name, cwd: workspace.cwd }
+            : null,
+    };
+}
+function taskSessionSummary(session) {
+    return {
+        id: session.id,
+        provider: session.provider ?? "",
+        sessionKind: session.sessionKind ?? "",
+        title: session.title || session.description || session.command,
+        status: session.status,
+        cwd: session.cwd,
+        model: session.selectedModel || session.structuredState?.model || "",
+        thinkingEffort: session.thinkingEffort || "off",
+    };
+}
+function sendTaskError(res, error, fallback) {
+    res.status(400).json({ error: getErrorMessage(error, fallback) });
+}
+export function registerTaskRoutes(app, deps, sessionsLegacy, requireAdminLegacy) {
+    // 兼容旧的 positional 调用；新代码统一用对象形式的依赖。
+    const resolved = deps && typeof deps === "object" && "storage" in deps
+        ? deps
+        : { storage: deps, sessions: sessionsLegacy, requireAdmin: requireAdminLegacy };
+    const { storage, sessions, structured, config } = resolved;
+    const guard = resolved.requireAdmin ?? ((_req, _res, next) => next());
+    const dto = (task) => taskDto(resolved, task);
+    app.get("/api/wand-tasks", guard, (req, res) => {
+        const workspaceId = typeof req.query.workspaceId === "string" ? req.query.workspaceId : undefined;
+        res.json(storage.listWandTasks(workspaceId).map((task) => dto(task)));
+    });
+    app.post("/api/wand-tasks", guard, (req, res) => {
+        try {
+            const body = bodyObject(req.body);
+            const title = text(body.title);
+            if (!title)
                 throw new Error("任务标题不能为空。");
-            patch.title = value;
+            const workspaceId = body.workspaceId === null ? null : text(body.workspaceId) || null;
+            if (workspaceId && !storage.getWorkspace(workspaceId))
+                throw new Error("项目不存在。");
+            const status = STATUSES.has(body.status) ? body.status : "todo";
+            const priority = PRIORITIES.has(body.priority) ? body.priority : "none";
+            const agent = body.agent === undefined ? null : parseTaskAgent(body.agent);
+            const task = storage.createWandTask({
+                workspaceId,
+                title,
+                description: text(body.description),
+                status,
+                priority,
+                labels: labelsFrom(body.labels),
+                dueDate: dateValue(body.dueDate) ?? null,
+                agent,
+            });
+            res.status(201).json(dto(task));
         }
-        if (body.description !== undefined)
-            patch.description = text(body.description);
-        if (body.status !== undefined) {
-            if (!STATUSES.has(body.status))
-                throw new Error("任务状态无效。");
-            patch.status = body.status;
+        catch (error) {
+            sendTaskError(res, error, "无法创建任务。");
         }
-        if (body.priority !== undefined) {
-            if (!PRIORITIES.has(body.priority))
-                throw new Error("任务优先级无效。");
-            patch.priority = body.priority;
+    });
+    app.patch("/api/wand-tasks/:id", guard, (req, res) => {
+        try {
+            const body = bodyObject(req.body);
+            const patch = {};
+            if (body.title !== undefined) {
+                const value = text(body.title);
+                if (!value)
+                    throw new Error("任务标题不能为空。");
+                patch.title = value;
+            }
+            if (body.description !== undefined)
+                patch.description = text(body.description);
+            if (body.status !== undefined) {
+                if (!STATUSES.has(body.status))
+                    throw new Error("任务状态无效。");
+                patch.status = body.status;
+            }
+            if (body.priority !== undefined) {
+                if (!PRIORITIES.has(body.priority))
+                    throw new Error("任务优先级无效。");
+                patch.priority = body.priority;
+            }
+            if (body.labels !== undefined)
+                patch.labels = labelsFrom(body.labels);
+            if (body.dueDate !== undefined)
+                patch.dueDate = dateValue(body.dueDate) ?? null;
+            if (body.workspaceId !== undefined) {
+                const workspaceId = body.workspaceId === null ? null : text(body.workspaceId);
+                if (workspaceId && !storage.getWorkspace(workspaceId))
+                    throw new Error("项目不存在。");
+                patch.workspaceId = workspaceId || null;
+            }
+            if (body.agent !== undefined)
+                patch.agent = parseTaskAgent(body.agent);
+            if (body.sortOrder !== undefined && Number.isFinite(Number(body.sortOrder))) {
+                patch.sortOrder = Math.floor(Number(body.sortOrder));
+            }
+            const task = storage.updateWandTask(req.params.id, patch);
+            if (!task) {
+                res.status(404).json({ error: "未找到该任务。" });
+                return;
+            }
+            if (task.status === "done")
+                archiveBoardTask(storage, task.id);
+            res.json(dto(storage.getWandTask(task.id) ?? task));
         }
-        if (body.labels !== undefined)
-            patch.labels = Array.isArray(body.labels) ? body.labels.filter((item) => typeof item === "string").map((item) => item.trim()).filter(Boolean).slice(0, 20) : [];
-        if (body.dueDate !== undefined)
-            patch.dueDate = dateValue(body.dueDate) ?? null;
-        if (body.workspaceId !== undefined) {
-            const workspaceId = body.workspaceId === null ? null : text(body.workspaceId);
-            if (workspaceId && !storage.getWorkspace(workspaceId))
-                throw new Error("项目不存在。");
-            patch.workspaceId = workspaceId || null;
+        catch (error) {
+            sendTaskError(res, error, "无法更新任务。");
+        }
+    });
+    app.delete("/api/wand-tasks/:id", guard, (req, res) => {
+        const archived = archiveBoardTask(storage, req.params.id);
+        if (!archived) {
+            res.status(404).json({ error: "未找到该任务。" });
+            return;
+        }
+        res.json({ ok: true, ...dto(archived) });
+    });
+    app.post("/api/wand-tasks/:id/sessions", guard, (req, res) => {
+        try {
+            const sessionId = text(bodyObject(req.body).sessionId);
+            if (!sessionId)
+                throw new Error("缺少 sessionId。");
+            if (sessions && !sessions.get(sessionId))
+                throw new Error("未找到该会话。");
+            storage.bindWandTaskSession(req.params.id, sessionId);
+            res.status(201).json(dto(storage.getWandTask(req.params.id)));
         }
-        if (body.sortOrder !== undefined && Number.isFinite(Number(body.sortOrder)))
-            patch.sortOrder = Math.floor(Number(body.sortOrder));
-        const task = storage.updateWandTask(req.params.id, patch);
+        catch (error) {
+            sendTaskError(res, error, "无法绑定会话。");
+        }
+    });
+    app.delete("/api/wand-tasks/:id/sessions/:sessionId", guard, (req, res) => {
+        storage.unbindWandTaskSession(req.params.id, req.params.sessionId);
+        res.json({ ok: true });
+    });
+    /**
+     * 用任务上选定的 CLI 工具开一个结构化会话，把任务标题 + 描述作为首个 prompt
+     * 发过去，并把会话绑定回该任务。cwd 取任务所属项目目录；未指定项目时用全局默认目录。
+     */
+    app.post("/api/wand-tasks/:id/dispatch", guard, asyncRoute(async (req, res) => {
+        try {
+            const task = storage.getWandTask(req.params.id);
+            if (!task) {
+                res.status(404).json({ error: "未找到该任务。" });
+                return;
+            }
+            if (!structured || !config)
+                throw new Error("当前服务未启用结构化会话，无法派发 Agent。");
+            const body = bodyObject(req.body);
+            const agent = body.agent === undefined
+                ? task.agent ?? parseWandTaskAgent(JSON.stringify(body))
+                : parseTaskAgent(body.agent);
+            if (!agent)
+                throw new Error("请先为该任务选择 CLI 工具。");
+            const workspace = task.workspaceId ? storage.getWorkspace(task.workspaceId) : null;
+            if (task.workspaceId && !workspace)
+                throw new Error("任务所属项目已被删除，请重新指定。");
+            const cwd = workspace?.cwd || config.defaultCwd;
+            const model = agent.model === "default" ? "" : agent.model;
+            const session = structured.createSession({
+                cwd,
+                mode: "agent",
+                provider: agent.provider,
+                model: model || getDefaultModelForProvider(config, agent.provider) || undefined,
+                thinkingEffort: agent.thinkingEffort,
+                worktreeEnabled: false,
+                sessionSource: "automation",
+                automationId: `wand-task:${task.id}`,
+                workspaceId: task.workspaceId ?? undefined,
+            });
+            storage.updateWandTask(task.id, { agent, status: task.status === "todo" ? "doing" : task.status });
+            storage.bindWandTaskSession(task.id, session.id);
+            const prompt = [task.title, task.description.trim()].filter(Boolean).join("\n\n");
+            const completion = structured.sendMessage(session.id, prompt || task.title || "执行此任务");
+            completion.catch((error) => console.error(`[WandTask] Agent dispatch failed for ${task.id}:`, error));
+            res.status(202).json({
+                ok: true,
+                taskId: task.id,
+                session: {
+                    id: session.id,
+                    provider: session.provider,
+                    model: session.selectedModel,
+                    thinkingEffort: session.thinkingEffort,
+                    cwd: session.cwd,
+                },
+            });
+        }
+        catch (error) {
+            sendTaskError(res, error, "无法派发 Agent。");
+        }
+    }));
+    app.get("/api/wand-tasks/:id", guard, asyncRoute(async (req, res) => {
+        const task = dto(storage.getWandTask(req.params.id));
         if (!task) {
             res.status(404).json({ error: "未找到该任务。" });
             return;
         }
-        res.json(taskDto(storage, task));
-    }
-    catch (error) {
-        res.status(400).json({ error: getErrorMessage(error, "无法更新任务。") });
-    } });
-    app.delete("/api/wand-tasks/:id", guard, (req, res) => { if (!storage.getWandTask(req.params.id)) {
-        res.status(404).json({ error: "未找到该任务。" });
-        return;
-    } storage.deleteWandTask(req.params.id); res.json({ ok: true }); });
-    app.post("/api/wand-tasks/:id/sessions", guard, (req, res) => { try {
-        const body = bodyObject(req.body);
-        const sessionId = text(body.sessionId);
-        if (!sessionId)
-            throw new Error("缺少 sessionId。");
-        if (sessions && !sessions.get(sessionId))
-            throw new Error("未找到该会话。");
-        storage.bindWandTaskSession(req.params.id, sessionId);
-        res.status(201).json(taskDto(storage, storage.getWandTask(req.params.id)));
-    }
-    catch (error) {
-        res.status(400).json({ error: getErrorMessage(error, "无法绑定会话。") });
-    } });
-    app.delete("/api/wand-tasks/:id/sessions/:sessionId", guard, (req, res) => { storage.unbindWandTaskSession(req.params.id, req.params.sessionId); res.json({ ok: true }); });
-    app.get("/api/wand-tasks/:id", guard, asyncRoute(async (req, res) => { const task = taskDto(storage, storage.getWandTask(req.params.id)); if (!task) {
-        res.status(404).json({ error: "未找到该任务。" });
-        return;
-    } res.json(task); }));
+        res.json(task);
+    }));
 }

package/dist/server-workspace-routes.js

@@ -9,6 +9,7 @@ import { collectSessionTopicBlocklist } from "./session-topic.js";
 import { resolveSessionDisplayTitle } from "./session-transport.js";
 import { GLOBAL_WORKSPACE_ID } from "./types.js";
 import { attachUnboundSessionsToWorkspace, backfillSessionWorkspaces, normalizeProjectCwd, projectCwdForSession, } from "./workspace-binding.js";
+import { archiveBoardTaskForWorkspaceTask, ensureBoardTaskForWorkspaceTask } from "./wand-task-sync.js";
 const PROVIDERS = new Set(["claude", "codex", "opencode", "grok", "qoder", "pi"]);
 function workspaceSessionTitle(session, names = {}) {
     return resolveSessionDisplayTitle(session, collectSessionTopicBlocklist({
@@ -37,8 +38,39 @@ function workspaceSessionSummary(session, names = {}, registry) {
         startedAt: live.startedAt,
     };
 }
-function tasksRevision(groups) {
-    return crypto.createHash("sha256").update(JSON.stringify(groups)).digest("base64url");
+function cheapTasksRevision(storage, registry) {
+    const fingerprint = [
+        storage.tasksAggregateFingerprint(),
+        ...(registry?.listSlim() ?? []).map((session) => [
+            session.id,
+            session.status,
+            session.ptyBusy === true ? 1 : 0,
+            session.providerCliActive ? 1 : 0,
+            session.structuredState?.inFlight === true ? 1 : 0,
+            session.title ?? "",
+            session.workspaceId ?? "",
+            session.workspaceTaskId ?? "",
+        ]),
+    ];
+    return crypto.createHash("sha256").update(JSON.stringify(fingerprint)).digest("base64url");
+}
+function compareCreatedDesc(left, right) {
+    const a = typeof left === "string" ? left.trim() : "";
+    const b = typeof right === "string" ? right.trim() : "";
+    if (a === b)
+        return 0;
+    if (!a)
+        return 1;
+    if (!b)
+        return -1;
+    return b.localeCompare(a);
+}
+function rememberCreatedAt(target, iso) {
+    const value = typeof iso === "string" ? iso.trim() : "";
+    if (!value)
+        return;
+    if (!target.createdAt || value < target.createdAt)
+        target.createdAt = value;
 }
 function parseDefaultProvider(value) {
     return typeof value === "string" && PROVIDERS.has(value) ? value : undefined;
@@ -82,7 +114,8 @@ function createTaskForWorkspace(storage, workspace, body) {
     }
     const baseRef = typeof body.baseRef === "string" && body.baseRef.trim() ? body.baseRef.trim() : undefined;
     const runCwd = mountedCwd ?? workspace.cwd;
-    const wantWorktree = body.worktree === true || (body.worktree !== false && !isGlobalWorkspace(workspace));
+    const requireWorktree = body.worktree === true;
+    const wantWorktree = requireWorktree || (body.worktree !== false && !isGlobalWorkspace(workspace));
     let worktree = null;
     let worktreeError;
     if (wantWorktree) {
@@ -95,6 +128,9 @@ function createTaskForWorkspace(storage, workspace, body) {
             worktree = setup.worktree;
         }
         catch (error) {
+            if (requireWorktree) {
+                throw new Error(getErrorMessage(error, "无法创建隔离 worktree。"));
+            }
             worktreeError = getErrorMessage(error, "无法创建 worktree，将在项目目录直接运行。");
         }
     }
@@ -105,6 +141,7 @@ function createTaskForWorkspace(storage, workspace, body) {
         cwd: storedCwd,
         worktree,
     });
+    ensureBoardTaskForWorkspaceTask(storage, task, workspace);
     return {
         task,
         cwd: taskRuntimeCwd(task, workspace),
@@ -231,7 +268,7 @@ export function sanitizeTaskLayout(value) {
  * - 布局树由前端 allotment 构造，PUT 时经 sanitizeLayout 校验/规整后落库。
  */
 export function registerWorkspaceRoutes(app, storage, sessions) {
-    // 列出所有项目（按创建时间升序，保证项目层级稳定）
+    // 列出所有项目（按创建时间降序：新建在前，打开不会改位置）
     app.get("/api/workspaces", (_req, res) => {
         backfillSessionWorkspaces(storage);
         const sessionCounts = storage.countSessionsByWorkspace();
@@ -374,6 +411,15 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
     app.get("/api/tasks", (req, res) => {
         // 查询参数：workspaceId 过滤单目录；limit 截断每目录任务数；
         // maxSessions 截断每任务内嵌会话数（大数据量时控制响应体积）。
+        const hasRevisionQuery = typeof req.query.revision === "string";
+        const requestedRevision = hasRevisionQuery ? req.query.revision : "";
+        if (hasRevisionQuery && requestedRevision) {
+            const cheap = cheapTasksRevision(storage, sessions);
+            if (requestedRevision === cheap) {
+                res.json({ unchanged: true, revision: cheap, groups: [] });
+                return;
+            }
+        }
         const workspaceFilter = typeof req.query.workspaceId === "string" ? req.query.workspaceId : "";
         const parseBoundedCount = (raw) => {
             const value = Number(raw);
@@ -394,6 +440,7 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
                 workspaceId: workspace.id,
                 workspaceName: global ? "全局" : workspace.name,
                 workspaceCwd: workspace.cwd,
+                createdAt: workspace.createdAt,
                 ...(global ? { global: true } : {}),
                 tasks: [],
                 standaloneSessions: [],
@@ -435,6 +482,8 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
                 sessions,
                 totalSessions: allSessions.length,
             });
+            if (target.synthetic)
+                rememberCreatedAt(target, task.createdAt);
         };
         for (const workspace of visibleWorkspaces) {
             const base = groups.get(workspace.id);
@@ -488,25 +537,33 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
                     };
                     groups.set(id, synthetic);
                 }
+                rememberCreatedAt(synthetic, session.startedAt);
                 group = synthetic;
             }
             // workspaceId 过滤时，不属于目标目录组的会话直接排除（含合成组）。
             if (workspaceFilter && group?.workspaceId !== workspaceFilter)
                 continue;
-            group?.standaloneSessions.push(summarize(session, {
+            if (!group)
+                continue;
+            group.standaloneSessions.push(summarize(session, {
                 workspaceName: group.workspaceName,
             }));
+            if (group.synthetic)
+                rememberCreatedAt(group, session.startedAt);
         }
         const payload = [...groups.values()]
             .filter((group) => !group.global || group.tasks.length > 0 || group.standaloneSessions.length > 0)
-            .sort((left, right) => Number(Boolean(right.global)) - Number(Boolean(left.global)));
-        const revision = tasksRevision(payload);
-        if (typeof req.query.revision === "string") {
-            if (req.query.revision === revision) {
-                res.json({ unchanged: true, revision, groups: [] });
-                return;
-            }
-            res.json({ unchanged: false, revision, groups: payload });
+            .sort((left, right) => {
+            const global = Number(Boolean(right.global)) - Number(Boolean(left.global));
+            if (global)
+                return global;
+            const created = compareCreatedDesc(left.createdAt, right.createdAt);
+            if (created)
+                return created;
+            return String(left.workspaceId).localeCompare(String(right.workspaceId));
+        });
+        if (hasRevisionQuery) {
+            res.json({ unchanged: false, revision: cheapTasksRevision(storage, sessions), groups: payload });
             return;
         }
         res.json(payload);
@@ -597,7 +654,7 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
         });
     }));
     // 新建任务：命名 + 可选独立 worktree（默认尝试创建，非 git 仓库时退化为直接用项目目录；
-    // 显式传 worktree:false 时跳过隔离，会话直接跑在项目目录）。
+    // 显式 worktree:false 跳过隔离；显式 worktree:true 失败则 400，不静默降级）。
     app.post("/api/workspaces/:id/tasks", asyncRoute(async (req, res) => {
         const workspace = storage.getWorkspace(req.params.id);
         if (!workspace) {
@@ -652,6 +709,8 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
         if (body.status === "active" || body.status === "done")
             patch.status = body.status;
         storage.updateWorkspaceTask(existing.id, patch);
+        if (patch.status === "done")
+            archiveBoardTaskForWorkspaceTask(storage, existing.id);
         res.json(storage.getWorkspaceTask(existing.id));
     });
     // 删除任务；cascade=true 连带删会话，否则仅解绑；尽力清理 worktree
@@ -672,6 +731,10 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
         // 尽力清理 worktree 与分支；失败不阻塞删除任务行。
         if (cascade)
             cleanupWorktreeSync(existing.worktree);
+        archiveBoardTaskForWorkspaceTask(storage, existing.id);
+        const board = storage.getWandTaskByWorkspaceTaskId(existing.id);
+        if (board)
+            storage.updateWandTask(board.id, { workspaceTaskId: null });
         storage.deleteWorkspaceTask(existing.id, { cascade });
         res.json({ ok: true });
     });
@@ -684,7 +747,18 @@ export function registerWorkspaceRoutes(app, storage, sessions) {
         }
         const body = req.body;
         const layout = sanitizeTaskLayout(body === null || typeof body !== "object" ? undefined : body.layout);
-        storage.saveWorkspaceTaskLayout(existing.id, layout);
-        res.json({ ok: true, layout });
+        const expected = typeof body.layoutRevision === "number" && Number.isFinite(body.layoutRevision)
+            ? Math.floor(body.layoutRevision)
+            : undefined;
+        const saved = storage.saveWorkspaceTaskLayout(existing.id, layout, expected);
+        if (!saved.ok) {
+            res.status(409).json({
+                error: "布局已被其他端更新。",
+                layout: saved.layout,
+                layoutRevision: saved.layoutRevision,
+            });
+            return;
+        }
+        res.json({ ok: true, layout, layoutRevision: saved.layoutRevision });
     });
 }