fix(ulw-loop): track Oracle verification sessions explicitly

🤖 GENERATED WITH ASSISTANCE OF [OhMyOpenCode](https://github.com/code-yeongyu/oh-my-opencode)
2026-03-06 22:37:41 +09:00
parent 9778cc6c98
commit 898b628d3d
11 changed files with 281 additions and 29 deletions
@@ -2,9 +2,10 @@ import { describe, expect, test } from "bun:test"
 import { mkdirSync, rmSync } from "node:fs"
 import { tmpdir } from "node:os"
 import { join } from "node:path"
+import { createToolExecuteAfterHandler } from "./tool-execute-after"
 import { createToolExecuteBeforeHandler } from "./tool-execute-before"
 import { ULTRAWORK_VERIFICATION_PROMISE } from "../hooks/ralph-loop/constants"
-import { clearState, writeState } from "../hooks/ralph-loop/storage"
+import { clearState, readState, writeState } from "../hooks/ralph-loop/storage"

 describe("tool.execute.before ultrawork oracle verification", () => {
 	function createCtx(directory: string) {
@@ -47,6 +48,7 @@ describe("tool.execute.before ultrawork oracle verification", () => {

 		await handler({ tool: "task", sessionID: "ses-main", callID: "call-1" }, output)

+		expect(readState(directory)?.verification_attempt_id).toBeTruthy()
 		expect(output.args.run_in_background).toBe(false)
 		expect(output.args.prompt).toContain("Ship feature")
 		expect(output.args.prompt).toContain(`<promise>${ULTRAWORK_VERIFICATION_PROMISE}</promise>`)
@@ -77,4 +79,138 @@ describe("tool.execute.before ultrawork oracle verification", () => {

 		rmSync(directory, { recursive: true, force: true })
 	})
+
+	test("#given ulw loop is awaiting verification #when oracle task finishes #then oracle session id is stored", async () => {
+		const directory = join(tmpdir(), `tool-after-ulw-${Date.now()}`)
+		mkdirSync(directory, { recursive: true })
+		writeState(directory, {
+			active: true,
+			iteration: 3,
+			completion_promise: ULTRAWORK_VERIFICATION_PROMISE,
+			initial_completion_promise: "DONE",
+			started_at: new Date().toISOString(),
+			prompt: "Ship feature",
+			session_id: "ses-main",
+			ultrawork: true,
+			verification_pending: true,
+		})
+
+		const beforeHandler = createToolExecuteBeforeHandler({
+			ctx: createCtx(directory) as unknown as Parameters<typeof createToolExecuteBeforeHandler>[0]["ctx"],
+			hooks: {} as Parameters<typeof createToolExecuteBeforeHandler>[0]["hooks"],
+		})
+		const beforeOutput = {
+			args: {
+				subagent_type: "oracle",
+				run_in_background: true,
+				prompt: "Check it",
+			} as Record<string, unknown>,
+		}
+		await beforeHandler({ tool: "task", sessionID: "ses-main", callID: "call-1" }, beforeOutput)
+
+		const handler = createToolExecuteAfterHandler({
+			ctx: createCtx(directory) as unknown as Parameters<typeof createToolExecuteAfterHandler>[0]["ctx"],
+			hooks: {} as Parameters<typeof createToolExecuteAfterHandler>[0]["hooks"],
+		})
+
+		await handler(
+			{ tool: "task", sessionID: "ses-main", callID: "call-1" },
+			{
+				title: "oracle task",
+				output: "done",
+				metadata: {
+					agent: "oracle",
+					prompt: String(beforeOutput.args.prompt),
+					sessionId: "ses-oracle",
+				},
+			},
+		)
+
+		expect(readState(directory)?.verification_session_id).toBe("ses-oracle")
+
+		clearState(directory)
+		rmSync(directory, { recursive: true, force: true })
+	})
+
+	test("#given newer oracle attempt exists #when older oracle task finishes #then old session does not overwrite active verification", async () => {
+		const directory = join(tmpdir(), `tool-race-ulw-${Date.now()}`)
+		mkdirSync(directory, { recursive: true })
+		writeState(directory, {
+			active: true,
+			iteration: 3,
+			completion_promise: ULTRAWORK_VERIFICATION_PROMISE,
+			initial_completion_promise: "DONE",
+			started_at: new Date().toISOString(),
+			prompt: "Ship feature",
+			session_id: "ses-main",
+			ultrawork: true,
+			verification_pending: true,
+		})
+
+		const beforeHandler = createToolExecuteBeforeHandler({
+			ctx: createCtx(directory) as unknown as Parameters<typeof createToolExecuteBeforeHandler>[0]["ctx"],
+			hooks: {} as Parameters<typeof createToolExecuteBeforeHandler>[0]["hooks"],
+		})
+		const afterHandler = createToolExecuteAfterHandler({
+			ctx: createCtx(directory) as unknown as Parameters<typeof createToolExecuteAfterHandler>[0]["ctx"],
+			hooks: {} as Parameters<typeof createToolExecuteAfterHandler>[0]["hooks"],
+		})
+
+		const firstOutput = {
+			args: {
+				subagent_type: "oracle",
+				run_in_background: true,
+				prompt: "Check it",
+			} as Record<string, unknown>,
+		}
+		await beforeHandler({ tool: "task", sessionID: "ses-main", callID: "call-1" }, firstOutput)
+		const firstAttemptId = readState(directory)?.verification_attempt_id
+
+		const secondOutput = {
+			args: {
+				subagent_type: "oracle",
+				run_in_background: true,
+				prompt: "Check it again",
+			} as Record<string, unknown>,
+		}
+		await beforeHandler({ tool: "task", sessionID: "ses-main", callID: "call-2" }, secondOutput)
+		const secondAttemptId = readState(directory)?.verification_attempt_id
+
+		expect(firstAttemptId).toBeTruthy()
+		expect(secondAttemptId).toBeTruthy()
+		expect(secondAttemptId).not.toBe(firstAttemptId)
+
+		await afterHandler(
+			{ tool: "task", sessionID: "ses-main", callID: "call-1" },
+			{
+				title: "oracle task",
+				output: "done",
+				metadata: {
+					agent: "oracle",
+					prompt: String(firstOutput.args.prompt),
+					sessionId: "ses-oracle-old",
+				},
+			},
+		)
+
+		expect(readState(directory)?.verification_session_id).toBeUndefined()
+
+		await afterHandler(
+			{ tool: "task", sessionID: "ses-main", callID: "call-2" },
+			{
+				title: "oracle task",
+				output: "done",
+				metadata: {
+					agent: "oracle",
+					prompt: String(secondOutput.args.prompt),
+					sessionId: "ses-oracle-new",
+				},
+			},
+		)
+
+		expect(readState(directory)?.verification_session_id).toBe("ses-oracle-new")
+
+		clearState(directory)
+		rmSync(directory, { recursive: true, force: true })
+	})
 })