From fd77a721acc03ff608392a07a7b151ccde385181 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Thu, 27 Aug 2026 22:31:33 -0400
Subject: [PATCH] test(core): align session test vocabulary (#45670)

---
 packages/core/test/session-runner-recorded.test.ts | 14 +++++++-------
 packages/core/test/session-tool-progress.test.ts   |  2 +-
 ...tool-registry.test.ts => tool-registry.test.ts} |  0
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename packages/core/test/{session-runner-tool-registry.test.ts => tool-registry.test.ts} (100%)

diff --git a/packages/core/test/session-runner-recorded.test.ts b/packages/core/test/session-runner-recorded.test.ts
index c7c8c64cb5e..1a80b36fc79 100644
--- a/packages/core/test/session-runner-recorded.test.ts
+++ b/packages/core/test/session-runner-recorded.test.ts
@@ -1,5 +1,5 @@
 import { HttpRecorder } from "@opencode-ai/http-recorder"
-import * as OpenAIChat from "@opencode-ai/ai/protocols/openai-chat"
+import { OpenAIChat } from "@opencode-ai/ai/protocols/openai-chat"
 import { Auth, LLMClient, RequestExecutor } from "@opencode-ai/ai/route"
 import { Catalog } from "@opencode-ai/core/catalog"
 import { Database } from "@opencode-ai/core/database/database"
@@ -23,7 +23,7 @@ import { SessionProjector } from "@opencode-ai/core/session/projector"
 import { SessionExecution } from "@opencode-ai/core/session/execution"
 import { SessionRunCoordinator } from "@opencode-ai/core/session/run-coordinator"
 import { SessionRunner } from "@opencode-ai/core/session/runner/index"
-import * as SessionRunnerLLM from "@opencode-ai/core/session/runner/llm"
+import { SessionRunnerLLM } from "@opencode-ai/core/session/runner/llm"
 import { SessionRunnerModel } from "@opencode-ai/core/session/runner/model"
 import { Tool } from "@opencode-ai/core/tool"
 import { SessionTable } from "@opencode-ai/core/session/sql"
@@ -323,11 +323,11 @@ describe("SessionModelRequest HTTP bridge", () => {
         .onConflictDoNothing()
         .run()
         .pipe(Effect.orDie)
-      const retrySessionID = Session.ID.make("ses_model_request_http_retry")
+      const sessionID = Session.ID.make("ses_model_request_http")
       yield* db
         .insert(SessionTable)
         .values({
-          id: retrySessionID,
+          id: sessionID,
           project_id: Project.ID.global,
           slug: "test",
           directory: "/project",
@@ -337,16 +337,16 @@ describe("SessionModelRequest HTTP bridge", () => {
         .run()
         .pipe(Effect.orDie)
       const session = yield* Session.Service
-      yield* session.prompt({ sessionID: retrySessionID, text: "Say hello.", resume: false })
+      yield* session.prompt({ sessionID, text: "Say hello.", resume: false })
 
-      yield* session.resume(retrySessionID)
+      yield* session.resume(sessionID)
 
       expect(methods).toEqual(["POST"])
       expect(headers).toEqual(["effect"])
       expect(seen).toEqual(["request", "response:200:effect"])
       expect(bodies).toHaveLength(1)
       expect(bodies[0]?.byteLength).toBeGreaterThan(0)
-      expect((yield* session.context(retrySessionID))[1]).toMatchObject({
+      expect((yield* session.context(sessionID))[1]).toMatchObject({
         type: "assistant",
         content: [{ type: "text", text: "Hooked!" }],
       })
diff --git a/packages/core/test/session-tool-progress.test.ts b/packages/core/test/session-tool-progress.test.ts
index b0dcfd439fb..d37fed2b9cd 100644
--- a/packages/core/test/session-tool-progress.test.ts
+++ b/packages/core/test/session-tool-progress.test.ts
@@ -28,7 +28,7 @@ const model = { id: Model.ID.make("model"), providerID: Provider.ID.make("provid
 
 const content = (text: string) => [{ type: "text" as const, text }] as const
 
-describe("Tool.Metadata", () => {
+describe("Session tool progress", () => {
   it.effect("keeps progress live-only and terminal settlements durable", () =>
     Effect.gen(function* () {
       const { db } = yield* Database.Service
diff --git a/packages/core/test/session-runner-tool-registry.test.ts b/packages/core/test/tool-registry.test.ts
similarity index 100%
rename from packages/core/test/session-runner-tool-registry.test.ts
rename to packages/core/test/tool-registry.test.ts