Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(telegram): 限制终稿发布等待并交回服务端出箱

Dash0a82e14d44e1
diff --git a/apps/desktop/src/main/hook-control/__tests__/dispatcher.test.ts b/apps/desktop/src/main/hook-control/__tests__/dispatcher.test.ts
index e321f1d15d..ad1837d8cc 100644
--- a/apps/desktop/src/main/hook-control/__tests__/dispatcher.test.ts
+++ b/apps/desktop/src/main/hook-control/__tests__/dispatcher.test.ts
@@ -5377,6 +5377,51 @@ describe('官方 Telegram 终稿 / 交互卡 / 命令菜单由客户端发布',
}
});
+ // 2026-10-27 长期 pending 回归:经真实 dispatcher 验证小时级 429 后完整正文
+ // 进入既有出箱交接,且下一轮能执行;已有未知回执用例不覆盖长退避。unit 假时钟。
+ it('终稿长退避到期后交回完整正文、释放同任务队列,不重跑已完成轮次', async () => {
+ vi.useFakeTimers();
+ const ledger = memoryTerminalLedger();
+ const fr = fakeRunner();
+ const { d } = makeDispatcher({ runner: fr.runner, terminalLedger: ledger });
+ try {
+ const c = respondingCollector(d, (p) =>
+ p.requestId === 'req-1' && p.purpose === 'turn-final'
+ ? { ok: false, channelErrorCode: 429, retryAfterMs: 3_600_000 }
+ : {},
+ );
+ d.onConnected('conn-1', c.send, ALL_FEATURES);
+ d.handleDispatch('conn-1', telegramDispatch(), c.send);
+ await tick();
+ d.handleDispatch('conn-1', telegramDispatch({ requestId: 'req-2' }), c.send);
+ await tick();
+ expect(c.last('task.ack')?.payload.result).toBe('queued');
+ fr.finish({ finalText: '已经生成的完整答案' });
+ await tick(40);
+ expect(ledger.get('conn-1', 'req-1')?.delivery).toBe('pending');
+ expect(c.ofType('turn.end')).toHaveLength(0);
+
+ await vi.advanceTimersByTimeAsync(120_000);
+ await tick(40);
+ expect(c.last('turn.end')?.payload).toMatchObject({
+ requestId: 'req-1',
+ finalText: '已经生成的完整答案',
+ clientFinal: { complete: false },
+ });
+ expect(ledger.get('conn-1', 'req-1')?.delivery).toBe('sent');
+ expect(fr.calls).toHaveLength(2);
+ fr.finish({ finalText: '第二轮答案' });
+ await tick(40);
+ expect(c.ofType('turn.end').map((m) => m.payload.requestId)).toEqual(['req-1', 'req-2']);
+ await vi.advanceTimersByTimeAsync(3_600_000);
+ expect(fr.calls).toHaveLength(2);
+ expect(ops(c.sent, 'turn-final').filter((m) => m.payload.requestId === 'req-1')).toHaveLength(1);
+ } finally {
+ d.dispose();
+ vi.useRealTimers();
+ }
+ });
+
it('持久出箱写不进兜底帧: 不走客户端终稿, turn.end 交给服务端照旧发布', async () => {
const ledger = memoryTerminalLedger();
const set = ledger.set.bind(ledger);
diff --git a/apps/desktop/src/main/hook-control/__tests__/telegramTurnCarrier.test.ts b/apps/desktop/src/main/hook-control/__tests__/telegramTurnCarrier.test.ts
index 27601fa6da..8f63038553 100644
--- a/apps/desktop/src/main/hook-control/__tests__/telegramTurnCarrier.test.ts
+++ b/apps/desktop/src/main/hook-control/__tests__/telegramTurnCarrier.test.ts
@@ -365,6 +365,42 @@ let nextId = 100;
const okWithId = () => ({ ok: true, messageId: String(nextId++) });
describe('官方 Telegram 终稿由客户端发布(turn-final)', () => {
+ // 回归 2026-10-27 终稿长期 pending:生产 publishFinal 遇小时级 429 时必须交回
+ // 服务端,而不是一直挡住 turn.end。现有测试只覆盖短退避与单次回执超时;unit 假时钟。
+ it.each(['turn-progress', 'turn-final'] as const)(
+ '%s 长退避不阻塞终稿交接;交接后不再重发旧 op',
+ async (limitedPurpose) => {
+ const h = autoHarness((p) =>
+ p.purpose === limitedPurpose
+ ? { ok: false, channelErrorCode: 429, retryAfterMs: 3_600_000 }
+ : okWithId(),
+ );
+ h.carrier.update('工作中');
+ await advance(THROTTLE_MS);
+ const completed = vi.fn();
+ const done = h.carrier.publishFinal({ status: 'ok', finalText: '完整答案' }).then(completed);
+ await advance(120_000);
+ expect(completed).toHaveBeenCalledWith(false);
+ await done;
+ const count = h.sent.length;
+ h.carrier.update('迟到进度');
+ await advance(3_600_000);
+ expect(h.sent).toHaveLength(count);
+ },
+ );
+
+ it('终稿交接期限先于回执到达:迟到的拒绝不能再触发 HTML 回落', async () => {
+ const h = harness({ resultTimeoutMs: 300_000 });
+ const completed = vi.fn();
+ const done = h.carrier.publishFinal({ status: 'ok', finalText: '完整答案' }).then(completed);
+ await advance(120_000);
+ expect(completed).toHaveBeenCalledWith(false);
+ await done;
+ h.reply({ ok: false, channelErrorCode: 400 });
+ await advance(300_000);
+ expect(h.sent).toHaveLength(1);
+ });
+
it('有过程载体: Rich 新发终稿首段(私聊挂完成特效), 落地后删掉过程消息, 完整确认', async () => {
const h = autoHarness(() => okWithId(), { directMessage: true });
h.carrier.update('**工作中**');
diff --git a/apps/desktop/src/main/hook-control/telegramTurnCarrier.ts b/apps/desktop/src/main/hook-control/telegramTurnCarrier.ts
index cf4a7a44fc..f646e461fd 100644
--- a/apps/desktop/src/main/hook-control/telegramTurnCarrier.ts
+++ b/apps/desktop/src/main/hook-control/telegramTurnCarrier.ts
@@ -58,6 +58,9 @@ import {
export const TELEGRAM_DM_COMPLETION_EFFECT_ID = '5107584321108051014';
const NO_REPLY = 'NO_REPLY';
+// 包含等待在途进度、终稿分段及清理。超时交回已有服务端出箱,不截短 retry_after
+// 后继续发请求;否则小时级限流会一直挡住 turn.end 和同一任务的下一轮。
+const CLIENT_FINAL_TIMEOUT_MS = 120_000;
/** Telegram 完整应答后的 4xx(渠道错误码; 服务端自判的 RATE_LIMITED 也映射为 429)。 */
function isTelegramClientError(err: unknown): boolean {
@@ -162,7 +165,7 @@ export function createOfficialTelegramTurnCarrier(
}
const send = deps.getSend();
if (!send) throw new TelegramMsgOpError('telegram turn carrier is offline');
- return router.request(
+ const result = await router.request(
connectionId,
send,
makeMessageOp({
@@ -176,6 +179,13 @@ export function createOfficialTelegramTurnCarrier(
opId,
deps.resultTimeoutMs,
);
+ if (result && !result.ok) {
+ // 只记诊断字段,不写正文或服务端原始错误(可能包含用户内容)。
+ log.warn(
+ `telegram msg.op rejected: requestId=${requestId} purpose=${purpose} action=${action.kind} code=${result.errorCode ?? 'none'} channelCode=${result.channelErrorCode ?? 'none'} retryAfterMs=${result.retryAfterMs ?? 'none'}`,
+ );
+ }
+ return result;
}
/** 定案的失败回执: 停手码让本轮停止出站, 其余映射成同形错误抛给 outboundPolicy。 */
@@ -354,15 +364,30 @@ export function createOfficialTelegramTurnCarrier(
close();
return false;
}
+ let timer: ReturnType<typeof setTimeout> | undefined;
+ const deadline = new Promise<boolean>((resolve) => {
+ timer = setTimeout(() => {
+ // 先关闭旧载体并唤醒退避,迟到回执不得在服务端接管后再发消息。
+ close();
+ log.warn(
+ `telegram client final for ${requestId} timed out after ${CLIENT_FINAL_TIMEOUT_MS}ms; handing back to the server`,
+ );
+ resolve(false);
+ }, CLIENT_FINAL_TIMEOUT_MS);
+ timer.unref?.();
+ });
try {
- await carrier.finalize(input.finalText);
- return isLive();
+ return await Promise.race([
+ carrier.finalize(input.finalText).then(() => isLive()),
+ deadline,
+ ]);
} catch (err) {
log.warn(
`telegram client final for ${requestId} not confirmed; handing back to the server: ${err instanceof Error ? err.message : String(err)}`,
);
return false;
} finally {
+ clearTimeout(timer);
close();
}
},
diff --git a/docs/product-rules/telegram-bot-parity.md b/docs/product-rules/telegram-bot-parity.md
index c3011dbfdd..dd93610ab2 100644
--- a/docs/product-rules/telegram-bot-parity.md
+++ b/docs/product-rules/telegram-bot-parity.md
@@ -108,6 +108,14 @@ App 完成未读与提醒统一由 `renderer/hooks/useSessionRunningStatus.ts`
| **工具循环与输出上限终态的渠道文案** | `im/shared/turnRetryNotice.ts`(`terminalErrorText`) | `reason=tool_use_loop_detected` 的终态事件统一按受限 `toolLoop` 生成渠道可读说明;`reason=output-limit` 共用「回复可能不完整,可发送下一条消息继续」提示;个人侧 `turnRunner` 与官方侧 `hook-control/turnObserver` 都复用这份映射,原始 `loopHint` / `missing_required_field` 等内部分类只留在本地错误上下文,不外发。 |
| **Auto 审阅的引用证据**(用户本条回复/引用的消息与附件数) | 投影与上限:`packages/maker-shared/src/autoReviewIntent.ts` 的 `projectAutoReviewUserReferences`;两侧映射:`im/shared/autoReviewReferences.ts` | 两侧都把宿主盖章的引用事实放进 `MAIN_OWNED_SEND_CONTEXT.autoReviewReferences`,由 maker-core 挂到当前消息的审阅意图上,审阅器以独立低信任块呈现,不算用户原话、不构成授权。**数据来源各不相同**:个人只取 adapter 的 `prepareAgentTurnText` 实际交给模型的回复投影(`replyContext`;飞书被注入扫描拦下时就是占位,模型没看到的回复审阅器也看不到),附件数取本条附件(`im/shared/turnRunner.ts`,纯图引用为「[图片]」占位);官方由 `hook-control/dispatcher.ts` 在展示截短(只留最早 20 条)之前从服务端原始 `source.threadContext` 取回复目标(触发消息带 `replyToMessageId` 时按它找父消息、找不到不猜,否则取排除当前请求后的最后一条),连同实际送达附件数交给 `hook-control/session-runner.ts`。服务端在被引消息没有文字时不下发 threadContext、且附件不区分自带与引用,所以官方纯图引用只剩「本条带 N 张图」 |
+官方成功终稿的客户端发布有 **120 秒交接期限**(2026-10-27):从 `publishFinal`
+开始计时,包含在途进度、终稿分段与过程消息清理。期限内沿用共享发送判据;超时关闭
+该轮载体、取消退避,返回 `clientFinal.complete=false`,完整正文经既有 `turn.end`
+出箱交回服务端,释放同任务队列。不会截短 `retry_after` 后继续由旧载体重发,也不重新
+调用模型;实际送达仍取决于服务端与 Telegram 状态。个人 bot 没有服务端出箱,不套用
+此期限。实现与回归:`hook-control/telegramTurnCarrier.ts`、
+`__tests__/telegramTurnCarrier.test.ts`、`__tests__/dispatcher.test.ts`。
+
### 放在共享目录、但**只有一侧消费**的
| 东西 | 实际情况 |