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): 连发间隔按调用发出前已到达的结果计算

Dashe9afeecf3e5a
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 38cfd2d5e1..499e8074de 100644
--- a/packages/maker-core/src/agents/shared/loop-guard.test.ts
+++ b/packages/maker-core/src/agents/shared/loop-guard.test.ts
@@ -787,6 +787,24 @@ describe('ToolLoopGuard pacing and final limits', () => {
expect(captured.nested).toEqual({ a: [1, { b: 'c' }] });
expect(captured).not.toBe(input);
});
+
+ // codex P1(#6388):后台脚本调用在模型调用发出之后才完成时,间隔不能按「最新结果」算(为负),
+ // 否则间隔很长的真实重复会被误判为脚本连发而永远不计数。
+ it('measures the chained gap from results that arrived before the call started', () => {
+ const { guard, advance } = clockGuard({ chainedCallGapMs: 2_000 });
+ let last: ToolLoopGuardVerdict = { kind: 'ok' };
+ for (let round = 0; round < 6; round++) {
+ guard.onToolUse(`model-${round}`, 'read', { path: 'a' });
+ advance(500);
+ guard.onToolUse(`script-${round}`, 'read', { path: 'b' });
+ advance(500);
+ guard.onToolResult(`script-${round}`, 'same');
+ advance(500);
+ last = guard.onToolResult(`model-${round}`, 'same');
+ advance(8_500);
+ }
+ expect(last).toMatchObject({ kind: 'hard', reason: 'pingpong', count: 12 });
+ });
});
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 824bba49b4..d31a8a82c3 100644
--- a/packages/maker-core/src/agents/shared/loop-guard.ts
+++ b/packages/maker-core/src/agents/shared/loop-guard.ts
@@ -179,6 +179,8 @@ interface PendingToolUse {
name: string;
input: unknown;
startedAt: number;
+ /** 本调用发出时,此前最近一次普通结果到达的时刻(没有则 null);连发判据用它算间隔。 */
+ precedingFinishedAt: number | null;
}
/**
@@ -342,8 +344,13 @@ export class ToolLoopGuard {
onToolUse(toolUseId: string, toolName: unknown, input: unknown): void {
if (toolUseId.length === 0) return;
if (typeof toolName !== 'string' || toolName.length === 0) return;
- const startedAt = this.pendingToolUses.get(toolUseId)?.startedAt ?? this.now();
- this.pendingToolUses.set(toolUseId, { name: toolName, input, startedAt });
+ const previous = this.pendingToolUses.get(toolUseId);
+ this.pendingToolUses.set(toolUseId, {
+ name: toolName,
+ input,
+ startedAt: previous?.startedAt ?? this.now(),
+ precedingFinishedAt: previous ? previous.precedingFinishedAt : this.lastOrdinaryFinishedAt,
+ });
}
/** 最近一次结果是否被纳入判定;为 true 且判定为 ok 说明此前的疑似模式已被打破。 */
@@ -406,9 +413,11 @@ export class ToolLoopGuard {
this.lastResultObservedValue = true;
const finishedAt = this.now();
- // 连发:上一次结果刚到、紧接着就又发出调用,中间没有模型采样的时间。
- const chained = this.chainedCallGapMs !== undefined && this.lastOrdinaryFinishedAt !== null
- && toolUse.startedAt - this.lastOrdinaryFinishedAt < this.chainedCallGapMs;
+ // 连发:发出时距此前最近一次结果到达不足 chainedCallGapMs,中间没有模型采样的时间。
+ // 用发出当时已到达的结果而不是现在最新的:后台调用可能在本调用发出之后才完成,
+ // 那样算出的间隔为负,会把间隔很长的真实重复误判为连发。
+ const chained = this.chainedCallGapMs !== undefined && toolUse.precedingFinishedAt !== null
+ && toolUse.startedAt - toolUse.precedingFinishedAt < this.chainedCallGapMs;
const paced = chained || (this.lastOrdinaryStartedAt !== null
&& toolUse.startedAt - this.lastOrdinaryStartedAt >= this.pacedIntervalMs)
|| (this.lastOrdinaryFinishedAt !== null