okengine 0.18.4 → 0.19.0

package/src/docker/docker.test.ts

@@ -41,19 +41,7 @@ import {
   valkey,
   writeDerivedFiles,
   yugabyte,
-  ensureOllamaModel,
-  llamaCpp,
-  LLAMA_CPP_IMAGE,
-  LLAMA_CPP_MIN_SAFE_BUILD,
-  OllamaPullError,
-  OLLAMA_IMAGE,
-  OLLAMA_MIN_SAFE_VERSION,
-  sglang,
-  SGLANG_IMAGE,
-  vllm,
-  VLLM_IMAGE,
   type ImageRecipe,
-  type OllamaFetch,
   type ServiceSpec,
 } from "./index.ts";
 
@@ -370,12 +358,12 @@ describe("image recipes", () => {
   });
 
   test("pgdog matches the official image and waits on store-sql", () => {
-    expect(recipeFor("ghcr.io/pgdogdev/pgdog:v0.1.53").id).toBe("pgdog");
+    expect(recipeFor("ghcr.io/pgdogdev/pgdog:v0.1.57").id).toBe("pgdog");
     expect(pgdog.match("ghcr.io/pgdogdev/pgdog:main")).toBe(true);
     const applied = pgdog.apply({
       role: "pgdog",
       serviceName: "pgdog",
-      image: "ghcr.io/pgdogdev/pgdog:v0.1.53",
+      image: "ghcr.io/pgdogdev/pgdog:v0.1.57",
       port: 6432,
       hostPort: 6432,
       credentials: fixedCreds["store.sql"],
@@ -384,6 +372,8 @@ describe("image recipes", () => {
     expect(applied.volumes).toContain("./pgdog/pgdog.toml:/pgdog/pgdog.toml:ro");
     expect(applied.volumes).toContain("./pgdog/users.toml:/pgdog/users.toml:ro");
     expect(applied.healthcheck?.test.join(" ")).toContain("pg_isready");
+    expect(applied.healthcheck?.interval).toBe("2s");
+    expect(applied.healthcheck?.start_period).toBe("2s");
   });
 
   test("pgdog.toml + users.toml match upstream config shape", () => {
@@ -434,184 +424,6 @@ describe("image recipes", () => {
     expect(url).toBe("http://127.0.0.1:7700");
   });
 
-  test("ollama matches the official image, serves on 11434, emits http URL", () => {
-    expect(recipeFor(OLLAMA_IMAGE).id).toBe("ollama");
-    expect(OLLAMA_IMAGE).not.toContain("latest");
-    expect(OLLAMA_MIN_SAFE_VERSION).toBe("0.17.1");
-    const spec: ServiceSpec = {
-      role: "ai",
-      serviceName: "ai",
-      image: OLLAMA_IMAGE,
-      port: 11434,
-      hostPort: 11434,
-      credentials: { user: "oke", password: "unused", database: "oke" },
-    };
-    const applied = recipeFor(spec.image).apply(spec);
-    expect(applied.environment?.OKE_AI_MODEL).toBe("${OKE_AI_MODEL:-qwen3.5:9b}");
-    expect(applied.environment?.OLLAMA_HOST).toBe("0.0.0.0:11434");
-    expect(applied.publishBind).toBe("127.0.0.1");
-    expect(applied.volumes).toContain("ai-data:/root/.ollama");
-    expect(applied.healthcheck?.test.join(" ")).toContain("ollama list");
-    // Pull is host-side via ensureOllamaModel — never a boot `ollama pull` CLI.
-    expect(applied.command).toBeUndefined();
-    expect(applied.entrypoint).toBeUndefined();
-    const url = recipeFor(spec.image).url(spec, {
-      host: "127.0.0.1",
-      port: 11434,
-      user: "oke",
-      password: "unused",
-      database: "oke",
-    });
-    expect(url).toBe("http://127.0.0.1:11434");
-  });
-
-  test("llama-cpp is the default local AI recipe — OpenAI /v1, loopback publish, pinned ≥ b8146", () => {
-    expect(recipeFor(LLAMA_CPP_IMAGE).id).toBe("llama-cpp");
-    expect(LLAMA_CPP_IMAGE).not.toContain("latest");
-    const build = Number(/server-b(\d+)/.exec(LLAMA_CPP_IMAGE)?.[1]);
-    expect(build).toBeGreaterThanOrEqual(LLAMA_CPP_MIN_SAFE_BUILD);
-    const spec: ServiceSpec = {
-      role: "ai",
-      serviceName: "ai",
-      image: LLAMA_CPP_IMAGE,
-      port: 8080,
-      hostPort: 8080,
-      credentials: { user: "oke", password: "unused", database: "oke" },
-    };
-    const applied = llamaCpp.apply(spec);
-    expect(applied.publishBind).toBe("127.0.0.1");
-    // Never put docker-repo / models-preset / interpolated OKE_AI_MODEL in
-    // service environment — router children recurse / OOM; Compose ${} would
-    // also override env_file from an empty host shell.
-    expect(applied.environment?.LLAMA_ARG_MODELS_PRESET).toBeUndefined();
-    expect(applied.environment?.LLAMA_ARG_DOCKER_REPO).toBeUndefined();
-    expect(applied.environment?.OKE_AI_MODEL).toBeUndefined();
-    expect(applied.entrypoint).toEqual(["/usr/bin/python3", "/oke/llama-entrypoint.py"]);
-    expect(applied.command).toBeUndefined();
-    expect(applied.volumes?.some((v) => v.includes("../.oke/llama-entrypoint.py"))).toBe(true);
-    expect(applied.extraPorts).toBeUndefined();
-    expect(llamaCpp.url(spec, { host: "127.0.0.1", port: 8080, ...spec.credentials })).toBe(
-      "http://127.0.0.1:8080/v1",
-    );
-  });
-
-  test("vllm recipe is GPU-aware, OpenAI /v1, loopback publish, never latest", () => {
-    expect(recipeFor(VLLM_IMAGE).id).toBe("vllm");
-    expect(VLLM_IMAGE).not.toContain("latest");
-    const spec: ServiceSpec = {
-      role: "ai",
-      serviceName: "ai",
-      image: VLLM_IMAGE,
-      port: 8000,
-      hostPort: 8000,
-      credentials: { user: "oke", password: "unused", database: "oke" },
-    };
-    const applied = vllm.apply(spec);
-    expect(applied.publishBind).toBe("127.0.0.1");
-    expect(applied.ipc).toBe("host");
-    expect(JSON.stringify(applied.deploy)).toContain("nvidia");
-    expect(vllm.url(spec, { host: "127.0.0.1", port: 8000, ...spec.credentials })).toBe(
-      "http://127.0.0.1:8000/v1",
-    );
-  });
-
-  test("sglang recipe is GPU-aware, OpenAI /v1, loopback publish, never latest", () => {
-    expect(recipeFor(SGLANG_IMAGE).id).toBe("sglang");
-    expect(SGLANG_IMAGE).not.toContain("latest");
-    const spec: ServiceSpec = {
-      role: "ai",
-      serviceName: "ai",
-      image: SGLANG_IMAGE,
-      port: 30000,
-      hostPort: 30000,
-      credentials: { user: "oke", password: "unused", database: "oke" },
-    };
-    const applied = sglang.apply(spec);
-    expect(applied.publishBind).toBe("127.0.0.1");
-    expect(applied.ipc).toBe("host");
-    expect(JSON.stringify(applied.deploy)).toContain("nvidia");
-    expect(sglang.url(spec, { host: "127.0.0.1", port: 30000, ...spec.credentials })).toBe(
-      "http://127.0.0.1:30000/v1",
-    );
-  });
-
-  test("ensureOllamaModel POSTs /api/pull to the container base URL (not a host CLI)", async () => {
-    const calls: { url: string; method: string; body?: string }[] = [];
-    const fetchFn: OllamaFetch = async (input, init) => {
-      const url = String(input);
-      const method = (init?.method ?? "GET").toUpperCase();
-      const body = typeof init?.body === "string" ? init.body : undefined;
-      calls.push({ url, method, ...(body !== undefined ? { body } : {}) });
-      if (url.endsWith("/api/tags") && method === "GET") {
-        return new Response(JSON.stringify({ models: [] }), { status: 200 });
-      }
-      if (url.endsWith("/api/pull") && method === "POST") {
-        expect(body).toContain('"model":"qwen3.5:9b"');
-        expect(body).toContain('"stream":true');
-        return new Response(`${JSON.stringify({ status: "success" })}\n`, { status: 200 });
-      }
-      return new Response("unexpected", { status: 500 });
-    };
-
-    await ensureOllamaModel({
-      url: "http://127.0.0.1:11434",
-      model: "qwen3.5:9b",
-      fetch: fetchFn,
-      readyTimeoutMs: 2_000,
-      pullTimeoutMs: 5_000,
-    });
-
-    expect(
-      calls.some((c) => c.url === "http://127.0.0.1:11434/api/tags" && c.method === "GET"),
-    ).toBe(true);
-    const pull = calls.find((c) => c.url === "http://127.0.0.1:11434/api/pull");
-    expect(pull?.method).toBe("POST");
-    expect(pull?.body).toBe(JSON.stringify({ model: "qwen3.5:9b", stream: true }));
-    // No host-side `ollama` binary assumption — only HTTP to the given URL.
-    expect(calls.every((c) => c.url.startsWith("http://127.0.0.1:11434/"))).toBe(true);
-  });
-
-  test("ensureOllamaModel skips pull when /api/tags already lists the model", async () => {
-    const calls: string[] = [];
-    const statuses: string[] = [];
-    const fetchFn: OllamaFetch = async (input, init) => {
-      const url = String(input);
-      const method = (init?.method ?? "GET").toUpperCase();
-      calls.push(`${method} ${url}`);
-      if (url.endsWith("/api/tags")) {
-        return new Response(JSON.stringify({ models: [{ name: "gemma4:e4b" }] }), {
-          status: 200,
-        });
-      }
-      return new Response("should not pull", { status: 500 });
-    };
-
-    await ensureOllamaModel({
-      url: "http://127.0.0.1:23100",
-      model: "gemma4:e4b",
-      fetch: fetchFn,
-      readyTimeoutMs: 2_000,
-      onStatus: (line) => statuses.push(line),
-    });
-
-    expect(calls.some((c) => c.includes("/api/pull"))).toBe(false);
-    expect(statuses.some((s) => /already has gemma4:e4b/.test(s))).toBe(true);
-  });
-
-  test("ensureOllamaModel fails loud when the container API never becomes ready", async () => {
-    const fetchFn: OllamaFetch = async () => {
-      throw new Error("connection refused");
-    };
-    await expect(
-      ensureOllamaModel({
-        url: "http://127.0.0.1:59999",
-        model: "qwen3.5:9b",
-        fetch: fetchFn,
-        readyTimeoutMs: 800,
-      }),
-    ).rejects.toBeInstanceOf(OllamaPullError);
-  });
-
   test("a new image recipe is ≤15 lines", async () => {
     const src = await Bun.file(`${import.meta.dir}/recipes/postgres.ts`).text();
     const exportLines = src
@@ -792,9 +604,8 @@ describe("deriveInfrastructure", () => {
   test("compose YAML spaces services and adds role comments", () => {
     const result = deriveInfrastructure({
       images: {
-        ai: "ghcr.io/ggml-org/llama.cpp:server",
-        "channel.email": "axllent/mailpit:v1.30.7",
-        pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.53",
+        "channel.email": "axllent/mailpit:v1.31.1",
+        pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.57",
         "store.sql": "postgres:16",
       },
       credentials: { "store.sql": fixedCreds["store.sql"] },
@@ -803,15 +614,14 @@ describe("deriveInfrastructure", () => {
     });
     const yml = result.files.find((f) => f.path === DOCKER_COMPOSE)!.content;
     expect(yml).toContain("# Generated by `oke docker`");
-    expect(yml).toContain("# ai — local inference");
     expect(yml).toContain("# channel.email — Mailpit");
     expect(yml).toContain("# pgdog — connection pooler");
     expect(yml).toContain("# store.sql — Postgres");
     // Blank line between adjacent service blocks (comment → key → … → blank → comment).
-    expect(yml).toMatch(/# ai —[^\n]+\n  ai:\n[\s\S]+\n\n  # channel\.email —/);
+    expect(yml).toMatch(/# channel\.email —[^\n]+\n  channel-email:\n[\s\S]+\n\n  # pgdog —/);
     expect(yml).toMatch(/\nnetworks:\n[\s\S]+\n\nservices:\n/);
     expect(serviceNamesFromComposeYaml(yml)).toEqual(
-      new Set(["ai", "channel-email", "pgdog", "store-sql"]),
+      new Set(["channel-email", "pgdog", "store-sql"]),
     );
   });
 
@@ -916,7 +726,7 @@ describe("deriveInfrastructure", () => {
     const result = deriveInfrastructure({
       images: {
         "store.sql": "postgres:18-alpine",
-        pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.53",
+        pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.57",
       },
       credentials: { "store.sql": fixedCreds["store.sql"] },
       prod: true,
@@ -931,7 +741,7 @@ describe("deriveInfrastructure", () => {
     expect(result.stackEnv.OKE_STORE_SQL_URL).toContain(":5432/");
 
     const pgdogYml = result.files.find((f) => f.path === DOCKER_COMPOSE)!.content;
-    expect(pgdogYml).toContain("ghcr.io/pgdogdev/pgdog:v0.1.53");
+    expect(pgdogYml).toContain("ghcr.io/pgdogdev/pgdog:v0.1.57");
     expect(pgdogYml).toContain("store-sql");
     expect(pgdogYml).toContain("service_healthy");
     expect(pgdogYml).not.toContain(fixedCreds["store.sql"].password);
@@ -1015,68 +825,13 @@ describe("deriveInfrastructure", () => {
     expect(result.stackEnv.DATABASE_URL).toBeUndefined();
   });
 
-  test("ai ollama emits OKE_AI_URL, loopback publish, and never binds 0.0.0.0 on the host", () => {
-    const result = deriveInfrastructure({
-      images: { ai: OLLAMA_IMAGE },
-      app: "skyport",
-    });
-    const yml = result.files.find((f) => f.path === DOCKER_COMPOSE)!.content;
-    expect(yml).toContain(OLLAMA_IMAGE);
-    expect(yml).toContain("OKE_AI_MODEL");
-    expect(yml).toContain("qwen3.5:9b");
-    expect(yml).toContain("127.0.0.1:11434:11434");
-    expect(yml).not.toMatch(/ports:\s*\n\s*-\s*"?11434:11434"?/);
-    expect(result.stackEnv.OKE_AI_URL).toBe("http://127.0.0.1:11434");
-    const envText = formatStackEnv(result.stackEnv);
-    expect(envText).toContain("# ── ai — local inference");
-    expect(envText.match(/^OKE_AI_URL=/gm)?.length).toBe(1);
-  });
-
-  test("ai llama-cpp (default) emits /v1 URL and loopback-only publish", () => {
-    const result = deriveInfrastructure({
-      images: { ai: LLAMA_CPP_IMAGE },
-      app: "skyport",
-      controls: { OKE_AI_MODEL: "gemma4:e4b-q4_K_M" },
-    });
-    const yml = result.files.find((f) => f.path === DOCKER_COMPOSE)!.content;
-    expect(yml).toContain(LLAMA_CPP_IMAGE);
-    expect(yml).toContain("127.0.0.1:8080:8080");
-    expect(yml).toContain("llama-entrypoint.py");
-    expect(yml).toContain("../.oke/llama-entrypoint.py");
-    expect(yml).toContain("/oke/llama-entrypoint.py");
-    expect(yml).not.toMatch(/ports:\s*\n\s*-\s*"?8080:8080"?/);
-    expect(result.stackEnv.OKE_AI_URL).toBe("http://127.0.0.1:8080/v1");
-    expect(result.stackEnv.OKE_AI_MODEL).toBe("gemma4:e4b-q4_K_M");
-    const entry = result.files.find((f) => f.path === "../.oke/llama-entrypoint.py")!.content;
-    expect(entry).toContain("Generated by oke");
-    expect(entry).toContain("llama download");
-    expect(entry).toContain("org.cncf.model.filepath");
-    expect(entry).toContain("CNCF / Hub registry pull");
-    expect(entry).toContain("llama-server");
-    expect(entry).toContain("--alias");
-    expect(yml).not.toContain("--models-preset");
-  });
-
-  test("ai vllm and sglang emit loopback publish + GPU deploy", () => {
-    for (const [image, port, path] of [
-      [VLLM_IMAGE, 8000, DOCKER_COMPOSE],
-      [SGLANG_IMAGE, 30000, DOCKER_COMPOSE],
-    ] as const) {
-      const result = deriveInfrastructure({ images: { ai: image }, app: "skyport" });
-      const yml = result.files.find((f) => f.path === path)!.content;
-      expect(yml).toContain(`127.0.0.1:${port}:${port}`);
-      expect(yml).toContain("nvidia");
-      expect(result.stackEnv.OKE_AI_URL).toBe(`http://127.0.0.1:${port}/v1`);
-    }
-  });
-
   test("emits protocol-specific env keys plus optional control notes", () => {
     const result = deriveInfrastructure({
       images: {
         "store.sql": "postgres:18-alpine",
         "store.kv": "redis:8-alpine",
-        "store.files": "rustfs/rustfs:1.0.0-rc.2",
-        "channel.email": "axllent/mailpit:v1.30.7",
+        "store.files": "rustfs/rustfs:1.0.0-rc.5",
+        "channel.email": "axllent/mailpit:v1.31.1",
       },
       credentials: {
         ...fixedCreds,
@@ -1119,8 +874,8 @@ describe("deriveInfrastructure", () => {
     const n = Number.parseInt(id.slice(0, 4), 16) % 1000;
     const result = deriveInfrastructure({
       images: {
-        "channel.email": "axllent/mailpit:v1.30.7",
-        "store.files": "rustfs/rustfs:1.0.0-rc.2",
+        "channel.email": "axllent/mailpit:v1.31.1",
+        "store.files": "rustfs/rustfs:1.0.0-rc.5",
       },
       instanceId: id,
       credentials: {
@@ -1158,8 +913,8 @@ describe("deriveInfrastructure", () => {
     const n = Number.parseInt(id.slice(0, 4), 16) % 1000;
     const rows = resolveStack({
       images: {
-        "channel.email": "axllent/mailpit:v1.30.7",
-        "store.files": "rustfs/rustfs:1.0.0-rc.2",
+        "channel.email": "axllent/mailpit:v1.31.1",
+        "store.files": "rustfs/rustfs:1.0.0-rc.5",
       },
       instanceId: id,
       credentials: {

package/src/docker/images-config.test.ts

@@ -66,9 +66,9 @@ describe("ImagesConfig nesting — recipe coverage", () => {
       },
       // store.files / store.index
       {
-        images: { store: { files: "rustfs/rustfs:1.0.0-rc.2" } },
+        images: { store: { files: "rustfs/rustfs:1.0.0-rc.5" } },
         role: "store.files",
-        image: "rustfs/rustfs:1.0.0-rc.2",
+        image: "rustfs/rustfs:1.0.0-rc.5",
       },
       {
         images: { store: { index: "getmeili/meilisearch:v1.53" } },
@@ -77,27 +77,15 @@ describe("ImagesConfig nesting — recipe coverage", () => {
       },
       // channel.email
       {
-        images: { channel: { email: "axllent/mailpit:v1.30.7" } },
+        images: { channel: { email: "axllent/mailpit:v1.31.1" } },
         role: "channel.email",
-        image: "axllent/mailpit:v1.30.7",
+        image: "axllent/mailpit:v1.31.1",
       },
-      // flat roles — no driver counterpart in DriversConfig
+      // ai role: no compose recipes (BYO OKE_AI_URL) — not covered here
       {
-        images: { ai: "ghcr.io/ggml-org/llama.cpp:server-b10450" },
-        role: "ai",
-        image: "ghcr.io/ggml-org/llama.cpp:server-b10450",
-      },
-      { images: { ai: "vllm/vllm-openai:v0.27.1" }, role: "ai", image: "vllm/vllm-openai:v0.27.1" },
-      {
-        images: { ai: "lmsysorg/sglang:v0.5.17-runtime" },
-        role: "ai",
-        image: "lmsysorg/sglang:v0.5.17-runtime",
-      },
-      { images: { ai: "ollama/ollama:0.32.13" }, role: "ai", image: "ollama/ollama:0.32.13" },
-      {
-        images: { pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.53" },
+        images: { pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.57" },
         role: "pgdog",
-        image: "ghcr.io/pgdogdev/pgdog:v0.1.53",
+        image: "ghcr.io/pgdogdev/pgdog:v0.1.57",
       },
       { images: { proxy: "caddy:2-alpine" }, role: "proxy", image: "caddy:2-alpine" },
       { images: { proxy: "traefik:v3.1" }, role: "proxy", image: "traefik:v3.1" },
@@ -120,22 +108,22 @@ describe("ImagesConfig nesting — compose output parity", () => {
   test("nested config derives byte-identical output to its flat-shape equivalent", () => {
     const flatImages: Readonly<Record<string, string>> = {
       "store.sql": "postgres:18-alpine",
-      pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.53",
+      pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.57",
       "store.kv": "redis:8-alpine",
-      "store.files": "rustfs/rustfs:1.0.0-rc.2",
+      "store.files": "rustfs/rustfs:1.0.0-rc.5",
       "store.index": "getmeili/meilisearch:v1.53",
-      "channel.email": "axllent/mailpit:v1.30.7",
+      "channel.email": "axllent/mailpit:v1.31.1",
     };
 
     const nestedImages: ImagesConfig = {
       store: {
         sql: "postgres:18-alpine",
         kv: "redis:8-alpine",
-        files: "rustfs/rustfs:1.0.0-rc.2",
+        files: "rustfs/rustfs:1.0.0-rc.5",
         index: "getmeili/meilisearch:v1.53",
       },
-      channel: { email: "axllent/mailpit:v1.30.7" },
-      pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.53",
+      channel: { email: "axllent/mailpit:v1.31.1" },
+      pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.57",
     };
 
     // Same nested→flat set, written in a different field order — proves the

package/src/docker/index.ts

@@ -61,22 +61,12 @@ export {
   type ComposeYamlOptions,
 } from "./helpers.ts";
 export { generateCredentials } from "./credentials.ts";
-export {
-  ensureOllamaModel,
-  normalizeOllamaPullUrl,
-  ollamaTagsInclude,
-  parseOllamaTagsNames,
-  OllamaPullError,
-  type EnsureOllamaModelOptions,
-  type OllamaFetch,
-} from "./ollama-pull.ts";
 export {
   aiModelIdsMatch,
   formatAiModelStatusMessage,
   normalizeAiProbeUrl,
   probeAiModelStatus,
   startAiModelWatch,
-  statusFromOllamaTags,
   statusFromOpenAiModels,
   type AiModelFetch,
   type AiModelPhase,
@@ -102,19 +92,9 @@ export {
   caddy,
   cockroach,
   dragonfly,
-  llamaCpp,
-  buildLlamaCppEntrypoint,
-  LLAMA_CPP_ENTRYPOINT_FILE,
-  LLAMA_CPP_ENTRYPOINT_HOST_PATH,
-  LLAMA_CPP_ENTRYPOINT_MOUNT,
-  LLAMA_CPP_IMAGE,
-  LLAMA_CPP_MIN_SAFE_BUILD,
   mailpit,
   meilisearch,
   nginx,
-  ollama,
-  OLLAMA_IMAGE,
-  OLLAMA_MIN_SAFE_VERSION,
   pgdog,
   postgres,
   postgresAdvisor,
@@ -126,13 +106,10 @@ export {
   recipeFor,
   redis,
   rustfs,
-  sglang,
-  SGLANG_IMAGE,
+  supabase,
   timescale,
   traefik,
   valkey,
-  vllm,
-  VLLM_IMAGE,
   yugabyte,
 } from "./recipes/index.ts";
 export { CADDY_APP_SERVICE, buildCaddyfile } from "./recipes/caddy.ts";

package/src/docker/recipes/index.ts

@@ -6,22 +6,18 @@ import type { ImageRecipe } from "../types.ts";
 import { caddy } from "./caddy.ts";
 import { cockroach } from "./cockroach.ts";
 import { dragonfly } from "./dragonfly.ts";
-import { llamaCpp } from "./llama-cpp.ts";
 import { mailpit } from "./mailpit.ts";
 import { meilisearch } from "./meilisearch.ts";
 import { nginx } from "./nginx.ts";
-import { ollama } from "./ollama.ts";
 import { pgdog } from "./pgdog.ts";
 import { postgresAdvisor } from "./postgres-advisor.ts";
 import { postgres } from "./postgres.ts";
 import { redis } from "./redis.ts";
 import { rustfs } from "./rustfs.ts";
-import { sglang } from "./sglang.ts";
 import { supabase } from "./supabase.ts";
 import { timescale } from "./timescale.ts";
 import { traefik } from "./traefik.ts";
 import { valkey } from "./valkey.ts";
-import { vllm } from "./vllm.ts";
 import { yugabyte } from "./yugabyte.ts";
 
 /** Default recipe catalogue — more specific image matches before protocol peers. */
@@ -39,10 +35,6 @@ export const builtinRecipes: readonly ImageRecipe[] = [
   mailpit,
   rustfs,
   meilisearch,
-  llamaCpp,
-  vllm,
-  sglang,
-  ollama,
   caddy,
   nginx,
   traefik,
@@ -52,36 +44,21 @@ export {
   caddy,
   cockroach,
   dragonfly,
-  llamaCpp,
   mailpit,
   meilisearch,
   nginx,
-  ollama,
   pgdog,
   postgres,
   postgresAdvisor,
   redis,
   rustfs,
-  sglang,
   supabase,
   timescale,
   traefik,
   valkey,
-  vllm,
   yugabyte,
 };
 
-export {
-  buildLlamaCppEntrypoint,
-  LLAMA_CPP_ENTRYPOINT_FILE,
-  LLAMA_CPP_ENTRYPOINT_HOST_PATH,
-  LLAMA_CPP_ENTRYPOINT_MOUNT,
-  LLAMA_CPP_IMAGE,
-  LLAMA_CPP_MIN_SAFE_BUILD,
-} from "./llama-cpp.ts";
-export { OLLAMA_IMAGE, OLLAMA_MIN_SAFE_VERSION } from "./ollama.ts";
-export { SGLANG_IMAGE } from "./sglang.ts";
-export { VLLM_IMAGE } from "./vllm.ts";
 export {
   emitPostgresAdvisorDockerfile,
   HYPOPG_GIT_TAG,

package/src/docker/recipes/pgdog.ts

@@ -80,11 +80,13 @@ export const pgdog: ImageRecipe = {
       [PGDOG_BACKEND_SERVICE]: { condition: "service_healthy" },
     },
     healthcheck: {
+      // Tight interval — pooler is ready seconds after store-sql healthy;
+      // 5s polls made `oke dev` look stuck on pgdog for a long time.
       test: ["CMD-SHELL", "pg_isready -h 127.0.0.1 -p 6432 || exit 1"],
-      interval: "5s",
-      timeout: "3s",
-      retries: 12,
-      start_period: "5s",
+      interval: "2s",
+      timeout: "2s",
+      retries: 20,
+      start_period: "2s",
     },
   }),
   url: (_s, c) =>

package/src/docker/stack-id.test.ts

@@ -142,8 +142,8 @@ describe("deriveInfrastructure instanceId", () => {
     const n = instancePortOffset(id);
     const result = deriveInfrastructure({
       images: {
-        "channel.email": "axllent/mailpit:v1.30.7",
-        "store.files": "rustfs/rustfs:1.0.0-rc.2",
+        "channel.email": "axllent/mailpit:v1.31.1",
+        "store.files": "rustfs/rustfs:1.0.0-rc.5",
       },
       app: `dev-${id}`,
       instanceId: id,

package/src/docker/stack-id.ts

@@ -127,7 +127,6 @@ export const STACK_CONTROL_KEYS = [
   "MP_SMTP_AUTH_ACCEPT_ANY",
   "MP_SMTP_AUTH_ALLOW_INSECURE",
   "OKE_AI_MODEL",
-  "OKE_AI_CTX_SIZE",
   "OKE_PROXY_HOST",
   "OKE_PROXY_ACME_EMAIL",
 ] as const;

package/src/docker/types.ts

@@ -84,9 +84,9 @@ export interface RecipeApplyResult {
    * omit this for inference servers (raw API must not bind `0.0.0.0`).
    */
   readonly publishBind?: RecipePublishBind;
-  /** Compose `ipc` (e.g. vLLM `host` for shared-memory workers). */
+  /** Compose `ipc` (e.g. `host` for shared-memory workers). */
   readonly ipc?: string;
-  /** Compose `deploy` (e.g. GPU device reservations for vLLM / SGLang). */
+  /** Compose `deploy` (e.g. GPU device reservations). */
   readonly deploy?: Readonly<Record<string, unknown>>;
   /**
    * Compose `depends_on` (e.g. pooler waits for Postgres).

package/src/drivers/ai-anthropic.ts

@@ -12,6 +12,7 @@ import type {
   AiModelClient,
   AiOpenOptions,
 } from "./ai-types.ts";
+import { hostFromUrl } from "./external.ts";
 
 const DEFAULT_BASE = "https://api.anthropic.com";
 const ANTHROPIC_VERSION = "2023-06-01";
@@ -33,6 +34,14 @@ export async function openAnthropic(options: AiOpenOptions = {}): Promise<AiMode
   if (typeof preconnect === "function") {
     preconnect(baseUrl);
   }
+  const host = hostFromUrl(baseUrl);
+  const external = host
+    ? {
+        host,
+        kind: options.external?.kind ?? ("third-party" as const),
+        provider: options.external?.provider ?? "anthropic",
+      }
+    : undefined;
 
   return {
     driverId: "anthropic",
@@ -71,6 +80,7 @@ export async function openAnthropic(options: AiOpenOptions = {}): Promise<AiMode
           inputTokens: raw.usage?.input_tokens,
           outputTokens: raw.usage?.output_tokens,
         },
+        ...(external !== undefined ? { external } : {}),
       };
     },
   };