Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(bot-autonomy): 回答类请求换了也重新计时;任务摘要兼容旧版被控端的活动数组
Chris0462bca68360
diff --git a/apps/desktop/src/main/bot-autonomy/__tests__/autonomyRules.test.ts b/apps/desktop/src/main/bot-autonomy/__tests__/autonomyRules.test.tsindex 48b7da2d2d..75fb0f4fc3 100644--- a/apps/desktop/src/main/bot-autonomy/__tests__/autonomyRules.test.ts+++ b/apps/desktop/src/main/bot-autonomy/__tests__/autonomyRules.test.ts@@ -22,7 +22,7 @@ import {import { AutonomyEventLedger, dueEventType } from '../events.js';import { deriveFollowerBotId, resolveSchedulerBotId, type FollowerBotState } from '../follower.js';import { projectBotGlance } from '../glance.js';-import { summarizeInteraction } from '../phase.js';+import { parseActiveSessionList, summarizeInteraction } from '../phase.js';const bot = (status: string, allowSchedulerFollow = false, shadowed = false): FollowerBotState => ({status, allowSchedulerFollow, shadowed,@@ -200,11 +200,30 @@ describe('workbench glance scope', () => {});});+describe('pending interaction identity and active-session responses', () => {+ // 依据:同一相位里换了一条请求要重新计时;缺口:回答 / 确认卡的 id 被归成 null,换了也认不出。+ // 「允许」只对真正的权限请求:确认卡有 id 也不能成为可批准的 requestId。tier:unit。+ it('keeps every interaction id for change detection but only exposes permission ids for approval', () => {+ expect(summarizeInteraction({ kind: 'ask_user_question', requestId: 'q1', questions: [{ question: '用哪个分支?' }] }))+ .toEqual({ summary: '用哪个分支?', waitingFor: 'answer', requestId: null, interactionId: 'q1' });+ expect(summarizeInteraction({ kind: 'host_confirm', requestId: 'c1' }))+ .toEqual({ summary: null, waitingFor: 'permission', requestId: null, interactionId: 'c1' });+ });++ it('reads both the v2 wrapper and the legacy array from list-active, and rejects anything else', () => {+ const rows = [{ sessionId: 's1' }];+ expect(parseActiveSessionList({ format: 'active-sessions-v2', sessions: rows })).toBe(rows);+ expect(parseActiveSessionList(rows)).toBe(rows);+ expect(parseActiveSessionList({ format: 'unknown' })).toBeNull();+ expect(parseActiveSessionList(null)).toBeNull();+ });+});+describe('waiting-row summary for a permission request', () => {it('shows an MCP tool as "server · tool" instead of the raw mcp__ identifier, and keeps other names', () => {// Seen in the dev build: the glance row title was `mcp__cindy_helper__call_tool` (programmer-speak on a user-facing row).const mcp = summarizeInteraction({ kind: 'permission', requestId: 'r1', toolName: 'mcp__cindy_helper__call_tool' });- expect(mcp).toEqual({ summary: 'cindy_helper · call_tool', waitingFor: 'permission', requestId: 'r1' });+ expect(mcp).toEqual({ summary: 'cindy_helper · call_tool', waitingFor: 'permission', requestId: 'r1', interactionId: 'r1' });const bash = summarizeInteraction({ kind: 'permission', requestId: 'r2', title: 'bash' });expect(bash?.summary).toBe('bash');});diff --git a/apps/desktop/src/main/bot-autonomy/__tests__/taskWatch.test.ts b/apps/desktop/src/main/bot-autonomy/__tests__/taskWatch.test.tsindex ee87888067..8e976e04e0 100644--- a/apps/desktop/src/main/bot-autonomy/__tests__/taskWatch.test.ts+++ b/apps/desktop/src/main/bot-autonomy/__tests__/taskWatch.test.ts@@ -8,7 +8,7 @@* - 现有覆盖缺口:新模块;autonomyRules 只测纯判定,不经过活动订阅、读库与远程轮询的组合时序。* - 最小失败输入:伙伴主任务(canonical)出现在活动里;启动时灵动岛残留「完成」;主人点停止后灵动岛条目消失* 被当成做完;同一条挂起交互在重启后得到新的事件 id;远程 list-active 连续失败;远程任务两次轮询之间从权限请求- * A 换到 B,仍显示 A;本机任务在同一相位里从请求 A 换到 B,沿用 A 的等待时刻;读任务元数据失败一次后,+ * A 换到 B,仍显示 A;本机任务在同一相位里从请求 A 换到 B(权限或回答),沿用 A 的等待时刻;读任务元数据失败一次后,* 这批任务被丢掉,之后再无活动就永远不进表;启动兜底读失败一次后再不重试;启动时归属读失败,上一轮被打断的任务按空归属判给总调度;伙伴刚开的任务在上次归属读取* 几秒内出现,被当成「没人开」落到总调度。* - tier:unit(全部 IO 经注入的内存 fake,时间由 now() 推进,无真实等待)。@@ -198,6 +198,22 @@ describe('TaskWatch local observation', () => {});});+ it('restarts the wait clock when a local task moves from one question to another', async () => {+ const h = harness({ metas: [meta('q')] });+ await h.watch.start();+ const waiting = activity('q', 'needs-interaction', { interactionKind: 'ask_user_question', lastActivityAtMs: 7_000 });+ h.pending.set('q', [{ kind: 'ask_user_question', requestId: 'ask-A', questions: [{ question: '用哪个分支?' }] }]);+ h.watch.applyActivity('q', waiting);+ await h.watch.settled();+ expect(h.watch.get('q')).toMatchObject({ phase: 'waiting-answer', phaseSince: 7_000, pendingRequestId: null });++ h.advance(AUTONOMY_THRESHOLDS.waitingAfterMs);+ h.pending.set('q', [{ kind: 'ask_user_question', requestId: 'ask-B', questions: [{ question: '要不要推送?' }] }]);+ h.watch.applyActivity('q', waiting);+ await h.watch.settled();+ expect(h.watch.get('q')).toMatchObject({ phase: 'waiting-answer', pendingQuestion: '要不要推送?', phaseSince: h.now() });+ });+it('keeps tasks whose metadata read failed and retries them on the next sweep', async () => {const h = harness({ metas: [meta('quiet')] });await h.watch.start();diff --git a/apps/desktop/src/main/bot-autonomy/phase.ts b/apps/desktop/src/main/bot-autonomy/phase.tsindex 6c6356c01a..5eff93bfca 100644--- a/apps/desktop/src/main/bot-autonomy/phase.ts+++ b/apps/desktop/src/main/bot-autonomy/phase.ts@@ -94,8 +94,10 @@ function readableToolName(name: string): string {export interface InteractionSummary {summary: string | null;waitingFor: 'permission' | 'answer';- /** 权限请求的 id(只对 kind=permission 给出)。 */+ /** 权限请求的 id(只对 kind=permission 给出):工作台「允许」只回应这一条。 */requestId: string | null;+ /** 任何挂起交互的 id(回答、确认卡也有):只用来认出「换成了另一条请求」,不用于批准。 */+ interactionId: string | null;}export function summarizeInteraction(raw: unknown): InteractionSummary | null {@@ -104,14 +106,24 @@ export function summarizeInteraction(raw: unknown): InteractionSummary | null {const kind = text(request.kind);if (kind === 'permission') {const name = text(request.title) ?? text(request.displayName) ?? text(request.toolName);- return { summary: name ? truncateSummary(readableToolName(name)) : null, waitingFor: 'permission', requestId: text(request.requestId) };+ return { summary: name ? truncateSummary(readableToolName(name)) : null, waitingFor: 'permission', requestId: text(request.requestId), interactionId: text(request.requestId) };}if (kind === 'ask_user_question') {const questions = Array.isArray(request.questions) ? request.questions : [];const first = record(questions[0]);const question = text(first?.question) ?? text(first?.header);- return { summary: question ? truncateSummary(question) : null, waitingFor: 'answer', requestId: null };+ return { summary: question ? truncateSummary(question) : null, waitingFor: 'answer', requestId: null, interactionId: text(request.requestId) };}// plan_review / input_handoff / plugin_setup / 宿主确认卡:只报种类,不带正文。- return { summary: null, waitingFor: kind?.includes('confirm') ? 'permission' : 'answer', requestId: null };+ return { summary: null, waitingFor: kind?.includes('confirm') ? 'permission' : 'answer', requestId: null, interactionId: text(request.requestId) };+}++/**+ * `maker:list-active` 的返回:新版被控端认 `snapshotVersion: 2`,回 `active-sessions-v2` 包装;更旧的版本+ * 忽略这个参数,仍回原来的数组。两种都收;都不是返回 null,由调用方按读取失败处理(不能当成「没有任务」)。+ */+export function parseActiveSessionList(response: unknown): unknown[] | null {+ if (Array.isArray(response)) return response;+ const wrapped = record(response);+ return wrapped && Array.isArray(wrapped.sessions) ? wrapped.sessions : null;}diff --git a/apps/desktop/src/main/bot-autonomy/taskWatch.ts b/apps/desktop/src/main/bot-autonomy/taskWatch.tsindex 6a1c9ea258..8353d47ea9 100644--- a/apps/desktop/src/main/bot-autonomy/taskWatch.ts+++ b/apps/desktop/src/main/bot-autonomy/taskWatch.ts@@ -30,6 +30,7 @@ import {deriveLocalPhase,deriveRemotePhase,nextPhaseSince,+ parseActiveSessionList,summarizeInteraction,truncateSummary,} from './phase.js';@@ -373,15 +374,17 @@ export class TaskWatch {}let pendingQuestion: string | null = null;let pendingRequestId: string | null = null;+ let pendingInteractionId: string | null = null;if (phase === 'waiting-answer' || phase === 'waiting-permission') {const summary = summarizeInteraction(this.deps.getPendingInteractions(sessionId)[0]);const keep = previous?.phase === phase;pendingQuestion = summary?.summary ?? (keep ? previous.pendingQuestion : null);pendingRequestId = summary?.requestId ?? (keep ? previous.pendingRequestId ?? null : null);+ pendingInteractionId = summary?.interactionId ?? (keep ? previous.pendingInteractionId ?? null : null);}// 同一相位里从请求 A 换到 B:新请求是新的等待,等待时刻从这次观察算起(与远程一致)。- if (previous?.phase === phase && previous.pendingRequestId && pendingRequestId- && previous.pendingRequestId !== pendingRequestId) phaseSince = now;+ if (previous?.phase === phase && previous.pendingInteractionId && pendingInteractionId+ && previous.pendingInteractionId !== pendingInteractionId) phaseSince = now;const canonicalOfBotId = this.canonicalOwner(sessionId, meta);const creatorBotId = this.creatorOf(sessionId, canonicalOfBotId);const row: WatchedSession = {@@ -397,6 +400,7 @@ export class TaskWatch {startedAt: activity?.startedAtMs ?? previous?.startedAt ?? null,pendingQuestion,pendingRequestId,+ pendingInteractionId,toolInFlight: phase === 'running' && this.deps.isToolCallInFlight(sessionId),error: phase === 'errored' && facts.inputError ? truncateSummary(facts.inputError) : null,creatorBotId,@@ -690,10 +694,8 @@ export class TaskWatch {const response = await this.deps.invokeRemote(deviceId, 'maker:list-active', [{ summary: true, snapshotVersion: 2 },]);- // 新版被控端返回 active-sessions-v2 包装;不认识 snapshotVersion 的旧版仍返回原来的数组,两种都收。- // 都不是就按读取失败处理(退避、标离线),不能当成「没有任务」把那台电脑的行全清掉。- const result = record(response);- const sessions = Array.isArray(response) ? response : Array.isArray(result?.sessions) ? result.sessions : null;+ // 两种返回都收;都不是就按读取失败处理(退避、标离线),不能当成「没有任务」把那台电脑的行全清掉。+ const sessions = parseActiveSessionList(response);if (!sessions) throw Object.assign(new Error('Unexpected active session list'), { code: 'REMOTE_SHAPE' });const active = new Map<string, { isTurnRunning?: unknown; activityPhase?: unknown }>();for (const raw of sessions) {@@ -726,6 +728,7 @@ export class TaskWatch {let interactionKind: string | null = null;let pendingQuestion: string | null = null;let pendingRequestId: string | null = null;+ let pendingInteractionId: string | null = null;if (activity.activityPhase === 'needs-interaction') {// 每次轮询都重读挂起交互(每个等待中的远程任务每分钟一次):两次轮询之间可能从请求 A 直接换到 B。let summary: ReturnType<typeof summarizeInteraction> = null;@@ -740,10 +743,12 @@ export class TaskWatch {interactionKind = summary.waitingFor === 'permission' ? 'permission' : 'ask_user_question';pendingQuestion = summary.summary;pendingRequestId = summary.requestId;+ pendingInteractionId = summary.interactionId;} else if (previous && (previous.phase === 'waiting-answer' || previous.phase === 'waiting-permission')) {interactionKind = previous.phase === 'waiting-permission' ? 'permission' : 'ask_user_question';pendingQuestion = previous.pendingQuestion;pendingRequestId = previous.pendingRequestId ?? null;+ pendingInteractionId = previous.pendingInteractionId ?? null;}}const phase = deriveRemotePhase({ ...activity, interactionKind });@@ -760,7 +765,8 @@ export class TaskWatch {? previous.phaseSince: nextPhaseSince(previous, phase, candidateSince);// 同一任务从请求 A 换到请求 B 是新的等待:重新计时(也就是新的事件 id)。- if (previous?.phase === phase && previous.pendingRequestId && pendingRequestId && previous.pendingRequestId !== pendingRequestId) {+ if (previous?.phase === phase && previous.pendingInteractionId && pendingInteractionId+ && previous.pendingInteractionId !== pendingInteractionId) {phaseSince = now;}const row: WatchedSession = {@@ -776,6 +782,7 @@ export class TaskWatch {startedAt: previous?.startedAt ?? (phase === 'running' ? now : null),pendingQuestion,pendingRequestId,+ pendingInteractionId,error: null,creatorBotId: null,followerBotId: null,@@ -811,6 +818,7 @@ function sameRow(a: WatchedSession | null, b: WatchedSession): boolean {&& a.title === b.title&& a.pendingQuestion === b.pendingQuestion&& (a.pendingRequestId ?? null) === (b.pendingRequestId ?? null)+ && (a.pendingInteractionId ?? null) === (b.pendingInteractionId ?? null)&& a.error === b.error&& a.followerBotId === b.followerBotId&& a.online === b.online;diff --git a/apps/desktop/src/main/mcp-integrations/taskDigestHost.ts b/apps/desktop/src/main/mcp-integrations/taskDigestHost.tsindex ab2057d38b..efab0cb5fa 100644--- a/apps/desktop/src/main/mcp-integrations/taskDigestHost.ts+++ b/apps/desktop/src/main/mcp-integrations/taskDigestHost.ts@@ -7,6 +7,7 @@ import { and, eq, isNull } from 'drizzle-orm';import type { InvokeResultPayload } from '@cindy/device-link';import type { HistoryDevice, TaskDigestRoute } from '@cindy/mcps';+import { parseActiveSessionList } from '../bot-autonomy/phase.js';import { getDbClient } from '../localDb/client/current.js';import { botProfileVersions, botSessionLinks, sessions } from '../localDb/schema.js';import { readEffectiveBotModelChain } from '../maker-host/bot-model-chain-settings-store.js';@@ -214,10 +215,13 @@ export function createDesktopTaskDigestDeps(host: DesktopTaskDigestHost): TaskDi}},readActivity: async (deviceId, sessionId) => {- const result = (await unwrap(host.invokeRemote, deviceId, 'maker:list-active', [+ const list = parseActiveSessionList(await unwrap(host.invokeRemote, deviceId, 'maker:list-active', [{ summary: true, snapshotVersion: 2 },- ])) as { sessions?: Array<{ sessionId?: unknown; isTurnRunning?: unknown; activityPhase?: unknown }> } | null;- const row = (Array.isArray(result?.sessions) ? result.sessions : []).find((item) => item.sessionId === sessionId);+ ]));+ // 认不出的格式按读取失败:摘要退回保守推断,不报成「空闲」。+ if (!list) throw Object.assign(new Error('Unexpected active session list'), { code: 'REMOTE_SHAPE' });+ const row = (list as Array<{ sessionId?: unknown; isTurnRunning?: unknown; activityPhase?: unknown } | null>)+ .find((item) => item?.sessionId === sessionId);if (!row) return { phase: 'idle' };return { phase: typeof row.activityPhase === 'string' ? row.activityPhase : row.isTurnRunning === true ? 'running' : 'idle' };},diff --git a/apps/desktop/src/shared/botAutonomy.ts b/apps/desktop/src/shared/botAutonomy.tsindex ecb4c6cb7c..844d175272 100644--- a/apps/desktop/src/shared/botAutonomy.ts+++ b/apps/desktop/src/shared/botAutonomy.ts@@ -75,6 +75,8 @@ export interface WatchedSession {* (实现者 A 新增,可选字段。)*/pendingRequestId?: string | null;+ /** 挂起交互自身的 id(任何种类):只用来认出同一相位里换成了另一条请求,不用于批准。 */+ pendingInteractionId?: string | null;/*** 本机任务当前有前台工具调用在途(只是布尔事实,不含工具名与入参);远程与缺省为 false。* stuck 判定据此改用 `stuckInToolAfterMs`。(实现者 A 新增,可选字段。)