@co0ontty/wand 4.83.1 → 4.84.0

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

@@ -1,8 +1,10 @@
+import type { OpenRouterFreeModelsService } from "./openrouter-free-models.js";
 import type { Express, Request, RequestHandler } from "express";
 import { type BuildInfo } from "./build-info.js";
 import { type ModelCatalogService } from "./models.js";
 import { type RuntimeConfigState } from "./runtime-config.js";
 import type { WandStorage } from "./storage.js";
+import type { RetentionResult } from "./retention.js";
 import type { WandConfig } from "./types.js";
 import type { GithubConnectorStatus } from "./github-connector.js";
 interface SettingsDistributionPayload {
@@ -33,10 +35,13 @@ export interface ServerSettingsRoutesDependencies {
     getDistributionSettings(): Promise<SettingsDistributionPayload>;
     getGithubConnector(): GithubConnectorStatus;
     modelCatalog: ModelCatalogService;
+    openRouter: OpenRouterFreeModelsService;
     resolveAppConnectCode(req: Request): {
         code: string;
         url: string;
     };
+    /** 任务保留设置已写入当前进程后调用。失败不得回滚已保存的偏好。 */
+    sweepTaskRetention?: () => RetentionResult;
 }
 export declare function registerSettingsRoutes(app: Express, deps: ServerSettingsRoutesDependencies): void;
 export {};

package/dist/server-settings-routes.js

@@ -1,3 +1,4 @@
+import { normalizeModelGroups } from "./model-groups.js";
 import { existsSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { buildInfoPayload } from "./build-info.js";
@@ -62,6 +63,7 @@ export function registerSettingsRoutes(app, deps) {
             restartRequired: runtimeConfig.hasPendingRestart(),
             hasCert: existsSync(path.join(configDir, "server.key")) && existsSync(path.join(configDir, "server.crt")),
             githubConnector: deps.getGithubConnector(),
+            openRouter: deps.openRouter.status(),
             updateAvailable: cachedUpdate?.updateAvailable ?? false,
             latestVersion: cachedUpdate?.latest ?? null,
             updateChannel: deps.getUpdateChannel(),
@@ -125,6 +127,11 @@ export function registerSettingsRoutes(app, deps) {
         };
         let touchedDeployField = false;
         try {
+            if (body.modelGroups !== undefined && body.expectedModelGroups !== undefined
+                && JSON.stringify(normalizeModelGroups(body.expectedModelGroups)) !== JSON.stringify(config.modelGroups ?? [])) {
+                res.status(409).json({ error: "模型分组已在其他设备修改，请先刷新；当前草稿已保留。" });
+                return;
+            }
             for (const field of DEPLOYMENT_CONFIG_KEYS) {
                 if (!(field in body) || body[field] === undefined)
                     continue;
@@ -189,12 +196,27 @@ export function registerSettingsRoutes(app, deps) {
                 });
             }
             runtimeConfig.commit(candidateConfig, stagedPreferenceFields);
+            if (stagedPreferenceFields.has("modelGroups"))
+                deps.modelCatalog.publishModelGroups();
+            let retention;
+            let retentionError;
+            if (stagedPreferenceFields.has("taskRetention") && deps.sweepTaskRetention) {
+                try {
+                    retention = deps.sweepTaskRetention();
+                }
+                catch (error) {
+                    retentionError = error instanceof Error ? error.message : String(error);
+                    console.error(`[retention] save sweep failed: ${retentionError}`);
+                }
+            }
             res.json({
                 ok: true,
                 config: publicConfig(candidateConfig),
                 desiredConfig: publicConfig(candidateConfig),
                 activeConfig: publicConfig(config),
                 restartRequired: runtimeConfig.hasPendingRestart(),
+                ...(retention ? { retention } : {}),
+                ...(retentionError ? { retentionError: "设置已保存，但立即扫描失败，将在下次定时扫描时重试。" } : {}),
             });
         }
         catch (error) {
@@ -207,6 +229,30 @@ export function registerSettingsRoutes(app, deps) {
             sendRouteError(res, error, "保存配置失败。", 500);
         }
     }));
+    app.get("/api/settings/openrouter", requireAdmin, (_req, res) => {
+        res.set("Cache-Control", "no-store");
+        res.json(deps.openRouter.status());
+    });
+    app.post("/api/settings/openrouter", requireAdmin, asyncRoute(async (req, res) => {
+        try {
+            res.json(await deps.openRouter.saveKey(req.body?.apiKey));
+        }
+        catch (error) {
+            res.status(error instanceof TypeError ? 400 : 500).json({
+                error: error instanceof TypeError ? "请填写有效的 OpenRouter Key。" : "保存 OpenRouter 配置失败。",
+            });
+        }
+    }));
+    app.post("/api/settings/openrouter/refresh", requireAdmin, asyncRoute(async (_req, res) => {
+        if (!deps.openRouter.status().configured) {
+            res.status(400).json({ error: "请先保存 OpenRouter Key。" });
+            return;
+        }
+        res.json(await deps.openRouter.refresh());
+    }));
+    app.delete("/api/settings/openrouter", requireAdmin, (_req, res) => {
+        res.json(deps.openRouter.clearKey());
+    });
     app.get("/api/models", (_req, res) => {
         // Every client reads the server's persisted snapshot. Avoid browser/proxy
         // cache races after an administrator or scheduled server refresh.

package/dist/server-task-routes.js

@@ -2,6 +2,8 @@ import { dispatchAgentForTask, resolveTaskDispatchTarget } from "./agent-dispatc
 import { asyncRoute } from "./express-async.js";
 import { getErrorMessage } from "./error-utils.js";
 import { bodyObject, sendRouteError, text } from "./server-request.js";
+import { cleanupWorktreeSync } from "./git-worktree.js";
+import { isRetentionBusy } from "./retention.js";
 import { parseWandTaskAgent } from "./storage.js";
 import { defaultMilestoneIdForWrite, resolvedMilestoneFields, scopedMilestoneId } from "./milestone-scope.js";
 import { generateWandTaskTitle, provisionalTaskTitleFromDescription, TASK_TITLE_MAX_LENGTH } from "./task-title.js";
@@ -10,7 +12,7 @@ import { resolveSystemAiContext } from "./session-ai-context.js";
 import { memberAgents } from "./ai-team-types.js";
 import { selectEmployeeCandidate } from "./silicon-employee-dispatch.js";
 import { defaultRoleForCli } from "./default-employee.js";
-import { DEFAULT_WAND_TASK_AGENT_KIND, DEFAULT_WAND_TASK_AGENT_MODE, DEFAULT_WAND_TASK_PRIORITY, isWandTaskAgentKind, isWandTaskAgentMode, normalizeWandTaskAgentMode, WAND_MILESTONE_NAME_MAX_LENGTH } from "./task-types.js";
+import { DEFAULT_WAND_TASK_AGENT_KIND, DEFAULT_WAND_TASK_AGENT_MODE, DEFAULT_WAND_TASK_PRIORITY, isWandTaskAgentEngine, isWandTaskAgentKind, isWandTaskAgentMode, normalizeWandTaskAgentMode, WAND_MILESTONE_NAME_MAX_LENGTH } from "./task-types.js";
 import { isAutoNameableBoardTask, taskAutoNameSignature, taskAutoNameSourceText } from "./wand-task-sync.js";
 import { isSessionProvider } from "./session-provider.js";
 import { isThinkingEffort } from "./structured-provider-common.js";
@@ -187,7 +189,14 @@ export function parseTaskAgent(value, fallbackMode = DEFAULT_WAND_TASK_AGENT_MOD
     const rawKind = body.kind === undefined || body.kind === null || body.kind === "" ? fallbackKind : body.kind;
     if (!isWandTaskAgentKind(rawKind))
         throw new Error("会话形态无效。");
-    return { provider, model, thinkingEffort, mode, kind: rawKind };
+    const rawEngine = body.engine === undefined || body.engine === null || body.engine === "" ? "cli" : body.engine;
+    if (!isWandTaskAgentEngine(rawEngine))
+        throw new Error("执行引擎无效。");
+    if (rawEngine === "sdk" && (provider !== "pi" || rawKind !== "structured")) {
+        throw new Error("SDK 执行引擎仅支持 Pi 结构化会话。");
+    }
+    const engine = rawEngine === "sdk" ? rawEngine : undefined;
+    return { provider, model, thinkingEffort, mode, kind: rawKind, ...(engine ? { engine } : {}) };
 }
 function taskDto({ storage, sessions }, task) {
     if (!task)
@@ -580,6 +589,42 @@ export function registerTaskRoutes(app, deps) {
             sendRouteError(res, error, "无法更新任务。");
         }
     });
+    /**
+     * 清空归档目录：硬删除所有 archived 卡片（可按项目范围）。
+     * 名下会话还在处理的卡片跳过，不静默打断执行；其余按单卡删除的同一套归属清理。
+     * 必须注册在 `/api/wand-tasks/:id` 之前，否则 "archived" 会被当成任务 id。
+     */
+    app.delete("/api/wand-tasks/archived", (req, res) => {
+        try {
+            const workspaceId = typeof req.query.workspaceId === "string" && req.query.workspaceId
+                ? req.query.workspaceId
+                : undefined;
+            const archived = storage.listWandTasks(workspaceId).filter((task) => task.status === "archived");
+            const busy = new Set(sessions?.listSlim().filter(isRetentionBusy).map((session) => session.id) ?? []);
+            const deletable = [];
+            let skipped = 0;
+            for (const task of archived) {
+                const bound = storage.listWandTaskSessionIds(task.id);
+                if (bound.some((sessionId) => busy.has(sessionId))) {
+                    skipped += 1;
+                    continue;
+                }
+                const container = task.workspaceTaskId ? storage.getWorkspaceTask(task.workspaceTaskId) : null;
+                if (container?.worktree) {
+                    try {
+                        cleanupWorktreeSync(container.worktree);
+                    }
+                    catch { /* worktree 可能已被手动删除 */ }
+                }
+                deletable.push(task.id);
+            }
+            const deleted = storage.deleteWandTasks(deletable);
+            res.json({ ok: true, deleted: deleted.length, skipped });
+        }
+        catch (error) {
+            sendRouteError(res, error, "无法清空归档任务。");
+        }
+    });
     app.delete("/api/wand-tasks/:id", (req, res) => {
         const archived = storage.updateWandTask(req.params.id, { status: "archived" });
         if (!archived) {
@@ -694,12 +739,12 @@ export function registerTaskRoutes(app, deps) {
             if (subject?.type === "employee" && (!employee || employee.archivedAt)) {
                 throw new Error("硅基员工不存在或已归档。");
             }
-            const selected = employee ? selectEmployeeCandidate(employee) : null;
+            const selected = employee ? selectEmployeeCandidate(employee, undefined, { skipSdk: true }) : null;
             const cliDefault = subject?.type === "cli"
                 ? parseTaskAgent({ ...cliAgentForSubject(subject, task.agent), ...(body.kind === "pty" ? { kind: "pty" } : {}) })
                 : null;
             const fallbackCandidate = !subject && body.agent === undefined && !task.agent
-                && !body.provider ? selectEmployeeCandidate(defaultRoleForCli(storage, config.defaultProvider)).agent : null;
+                && !body.provider ? selectEmployeeCandidate(defaultRoleForCli(storage, config.defaultProvider), undefined, { skipSdk: true }).agent : null;
             const fallbackAgent = fallbackCandidate && body.kind === "pty"
                 ? { ...fallbackCandidate, kind: "pty" } : fallbackCandidate;
             const agent = selected?.agent ?? (body.agent === undefined

package/dist/server-team-dispatch-routes.d.ts

@@ -0,0 +1,19 @@
+import type { Express } from "express";
+import type { DecisionService } from "./decision-service.js";
+import type { WandStorage } from "./storage.js";
+/**
+ * 无指派派工：不预设员工，由本地决策模型按任务描述给出建议名单，确认后才开工。
+ * 「建议」和「开工」是两个独立请求，中间不需要服务端保存计划：
+ * 开工时重新校验名单（员工存在、未归档、非系统运维、含负责人）。
+ */
+export declare function registerTeamDispatchRoutes(app: Express, deps: {
+    storage: WandStorage;
+    runner: {
+        start(input: {
+            teamId: string;
+            taskId: string;
+            note?: string;
+        }): Promise<unknown>;
+    };
+    decisions: Pick<DecisionService, "evaluate" | "status">;
+}): void;

package/dist/server-team-dispatch-routes.js

@@ -0,0 +1,71 @@
+import { DecisionError } from "./decision-types.js";
+import { asyncRoute } from "./express-async.js";
+import { getErrorMessage } from "./error-utils.js";
+import { bodyObject, sendRouteError, text } from "./server-request.js";
+import { assertDispatchDecisionReady, planTeamDispatch, startTeamDispatch, } from "./team-dispatch.js";
+function sendDispatchError(res, error) {
+    const message = getErrorMessage(error, "派工失败。");
+    // 这里所有错误都是“请求体/名单不合法”或决策服务不可用；不当成资源路径缺失（404），
+    // 也不把“员工不存在”（名单里的 id）混同于“项目不存在”。
+    if (error instanceof DecisionError) {
+        res.status(error.status).json({ error: message, code: error.code });
+        return;
+    }
+    sendRouteError(res, error, "派工失败。", 400);
+}
+/**
+ * 无指派派工：不预设员工，由本地决策模型按任务描述给出建议名单，确认后才开工。
+ * 「建议」和「开工」是两个独立请求，中间不需要服务端保存计划：
+ * 开工时重新校验名单（员工存在、未归档、非系统运维、含负责人）。
+ */
+export function registerTeamDispatchRoutes(app, deps) {
+    app.post("/api/team-dispatch/plan", asyncRoute(async (req, res) => {
+        try {
+            const body = bodyObject(req.body ?? {});
+            const note = text(body.note);
+            const maxMembers = typeof body.maxMembers === "number" ? body.maxMembers : undefined;
+            const threshold = typeof body.threshold === "number" ? body.threshold : undefined;
+            assertDispatchDecisionReady(deps.decisions);
+            const plan = await planTeamDispatch({
+                storage: deps.storage,
+                note,
+                ...(maxMembers === undefined ? {} : { maxMembers }),
+                ...(threshold === undefined ? {} : { threshold }),
+                evaluate: (value, caller, signal) => deps.decisions.evaluate(value, caller, signal),
+            });
+            res.json(plan);
+        }
+        catch (error) {
+            sendDispatchError(res, error);
+        }
+    }));
+    app.post("/api/team-dispatch/start", asyncRoute(async (req, res) => {
+        try {
+            const body = bodyObject(req.body ?? {});
+            const workspaceId = text(body.workspaceId);
+            if (!workspaceId)
+                throw new Error("请选择工作项目。");
+            const rawMembers = Array.isArray(body.members) ? body.members : [];
+            const members = rawMembers.map((raw) => {
+                const record = bodyObject(raw);
+                return {
+                    employeeId: text(record.employeeId),
+                    ...(record.isLeader === true ? { isLeader: true } : {}),
+                };
+            });
+            const name = text(body.name);
+            const result = await startTeamDispatch({
+                storage: deps.storage,
+                runner: deps.runner,
+                workspaceId,
+                note: text(body.note),
+                members,
+                ...(name ? { name } : {}),
+            });
+            res.status(202).json({ ...result.run, teamId: result.teamId, taskId: result.taskId });
+        }
+        catch (error) {
+            sendDispatchError(res, error);
+        }
+    }));
+}

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

@@ -39,7 +39,7 @@ export interface PublicUpdateRoutesDependencies {
     resolveLatestIpa(): Promise<ResolvedUpdateAsset | null>;
     resolveIosDownload(): Promise<DownloadAsset | null>;
 }
-export declare function registerPublicUpdateRoutes(app: Express, deps: PublicUpdateRoutesDependencies): void;
+export declare function registerPublicUpdateRoutes(app: Express, deps: PublicUpdateRoutesDependencies, publicOrigin?: string): void;
 export declare class ServerUpdateState {
     providerCliUpdateCache: {
         items: ProviderCliUpdateStatus[];

package/dist/server-update-routes.js

@@ -63,7 +63,7 @@ function requireCurrentVersion(req, res) {
     }
     return currentVersion;
 }
-export function registerPublicUpdateRoutes(app, deps) {
+export function registerPublicUpdateRoutes(app, deps, publicOrigin) {
     app.get("/api/android-apk-update", asyncRoute(async (req, res) => {
         const currentVersion = requireCurrentVersion(req, res);
         if (currentVersion === null)
@@ -220,7 +220,7 @@ export function registerPublicUpdateRoutes(app, deps) {
         const currentVersion = requireCurrentVersion(req, res);
         if (currentVersion === null)
             return;
-        const payload = await resolveIosOtaPayload(req, deps);
+        const payload = await resolveIosOtaPayload(req, deps, publicOrigin);
         if (!payload) {
             res.json({
                 updateAvailable: false,
@@ -259,7 +259,7 @@ export function registerPublicUpdateRoutes(app, deps) {
         });
     }));
     app.get("/ios/manifest.plist", asyncRoute(async (req, res) => {
-        const payload = await resolveIosOtaPayload(req, deps);
+        const payload = await resolveIosOtaPayload(req, deps, publicOrigin);
         if (!payload) {
             res.status(404).type("text/plain").send("当前没有可安装的 IPA 文件。");
             return;
@@ -269,7 +269,7 @@ export function registerPublicUpdateRoutes(app, deps) {
         res.send(payload.manifest);
     }));
     app.get("/ios/install", asyncRoute(async (req, res) => {
-        const payload = await resolveIosOtaPayload(req, deps);
+        const payload = await resolveIosOtaPayload(req, deps, publicOrigin);
         if (!payload) {
             res.status(404).type("text/plain").send("当前没有可安装的 IPA 文件。");
             return;
@@ -301,12 +301,17 @@ export function registerPublicUpdateRoutes(app, deps) {
         });
     }));
 }
-async function resolveIosOtaPayload(req, deps) {
+async function resolveIosOtaPayload(req, deps, publicOrigin) {
     const latest = await deps.resolveLatestIpa();
     const local = await deps.resolveIosDownload();
     if (!latest && !local)
         return null;
+    // Explicit ?origin= wins; then the deployment's configured publicOrigin
+    // (same precedence as the connection-code logic in server-app-connect);
+    // request-derived headers are the last resort — L4 proxies may not forward
+    // x-forwarded-proto, which would otherwise emit http:// manifest URLs.
     const origin = normalizePublicOrigin(typeof req.query.origin === "string" ? req.query.origin : undefined)
+        ?? normalizePublicOrigin(publicOrigin)
         ?? publicOriginFromRequest(req)
         ?? "";
     const source = local ? "local" : (latest?.source ?? "github");

package/dist/server-workspace-routes.js

@@ -67,8 +67,11 @@ function teamMarkersFor(markers, sessionId) {
     const step = markers.step.get(sessionId);
     return step ? { step } : {};
 }
-function cheapTasksRevision(storage, registry) {
+function cheapTasksRevision(storage, registry, includeArchived = false) {
     const fingerprint = [
+        // Invalidate pre-filter client caches even if no stored row has changed.
+        "visible-sessions-v2",
+        includeArchived,
         storage.tasksAggregateFingerprint(),
         // 团队标记（群聊入口、成员步骤与运行状态）也在列表里。
         storage.teamSessionFingerprint(),
@@ -229,12 +232,11 @@ function createTaskForWorkspace(storage, workspace, body) {
         isolated: worktree !== null,
     };
 }
-function workspaceWithCounts(storage, workspace, sessionCounts) {
+function workspaceWithCounts(storage, workspace, sessionCounts, includeArchived = false) {
     const worktreeCount = storage.listWorkspaceTasks(workspace.id)
-        .filter((task) => task.worktree !== null)
+        .filter((task) => (includeArchived || !task.archived) && task.worktree !== null)
         .length;
-    const sessionCount = sessionCounts?.get(workspace.id)
-        ?? storage.listSessionsByWorkspace(workspace.id).length;
+    const sessionCount = (sessionCounts ?? storage.countSessionsByWorkspace({ includeArchived })).get(workspace.id) ?? 0;
     return { ...workspace, worktreeCount, sessionCount };
 }
 // ── Layout validation / sanitization（前端 PUT 与测试共用）──
@@ -344,12 +346,13 @@ export function sanitizeTaskLayout(value) {
  */
 export function registerWorkspaceRoutes(app, storage, sessions, titleOptions = {}) {
     // 列出所有项目（按创建时间降序：新建在前，打开不会改位置）
-    app.get("/api/workspaces", (_req, res) => {
+    app.get("/api/workspaces", (req, res) => {
         backfillSessionWorkspaces(storage);
-        const sessionCounts = storage.countSessionsByWorkspace();
+        const includeArchived = req.query.includeArchived === "1";
+        const sessionCounts = storage.countSessionsByWorkspace({ includeArchived });
         res.json(storage.listWorkspaces()
             .filter((workspace) => !isGlobalWorkspace(workspace))
-            .map((workspace) => workspaceWithCounts(storage, workspace, sessionCounts)));
+            .map((workspace) => workspaceWithCounts(storage, workspace, sessionCounts, includeArchived)));
     });
     // 新建项目：名称 + 目录 + 默认 IDE，不启动会话
     app.post("/api/workspaces", asyncRoute(async (req, res) => {
@@ -371,8 +374,8 @@ export function registerWorkspaceRoutes(app, storage, sessions, titleOptions = {
         const workspace = storage.createWorkspace({ name, cwd, defaultProvider });
         // 项目名就是工作区显示名：目录自定义名一起写，保证各端显示一致。
         storage.setSessionDirectoryName(cwd, name);
-        const attached = attachUnboundSessionsToWorkspace(storage, workspace);
-        res.status(201).json({ ...workspace, worktreeCount: 0, sessionCount: attached });
+        attachUnboundSessionsToWorkspace(storage, workspace);
+        res.status(201).json(workspaceWithCounts(storage, workspace));
     }));
     // 项目详情：meta + 会话 + 布局；访问即更新 lastOpenedAt
     app.get("/api/workspaces/:id", (req, res) => {
@@ -382,13 +385,19 @@ export function registerWorkspaceRoutes(app, storage, sessions, titleOptions = {
             return;
         }
         storage.touchWorkspace(workspace.id);
+        const includeArchived = req.query.includeArchived === "1";
+        const archivedTaskIds = new Set(storage.listWorkspaceTasks(workspace.id)
+            .filter((task) => task.archived).map((task) => task.id));
         const teamMarkers = teamSessionMarkers(storage);
+        const visibleSessions = storage.listSessionsByWorkspace(workspace.id).map((session) => ({
+            ...workspaceSessionSummary(session, { workspaceName: workspace.name }, sessions, teamMarkersFor(teamMarkers, session.id)),
+            workspaceTaskId: session.workspaceTaskId,
+        })).filter((session) => includeArchived || (!session.archived
+            && (!session.workspaceTaskId || !archivedTaskIds.has(session.workspaceTaskId))));
         res.json({
-            ...workspaceWithCounts(storage, workspace),
-            sessions: storage.listSessionsByWorkspace(workspace.id).map((session) => ({
-                ...workspaceSessionSummary(session, { workspaceName: workspace.name }, sessions, teamMarkersFor(teamMarkers, session.id)),
-                workspaceTaskId: session.workspaceTaskId,
-            })),
+            ...workspaceWithCounts(storage, workspace, undefined, includeArchived),
+            sessionCount: visibleSessions.length,
+            sessions: visibleSessions,
         });
     });
     // 改名 / 目录 / 默认 IDE
@@ -514,10 +523,11 @@ export function registerWorkspaceRoutes(app, storage, sessions, titleOptions = {
         }
         // 查询参数：workspaceId 过滤单目录；limit 截断每目录任务数；
         // maxSessions 截断每任务内嵌会话数（大数据量时控制响应体积）。
+        const includeArchived = req.query.includeArchived === "1";
         const hasRevisionQuery = typeof req.query.revision === "string";
         const requestedRevision = hasRevisionQuery ? req.query.revision : "";
         if (hasRevisionQuery && requestedRevision) {
-            const cheap = cheapTasksRevision(storage, sessions);
+            const cheap = cheapTasksRevision(storage, sessions, includeArchived);
             if (requestedRevision === cheap) {
                 res.json({ unchanged: true, revision: cheap, groups: [] });
                 return;
@@ -534,6 +544,9 @@ export function registerWorkspaceRoutes(app, storage, sessions, titleOptions = {
         // 目录组只需要会话元数据：用 slim 读，否则每次轮询都要把每个会话的
         // messages 大字段 JSON 解析一遍（单会话可达十几 MB，整表 ~30MB）。
         const allSessions = storage.loadSessionsSlim();
+        const liveArchiveFlags = new Map((sessions?.listSlim() ?? []).map((session) => [session.id, session.archived]));
+        const sessionVisible = (session) => includeArchived
+            || !(liveArchiveFlags.get(session.id) ?? session.archived);
         const workspaces = storage.listWorkspaces();
         // 群聊与成员派发标记一次查全：列表里每条会话只做 Map 命中，不逐个查库。
         const teamMarkers = teamSessionMarkers(storage);
@@ -596,8 +609,8 @@ export function registerWorkspaceRoutes(app, storage, sessions, titleOptions = {
             return snapshots;
         };
         const appendTask = (target, workspace, task) => {
-            const allSessions = taskSessions(task.id);
-            const sessions = allSessions
+            const visibleSessions = taskSessions(task.id).filter(sessionVisible);
+            const sessions = visibleSessions
                 .slice(0, sessionLimit ?? undefined)
                 .map((session) => ({
                 ...summarize(session, { taskName: task.name, workspaceName: isGlobalWorkspace(workspace) ? undefined : workspace.name }),
@@ -610,7 +623,7 @@ export function registerWorkspaceRoutes(app, storage, sessions, titleOptions = {
                 cwd: taskRuntimeCwd(task, workspace),
                 isolated: task.worktree !== null,
                 sessions,
-                totalSessions: allSessions.length,
+                totalSessions: visibleSessions.length,
             });
             if (target.synthetic)
                 rememberCreatedAt(target, task.createdAt);
@@ -620,7 +633,11 @@ export function registerWorkspaceRoutes(app, storage, sessions, titleOptions = {
             if (!base)
                 continue;
             const global = isGlobalWorkspace(workspace);
-            for (const task of tasksByWorkspace.get(workspace.id).slice(0, taskLimit ?? undefined)) {
+            // Filter before pagination. Keep the full membership map below so hidden
+            // task sessions cannot reappear as standalone conversations.
+            const visibleTasks = tasksByWorkspace.get(workspace.id)
+                .filter((task) => includeArchived || !task.archived);
+            for (const task of visibleTasks.slice(0, taskLimit ?? undefined)) {
                 const taskCwd = taskRuntimeCwd(task, workspace);
                 const target = global && taskCwd
                     && normalizeProjectCwd(taskCwd) !== normalizeProjectCwd(workspace.cwd)
@@ -638,7 +655,7 @@ export function registerWorkspaceRoutes(app, storage, sessions, titleOptions = {
             }
         }
         for (const session of allSessions) {
-            if (taskBoundSessionIds.has(session.id))
+            if (taskBoundSessionIds.has(session.id) || !sessionVisible(session))
                 continue;
             const direct = session.workspaceId ? groups.get(session.workspaceId) : undefined;
             const resolved = projectCwdForSession(session);
@@ -688,7 +705,7 @@ export function registerWorkspaceRoutes(app, storage, sessions, titleOptions = {
             .filter((group) => !group.global || group.tasks.length > 0 || group.standaloneSessions.length > 0);
         const payload = sortTaskDirectoryGroups(orderedGroups, storage.getWorkspaceGroupOrder());
         if (hasRevisionQuery) {
-            res.json({ unchanged: false, revision: cheapTasksRevision(storage, sessions), groups: payload });
+            res.json({ unchanged: false, revision: cheapTasksRevision(storage, sessions, includeArchived), groups: payload });
             return;
         }
         res.json(payload);
@@ -723,7 +740,9 @@ export function registerWorkspaceRoutes(app, storage, sessions, titleOptions = {
             res.status(404).json({ error: "未找到该项目。" });
             return;
         }
-        res.json(storage.listWorkspaceTasks(workspace.id).map((task) => ({
+        res.json(storage.listWorkspaceTasks(workspace.id)
+            .filter((task) => req.query.includeArchived === "1" || !task.archived)
+            .map((task) => ({
             ...task,
             ...resolvedMilestoneFields(storage, task.milestoneId),
         })));
@@ -735,7 +754,8 @@ export function registerWorkspaceRoutes(app, storage, sessions, titleOptions = {
             res.status(404).json({ error: "未找到该项目。" });
             return;
         }
-        const tasks = storage.listWorkspaceTasks(workspace.id).filter((task) => task.worktree !== null);
+        const tasks = storage.listWorkspaceTasks(workspace.id)
+            .filter((task) => (req.query.includeArchived === "1" || !task.archived) && task.worktree !== null);
         if (tasks.length === 0) {
             res.json({ workspaceId: workspace.id, repoRoot: workspace.cwd, targetBranch: "", worktrees: [] });
             return;

package/dist/server.d.ts

@@ -33,5 +33,6 @@ export declare function isPortInUseError(error: unknown): error is PortInUseErro
 export declare function startServer(config: WandConfig, configPath: string, options?: {
     modelRefreshOptions?: () => Partial<ModelRefreshOptions>;
     terminalHost?: TerminalHost;
+    openRouterFetch?: typeof fetch;
 }): Promise<ServerHandle>;
 export {};