From d974cd3d3b0775efbe51d62b9083e0ab404a94ea Mon Sep 17 00:00:00 2001 From: YeonGyu-Kim Date: Sat, 16 May 2026 15:43:15 +0900 Subject: [PATCH] test(hooks): repair stale retry harnesses --- src/hooks/atlas/background-task-retry.test.ts | 16 ++++++++++++---- src/hooks/atlas/index.test.ts | 10 ++++++---- ...ndex.compaction-model-agnostic.static.test.ts | 8 ++++---- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/hooks/atlas/background-task-retry.test.ts b/src/hooks/atlas/background-task-retry.test.ts index 8cab40ba2..3df7194a0 100644 --- a/src/hooks/atlas/background-task-retry.test.ts +++ b/src/hooks/atlas/background-task-retry.test.ts @@ -7,6 +7,7 @@ import type { PluginInput } from "@opencode-ai/plugin" import { createAtlasHook } from "./atlas-hook" import { clearBoulderState, writeBoulderState } from "../../features/boulder-state" import { _resetForTesting, clearSessionAgent, registerAgentName, setSessionAgent } from "../../features/claude-code-session-state" +import { DEFAULT_PROMPT_DISPATCH_TIMEOUT_MS } from "../../shared/prompt-async-gate" import { unsafeTestValue } from "../../../test-support/unsafe-test-value" // Force process isolation in CI runner (globalThis.setTimeout override conflicts with other atlas tests) @@ -24,6 +25,8 @@ describe("atlas background task retry", () => { let nextFakeTimerId = 1000 const originalSetTimeout = globalThis.setTimeout const originalClearTimeout = globalThis.clearTimeout + const originalDateNow = Date.now + let fakeNow = 0 async function flushMicrotasks(): Promise { await Promise.resolve() @@ -52,6 +55,7 @@ describe("atlas background task retry", () => { } capturedTimers.delete(id) + fakeNow += 6000 await entry.callback() } await flushMicrotasks() @@ -67,6 +71,8 @@ describe("atlas background task retry", () => { capturedTimers.clear() nextFakeTimerId = 1000 + fakeNow = 10_000 + Date.now = () => fakeNow globalThis.setTimeout = ((callback: Parameters[0], delay?: number, ...args: unknown[]) => { const normalizedDelay = typeof delay === "number" ? delay : 0 @@ -74,7 +80,7 @@ describe("atlas background task retry", () => { return originalSetTimeout(callback, delay, ...args) } - if (normalizedDelay >= 5000) { + if (normalizedDelay >= 5000 && normalizedDelay !== DEFAULT_PROMPT_DISPATCH_TIMEOUT_MS) { const id = nextFakeTimerId++ capturedTimers.set(id, { callback: () => (callback as LongTimerCallback)(...args), @@ -87,8 +93,9 @@ describe("atlas background task retry", () => { }) as typeof setTimeout globalThis.clearTimeout = ((id?: number | ReturnType) => { - if (typeof id === "number" && capturedTimers.has(id)) { - capturedTimers.get(id)!.cleared = true + const timerEntry = typeof id === "number" ? capturedTimers.get(id) : undefined + if (timerEntry) { + timerEntry.cleared = true capturedTimers.delete(id) return } @@ -100,6 +107,7 @@ describe("atlas background task retry", () => { afterEach(() => { globalThis.setTimeout = originalSetTimeout globalThis.clearTimeout = originalClearTimeout + Date.now = originalDateNow _resetForTesting() clearBoulderState(testDir) if (existsSync(testDir)) { @@ -423,7 +431,7 @@ describe("atlas background task retry", () => { agent: "atlas", }) - const deferredPrompt = createDeferred<{}>() + const deferredPrompt = createDeferred() const promptAsyncMock = mock(() => deferredPrompt.promise) const hook = createAtlasHook(unsafeTestValue({ directory: testDir, diff --git a/src/hooks/atlas/index.test.ts b/src/hooks/atlas/index.test.ts index 019468224..58dffc638 100644 --- a/src/hooks/atlas/index.test.ts +++ b/src/hooks/atlas/index.test.ts @@ -11,6 +11,7 @@ import { } from "../../features/boulder-state" import type { BoulderState } from "../../features/boulder-state" import { _resetForTesting, registerAgentName, subagentSessions, updateSessionAgent } from "../../features/claude-code-session-state" +import { DEFAULT_PROMPT_DISPATCH_TIMEOUT_MS } from "../../shared/prompt-async-gate" import type { AtlasHookOptions, PendingTaskRef } from "./types" import { createAtlasHook } from "./index" import { createToolExecuteAfterHandler } from "./tool-execute-after" @@ -1702,7 +1703,7 @@ session_id: ses_untrusted_999 // then - stale idle is consumed, not converted into another scheduled continuation expect(mockInput._promptMock).toHaveBeenCalledTimes(1) - expect(scheduledDelays.filter((delay) => delay >= 5_000)).toHaveLength(0) + expect(scheduledDelays.filter((delay) => delay >= 5_000 && delay !== DEFAULT_PROMPT_DISPATCH_TIMEOUT_MS)).toHaveLength(0) } finally { globalThis.setTimeout = originalSetTimeout } @@ -2498,7 +2499,7 @@ session_id: ses_untrusted_999 globalThis.setTimeout = ((callback: Parameters[0], delay?: number, ...args: unknown[]) => { const normalized = typeof delay === "number" ? delay : 0 - if (normalized >= 5000) { + if (normalized >= 5000 && normalized !== DEFAULT_PROMPT_DISPATCH_TIMEOUT_MS) { const timerID = originalSetTimeout(() => undefined, 0) const capturedCallback = typeof callback === "function" ? () => callback(...args) @@ -2512,8 +2513,9 @@ session_id: ses_untrusted_999 }) as typeof setTimeout globalThis.clearTimeout = ((id?: ReturnType) => { - if (id && capturedTimers.has(id)) { - capturedTimers.get(id)!.cleared = true + const timerEntry = id ? capturedTimers.get(id) : undefined + if (timerEntry) { + timerEntry.cleared = true capturedTimers.delete(id) return } diff --git a/src/index.compaction-model-agnostic.static.test.ts b/src/index.compaction-model-agnostic.static.test.ts index 91b427ba6..036c0052b 100644 --- a/src/index.compaction-model-agnostic.static.test.ts +++ b/src/index.compaction-model-agnostic.static.test.ts @@ -4,9 +4,9 @@ import { readFileSync } from "node:fs" describe("experimental.session.compacting", () => { test("does not hardcode a model and uses output.context", () => { //#given - const indexUrl = new URL("./index.ts", import.meta.url) + const moduleUrl = new URL("./testing/create-plugin-module.ts", import.meta.url) const compactionUrl = new URL("./plugin/session-compacting.ts", import.meta.url) - const content = readFileSync(indexUrl, "utf-8") + const content = readFileSync(moduleUrl, "utf-8") const compactionContent = readFileSync(compactionUrl, "utf-8") //#when @@ -22,9 +22,9 @@ describe("experimental.session.compacting", () => { test("registers autocontinue restores before OpenCode synthetic continue", () => { //#given - const indexUrl = new URL("./index.ts", import.meta.url) + const moduleUrl = new URL("./testing/create-plugin-module.ts", import.meta.url) const compactionUrl = new URL("./plugin/session-compacting.ts", import.meta.url) - const content = readFileSync(indexUrl, "utf-8") + const content = readFileSync(moduleUrl, "utf-8") const compactionContent = readFileSync(compactionUrl, "utf-8") //#when