feat: support OpenCode 2 alongside OpenCode 1

README.md

@@ -4,7 +4,21 @@ Plugin for [OpenCode](https://opencode.ai) that adds [CoreInfra AI Hub](https://
 
 ## Installation
 
-**Important:** requires OpenCode version 1.4.0 or newer
+Works with OpenCode 1.x (1.4.0 or newer) and OpenCode 2.x (2.0.28 or newer).
+
+### OpenCode 2
+
+Install the plugin
+```bash
+opencode plugin add '@coreinfra/opencode-plugin@latest'
+```
+
+Log in by entering the API token
+```bash
+opencode auth login coreinfra
+```
+
+### OpenCode 1
 
 Install the plugin
 ```bash
@@ -55,6 +69,7 @@ https://hub.coreinfra.ai/pricing
 
 | Variable | Default | Description |
 |---|---|---|
+| `COREINFRA_API_KEY` | — | On OpenCode 2, an API token to use instead of logging in (a saved login takes precedence). On OpenCode 1 it only authenticates loading the model list; logging in is still required. |
 | `COREINFRA_HUB_BASE_URL` | `https://hub.coreinfra.ai` | Base URL of the CoreInfra Hub instance. Overrides the default endpoint for model listings and API proxying. |
 
 ## Development

README.ru.md

@@ -4,7 +4,21 @@
 
 ## Установка
 
-**Важно:** требуется версия OpenCode не старше 1.4.0
+Работает с OpenCode 1.x (1.4.0 или новее) и OpenCode 2.x (2.0.28 или новее).
+
+### OpenCode 2
+
+Установка плагина
+```bash
+opencode plugin add '@coreinfra/opencode-plugin@latest'
+```
+
+Авторизация с вводом API-токена
+```bash
+opencode auth login coreinfra
+```
+
+### OpenCode 1
 
 Установка плагина
 ```bash
@@ -55,6 +69,7 @@ https://hub.coreinfra.ai/pricing
 
 | Переменная | По умолчанию | Описание |
 |---|---|---|
+| `COREINFRA_API_KEY` | — | В OpenCode 2 — API-токен, используемый вместо авторизации (сохранённая авторизация имеет приоритет). В OpenCode 1 используется только для загрузки списка моделей; авторизация всё равно обязательна. |
 | `COREINFRA_HUB_BASE_URL` | `https://hub.coreinfra.ai` | Базовый URL экземпляра CoreInfra Hub. Переопределяет стандартный эндпоинт для получения списка моделей и проксирования API. |
 
 ## Разработка

docs/plans/opencode-v2-support.md

@@ -0,0 +1,66 @@
+# OpenCode 2 support (dual 1.x / 2.x plugin)
+
+Status: implemented and verified (packed package on OpenCode 1.4.0, 1.19.0, 2.0.28); reviewed by Codex. Target release: **1.3.0** (no breaking change for V1).
+
+## Feature
+
+One npm package that works on **OpenCode 1.x (≥ 1.4.0)** and **OpenCode 2.x**:
+
+- On V1, the plugin behaves exactly as it does today.
+- On V2, it registers the `coreinfra` login (API key or `COREINFRA_API_KEY`) and the `coreinfra` provider with every model the Hub lists. Each model gets its correct protocol and endpoint and keeps its thinking/effort variants.
+- After login, logout or an account switch, the model list refreshes without restarting OpenCode.
+
+## Why the V1 plugin can't just run on V2
+
+| Area | V1 (today) | V2 |
+|---|---|---|
+| Entry | `default { id, server() → hooks }` | `default { id, setup(ctx) }`. V1 plugins don't load. |
+| Models | `config` hook edits `config.provider.coreinfra.models` | `ctx.provider.transform(editor => editor.add(...))`. Must be sync and replayable. |
+| Login | `auth` hook + `loader → { apiKey }` | `ctx.integration.transform` registers `key` and `env` methods. Core adds `apiKey` itself. |
+| Key storage | `auth.json` | Database. `auth.json` is imported once, so new logins never reach it. |
+| Model shape | `provider{npm,api}`, `tool_call`, `modalities`, `cost{cache_read}`, `interleaved` | `package`, `settings.baseURL`, `capabilities`, `cost[{cache{read,write}}]`, `compatibility`, `variants[]`, `time`, `status`, `enabled` |
+| Logging | `client.app.log` | none; use `console` |
+| CLI | `opencode plugin -g`, `opencode providers login` | `opencode plugin add`, `opencode auth login coreinfra` |
+
+Compatibility is checked in the source: the V2 loader ignores the extra `server` key (`core/src/plugin/module.ts:78`). The V1 1.4.0 loader ignores the extra `setup` key (`readV1Plugin`).
+
+## Plan
+
+1. **Entry:** `export default { id, server: v1, setup: v2 }`. Import V2 types only (`import type`), because `@opencode/plugin` doesn't exist at runtime under V1.
+2. **`src/models.ts` (shared):** Hub fetch takes an explicit `apiKey` and has no `auth.json` fallback. Also holds `PROVIDERS` (protocol → base URL, headers), lookups and helpers.
+3. **`src/v1.ts`:** today's `config`/`auth` hooks moved here unchanged, including the `auth.json`/env key lookup.
+4. **`src/v2.ts` `setup(ctx)`:**
+   - Integration `coreinfra` ("CoreInfra AI Hub"), with methods `{type:"key"}` and `{type:"env", names:["COREINFRA_API_KEY"]}`. Always registered, even if discovery fails.
+   - Key comes from `integration.connection.active("coreinfra")` → `resolve()` only. V2 ranks a saved key above env.
+   - `refresh()` fetches the Hub list and stores a snapshot bound to the connection. Refreshes are serialized, results for a stale connection are dropped, and the last good data is kept only for the same connection.
+   - `provider.transform` (sync) does `editor.add({ info: { id:"coreinfra", integrationID:"coreinfra", activation:"auto", package:"" }, models, sourceConnection })`.
+   - `event.subscribe` reacts to `credential.switched` for `coreinfra` by calling `refresh()` and then `ctx.provider.reload()`. Cleanup aborts it.
+5. **V2 model mapping:** the Hub list decides which models exist. For each Hub model, look up the built-in upstream record (`openai`/`anthropic`/`deepseek`/…) inside each transform replay, never cached in `setup`.
+   - Package: `@opencode/ai/providers/{openai|anthropic|openai-compatible}`, explicit native packages, not `aisdk:`.
+   - Copy only allowlisted fields from upstream: capabilities, limit, cost, family, time, status. Replace ids, providerID, package, `settings.baseURL`, headers and `enabled`.
+   - Variants: deep-clone only the reviewed thinking/effort fields, and only when `upstream.package ?? record.provider.package` equals our package. Otherwise use `variants: []`. This is an accepted limitation for DeepSeek, ZAI and Moonshot.
+   - `compatibility.reasoningField` comes from the upstream model on chat routes only. No synthetic `reasoning_content` for Anthropic.
+   - If the upstream record is missing, fall back to the Hub name plus defaults and log a warning. V2 no longer fetches models.dev itself.
+6. **Packaging:** devDependencies `@opencode-ai/plugin`, `@opencode-ai/sdk`, `@opencode/plugin`. All host peers marked optional.
+7. **Docs:** README install and login steps for both majors; note that a saved key takes priority over env on V2.
+
+## Tests
+
+- Unit: V1 behaviour unchanged. V2 mapper covers inherited package, matching and mismatched package, missing record and variant field isolation.
+- V2 lifecycle with a fake `ctx`:
+  - discovery fails at first, then login succeeds
+  - env only, and env + saved key together
+  - switch account and logout
+  - a stale refresh finishes late
+  - transform replay after a catalog reload
+  - cleanup
+  - `auth.json` is never read
+- Manual release gate: install the **packed** package (no devDependencies) on OpenCode 1.4.0, 1.19.0 and 2.0.28. Log in, list models, then do a reasoning + tool-call round trip on the openai, anthropic and deepseek routes.
+
+## Out of scope / known limits
+
+- Thinking variants for models whose upstream uses a different package (DeepSeek/ZAI/Moonshot).
+- A key changed without a switch event doesn't refresh until restart.
+- Hub prices: OpenCode still supports USD only.
+- Hub models that models.dev marks deprecated are missing from OpenCode 2's built-in catalog, so on V2 they get default metadata (and a warning).
+- 2.x support is verified on 2.0.28. Older 2.x releases are unverified.

package.json

@@ -34,15 +34,28 @@
   },
   "peerDependencies": {
     "@opencode-ai/plugin": ">=1.4.0",
-    "@opencode-ai/sdk": ">=1.4.0"
+    "@opencode-ai/sdk": ">=1.4.0",
+    "@opencode/plugin": ">=2.0.28"
+  },
+  "peerDependenciesMeta": {
+    "@opencode-ai/plugin": {
+      "optional": true
+    },
+    "@opencode-ai/sdk": {
+      "optional": true
+    },
+    "@opencode/plugin": {
+      "optional": true
+    }
   },
   "devDependencies": {
+    "@biomejs/biome": "^2.4.11",
     "@opencode-ai/plugin": "1.4.0",
     "@opencode-ai/sdk": "1.4.0",
+    "@opencode/plugin": "2.0.28",
     "@types/node": "^24.9.0",
-    "@biomejs/biome": "^2.4.11",
-    "vitest": "^4.1.4",
-    "typescript": "^5.8.0"
+    "typescript": "^5.8.0",
+    "vitest": "^4.1.4"
   },
   "dependencies": {
     "xdg-basedir": "^5.1.0"

src/index.ts

@@ -1,107 +1,12 @@
-import type { Config, Hooks, PluginInput } from "@opencode-ai/plugin";
-
-import {
-  buildConfigModels,
-  fetchModelsDevData,
-  fetchHubModels,
-} from "./models.ts";
-
-const PROVIDER_NAME = "CoreInfra AI Hub";
-
-function ensureCoreInfraProvider(config: Config) {
-  config.provider ??= {};
-  config.provider.coreinfra = {
-    ...(config.provider.coreinfra ?? {}),
-    name: PROVIDER_NAME,
-  };
-}
-
-async function log(
-  input: PluginInput,
-  message: string,
-  extra?: Record<string, unknown>,
-  level: "debug" | "warn" | "error" = "debug",
-) {
-  await input.client.app
-    .log({
-      body: {
-        service: "plugin.coreinfra",
-        level,
-        message,
-        extra,
-      },
-    })
-    .catch(() => {});
-}
-
-async function plugin(input: PluginInput): Promise<Hooks> {
-  const t0 = performance.now();
-  await log(input, "plugin load started");
-  await log(input, "plugin hooks registered", {
-    duration: `${Math.round(performance.now() - t0)}ms`,
-  });
-
-  return {
-    config: async (config) => {
-      const t = performance.now();
-      ensureCoreInfraProvider(config);
-      try {
-        const [modelsDevData, hubData] = await Promise.all([
-          fetchModelsDevData(),
-          fetchHubModels(),
-        ]);
-        const { models: configModels, warnings } = buildConfigModels(
-          modelsDevData,
-          hubData,
-        );
-        for (const w of warnings) {
-          await log(input, w);
-        }
-        if (!config.provider) config.provider = {};
-        if (!config.provider.coreinfra) config.provider.coreinfra = {};
-        config.provider.coreinfra.models =
-          configModels as typeof config.provider.coreinfra.models;
-      } catch (err) {
-        await log(
-          input,
-          "fetchModels failed",
-          {
-            error: err instanceof Error ? err.message : String(err),
-          },
-          "error",
-        );
-      }
-      await log(input, "config hook completed", {
-        duration: `${Math.round(performance.now() - t)}ms`,
-      });
-    },
-    auth: {
-      provider: "coreinfra",
-      methods: [
-        {
-          type: "api",
-          label: "CoreInfra API Key",
-        },
-      ],
-      loader: async (getAuth) => {
-        const t = performance.now();
-        const auth = await getAuth();
-        if (!auth || auth.type !== "api") {
-          await log(input, "auth loader completed (no auth)", {
-            duration: `${Math.round(performance.now() - t)}ms`,
-          });
-          return {};
-        }
-        await log(input, "auth loader completed", {
-          duration: `${Math.round(performance.now() - t)}ms`,
-        });
-        return { apiKey: auth.key };
-      },
-    },
-  };
-}
+import { server } from "./v1.ts";
+import { setup } from "./v2.ts";
 
+// One default export serves both OpenCode majors: OpenCode 1 calls server()
+// and ignores setup, OpenCode 2 calls setup() and ignores server. Everything
+// imported from @opencode/plugin is type-only because OpenCode 1 does not
+// provide that package at runtime.
 export default {
   id: "coreinfra-opencode-plugin",
-  server: plugin,
+  server,
+  setup,
 };