From 20ea7a055ed2c3b989bce147f1c6e702db98a29a Mon Sep 17 00:00:00 2001 From: Vincent Koc Date: Wed, 17 Jun 2026 10:40:20 +0800 Subject: [PATCH] refactor(agents): remove stale compaction grace helper --- .../run/attempt.spawn-workspace.test-support.ts | 7 ------- .../run/compaction-timeout.test.ts | 10 ---------- .../run/compaction-timeout.ts | 14 +++----------- 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.test-support.ts b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.test-support.ts index 29e65114ee44..5879a790f3d4 100644 --- a/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.test-support.ts +++ b/src/agents/embedded-agent-runner/run/attempt.spawn-workspace.test-support.ts @@ -832,13 +832,6 @@ vi.mock("./compaction-retry-aggregate-timeout.js", () => ({ vi.mock("./compaction-timeout.js", () => ({ resolveRunTimeoutDuringCompaction: () => "abort", - resolveRunTimeoutWithCompactionGraceMs: ({ - runTimeoutMs, - compactionTimeoutMs, - }: { - runTimeoutMs: number; - compactionTimeoutMs: number; - }) => runTimeoutMs + compactionTimeoutMs, selectCompactionTimeoutSnapshot: ({ currentSnapshot, currentSessionId, diff --git a/src/agents/embedded-agent-runner/run/compaction-timeout.test.ts b/src/agents/embedded-agent-runner/run/compaction-timeout.test.ts index 07805f66d338..b10e9b342c99 100644 --- a/src/agents/embedded-agent-runner/run/compaction-timeout.test.ts +++ b/src/agents/embedded-agent-runner/run/compaction-timeout.test.ts @@ -3,7 +3,6 @@ import { describe, expect, it } from "vitest"; import { castAgentMessage } from "../../test-helpers/agent-message-fixtures.js"; import { resolveRunTimeoutDuringCompaction, - resolveRunTimeoutWithCompactionGraceMs, selectCompactionTimeoutSnapshot, shouldFlagCompactionTimeout, } from "./compaction-timeout.js"; @@ -90,15 +89,6 @@ describe("compaction-timeout helpers", () => { ).toBe("abort"); }); - it("adds one compaction grace window to the run timeout budget", () => { - expect( - resolveRunTimeoutWithCompactionGraceMs({ - runTimeoutMs: 600_000, - compactionTimeoutMs: 900_000, - }), - ).toBe(1_500_000); - }); - it("uses pre-compaction snapshot when compaction timeout occurs", () => { const pre = [castAgentMessage({ role: "user", content: "pre" })] as const; const current = [castAgentMessage({ role: "assistant", content: "current" })] as const; diff --git a/src/agents/embedded-agent-runner/run/compaction-timeout.ts b/src/agents/embedded-agent-runner/run/compaction-timeout.ts index e5cbb04b12e8..9c08962222e8 100644 --- a/src/agents/embedded-agent-runner/run/compaction-timeout.ts +++ b/src/agents/embedded-agent-runner/run/compaction-timeout.ts @@ -4,7 +4,7 @@ import type { AgentMessage } from "../../runtime/index.js"; /** Timeout state used to distinguish normal run deadlines from compaction stalls. */ -export type CompactionTimeoutSignal = { +type CompactionTimeoutSignal = { isTimeout: boolean; isCompactionPendingOrRetrying: boolean; isCompactionInFlight: boolean; @@ -34,16 +34,8 @@ export function resolveRunTimeoutDuringCompaction(params: { return params.graceAlreadyUsed ? "abort" : "extend"; } -/** Effective run timeout after adding the one-time compaction grace budget. */ -export function resolveRunTimeoutWithCompactionGraceMs(params: { - runTimeoutMs: number; - compactionTimeoutMs: number; -}): number { - return params.runTimeoutMs + params.compactionTimeoutMs; -} - /** Candidate transcript snapshots available when a timeout fires during compaction. */ -export type SnapshotSelectionParams = { +type SnapshotSelectionParams = { timedOutDuringCompaction: boolean; preCompactionSnapshot: AgentMessage[] | null; preCompactionSessionId: string; @@ -52,7 +44,7 @@ export type SnapshotSelectionParams = { }; /** Snapshot chosen for retry/replay after a compaction-related timeout. */ -export type SnapshotSelection = { +type SnapshotSelection = { messagesSnapshot: AgentMessage[]; sessionIdUsed: string; source: "pre-compaction" | "current";