Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(im): 等待后台终稿发送并过滤过期轮次事件
Dashf42cd49c3f35
diff --git a/apps/desktop/src/main/hook-control/__tests__/session-runner.test.ts b/apps/desktop/src/main/hook-control/__tests__/session-runner.test.tsindex e5b841b861..6c7fb6d498 100644--- a/apps/desktop/src/main/hook-control/__tests__/session-runner.test.ts+++ b/apps/desktop/src/main/hook-control/__tests__/session-runner.test.ts@@ -3322,7 +3322,8 @@ describe('watchContinuation: 观察桌面端续跑并回流', () => {}});- it.each([false, true])('isolates child events before root completion (isFinal=%s)', async (isFinal) => {+ it.each([false, true].flatMap((isFinal) => [false, true].map((background) => ({ isFinal, background }))))(+ 'isolates out-of-turn events (isFinal=$isFinal, background=$background)', async ({ isFinal, background }) => {const session = makeManualSession('sess-subagent-output');const onProgress = vi.fn();const onToolResult = vi.fn();@@ -3345,7 +3346,8 @@ describe('watchContinuation: 观察桌面端续跑并回流', () => {{ type: 'error', data: { message: 'child failed', isTerminal: true } },{ type: 'done', data: {} },];- for (const event of events) emit({ ...event, source: 'claude-code', agentMeta: child });+ for (const event of events) emit({ ...event, source: background ? 'pi' : 'claude-code',+ ...(background ? { turnScope: 'background' } : { agentMeta: child }) });expect(onProgress).not.toHaveBeenCalled();expect(onToolResult).not.toHaveBeenCalled();expect(onTurnTerminal).not.toHaveBeenCalled();diff --git a/apps/desktop/src/main/hook-control/turnObserver.ts b/apps/desktop/src/main/hook-control/turnObserver.tsindex d322e724de..1067f109d8 100644--- a/apps/desktop/src/main/hook-control/turnObserver.ts+++ b/apps/desktop/src/main/hook-control/turnObserver.ts@@ -202,7 +202,7 @@ export function observeHookTurn(failTurn(new Error(`hook turn session ended without a terminal event (${status})`));});const off = session.onEvent((ev: AgentEvent) => {- if (isImSubagentEvent(ev)) return;+ if (isImSubagentEvent(ev) || ev.turnScope === 'background') return;if (ev.type === 'text') {// 正文累积(isFinal 逐条契约 / 定稿段按消息切开 / fallbackTail 自成段 /// uuid 缺失退 requestId)都在 presenter 的 finalized-segments 策略里。diff --git a/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts b/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.tsindex 3a720bd1b4..8054afadc5 100644--- a/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts+++ b/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts@@ -245,7 +245,7 @@ function streamingHandleStub() {messageId: 'C1|9.9',append: vi.fn(),replace: vi.fn(),- finalize: vi.fn(async () => undefined),+ finalize: vi.fn(async (): Promise<void> => undefined),addExtraImageAbsPath: vi.fn(),close: vi.fn(),};@@ -558,6 +558,69 @@ describe('turnRunner thread = session 路由(slack threadScoped)', () => {});describe('turnRunner 渠道任务后台结果回传', () => {+ it.each(['next-background', 'dispose'] as const)('keeps delivery busy until the last result settles across %s', async (action) => {+ const h = await channelAndIdle();+ h.send.mockClear();+ const stub = streamingHandleStub();+ let release!: () => void;+ stub.finalize.mockImplementationOnce(() => new Promise<void>((resolve) => { release = resolve; }));+ mocks.slackIm.startStreamingText.mockResolvedValue(stub);+ h.emit({ type: 'text', data: { text: 'first background' } });+ h.emit({ type: 'done', data: {} });+ await vi.waitFor(() => expect(stub.finalize).toHaveBeenCalledTimes(1));+ if (action === 'next-background') {+ h.emit({ type: 'text', data: { text: 'second background' } });+ h.emit({ type: 'done', data: {} });+ await vi.waitFor(() => expect(stub.finalize).toHaveBeenCalledTimes(2));+ }+ await runTurn('100.1', 'arrives during delivery');+ expect(h.send).not.toHaveBeenCalled();+ if (action === 'dispose') await runner.disposeAllSessions();+ release();+ if (action === 'next-background') {+ await vi.waitFor(() => expect(h.send).toHaveBeenCalledTimes(1));+ h.emit({ type: 'done', data: {} });+ } else {+ await new Promise((resolve) => setImmediate(resolve));+ expect(h.send).not.toHaveBeenCalled();+ }+ });++ it.each(['done', 'error', 'settled'].flatMap((ending) => [false, true].map((fail) => ({ ending, fail }))))(+ 'holds queued input through background final delivery (ending=$ending, fail=$fail)', async ({ ending, fail }) => {+ const h = await channelAndIdle();+ h.send.mockClear();+ const stub = streamingHandleStub();+ let release!: () => void;+ stub.finalize.mockImplementationOnce(() => new Promise<void>((resolve, reject) => {+ release = () => fail ? reject(new Error('delivery failed')) : resolve();+ }));+ mocks.slackIm.startStreamingText.mockResolvedValue(stub);+ let settled!: () => void;+ if (ending === 'settled') {+ mocks.onSilentStopSettled.mockImplementationOnce((_id, cb) => { settled = cb; return vi.fn(); });+ }+ h.emit({ type: 'text', data: { text: 'background' } });+ await runTurn('100.1', 'queued before completion');+ if (ending === 'settled') {+ h.emit({ type: 'done', data: { silentStop: true } });+ settled();+ } else if (ending === 'error') {+ h.emit({ type: 'error', data: { message: 'failed', isTerminal: true } });+ } else h.emit({ type: 'done', data: {} });+ await vi.waitFor(() => expect(stub.finalize).toHaveBeenCalledTimes(1));+ await runTurn('100.1', 'queued during delivery');+ expect(h.send).not.toHaveBeenCalled();+ release();+ await vi.waitFor(() => expect(h.send).toHaveBeenCalledTimes(1));+ expect(h.send.mock.calls[0]![0]).toEqual(expect.objectContaining({+ content: expect.stringContaining('queued before completion'),+ }));+ h.emit({ type: 'done', data: {} });+ await vi.waitFor(() => expect(h.send).toHaveBeenCalledTimes(2));+ h.emit({ type: 'done', data: {} });+ });+it.each(['done', 'settled'] as const)('silent stop keeps queued input out of the resumed turn until %s', async (ending) => {const h = await channelAndIdle();h.send.mockClear();diff --git a/apps/desktop/src/main/im/shared/turnRunner.ts b/apps/desktop/src/main/im/shared/turnRunner.tsindex 11b98294e2..d2a35d4f2f 100644--- a/apps/desktop/src/main/im/shared/turnRunner.ts+++ b/apps/desktop/src/main/im/shared/turnRunner.ts@@ -367,6 +367,8 @@ interface SessionState {* 接管任务的 scheduler 输出。与正常入站 TurnState 分开,避免重复发送。*/scheduledTranspond: ScheduledTranspond | null;+ /** Agent execution ended, but its background output is still being delivered. */+ pendingTranspondFinals: number;}/**@@ -1120,6 +1122,7 @@ export function createTurnRunner(state.queue.length > 0 ||state.sendQueue.length > 0 ||state.scheduledTranspond !== null ||+ state.pendingTranspondFinals > 0 ||state.makerSession.isTurnRunning()) {if (args.queueMode === 'external') {@@ -1701,7 +1704,7 @@ export function createTurnRunner(function maybeDispatchNextQueued(state: SessionState, userId: string): void {if (state.sendQueue.length === 0) return;if (state.queue.length > 0) return;- if (state.scheduledTranspond) return;+ if (state.scheduledTranspond || state.pendingTranspondFinals > 0) return;if (state.makerSession.isTurnRunning()) {armDispatchRetry(state, userId);return;@@ -1937,6 +1940,7 @@ export function createTurnRunner(resolveDetachDrain: null,attached,scheduledTranspond: null,+ pendingTranspondFinals: 0,};sessionStates.set(row.id, state);@@ -2769,7 +2773,6 @@ export function createTurnRunner(waitForSilentStopSettled(state, t, () => {if (state.scheduledTranspond !== t) return;void finalizeTranspond(state, null);- maybeDispatchNextQueued(state, state.userId);});return;}@@ -2804,6 +2807,7 @@ export function createTurnRunner(const t = state.scheduledTranspond;if (!t) return;state.scheduledTranspond = null; // 防重入(下一条 stray 不会再命中)+ state.pendingTranspondFinals += 1;clearSilentStopSettleWait(t);clearTranspondTicker(t);// 防御性复位: composeTranspondView(final=true) 本身只取 header + 正文, 不含过程区,@@ -2811,11 +2815,11 @@ export function createTurnRunner(// (万一将来 final 视图改成包含过程区)。真正必须显式清的是 handleTurnErrorAsync ——// 它不置 turn.done, composeStreamingView 会把 activity 一起写进正文。setActivityNotice(t.activity, null);- // 没产出任何内容(无文本无步骤)且无错 → 不留空卡。- if (!t.streamingHandle && t.buffer.length === 0 && t.mediaAbsPaths.length === 0 && t.activity.totalSteps === 0 && !errMsg) {- return;- }try {+ // 没产出任何内容(无文本无步骤)且无错 → 不留空卡。+ if (!t.streamingHandle && t.buffer.length === 0 && t.mediaAbsPaths.length === 0 && t.activity.totalSteps === 0 && !errMsg) {+ return;+ }if (output.kind === 'chunked-text' && !state.makerSession.remoteHostId && t.buffer.includes('![')) {const materialized = await materializeLocalMarkdownImages({text: t.buffer, workingDir: state.workingDir, sessionId: state.makerSession.id,@@ -2846,6 +2850,11 @@ export function createTurnRunner(log.warn(`transpond finalize failed (non-fatal): ${err instanceof Error ? err.message : String(err)}`,);+ } finally {+ state.pendingTranspondFinals -= 1;+ if (sessionStates.get(state.makerSession.id) === state) {+ maybeDispatchNextQueued(state, state.userId);+ }}}@@ -4096,6 +4105,7 @@ export function createTurnRunner(resolveDetachDrain: null,attached: false,scheduledTranspond: null,+ pendingTranspondFinals: 0,};sessionStates.set(session.id, state);state.unsubscribers.push(session.onEvent(handleEventFor(session.id, userId)));diff --git a/docs/product-rules/telegram-bot-parity.md b/docs/product-rules/telegram-bot-parity.mdindex 1030e810d1..1f1c988a54 100644--- a/docs/product-rules/telegram-bot-parity.md+++ b/docs/product-rules/telegram-bot-parity.md@@ -258,6 +258,8 @@ SSH 任务不把远端路径或托管媒体引用当作本地文件上传;个每轮执行前从当前账号库恢复输出监听,核对 bot 身份和任务状态,因此重启后无需先从 IM 发一条消息。飞书/Lark 话题缺少内存锚点时,从原话题查询合法消息恢复;查询失败不降级到群主流。切换执行实例仅换绑事件监听,保留该任务已排队的 IM 消息。+个人 IM 的排队入站消息在已有后台结果的发送尝试结束后再派发;发送失败同样释放队列,+已销毁的任务不会因迟到的发送完成回调再次派发。官方 Telegram、Slack 复用已有 hook binding、轮次观察和附件收集;双方宣告 `session-result-v1`后用 `turn.end(background: true)` 发送结果,服务端在原私聊或话题新发消息。普通 IM 轮次和