diff --git a/src/api/server.ts b/src/api/server.ts index 2a6b26a..fa6ccad 100644 --- a/src/api/server.ts +++ b/src/api/server.ts @@ -26,8 +26,8 @@ function dataDir(): string { } /** Project 出参:附加 hasTodoJson(/todo/todo.json 是否存在,每次序列化时算) */ -function projectOut(p: Project): Project & { hasTodoJson: boolean } { - return { ...p, hasTodoJson: hasTodoJson(p.repoPath) }; +function projectOut(p: Project, store: Store): Project & { hasTodoJson: boolean; summary: ReturnType } { + return { ...p, hasTodoJson: hasTodoJson(p.repoPath), summary: store.projectSummary(p.id) }; } export interface ApiOptions { @@ -59,7 +59,7 @@ export function buildServer(opts: ApiOptions): FastifyInstance { }); // ---------- Projects ---------- - app.get('/api/projects', () => store.listProjects().map(projectOut)); + app.get('/api/projects', () => store.listProjects().map((p) => projectOut(p, store))); app.post('/api/projects', (req) => { const b = req.body as Record; @@ -83,14 +83,14 @@ export function buildServer(opts: ApiOptions): FastifyInstance { autoApproveExec: Boolean(pick('autoApproveExec', s.autoApproveExec)), budgetUsd: ((): number | null => { const v = pick('budgetUsd', s.budgetUsd); return v === null ? null : Number(v); })(), budgetPeriod: pick('budgetPeriod', s.budgetPeriod) as 'day' | 'month', - })); + }), store); }); app.get('/api/projects/:id', (req) => { const { id } = req.params as { id: string }; const p = store.getProject(id); if (!p) throw new StoreError(`项目不存在: ${id}`); - return projectOut(p); + return projectOut(p, store); }); // 部分更新项目配置(校验在 Store.patchProject) @@ -113,14 +113,14 @@ export function buildServer(opts: ApiOptions): FastifyInstance { if (b.checks !== undefined) patch.checks = b.checks === null || b.checks === '' ? null : String(b.checks); if (b.agentRules !== undefined) patch.agentRules = b.agentRules === null || b.agentRules === '' ? null : String(b.agentRules); if (b.models !== undefined) patch.models = b.models === null || b.models === '' ? null : (b.models as PatchProjectInput['models']); - return projectOut(store.patchProject(id, patch)); + return projectOut(store.patchProject(id, patch), store); }); // 项目重排序(侧栏拖动):body { order: [projectId, ...] } app.post('/api/projects/reorder', (req) => { const b = (req.body ?? {}) as { order?: unknown }; if (!Array.isArray(b.order)) throw new StoreError('order 必须是项目 id 数组'); - return store.reorderProjects(b.order.map(String)).map(projectOut); + return store.reorderProjects(b.order.map(String)).map((p) => projectOut(p, store)); }); // ---------- 用户级全局默认配置(per-user,新建项目默认值来源)---------- diff --git a/src/store/store.ts b/src/store/store.ts index c9065c8..14a366b 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -218,6 +218,21 @@ export class Store { return rows.map(rowToProject); } + /** 项目任务状态摘要(供侧栏状态点 + 关注数徽标):running=agent 在跑、attention=需人工。 */ + projectSummary(projectId: string): { executing: number; running: number; blocked: number; alive: number; attention: number } { + const rows = this.db.prepare(`SELECT status, COUNT(*) AS n FROM tasks WHERE project_id = ? GROUP BY status`).all(projectId) as Array<{ status: string; n: number }>; + const by: Record = {}; + for (const r of rows) by[r.status] = r.n; + const g = (s: string): number => by[s] || 0; + const executing = g('executing'); + const running = executing + g('analyzing') + g('speccing'); // agent 在跑:executor + planner + const attention = g('plan_review') + g('spec_review') + g('exec_review') + g('needs_attention'); // 待审批闸 + 需人工 + const TERMINAL = new Set(['done', 'cancelled']); + let alive = 0; + for (const [s, n] of Object.entries(by)) if (!TERMINAL.has(s)) alive += n; + return { executing, running, blocked: g('blocked'), alive, attention }; + } + /** 重排项目(侧栏拖动):按给定 id 顺序写 sort_order;未列出的排在后面、相对顺序不变。 */ reorderProjects(orderedIds: string[]): Project[] { const txn = this.db.transaction(() => {