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(im): 静默自动任务的自动续跑耗尽仍按失败回传

Dashe67f87c3f67a
diff --git a/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts b/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts
index ce6cd16492..7faaab8ff4 100644
--- a/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts
+++ b/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts
@@ -844,6 +844,16 @@ describe('turnRunner 渠道任务后台结果回传', () => {
h.emit({ type: 'error', data: { message: 'failed', isTerminal: true }, turnOrigin: origin('failed') });
await vi.waitFor(() => expect(delivered()).toHaveLength(2));
expect(delivered()[1]).toContain(slackUi.agent.runtimeError('failed'));
+
+ // Exhausted silent-stop auto-resume is a failure too, even though it settles without an error event.
+ let settle!: (sessionId: string, reason: string) => void;
+ mocks.onSilentStopSettled.mockImplementationOnce((_id, cb) => { settle = cb as typeof settle; return vi.fn(); });
+ silencedRuns.add('exhausted');
+ h.emit({ type: 'text', data: { text: '半截', isFinal: true }, turnOrigin: origin('exhausted') });
+ h.emit({ type: 'done', data: { silentStop: true }, turnOrigin: origin('exhausted') });
+ settle(h.session.id, 'exhausted');
+ await vi.waitFor(() => expect(delivered()).toHaveLength(3));
+ expect(delivered()[2]).toContain(slackUi.agent.runtimeError('模型连续多次返回空响应,自动续跑已暂停。'));
} finally {
setSilencedRunProbe(null);
await runner.disposeAllSessions();
diff --git a/apps/desktop/src/main/im/shared/turnRetryNotice.ts b/apps/desktop/src/main/im/shared/turnRetryNotice.ts
index 330d02654d..86b0ba0fa8 100644
--- a/apps/desktop/src/main/im/shared/turnRetryNotice.ts
+++ b/apps/desktop/src/main/im/shared/turnRetryNotice.ts
@@ -175,6 +175,9 @@ export function terminalErrorText(data: unknown): string {
if (data && typeof data === 'object' && 'reason' in data && data.reason === 'output-limit') {
return '模型已达到输出长度上限,本轮回复可能不完整。可以直接发送下一条消息继续。';
}
+ if (data && typeof data === 'object' && 'reason' in data && data.reason === 'silent-stop-exhausted') {
+ return '模型连续多次返回空响应,自动续跑已暂停。';
+ }
const record =
data && typeof data === 'object'
? (data as { message?: unknown; errorStatus?: unknown; codexErrorInfo?: unknown })
diff --git a/apps/desktop/src/main/im/shared/turnRunner.ts b/apps/desktop/src/main/im/shared/turnRunner.ts
index 4e4f3c4bc7..4295c5bab5 100644
--- a/apps/desktop/src/main/im/shared/turnRunner.ts
+++ b/apps/desktop/src/main/im/shared/turnRunner.ts
@@ -2806,9 +2806,14 @@ export function createTurnRunner(
}
case 'done':
if ((event.data as { silentStop?: boolean } | null)?.silentStop === true) {
- waitForSilentStopSettled(state, t, () => {
+ waitForSilentStopSettled(state, t, (reason) => {
if (state.scheduledTranspond !== t) return;
- void finalizeTranspond(state, null);
+ // Exhausted auto-resume is a failure (scheduler and hook settle it as one), so a
+ // silenced run must still report it.
+ void finalizeTranspond(
+ state,
+ reason === 'exhausted' ? terminalErrorText({ reason: 'silent-stop-exhausted' }) : null,
+ );
});
return;
}
@@ -3359,12 +3364,12 @@ export function createTurnRunner(
function waitForSilentStopSettled(
state: SessionState,
turn: Pick<TurnState, 'silentStopSettleUnsub'>,
- onSettled: () => void,
+ onSettled: (reason: 'exhausted' | 'skip' | 'send-failed') => void,
): void {
if (turn.silentStopSettleUnsub) return;
- const unsub = onSilentStopSettled(state.makerSession.id, () => {
+ const unsub = onSilentStopSettled(state.makerSession.id, (_sessionId, reason) => {
clearSilentStopSettleWait(turn);
- onSettled();
+ onSettled(reason);
});
turn.silentStopSettleUnsub = unsub;
}
diff --git a/docs/product-rules/telegram-bot-parity.md b/docs/product-rules/telegram-bot-parity.md
index 3e76b5eac0..047c93e5df 100644
--- a/docs/product-rules/telegram-bot-parity.md
+++ b/docs/product-rules/telegram-bot-parity.md
@@ -302,8 +302,10 @@ bot 身份按入站使用的稳定 ID 校验;Discord 取 gateway application i
静默的自动任务轮次不回传,两条路径同判据:轮次终态时读 scheduler 该 run 的静默标记
(`scheduler-host/silent-output.ts` 的 `isSilencedSchedulerTurn`),与桌面完成通知一致——
静默运行默认静默,`schedule_notify_current_run` 解除,`schedule_silence_current_run` 设为静默;
-失败照常回传。个人渠道对开始即静默的轮次不开流式卡,仅累积;收口仍静默则整轮不发,
+失败照常回传,包括静默运行中自动续跑耗尽(两条路径都按失败收口)。个人渠道对开始即静默的轮次不开流式卡,仅累积;收口仍静默则整轮不发,
已请求提醒则一次性发终稿。中途才静默且已开卡的轮次照常收口,不留半截卡。
+已知边界:会话在产生首个事件前就关闭或出错的轮次无法判断来源(与桌面输入的同类失败无从区分),
+两条路径都不回传;个人渠道此前也不回传这类失败,scheduler 仍记为失败并发桌面通知。
两条路径均为在线尽力投递,不增加离线补发或持久化出箱。官方能力需客户端与服务端同时支持,
旧版本通过能力协商保持原行为;本地测试通过不代表服务端已经部署或真实渠道已联调。