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(maker-core): 连发调用不清零模型的连续重复计数

Dash9ec3934fc706
diff --git a/packages/maker-core/src/agents/shared/loop-guard.test.ts b/packages/maker-core/src/agents/shared/loop-guard.test.ts
index 499e8074de..5fd256fc2e 100644
--- a/packages/maker-core/src/agents/shared/loop-guard.test.ts
+++ b/packages/maker-core/src/agents/shared/loop-guard.test.ts
@@ -805,6 +805,23 @@ describe('ToolLoopGuard pacing and final limits', () => {
}
expect(last).toMatchObject({ kind: 'hard', reason: 'pingpong', count: 12 });
});
+
+ // codex P1(#6388):夹在模型重复调用之间的脚本连发调用不能清零模型的连续计数。
+ it('keeps the model streak when different chained script calls run between its repeats', () => {
+ const { guard, advance } = clockGuard({ chainedCallGapMs: 2_000 });
+ let last: ToolLoopGuardVerdict = { kind: 'ok' };
+ for (let round = 0; round < 4; round++) {
+ guard.onToolUse(`model-${round}`, 'read', { path: 'a' });
+ advance(500);
+ last = guard.onToolResult(`model-${round}`, 'same');
+ advance(500);
+ guard.onToolUse(`script-${round}`, 'read', { path: `other-${round}` });
+ advance(500);
+ guard.onToolResult(`script-${round}`, `other-${round}`);
+ advance(8_500);
+ }
+ expect(last).toMatchObject({ kind: 'hard', reason: 'consecutive', count: 4 });
+ });
});
describe('classifyToolContractError', () => {
diff --git a/packages/maker-core/src/agents/shared/loop-guard.ts b/packages/maker-core/src/agents/shared/loop-guard.ts
index d31a8a82c3..f96f4f8c0c 100644
--- a/packages/maker-core/src/agents/shared/loop-guard.ts
+++ b/packages/maker-core/src/agents/shared/loop-guard.ts
@@ -435,6 +435,12 @@ export class ToolLoopGuard {
if (paced) {
// 连发不算参与判定:既不推进也不打破模式,进行中的复核因此不会被它取消。
if (chained) this.lastResultObservedValue = false;
+ if (chained) {
+ // 连发既不推进也不打破已有计数:夹在模型重复调用之间的脚本调用不能清零连续段,
+ // 只有与当前连续段完全相同时才续接时长上限。
+ if (fullFingerprint === this.lastFullFingerprint) this.observeStreak(fullFingerprint, false);
+ return this.finalVerdict(toolUse.name);
+ }
// 写入或命令照常打断长只读窗口,节奏本身不改变这一点。
if (!READ_ONLY_TOOL_NAMES.has(toolUse.name)) this.stableReadWindow = [];
this.observeStreak(fullFingerprint, false);