refactor(core): simplify integration test fixtures (#33292)

packages/core/test/plugin/provider-togetherai.test.ts

@@ -1,17 +1,50 @@
 import { describe, expect } from "bun:test"
+import type { LanguageModelV3 } from "@ai-sdk/provider"
 import { Effect } from "effect"
+import { ModelV2 } from "@opencode-ai/core/model"
 import { PluginV2 } from "@opencode-ai/core/plugin"
+import { PluginHost } from "@opencode-ai/core/plugin/host"
 import { TogetherAIPlugin } from "@opencode-ai/core/plugin/provider/togetherai"
-import { addPlugin, fakeSelectorSdk, it, model } from "./provider-helper"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { testEffect } from "../lib/effect"
+import { PluginTestLayer } from "./fixture"
+
+const it = testEffect(PluginTestLayer)
+
+const addPlugin = Effect.fn(function* () {
+  const plugin = yield* PluginV2.Service
+  const host = yield* PluginHost.make()
+  yield* plugin.add({ id: TogetherAIPlugin.id, effect: TogetherAIPlugin.effect(host) })
+})
+
+function fakeSelectorSdk(calls: string[]) {
+  const make = (method: string) => (id: string) => {
+    calls.push(`${method}:${id}`)
+    return { modelId: id, provider: method, specificationVersion: "v3" } as unknown as LanguageModelV3
+  }
+  return {
+    responses: make("responses"),
+    messages: make("messages"),
+    chat: make("chat"),
+    languageModel: make("languageModel"),
+  }
+}
 
 describe("TogetherAIPlugin", () => {
   it.effect("creates a TogetherAI SDK for @ai-sdk/togetherai", () =>
     Effect.gen(function* () {
       const plugin = yield* PluginV2.Service
-      yield* addPlugin(plugin, TogetherAIPlugin)
+      yield* addPlugin()
       const result = yield* plugin.trigger(
         "aisdk.sdk",
-        { model: model("togetherai", "model"), package: "@ai-sdk/togetherai", options: { name: "togetherai" } },
+        {
+          model: new ModelV2.Info({
+            ...ModelV2.Info.empty(ProviderV2.ID.make("togetherai"), ModelV2.ID.make("model")),
+            api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" },
+          }),
+          package: "@ai-sdk/togetherai",
+          options: { name: "togetherai" },
+        },
         {},
       )
       expect(result.sdk).toBeDefined()
@@ -21,12 +54,15 @@ describe("TogetherAIPlugin", () => {
   it.effect("matches the old bundled provider package exactly", () =>
     Effect.gen(function* () {
       const plugin = yield* PluginV2.Service
-      yield* addPlugin(plugin, TogetherAIPlugin)
+      yield* addPlugin()
 
       const ignored = yield* plugin.trigger(
         "aisdk.sdk",
         {
-          model: model("togetherai", "model"),
+          model: new ModelV2.Info({
+            ...ModelV2.Info.empty(ProviderV2.ID.make("togetherai"), ModelV2.ID.make("model")),
+            api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" },
+          }),
           package: "file:///tmp/@ai-sdk/togetherai-provider.js",
           options: { name: "togetherai" },
         },
@@ -36,7 +72,14 @@ describe("TogetherAIPlugin", () => {
 
       const result = yield* plugin.trigger(
         "aisdk.sdk",
-        { model: model("togetherai", "model"), package: "@ai-sdk/togetherai", options: { name: "togetherai" } },
+        {
+          model: new ModelV2.Info({
+            ...ModelV2.Info.empty(ProviderV2.ID.make("togetherai"), ModelV2.ID.make("model")),
+            api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" },
+          }),
+          package: "@ai-sdk/togetherai",
+          options: { name: "togetherai" },
+        },
         {},
       )
       expect(result.sdk).toBeDefined()
@@ -46,29 +89,22 @@ describe("TogetherAIPlugin", () => {
   it.effect("creates bundled TogetherAI SDKs for custom provider IDs", () =>
     Effect.gen(function* () {
       const plugin = yield* PluginV2.Service
-      const observed: string[] = []
-      yield* addPlugin(plugin, TogetherAIPlugin)
-      yield* plugin.add({
-        id: PluginV2.ID.make("inspector"),
-        effect: Effect.succeed({
-          "aisdk.sdk": (evt) =>
-            Effect.sync(() => {
-              observed.push(evt.sdk.languageModel("model").provider)
-            }),
-        }),
-      })
+      yield* addPlugin()
 
-      yield* plugin.trigger(
+      const result = yield* plugin.trigger(
         "aisdk.sdk",
         {
-          model: model("custom-togetherai", "model"),
+          model: new ModelV2.Info({
+            ...ModelV2.Info.empty(ProviderV2.ID.make("custom-togetherai"), ModelV2.ID.make("model")),
+            api: { id: ModelV2.ID.make("model"), type: "aisdk", package: "test-provider" },
+          }),
           package: "@ai-sdk/togetherai",
           options: { name: "custom-togetherai" },
         },
         {},
       )
 
-      expect(observed).toEqual(["togetherai.chat"])
+      expect(result.sdk.languageModel("model").provider).toBe("togetherai.chat")
     }),
   )
 
@@ -76,12 +112,22 @@ describe("TogetherAIPlugin", () => {
     Effect.gen(function* () {
       const plugin = yield* PluginV2.Service
       const calls: string[] = []
-      yield* addPlugin(plugin, TogetherAIPlugin)
+      yield* addPlugin()
 
       const result = yield* plugin.trigger(
         "aisdk.language",
         {
-          model: model("togetherai", "meta-llama/Llama-3.3-70B-Instruct-Turbo"),
+          model: new ModelV2.Info({
+            ...ModelV2.Info.empty(
+              ProviderV2.ID.make("togetherai"),
+              ModelV2.ID.make("meta-llama/Llama-3.3-70B-Instruct-Turbo"),
+            ),
+            api: {
+              id: ModelV2.ID.make("meta-llama/Llama-3.3-70B-Instruct-Turbo"),
+              type: "aisdk",
+              package: "test-provider",
+            },
+          }),
           sdk: { languageModel: fakeSelectorSdk(calls).languageModel },
           options: {},
         },