diff --git a/packages/core/src/plugin/models-dev.ts b/packages/core/src/plugin/models-dev.ts index 2784fedc3f2..014d6774ff7 100644 --- a/packages/core/src/plugin/models-dev.ts +++ b/packages/core/src/plugin/models-dev.ts @@ -37,7 +37,7 @@ export const ModelsDevPlugin = define({ }) for (const model of provider.models) { if (model.status === "deprecated") continue - catalog.model.update(provider.info.id, model.id, (draft) => Object.assign(draft, model)) + catalog.model.update(provider.info.id, model.id, (draft) => Object.assign(draft, structuredClone(model))) } } }) diff --git a/packages/core/test/plugin/models-dev.test.ts b/packages/core/test/plugin/models-dev.test.ts index ab37299279c..20c4fecfc59 100644 --- a/packages/core/test/plugin/models-dev.test.ts +++ b/packages/core/test/plugin/models-dev.test.ts @@ -1,7 +1,7 @@ import path from "path" import { describe, expect } from "bun:test" import { Money } from "@opencode-ai/schema/money" -import { Effect, Layer } from "effect" +import { Effect, Exit, Layer, Scope } from "effect" import { Catalog } from "@opencode-ai/core/catalog" import { Integration } from "@opencode-ai/core/integration" import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder" @@ -11,6 +11,8 @@ import { Location } from "@opencode-ai/core/location" import { Model } from "@opencode-ai/core/model" import { ModelsDev } from "@opencode-ai/core/models-dev" import { ModelsDevPlugin } from "@opencode-ai/core/plugin/models-dev" +import { Plugin } from "@opencode-ai/core/plugin" +import { PluginHost } from "@opencode-ai/core/plugin/host" import { ProviderPlugins } from "@opencode-ai/core/plugin/provider" import { Provider } from "@opencode-ai/core/provider" import { AbsolutePath } from "@opencode-ai/core/schema" @@ -18,6 +20,7 @@ import { withEnv } from "../fixture/env" import { location } from "../fixture/location" import { testEffect } from "../lib/effect" import { catalogHost, host, integrationHost } from "./host" +import { PluginTestLayer } from "./fixture" const locationLayer = Layer.succeed( Location.Service, @@ -27,10 +30,68 @@ const layer = AppNodeBuilder.build(LayerNode.group([Catalog.node, Integration.no [Location.node, locationLayer], ]) const it = testEffect(layer) +const real = testEffect(PluginTestLayer) const models = (file: string) => AppNodeBuilder.build(ModelsDev.node, [[ModelsDev.node, ModelsDev.configured({ file, fetch: false })]]) describe("ModelsDevPlugin", () => { + real.effect("keeps the retained model seed unchanged across catalog replay", () => + Effect.gen(function* () { + const catalog = yield* Catalog.Service + const plugins = yield* Plugin.Service + const providerID = Provider.ID.make("acme") + const modelID = Model.ID.make("model") + const modelsDev = ModelsDev.Service.of({ + get: () => + Effect.succeed([ + { + info: { + id: providerID, + name: "Acme", + activation: "auto", + package: Provider.aisdk("@ai-sdk/openai-compatible"), + }, + environment: [], + models: [ + { + id: modelID, + modelID, + providerID, + name: "Model", + capabilities: { tools: true, input: [], output: [] }, + variants: [], + time: { released: Date.parse("2026-01-01") }, + cost: [], + status: "active", + enabled: true, + limit: { context: 128_000, output: 32_000 }, + }, + ], + }, + ] satisfies readonly ModelsDev.Snapshot[]), + refresh: () => Effect.void, + }) + const pluginHost = yield* PluginHost.make(plugins) + yield* ModelsDevPlugin.effect(pluginHost).pipe(Effect.provideService(ModelsDev.Service, modelsDev)) + + const scope = yield* Scope.make() + yield* catalog + .transform((draft) => + draft.model.update(providerID, modelID, (model) => { + model.variants ??= [] + model.variants.push({ id: Model.VariantID.make("configured") }) + }), + ) + .pipe(Scope.provide(scope)) + expect((yield* catalog.model.get(providerID, modelID))?.variants).toEqual([ + { id: Model.VariantID.make("configured") }, + ]) + + yield* Scope.close(scope, Exit.void) + expect((yield* catalog.model.get(providerID, modelID))?.variants).toEqual([]) + }), + ) + it.effect("projects normalized models.dev snapshots into the catalog", () => Effect.gen(function* () { const integrations = yield* Integration.Service