@goodandready/dsh-opencode-provider 0.5.6 → 0.5.8

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.5.8
+
+- **Free-tier error cooldown**: a `FreeTierError` (free model used with a free/anonymous key) is now a short `RATE_LIMIT`, not `INVALID_CREDENTIAL`. The account rotates to the next key and is cooled for 60s instead of 24h; the key itself is not invalid. Added an adapter regression test.
+- 90 tests.
+
+## 0.5.7
+
+- **Provider-id conflict fix**: the plugin now registers `opencode-direct` and `opencode-go-direct` instead of `opencode`/`opencode-go`. The built-in `llm-pi-ai` catalog owns those ids; reusing them triggered `DUPLICATE_DIRECTORY`, dropped the built-in catalog, hid other providers and disabled the add button. Existing sessions recorded under the old ids stay on the built-in routes; select **OpenCode (plugin)** or **OpenCode Go (plugin)** for this plugin's features.
+- 89 tests.
+
 ## 0.5.6
 
 - **Persistent sticky routing**: the last successful account/model per conversation survives adapter and Desktop restarts. `~/.dsh/storages/dsh-opencode/sticky.json` stores hashed session ids and key fingerprints only (no keys or prompt text), keeps 500 entries for 14 days.

package/README.md

@@ -30,11 +30,18 @@ It registers two native LLM routes:
 
 | Route | Product | Base |
 |---|---|---|
-| `opencode` | OpenCode Console / Zen (pay-as-you-go) | `https://opencode.ai/inference` |
-| `opencode-go` | OpenCode Go / Go Plus subscription | `https://opencode.ai/inference/go` |
+| `opencode-direct` | OpenCode Console / Zen (pay-as-you-go) | `https://opencode.ai/inference` |
+| `opencode-go-direct` | OpenCode Go / Go Plus subscription | `https://opencode.ai/inference/go` |
 
 Requests resolve the key per call, so a changed credential reaches the next request without a restart.
 
+The ids use the `-direct` suffix because the built-in `llm-pi-ai` catalog already owns
+`opencode` and `opencode-go`. Reusing those ids makes the core registry reject the
+duplicate (`DUPLICATE_DIRECTORY`) and drop the built-in catalog, which hides the other
+providers and disables the add button. Existing sessions recorded under the old ids stay on
+the built-in routes; select **OpenCode (plugin)** or **OpenCode Go (plugin)** for this
+plugin's accounts, quotas, fallback and telemetry.
+
 ## Architecture
 
 ```mermaid
@@ -58,14 +65,14 @@ graph LR
     end
 
     subgraph OpenCode["OpenCode Gateway"]
-        Console["opencode (Console / Zen)"]
-        Go["opencode-go (Go / Go Plus)"]
+        Console["opencode-direct (Console / Zen)"]
+        Go["opencode-go-direct (Go / Go Plus)"]
     end
 
     Agent --> Router
     Creds -.-> Pool
-    Router -->|opencode| Pool
-    Router -->|opencode-go| Pool
+    Router -->|opencode-direct| Pool
+    Router -->|opencode-go-direct| Pool
     Pool --> Heatmap
     Pool --> Transports
     T1 & T2 & T3 & T4 --> Console & Go
@@ -123,15 +130,15 @@ npm pack
 Install the **packed tarball** into a profile:
 
 ```bash
-dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.6.tgz
+dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.8.tgz
 # DSH Desktop:
-dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.6.tgz
+dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.8.tgz
 
 # Or install the published package:
-dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.6
+dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.8
 ```
 
-Restart dsh (or DSH Desktop), then pick `OpenCode` or `OpenCode Go` in the model picker.
+Restart dsh (or DSH Desktop), then pick **OpenCode (plugin)** or **OpenCode Go (plugin)** in the model picker.
 
 > **Use the tarball, not the directory.** On dsh 0.2.1-rc.2 the Desktop CLI aliases a local
 > directory passed to `dsh plugin add` as `@deepseek-ai/dsh-desktop-runtime` and overwrites
@@ -205,7 +212,7 @@ Cooldowns survive restarts: deadlines and reasons are stored in `~/.dsh/storages
 
 ### Model → account rules
 
-Pin a model to a preferred account with a glob. The first matching rule wins; `*` and `?` are supported and matching is case-insensitive. The named account is tried first, and the other accounts remain fallbacks if it is cooling, missing, or rejected — a rule is a preference, not a hard filter. An unknown account label is ignored, and rules apply to both `opencode` and `opencode-go`.
+Pin a model to a preferred account with a glob. The first matching rule wins; `*` and `?` are supported and matching is case-insensitive. The named account is tried first, and the other accounts remain fallbacks if it is cooling, missing, or rejected — a rule is a preference, not a hard filter. An unknown account label is ignored, and rules apply to both `opencode-direct` and `opencode-go-direct`.
 
 Configure them in **Settings → OpenCode → Model → account rules**, or in YAML:
 
@@ -298,7 +305,7 @@ GitHub Actions runs `npm run check` and `npm pack` on push/PR (`.github/workflow
 - Automatic update requires the DSH CLI entry in the runtime. When it is not exposed, the update card shows the current/latest status and directs the user to the DSH plugin manager.
 - Subscription request counts are OpenCode's published estimates, not enforced quotas. They can change when OpenCode updates the Go pricing table; the gateway is the final authority.
 - Usage-by-model aggregates the local projection cache and attributes a whole session to its last-used model; a session that switched models is therefore approximate. It never reads prompt text or titles.
-- `opencode` (Console) billing shows no per-model allowance; the Go route is the primary target.
+- `opencode-direct` (Console) billing shows no per-model allowance; the Go route is the primary target.
 - The anonymous free lane (`Bearer public` + CLI impersonation) is not implemented.
 - The UI requires a web profile (the Host needs `ctx.webServer`); the TUI keeps the `/opencode` command and the model routes.
 - Write routes are loopback-only; a web profile exposed to a LAN can read state but cannot save configuration or keys until the host auth token is integrated.

package/README.ru.md

@@ -30,11 +30,18 @@
 
 | Маршрут | Продукт / Тариф | Базовый эндпоинт | Назначение |
 |---|---|---|---|
-| `opencode` | OpenCode Console / Zen | `https://opencode.ai/inference` | Поминутная тарификация (pay-as-you-go) |
-| `opencode-go` | OpenCode Go / Go Plus | `https://opencode.ai/inference/go` | Фиксированная подписка с лимитами 5h / недели / месяца |
+| `opencode-direct` | OpenCode Console / Zen | `https://opencode.ai/inference` | Поминутная тарификация (pay-as-you-go) |
+| `opencode-go-direct` | OpenCode Go / Go Plus | `https://opencode.ai/inference/go` | Фиксированная подписка с лимитами 5h / недели / месяца |
 
 Ключи разрешаются динамически на каждый вызов: смена токена в настройках или в файле окружения вступает в силу мгновенно без перезапуска сервера.
 
+Суффикс `-direct` нужен потому, что встроенный каталог `llm-pi-ai` уже объявляет
+`opencode` и `opencode-go`. Повтор этих id даёт `DUPLICATE_DIRECTORY`, из-за чего
+ядро отбрасывает встроенный каталог, исчезают остальные провайдеры и отключается
+кнопка добавления. Старые сессии с прежними id остаются на встроенных маршрутах;
+для возможностей плагина выбирайте **OpenCode (plugin)** или
+**OpenCode Go (plugin)**.
+
 ## Архитектура
 
 ```mermaid
@@ -58,14 +65,14 @@ graph LR
     end
 
     subgraph OpenCode["Шлюз OpenCode Gateway"]
-        Console["opencode (Console / Zen)"]
-        Go["opencode-go (Go / Go Plus)"]
+        Console["opencode-direct (Console / Zen)"]
+        Go["opencode-go-direct (Go / Go Plus)"]
     end
 
     Agent --> Router
     Creds -.-> Pool
-    Router -->|opencode| Pool
-    Router -->|opencode-go| Pool
+    Router -->|opencode-direct| Pool
+    Router -->|opencode-go-direct| Pool
     Pool --> Heatmap
     Pool --> Transports
     T1 & T2 & T3 & T4 --> Console & Go
@@ -122,15 +129,15 @@ npm pack
 Установка из **упакованного tarball**:
 
 ```bash
-dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.6.tgz
+dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.8.tgz
 # DSH Desktop:
-dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.6.tgz
+dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.8.tgz
 
 # Либо установка опубликованного пакета из npm:
-dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.6
+dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.8
 ```
 
-После установки перезапустите dsh (или DSH Desktop) и выберите **OpenCode** или **OpenCode Go** в списке моделей.
+После установки перезапустите dsh (или DSH Desktop) и выберите **OpenCode (plugin)** или **OpenCode Go (plugin)** в списке моделей.
 
 ## Конфигурация
 

package/README.zh.md

@@ -30,11 +30,16 @@
 
 | 路由 | 产品 / 方案 | 基础接口 | 特性说明 |
 |---|---|---|---|
-| `opencode` | OpenCode Console / Zen | `https://opencode.ai/inference` | 按量计费（pay-as-you-go） |
-| `opencode-go` | OpenCode Go / Go Plus | `https://opencode.ai/inference/go` | 订阅专属，含 5小时/每周/每月配额估算 |
+| `opencode-direct` | OpenCode Console / Zen | `https://opencode.ai/inference` | 按量计费（pay-as-you-go） |
+| `opencode-go-direct` | OpenCode Go / Go Plus | `https://opencode.ai/inference/go` | 订阅专属，含 5小时/每周/每月配额估算 |
 
 密钥在每次调用时动态解析：在设置中或环境文件中更换凭据无需重启服务器即可立即生效。
 
+`-direct` 后缀用于避免与内置 `llm-pi-ai` 已声明的 `opencode` / `opencode-go` 冲突。
+重复 id 会触发 `DUPLICATE_DIRECTORY`，导致核心丢弃内置目录、其他提供商消失并禁用添加按钮。
+旧会话继续使用内置路由；要使用本插件的账户、配额、回退和遥测，请选择
+**OpenCode (plugin)** 或 **OpenCode Go (plugin)**。
+
 ## 架构示意
 
 ```mermaid
@@ -58,14 +63,14 @@ graph LR
     end
 
     subgraph OpenCode["OpenCode 网关"]
-        Console["opencode (Console / Zen)"]
-        Go["opencode-go (Go / Go Plus)"]
+        Console["opencode-direct (Console / Zen)"]
+        Go["opencode-go-direct (Go / Go Plus)"]
     end
 
     Agent --> Router
     Creds -.-> Pool
-    Router -->|opencode| Pool
-    Router -->|opencode-go| Pool
+    Router -->|opencode-direct| Pool
+    Router -->|opencode-go-direct| Pool
     Pool --> Heatmap
     Pool --> Transports
     T1 & T2 & T3 & T4 --> Console & Go
@@ -119,15 +124,15 @@ npm pack
 通过**打包文件 (.tgz)**安装：
 
 ```bash
-dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.6.tgz
+dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.8.tgz
 # DSH 桌面端：
-dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.6.tgz
+dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.8.tgz
 
 # 或从 npm 安装已发布版本：
-dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.6
+dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.8
 ```
 
-安装完成后重启 dsh 或 DSH 桌面端，在模型选择器中选择 **OpenCode** 或 **OpenCode Go** 即可。
+安装完成后重启 dsh 或 DSH 桌面端，在模型选择器中选择 **OpenCode (plugin)** 或 **OpenCode Go (plugin)** 即可。
 
 ## 配置示例
 

package/lib/client.js

@@ -379,6 +379,9 @@ window.__ModuleLoader__.load({
 			}
 		};
 		//#endregion
+		//#region src/provider-ids.ts
+		const GO_PROVIDER = "opencode-go-direct";
+		//#endregion
 		//#region src/client/api.ts
 		async function call(path, init) {
 			const response = await fetch(path, {
@@ -452,7 +455,7 @@ window.__ModuleLoader__.load({
 		function fetchAnalytics(days = 30) {
 			return call(`/dsh-opencode/analytics?days=${encodeURIComponent(String(days))}`);
 		}
-		function testConnection(model, provider = "opencode-go") {
+		function testConnection(model, provider = GO_PROVIDER) {
 			return call("/dsh-opencode/test", {
 				method: "POST",
 				body: JSON.stringify({
@@ -2205,7 +2208,7 @@ window.__ModuleLoader__.load({
 											testConnection(testModel).then(setTestResult).catch((caught) => setTestResult({
 												ok: false,
 												model: testModel,
-												provider: "opencode-go",
+												provider: GO_PROVIDER,
 												latencyMs: 0,
 												error: caught instanceof Error ? caught.message : t("failed")
 											})).finally(() => setTesting(false));

package/lib/index.js

@@ -17,7 +17,7 @@ const DEFAULT_GO_API_BASE = "https://opencode.ai/inference/go";
 const DEFAULT_GO_ZEN_BASE = "https://opencode.ai/zen/go/v1";
 const DEFAULT_USAGE_URL = "https://opencode.ai/zen/go/v1/usage";
 const DEFAULT_AUTH_ENTRY = "opencode-go";
-const DEFAULT_USER_AGENT = "dsh-opencode-provider/0.5.6";
+const DEFAULT_USER_AGENT = "dsh-opencode-provider/0.5.8";
 const DEFAULT_CONTEXT_WINDOW = 262144;
 const DEFAULT_MAX_TOKENS = 32768;
 const DEFAULT_GENERATE_MAX_TOKENS = 32768;
@@ -791,9 +791,24 @@ const GENERATED_MODELS = {
 	}
 };
 //#endregion
+//#region src/provider-ids.ts
+/**
+* Provider ids owned by this plugin. The built-in llm-pi-ai catalog already
+* declares `opencode` and `opencode-go`; the core registry rejects duplicate
+* configurable provider ids and would drop the whole catalog when they clash.
+*/
+const CONSOLE_PROVIDER = "opencode-direct";
+const GO_PROVIDER = "opencode-go-direct";
+const PLUGIN_AND_LEGACY_PROVIDERS = /* @__PURE__ */ new Set([
+	CONSOLE_PROVIDER,
+	GO_PROVIDER,
+	"opencode",
+	"opencode-go"
+]);
+//#endregion
 //#region src/routing.ts
 function isGoProvider(provider) {
-	return provider === "opencode-go";
+	return provider === "opencode-go-direct" || provider === "opencode-go";
 }
 function rootFor(provider, config) {
 	return isGoProvider(provider) ? config.goApiBase : config.apiBase;
@@ -1059,7 +1074,7 @@ async function discoverModelIds(provider, config, apiKey, fetchImpl = fetch) {
 	return Object.keys(GENERATED_MODELS);
 }
 function sortForPicker(ids, config, unfiltered = false, provider) {
-	return ids.filter((id) => unfiltered || modelVisible(id, config) && (provider !== "opencode-go" || modelInGoPlan(id, config))).sort((left, right) => {
+	return ids.filter((id) => unfiltered || modelVisible(id, config) && (!isGoProvider(provider) || modelInGoPlan(id, config))).sort((left, right) => {
 		const a = effectiveModel(left, config);
 		const b = effectiveModel(right, config);
 		if (a.free !== b.free) return a.free ? -1 : 1;
@@ -1072,7 +1087,7 @@ function describeModel(meta, provider) {
 	else if (meta.cost.input > 0 || meta.cost.output > 0) parts.push(`$${meta.cost.input}/$${meta.cost.output} per 1M`);
 	if (meta.input.includes("image")) parts.push("Image");
 	if (meta.reasoning.length > 0) parts.push(`reasoning: ${meta.reasoning.join("/")}`);
-	if (provider === "opencode-go") {
+	if (isGoProvider(provider)) {
 		const limits = limitsFor(meta.id);
 		if (!meta.free) parts.unshift(limits === void 0 ? "Console" : "Go");
 		if (limits !== void 0) parts.push(describeLimitsShort(limits));
@@ -1154,7 +1169,7 @@ function classifyResponseError(status, text, headers) {
 	};
 	const quota = /\bquota\b/.test(detail) || detail.includes("usage limit") || detail.includes("usage_limit") || detail.includes("monthly limit") || detail.includes("weekly limit") || detail.includes("5-hour limit") || detail.includes("limit reached") || detail.includes("insufficient credit") || detail.includes("insufficient balance") || detail.includes("insufficient funds") || detail.includes("credit balance") || detail.includes("out of credit");
 	if (type === "MissingSessionID" || detail.includes("missing x-opencode-session")) return new LlmError(`OpenCode rejected the request: ${message}. The plugin always sends a stable x-opencode-session; a proxy in front of it may be stripping the header.`, "PROVIDER_HTTP_ERROR", options);
-	if (type === "FreeTierError" || detail.includes("free tier can only be used")) return new LlmError(`OpenCode refused the free tier: ${message}. Free models require a Go/paid key; an anonymous free key is only accepted inside the OpenCode client.`, "INVALID_CREDENTIAL", options);
+	if (type === "FreeTierError" || detail.includes("free tier can only be used")) return new LlmError(`OpenCode refused the free tier: ${message}. Free models require a Go/paid key; an anonymous free key is only accepted inside the OpenCode client.`, "RATE_LIMIT", options);
 	if (type === "ModelProtocolUnsupported" || detail.includes("does not support this protocol")) return new LlmError(`OpenCode model does not support the selected protocol: ${message}. Set config.modelTransports[model] to the protocol named in the model catalog.`, "UNSUPPORTED_MODEL", options);
 	if (status === 402 || quota) return new LlmError(`OpenCode quota is exhausted: ${message}`, "QUOTA", options);
 	if (status === 401 || status === 403 || detail.includes("invalid credential") || detail.includes("unauthorized")) return new LlmError(`OpenCode rejected the credential: ${message}. Check the key, the selected auth.json entry, or whether the account has an active subscription.`, "INVALID_CREDENTIAL", options);
@@ -3104,7 +3119,7 @@ var OpenCodeAdapter = class extends LlmAdapter {
 	providerInfo(provider) {
 		return {
 			id: provider,
-			name: isGoProvider(provider) ? "OpenCode Go" : "OpenCode"
+			name: isGoProvider(provider) ? "OpenCode Go (plugin)" : "OpenCode (plugin)"
 		};
 	}
 	providerRetryPolicy(_provider) {
@@ -3276,7 +3291,7 @@ var OpenCodeAdapter = class extends LlmAdapter {
 				const transient = this.isTransient(classified);
 				if (transient && !responseFailure && !fallback) this.markCooldown(entry.key, 0);
 				if (!(index < keys.length - 1 && transient)) {
-					if (!fallback && config.quotaFallbackModel !== "" && options.provider === "opencode-go" && classified.code === "QUOTA") break;
+					if (!fallback && config.quotaFallbackModel !== "" && isGoProvider(options.provider) && classified.code === "QUOTA") break;
 					throw classified;
 				}
 			}
@@ -3298,10 +3313,10 @@ var OpenCodeAdapter = class extends LlmAdapter {
 			ok: false,
 			error: finalError.code
 		});
-		if (!fallback && config.quotaFallbackModel !== "" && options.provider === "opencode-go" && (lastError === void 0 || lastError.code === "QUOTA")) try {
+		if (!fallback && config.quotaFallbackModel !== "" && isGoProvider(options.provider) && (lastError === void 0 || lastError.code === "QUOTA")) try {
 			yield* this.run({
 				...options,
-				provider: "opencode",
+				provider: CONSOLE_PROVIDER,
 				model: config.quotaFallbackModel
 			}, true);
 			return;
@@ -3490,14 +3505,14 @@ var OpenCodeAdapter = class extends LlmAdapter {
 			const seconds = raw === null || raw === void 0 ? NaN : Number(raw);
 			delayMs = Number.isFinite(seconds) && seconds > 0 ? seconds * 1e3 : 6e5;
 			reason = "quota";
-		} else if (status === 401 || status === 403) {
-			delayMs = 864e5;
-			reason = "invalid-credential";
-		} else if (status === 429) {
+		} else if (code === "RATE_LIMIT" || status === 429) {
 			const raw = headers?.get("retry-after");
 			const seconds = raw === null || raw === void 0 ? NaN : Number(raw);
 			delayMs = Number.isFinite(seconds) && seconds > 0 ? seconds * 1e3 : 6e4;
 			reason = "rate-limit";
+		} else if (status === 401 || status === 403) {
+			delayMs = 864e5;
+			reason = "invalid-credential";
 		}
 		this.cooldowns.set(this.keyId(key), {
 			until: Date.now() + delayMs,
@@ -3549,7 +3564,7 @@ function relative(until) {
 }
 async function accountsText(deps) {
 	const lines = [];
-	for (const provider of ["opencode-go", "opencode"]) {
+	for (const provider of [GO_PROVIDER, CONSOLE_PROVIDER]) {
 		let keys;
 		try {
 			keys = await deps.pool.resolveAll(provider);
@@ -3565,7 +3580,7 @@ async function accountsText(deps) {
 		lines.push(`${provider}:`);
 		for (const [index, entry] of keys.entries()) {
 			const health = deps.adapter.accountHealth(entry.key);
-			const usage = provider === "opencode-go" ? await deps.usage(provider, entry.key) : void 0;
+			const usage = provider === "opencode-go-direct" ? await deps.usage(provider, entry.key) : void 0;
 			const tags = [
 				entry.source,
 				entry === active ? "active" : "",
@@ -3585,7 +3600,7 @@ function rulesText(deps) {
 async function modelsText(deps) {
 	const config = deps.config();
 	try {
-		const models = await deps.adapter.listModels("opencode-go", { unfiltered: true });
+		const models = await deps.adapter.listModels(GO_PROVIDER, { unfiltered: true });
 		if (models.length === 0) return "No models.";
 		return models.map((model) => {
 			const meta = effectiveModel(model.id, config);
@@ -3602,7 +3617,7 @@ async function testText(deps, model) {
 	let text = "";
 	try {
 		for await (const chunk of deps.adapter.stream({
-			provider: "opencode-go",
+			provider: GO_PROVIDER,
 			model,
 			messages: [{
 				role: "user",
@@ -3650,7 +3665,7 @@ function applyCommands(ctx, deps) {
 					text: await statusText(deps)
 				};
 				case "usage": {
-					const usage = await deps.usage("opencode-go");
+					const usage = await deps.usage(GO_PROVIDER);
 					if (usage?.report === void 0) return {
 						kind: "error",
 						text: `Quota unavailable: ${usage?.error ?? "no report"}`
@@ -4195,7 +4210,7 @@ function aggregateSessions(sessions, days, now = Date.now()) {
 	for (const session of sessions) {
 		const provider = session.lastUsed?.provider;
 		const model = session.lastUsed?.model;
-		if (provider !== "opencode" && provider !== "opencode-go" || model === void 0 || model === "") continue;
+		if (typeof provider !== "string" || !PLUGIN_AND_LEGACY_PROVIDERS.has(provider) || model === void 0 || model === "") continue;
 		const usage = session.usage;
 		if (usage === void 0) continue;
 		const input = count(usage.uncachedInputTokens);
@@ -4620,14 +4635,14 @@ async function buildState(ctx, deps) {
 			...info.source === void 0 ? {} : { source: info.source }
 		};
 	} catch {}
-	const resolved = await deps.pool.resolveAll("opencode-go").catch(() => []);
+	const resolved = await deps.pool.resolveAll(GO_PROVIDER).catch(() => []);
 	if (!keyInfo.configured) keyInfo = {
 		...keyInfo,
 		configured: resolved.length > 0
 	};
 	const usageByKey = /* @__PURE__ */ new Map();
 	await Promise.all([...new Set(resolved.map((entry) => entry.key))].map(async (key) => {
-		const result = await deps.usage("opencode-go", key);
+		const result = await deps.usage(GO_PROVIDER, key);
 		usageByKey.set(key, result ?? null);
 	}));
 	const usageByLabel = /* @__PURE__ */ new Map();
@@ -4674,7 +4689,7 @@ async function buildState(ctx, deps) {
 	}
 	let models = [];
 	try {
-		models = (await deps.adapter.listModels("opencode-go", { unfiltered: true })).map((model) => {
+		models = (await deps.adapter.listModels(GO_PROVIDER, { unfiltered: true })).map((model) => {
 			const meta = effectiveModel(model.id, config);
 			return {
 				id: model.id,
@@ -4747,10 +4762,10 @@ function applyRoutes(ctx, web, deps) {
 		}
 		try {
 			const config = deps.config();
-			const models = await deps.adapter.listModels("opencode-go", { unfiltered: true }).catch(() => []);
+			const models = await deps.adapter.listModels(GO_PROVIDER, { unfiltered: true }).catch(() => []);
 			json(res, 200, {
 				ok: true,
-				providers: ["opencode", "opencode-go"],
+				providers: [CONSOLE_PROVIDER, GO_PROVIDER],
 				accounts: config.accounts.length + 1,
 				models: models.length
 			});
@@ -4904,7 +4919,7 @@ function applyRoutes(ctx, web, deps) {
 			return;
 		}
 		const model = typeof body.model === "string" && body.model !== "" ? body.model : "deepseek-v4.1-flash";
-		const provider = body.provider === "opencode" ? "opencode" : "opencode-go";
+		const provider = body.provider === "opencode-direct" ? CONSOLE_PROVIDER : GO_PROVIDER;
 		const started = Date.now();
 		const controller = new AbortController();
 		const timer = setTimeout(() => controller.abort(), 6e4);
@@ -5227,7 +5242,7 @@ function fingerprint(key) {
 function createUsageReader(config, resolveKey, fetchImpl = fetch) {
 	const cache = /* @__PURE__ */ new Map();
 	const read = async (provider, explicitKey) => {
-		if (provider !== "opencode-go") return void 0;
+		if (provider !== "opencode-go-direct" && provider !== "opencode-go") return void 0;
 		const current = config();
 		let key;
 		if (explicitKey !== void 0 && explicitKey !== "") key = explicitKey;
@@ -5309,18 +5324,18 @@ function apply(ctx, config) {
 		warn: (message) => ctx.logger("llm-opencode").warn(message)
 	});
 	ctx.llm.registerConfigurableProviders([{
-		provider: "opencode",
-		displayName: "OpenCode",
+		provider: CONSOLE_PROVIDER,
+		displayName: "OpenCode (plugin)",
 		settingsNs: NS,
 		settingsPath: []
 	}, {
-		provider: "opencode-go",
-		displayName: "OpenCode Go",
+		provider: GO_PROVIDER,
+		displayName: "OpenCode Go (plugin)",
 		settingsNs: NS,
 		settingsPath: []
 	}]);
-	ctx.llm.registerAdapter(["opencode", "opencode-go"], adapter);
-	ctx.logger("llm-opencode").info("registered providers: opencode, opencode-go");
+	ctx.llm.registerAdapter([CONSOLE_PROVIDER, GO_PROVIDER], adapter);
+	ctx.logger("llm-opencode").info(`registered providers: ${CONSOLE_PROVIDER}, ${GO_PROVIDER}`);
 	ctx.inject(["settings"], (settingsCtx) => {
 		settingsCtx.settings.configure({ auto: false }, ctx.fiber);
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-opencode-provider",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "description": "OpenCode / OpenCode Go LLM provider plugin for DeepSeek Harness (dsh).",
   "license": "MIT",
   "type": "module",