@co0ontty/wand 4.76.0 → 4.77.0-beta.g6c4df97

package/dist/server.js

@@ -31,6 +31,9 @@ import { registerTaskRoutes } from "./server-task-routes.js";
 import { getGithubConnectorStatus } from "./github-connector.js";
 import { registerMissionRoutes } from "./server-mission-routes.js";
 import { Missions } from "./missions.js";
+import { createAiTeamRunner } from "./ai-team-runner.js";
+import { registerAiTeamRoutes } from "./server-ai-team-routes.js";
+import { registerAttentionRoutes } from "./server-attention-routes.js";
 import { refreshProviderCliUpdateState, registerAdminUpdateRoutes, registerPublicUpdateRoutes, ServerUpdateState, } from "./server-update-routes.js";
 import { parseSessionCreationOrigin, registerClaudeHistoryRoutes, registerSessionRoutes } from "./server-session-routes.js";
 import { registerWorkspaceRoutes } from "./server-workspace-routes.js";
@@ -54,6 +57,7 @@ import { DistributionManager } from "./distribution-manager.js";
 import { isLogBusActive, wandTuiLog } from "./tui/log-bus.js";
 import { EMBEDDED_WEB_ASSETS } from "./web-ui/embedded-assets.js";
 import { renderApp } from "./web-ui/index.js";
+import { getAiTeamsChunk } from "./web-ui/scripts.js";
 import { WsBroadcastManager } from "./ws-broadcast.js";
 import { TerminalDaemonClient } from "./terminal-daemon-client.js";
 import { createUpgradeAwareTerminalHost } from "./render-host.js";
@@ -343,6 +347,26 @@ export async function startServer(config, configPath, options = {}) {
     const structuredSessions = new StructuredSessionManager(storage, config, structuredLogger, undefined, {}, structuredHosts.host);
     const sessionRegistry = new SessionRegistry(processes, structuredSessions, storage);
     const missions = new Missions(storage, structuredSessions, sessionRegistry);
+    // wsManager 在后面才建：团队运行的变更通知经由这个转发口，接好之前静默丢弃。
+    let notifyAiTeamRun = (_data) => { };
+    // 团队降级的 model-unknown 事前比对只看这份已发现的清单；没刷新过就是空，判定方向是放行。
+    const aiTeamModelIds = (provider) => {
+        const cache = modelCatalog.snapshot();
+        const key = {
+            claude: "models",
+            codex: "codexModels",
+            opencode: "opencodeModels",
+            grok: "grokModels",
+            qoder: "qoderModels",
+            pi: "piModels",
+        }[provider];
+        return cache[key].map((entry) => entry.id);
+    };
+    const aiTeams = createAiTeamRunner({
+        storage, config, structured: structuredSessions, processes, sessions: sessionRegistry,
+        notify: (run) => notifyAiTeamRun({ kind: "ai-team-run", runId: run.id, taskId: run.taskId }),
+        models: aiTeamModelIds,
+    });
     const updateState = new ServerUpdateState();
     const getUpdateChannel = () => normalizeUpdateChannel(storage.getConfigValue("updateChannel"));
     let disconnectAuthenticatedSockets = () => { };
@@ -396,6 +420,14 @@ export async function startServer(config, configPath, options = {}) {
     app.get("/vendor/xterm/xterm.bundle.js", (req, res) => sendEmbeddedVendorAsset("/vendor/xterm/xterm.bundle.js", req, res));
     app.get("/vendor/xterm/xterm.css", (req, res) => sendEmbeddedVendorAsset("/vendor/xterm/xterm.css", req, res));
     app.get("/vendor/qrcode/qrcode.bundle.js", (req, res) => sendEmbeddedVendorAsset("/vendor/qrcode/qrcode.bundle.js", req, res));
+    // AI 团队页按需脚本：页面 meta 里的地址带内容 hash，hash 对得上才长缓存。
+    app.get("/assets/ai-teams.js", (req, res) => {
+        const chunk = getAiTeamsChunk();
+        res.setHeader("Cache-Control", req.query.v === chunk.hash
+            ? "public, max-age=604800, immutable"
+            : "no-cache");
+        res.type("application/javascript").send(chunk.content);
+    });
     // ── Web UI endpoints ──
     app.get("/", (_req, res) => {
         res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
@@ -644,6 +676,8 @@ export async function startServer(config, configPath, options = {}) {
     registerGithubRoutes(app, { storage, requireAdmin, sessions: sessionRegistry });
     // 任务管理与 Missions 一样只需登录：原生 connected-app 也要能列/建/派发。
     registerTaskRoutes(app, { storage, sessions: sessionRegistry, structured: structuredSessions, processes, config });
+    registerAiTeamRoutes(app, { storage, runner: aiTeams });
+    registerAttentionRoutes(app, { sessions: sessionRegistry, runner: aiTeams });
     registerAdminUpdateRoutes(app, {
         storage,
         config,
@@ -760,6 +794,7 @@ export async function startServer(config, configPath, options = {}) {
                     cols: reqCols,
                     rows: reqRows,
                     thinkingEffort: body.thinkingEffort ?? config.defaultThinkingEffort,
+                    systemPrompt: body.systemPrompt,
                     workspaceId,
                     workspaceTaskId: body.workspaceTaskId,
                     ...origin,
@@ -839,15 +874,21 @@ export async function startServer(config, configPath, options = {}) {
     // Wire process events to WebSocket broadcast
     processes.on("process", (event) => {
         missions.ingest(event);
+        aiTeams.ingest(event);
         wsManager.emitEvent(event);
     });
     structuredSessions.setEventEmitter((event) => {
         missions.ingest(event);
+        aiTeams.ingest(event);
         wsManager.emitEvent(event);
     });
+    notifyAiTeamRun = (data) => {
+        wsManager.emitEvent({ type: "notification", sessionId: "__system__", data });
+    };
     // Re-attach structured CLI runs that kept going inside terminald while the
     // previous web process was down; fire-and-forget, failures are logged inside.
     void structuredSessions.recoverDetachedRuns();
+    aiTeams.reconcile();
     // ── Restart endpoint (needs server + wss in scope) ──
     /**
      * 统一的关服 + 重启。重启方式由 computeRelaunch 决定：
@@ -900,6 +941,7 @@ export async function startServer(config, configPath, options = {}) {
                 structuredSessions.dispose();
             }
             catch { /* noop */ }
+            aiTeams.dispose();
             try {
                 structuredHosts.rustClient?.disconnect();
             }
@@ -1177,6 +1219,7 @@ export async function startServer(config, configPath, options = {}) {
                 structuredSessions.dispose();
             }
             catch { /* best-effort shutdown */ }
+            aiTeams.dispose();
             try {
                 structuredHosts.rustClient?.disconnect();
             }

package/dist/session-topic.js

@@ -245,19 +245,19 @@ export async function generateSessionTopic(userMessages, cwd, language, ai = {})
     if (!input)
         throw new Error("没有可总结的用户消息。");
     const outputLanguage = language?.trim() || "与用户消息相同的语言";
-    const prompt = [
-        "请综合总结下面这段用户与编码助手对话中的所有用户消息，用于单个终端/会话的列表标题。",
-        `使用${outputLanguage}输出。`,
-        "只输出一个 JSON 对象，不要 Markdown、解释或额外文字。",
-        '格式：{"title":"不超过20个字的具体主题标题","description":"不超过60个字的一句话任务描述"}',
-        "标题必须概括该会话用户命令自己的具体工作，不要复述项目名、目录名或上级任务标题，也不要使用“关于”“请求”“任务”等空泛词。",
-        "描述保留当前整体目标、关键对象和新增要求。",
-        "后续轮次与前面目标有关时必须共同概括；发生目标切换时优先反映最新目标，同时保留仍有效的上下文。",
-        "",
-        "按发送顺序排列的用户消息：",
-        input,
-    ].join("\n");
-    const raw = await callConfiguredAiText(prompt, cwd ?? process.cwd(), language ?? "", ai);
+    const request = {
+        system: [
+            "请综合总结用户消息里的所有轮次，用于单个终端/会话的列表标题。",
+            `使用${outputLanguage}输出。`,
+            "只输出一个 JSON 对象，不要 Markdown、解释或额外文字。",
+            '格式：{"title":"不超过20个字的具体主题标题","description":"不超过60个字的一句话任务描述"}',
+            "标题必须概括该会话用户命令自己的具体工作，不要复述项目名、目录名或上级任务标题，也不要使用“关于”“请求”“任务”等空泛词。",
+            "描述保留当前整体目标、关键对象和新增要求。",
+            "后续轮次与前面目标有关时必须共同概括；发生目标切换时优先反映最新目标，同时保留仍有效的上下文。",
+        ].join("\n"),
+        prompt: `按发送顺序排列的用户消息：\n${input}`,
+    };
+    const raw = await callConfiguredAiText(request, cwd ?? process.cwd(), language ?? "", ai);
     const topic = parseTopic(raw);
     if (!topic)
         throw new Error("模型返回的会话主题格式无效。");

package/dist/session-transport.d.ts

@@ -21,6 +21,8 @@ export interface SessionDetailDTO extends SessionBaseDTO {
     messageTotal?: number;
     leadingBlockOffset?: number;
     leadingBlockTotal?: number;
+    /** 被切掉的头部里用户可感知的块数（默认收起的工具 / 思考块不计入）。 */
+    leadingVisibleCount?: number;
 }
 /** Resolve every client-visible title on the server so all clients show the same value. */
 export declare function resolveSessionDisplayTitle(snapshot: SessionSnapshot, blockedTitles?: readonly string[]): string;
@@ -32,6 +34,7 @@ export interface SessionDetailDTOOptions {
     messageTotal?: number;
     leadingBlockOffset?: number;
     leadingBlockTotal?: number;
+    leadingVisibleCount?: number;
     outputLimit?: number;
 }
 export declare function toSessionDetailDTO(snapshot: SessionSnapshot, options?: SessionDetailDTOOptions): SessionDetailDTO;

package/dist/session-transport.js

@@ -92,6 +92,7 @@ export function toSessionDetailDTO(snapshot, options = {}) {
         ...(options.messageTotal !== undefined ? { messageTotal: options.messageTotal } : {}),
         ...(options.leadingBlockOffset !== undefined ? { leadingBlockOffset: options.leadingBlockOffset } : {}),
         ...(options.leadingBlockTotal !== undefined ? { leadingBlockTotal: options.leadingBlockTotal } : {}),
+        ...(options.leadingVisibleCount !== undefined ? { leadingVisibleCount: options.leadingVisibleCount } : {}),
     };
 }
 /** Bound snapshot-like event payloads before they enter per-client WS queues. */

package/dist/storage.d.ts

@@ -1,6 +1,22 @@
-import { SessionSnapshot, ConversationTurn, StructuredSessionState, Workspace, LayoutNode, TaskWindowLayout, WorkspaceDefaultProvider, WorkspaceKind, WorkspaceTask, WorkspaceTaskWorktree, WorkspaceTaskStatus } from "./types.js";
+import { SessionSnapshot, ConversationTurn, SessionProvider, StructuredSessionState, Workspace, LayoutNode, TaskWindowLayout, WorkspaceDefaultProvider, WorkspaceKind, WorkspaceTask, WorkspaceTaskWorktree, WorkspaceTaskStatus } from "./types.js";
+import type { AiTeam, AiTeamRun, AiTeamRunChatMarker, AiTeamRunStatus, AiTeamStep, CandidateFailureKind, StepDispatchInfo } from "./ai-team-types.js";
+import type { WandTaskAgentKind } from "./task-types.js";
 import type { AgentActivityItem, Mission, MissionAttempt, MissionReviewComment, MissionReviewStatus, MissionStatus } from "./mission-types.js";
 import { type PasswordVault, type PasswordVaultItem, type PasswordVaultItemFilter, type PasswordVaultItemInput } from "./password-manager.js";
+/** `ai_team_runs.run_state_json`：本次运行的候选黑名单（§3.4 修正 B12 两层键值 + host-disabled）。 */
+export interface AiTeamRunState {
+    /** spawn-missing：该 provider 的候选全部直接跳过。 */
+    providers: SessionProvider[];
+    /** 五元组 key → 拉黑它的原因（model-unknown / startup-timeout）。 */
+    agents: Array<{
+        key: string;
+        kind: CandidateFailureKind;
+    }>;
+    /** 五元组 key → startup-timeout 累计次数（到 2 次进 agents）。 */
+    strikes: Record<string, number>;
+    /** host-disabled：整个 run 不再尝试该 kind 的候选。 */
+    hostDisabled: WandTaskAgentKind[];
+}
 export interface ConnectorMeta {
     provider: string;
     apiUrl: string | null;
@@ -88,6 +104,8 @@ export declare class WandStorage {
     setSessionWorkspaceId(sessionId: string, workspaceId: string | null): void;
     /** Lightweight count of persisted sessions grouped by workspace. */
     countSessionsByWorkspace(): Map<string, number>;
+    /** Count user-initiated CLI launches (one per session), including archived sessions. */
+    countInteractiveSessionsByProvider(): Record<SessionProvider, number>;
     /** Sessions not yet attached to a project. Omits messages/output. */
     listUnboundSessionBindings(): Array<{
         id: string;
@@ -265,6 +283,33 @@ export declare class WandStorage {
     deleteAuthSession(token: string): void;
     deleteAllAuthSessions(): void;
     deleteExpiredAuthSessions(now: number): void;
+    listAiTeams(): AiTeam[];
+    getAiTeam(id: string): AiTeam | null;
+    saveAiTeam(team: AiTeam): void;
+    /** 只删团队定义；已有运行保存了团队快照，不受影响。 */
+    deleteAiTeam(id: string): void;
+    saveAiTeamRun(run: AiTeamRun): void;
+    /** 群聊会话对应的最近一次运行（同一个群聊可以接着开新运行）。 */
+    getLatestAiTeamRunByChat(sessionId: string): AiTeamRun | null;
+    /**
+     * 会话列表用的群聊标记索引：chat_session_id → 最近一次运行的入口信息。
+     * 一次查询建整张表，供 /api/tasks 每请求一次构建；不逐会话查询。
+     */
+    listAiTeamRunChatMarkers(): Map<string, AiTeamRunChatMarker>;
+    getAiTeamRun(id: string): AiTeamRun | null;
+    listAiTeamRuns(filter?: {
+        taskId?: string;
+        teamId?: string;
+        statuses?: readonly AiTeamRunStatus[];
+        limit?: number;
+    }): AiTeamRun[];
+    saveAiTeamStep(step: AiTeamStep): void;
+    listAiTeamSteps(runId: string): AiTeamStep[];
+    getRunningAiTeamStepBySession(sessionId: string): AiTeamStep | null;
+    /** `ai_team_runs.run_state_json` 的读侧入口（§3.4）；脏值 / 旧行退化成空黑名单。 */
+    getAiTeamRunState(runId: string): AiTeamRunState;
+    /** 只写 `run_state_json` 一列，不碰 `saveAiTeamRun` 负责的业务字段。 */
+    setAiTeamRunState(runId: string, state: AiTeamRunState): void;
     saveMission(mission: Mission): void;
     getMission(id: string): Mission | null;
     listMissions(includeArchived?: boolean): Mission[];
@@ -301,4 +346,12 @@ export declare class WandStorage {
     private mapSessionRow;
     deleteSession(id: string): void;
 }
+/**
+ * `ai_team_steps.dispatch_info_json` 的读侧校验（§3.2）。脏值 / 旧行默认 `{}` 一律退化成
+ * 「首选、没跳过任何候选」，坏条目逐条丢弃，不整字段作废——降级留痕是可观测性数据，
+ * 不能因为一条脏记录把整条链丢掉。
+ */
+export declare function parseStepDispatchInfo(raw: unknown): StepDispatchInfo;
+/** `ai_team_runs.run_state_json` 的读侧校验（§3.4）；脏值退化成空黑名单。 */
+export declare function parseAiTeamRunState(raw: unknown): AiTeamRunState;
 export {};