From 23b0688a7fd65b63a10dc0ebd909396856669f09 Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Tue, 11 Aug 2026 12:18:07 -0400 Subject: [PATCH] fix(server): await models before listing (#41783) --- packages/server/src/handlers/model.ts | 13 ++++++ packages/server/test/model.test.ts | 57 +++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 packages/server/test/model.test.ts diff --git a/packages/server/src/handlers/model.ts b/packages/server/src/handlers/model.ts index a6ebdb84d7f..6ad09fa96b2 100644 --- a/packages/server/src/handlers/model.ts +++ b/packages/server/src/handlers/model.ts @@ -12,6 +12,19 @@ export const ModelHandler = HttpApiBuilder.group(Api, "server.model", (handlers) .handle( "model.list", Effect.fn(function* () { + const plugins = yield* PluginSupervisor.Service + yield* plugins.flush.pipe( + Effect.timeoutOrElse({ + duration: "5 seconds", + orElse: () => + Effect.fail( + new ServiceUnavailableError({ + message: "Model catalog initialization timed out", + service: "model.catalog", + }), + ), + }), + ) const catalog = yield* Catalog.Service return yield* response(catalog.model.available()) }), diff --git a/packages/server/test/model.test.ts b/packages/server/test/model.test.ts new file mode 100644 index 00000000000..9394a693daa --- /dev/null +++ b/packages/server/test/model.test.ts @@ -0,0 +1,57 @@ +import fs from "node:fs/promises" +import path from "node:path" +import { expect } from "bun:test" +import { Effect } from "effect" +import { HttpServer } from "effect/unstable/http" +import { tmpdir } from "../../core/test/fixture/tmpdir" +import { it } from "../../core/test/lib/effect" +import { ServerProcess } from "../src/process" + +it.live("waits for plugin initialization before listing models", () => + Effect.acquireUseRelease( + Effect.promise(() => tmpdir("opencode-model-endpoint-")), + (tmp) => + Effect.gen(function* () { + yield* Effect.promise(() => + fs.writeFile( + path.join(tmp.path, "opencode.json"), + JSON.stringify({ + providers: { + custom: { + package: "aisdk:@ai-sdk/openai-compatible", + settings: { apiKey: "secret" }, + models: { chat: {} }, + }, + }, + }), + ), + ) + const server = yield* ServerProcess.start({ + hostname: "127.0.0.1", + port: 0, + password: "secret", + app: { version: "test-version" }, + database: { path: ":memory:" }, + config: { directory: tmp.path }, + fs: { filewatcher: false }, + }) + const url = new URL("/api/model", HttpServer.formatAddress(server.address)) + url.searchParams.set("location[directory]", tmp.path) + const response = yield* Effect.promise(() => + fetch(url, { headers: { authorization: `Basic ${btoa("opencode:secret")}` } }), + ) + + expect(response.status).toBe(200) + const body: unknown = yield* Effect.promise(() => response.json()) + if (!isRecord(body) || !Array.isArray(body["data"])) throw new Error("Expected a model list response") + expect( + body["data"].some((model) => isRecord(model) && model["providerID"] === "custom" && model["id"] === "chat"), + ).toBeTrue() + }), + (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()), + ), +) + +function isRecord(value: unknown): value is Record { + return typeof value === "object" && value !== null && !Array.isArray(value) +}