pi-free 2.0.11 → 2.0.13

package/README.md

@@ -20,7 +20,7 @@ When you install pi-free, it:
 
 3. **Filters to show only free models by default** for providers that expose pricing — You see only the models that cost $0 to use. Paid models are hidden until you explicitly toggle them on.
 
-4. **Provides per-provider toggle commands** — Run `/toggle-{provider}` (e.g., `/toggle-kilo`, `/toggle-opencode`) to switch between free-only mode and showing all models including paid ones. Changes apply immediately and your preference is saved for the next Pi restart.
+4. **Provides per-provider toggle commands** — Run `/toggle-{provider}` (e.g., `/toggle-kilo`) to switch between free-only mode and showing all models including paid ones. Changes apply immediately and your preference is saved for the next Pi restart.
 
 5. **Handles authentication for you** — OAuth flows (Kilo, Cline) open your browser automatically; API keys are read from `~/.pi/free.json` or environment variables
 
@@ -46,7 +46,6 @@ Free models are shown by default — look for the provider prefixes:
 
 **✅ Free Models (no payment required):**
 
-- `opencode/` — OpenCode models (no setup required; toggle with `/toggle-opencode`)
 - `kilo/` — Kilo models (free models available immediately, more after `/login kilo`)
 - `openrouter/` — OpenRouter models (free account required)
 - `cline/` — Cline models (run `/login cline` to use)
@@ -64,6 +63,7 @@ Free models are shown by default — look for the provider prefixes:
 - `crofai/` — CrofAI OpenAI-compatible API (streaming, reasoning models)
 - `codestral/` — Codestral via Mistral (free Experiment plan: 2 req/min, 1B tokens/month)
 - `deepinfra/` — DeepInfra inference cloud ($5 one-time trial credit, no credit card)
+- `novita/` — Novita AI (100+ open-source models, OpenAI-compatible, 3 free models)
 
 > **Note:** Paid providers may occasionally offer free models or promotional credits. The `isFreeModel` helper automatically detects free models based on provider pricing data or model names containing "free". For providers that don't expose pricing (like CrofAI), only models with "free" in their names are marked as free.
 
@@ -74,6 +74,8 @@ Free models are shown by default — look for the provider prefixes:
 - `cerebras/` — Cerebras models (when `CEREBRAS_API_KEY` set)
 - `xai/` — xAI models (when `XAI_API_KEY` set)
 - `huggingface/` — Hugging Face models (when `HF_TOKEN` set)
+- `openrouter/` — OpenRouter models (fetched from openrouter.ai, when `OPENROUTER_API_KEY` set)
+- `fastrouter/` — FastRouter models (always discovered, 170+ models, no auth for listing)
 
 **Note:** Fireworks is now a [built-in Pi provider](https://github.com/badlogic/pi-mono/blob/main/packages/coding-agent/CHANGELOG.md#0681---2026-04-22) — no extension needed. Set `FIREWORKS_API_KEY` to use it directly.
 
@@ -82,7 +84,6 @@ Free models are shown by default — look for the provider prefixes:
 Want to see paid models too? Run the toggle command for your provider:
 
 ```
-/toggle-opencode   # Toggle OpenCode (✅ offers free models)
 /toggle-kilo       # Toggle Kilo (✅ offers free models)
 /toggle-openrouter # Toggle OpenRouter (✅ offers free models)
 /toggle-cline      # Toggle Cline (✅ offers free models)
@@ -100,6 +101,8 @@ Want to see paid models too? Run the toggle command for your provider:
 /toggle-together  # Toggle Together AI (💳 trial credit provider)
 /toggle-sambanova # Toggle SambaNova (🔄 freemium)
 /toggle-llm7      # Toggle LLM7 (✅ free gateway)
+/toggle-novita    # Toggle Novita AI (💳 paid — 3 free models)
+/toggle-fastrouter # Toggle FastRouter (🔧 dynamic — always discovered)
 ```
 
 **Notes:**
@@ -108,10 +111,6 @@ Want to see paid models too? Run the toggle command for your provider:
 - **🔧 Dynamic providers** show all fetched models by default — the toggle filters the list when you have an API key configured
 - **Freemium providers** show all models by default; you manage your usage limits via their dashboards
 
-You'll see a notification like: `opencode: showing free models` or `opencode: showing all models`
-
-**Note:** Built-in provider toggles such as OpenCode and OpenRouter update in the current session — no restart needed.
-
 ### 4. Add API keys for more providers (optional)
 
 Some providers require a free account or API key.
@@ -198,7 +197,7 @@ Providers have different pricing models. pi-free handles them all:
 
 **Provider types:**
 
-- ✅ **Free providers** (OpenCode, Kilo, Cline) — Toggle between free-only vs paid models
+- ✅ **Free providers** (Kilo, Cline) — Toggle between free-only vs paid models
 - 🔄 **Freemium** (NVIDIA, Ollama) — Free tier with limits, toggle shows all
 - 🔧 **Dynamic API** (Mistral, Groq, Cerebras, xAI) — Fetched when API key configured, toggle filters the list
 
@@ -213,17 +212,6 @@ Authentication is handled automatically:
 
 ## Using Free Models (No Setup Required)
 
-### OpenCode
-
-Works immediately with zero setup:
-
-1. Press `Ctrl+L`
-2. Search for `opencode/`
-3. Pick any model (e.g., `opencode/big-pickle`)
-4. Start chatting
-
-No account, no API key, no OAuth. Run `/toggle-opencode` to switch between free and paid OpenCode models.
-
 ### Kilo (free models, more after login)
 
 Kilo shows free models immediately. To unlock all models, authenticate with Kilo's free OAuth:
@@ -442,28 +430,27 @@ export SAMBANOVA_API_KEY="..."
 
 Each provider has toggle commands to switch between free and all models:
 
-| Command               | Action                                                   |
-| --------------------- | -------------------------------------------------------- |
-| `/toggle-opencode`    | Toggle between free/all OpenCode models                  |
-| `/toggle-kilo`        | Toggle between free/all Kilo models                      |
-| `/toggle-openrouter`  | Toggle between free/all OpenRouter models                |
-| `/toggle-cline`       | Toggle between free/all Cline models                     |
-| `/toggle-nvidia`      | Toggle between free/all NVIDIA models                    |
-| `/toggle-ollama`      | Toggle between free/all Ollama Cloud models              |
-| `/toggle-mistral`     | Toggle between free/all Mistral models (🔧 dynamic)      |
-| `/toggle-groq`        | Toggle between free/all Groq models (🔧 dynamic)         |
-| `/toggle-cerebras`    | Toggle between free/all Cerebras models (🔧 dynamic)     |
-| `/toggle-xai`         | Toggle between free/all xAI models (🔧 dynamic)          |
-| `/toggle-huggingface` | Toggle between free/all Hugging Face models (🔧 dynamic) |
-| `/toggle-codestral`   | Toggle Codestral (💳 paid)                               |
-| `/toggle-deepinfra`   | Toggle DeepInfra (💳 trial credit)                       |
-| `/toggle-together`    | Toggle Together AI (💳 trial credit)                     |
-| `/toggle-sambanova`   | Toggle SambaNova (🔄 freemium)                           |
-| `/toggle-llm7`        | Toggle LLM7 (✅ free gateway)                            |
-| `/toggle-zenmux`      | Toggle ZenMux (💳 paid)                                  |
-| `/toggle-crofai`      | Toggle CrofAI (💳 paid)                                  |
-| `/ollama-cloud-refresh` | Re-fetch Ollama Cloud models live (no restart needed)  |
-| `/probe-ollama`       | Test Ollama Cloud models for 403 errors (auto-hide)      |
+| Command                 | Action                                                   |
+| ----------------------- | -------------------------------------------------------- |
+| `/toggle-kilo`          | Toggle between free/all Kilo models                      |
+| `/toggle-openrouter`    | Toggle between free/all OpenRouter models                |
+| `/toggle-cline`         | Toggle between free/all Cline models                     |
+| `/toggle-nvidia`        | Toggle between free/all NVIDIA models                    |
+| `/toggle-ollama`        | Toggle between free/all Ollama Cloud models              |
+| `/toggle-mistral`       | Toggle between free/all Mistral models (🔧 dynamic)      |
+| `/toggle-groq`          | Toggle between free/all Groq models (🔧 dynamic)         |
+| `/toggle-cerebras`      | Toggle between free/all Cerebras models (🔧 dynamic)     |
+| `/toggle-xai`           | Toggle between free/all xAI models (🔧 dynamic)          |
+| `/toggle-huggingface`   | Toggle between free/all Hugging Face models (🔧 dynamic) |
+| `/toggle-codestral`     | Toggle Codestral (💳 paid)                               |
+| `/toggle-deepinfra`     | Toggle DeepInfra (💳 trial credit)                       |
+| `/toggle-together`      | Toggle Together AI (💳 trial credit)                     |
+| `/toggle-sambanova`     | Toggle SambaNova (🔄 freemium)                           |
+| `/toggle-llm7`          | Toggle LLM7 (✅ free gateway)                            |
+| `/toggle-zenmux`        | Toggle ZenMux (💳 paid)                                  |
+| `/toggle-crofai`        | Toggle CrofAI (💳 paid)                                  |
+| `/ollama-cloud-refresh` | Re-fetch Ollama Cloud models live (no restart needed)    |
+| `/probe-ollama`         | Test Ollama Cloud models for 403 errors (auto-hide)      |
 
 **The toggle command:**
 
@@ -471,7 +458,7 @@ Each provider has toggle commands to switch between free and all models:
 - **For 🔄 freemium providers**: Shows all models by default; toggle switches between filtered and full list
 - **For 🔧 dynamic API providers**: Filters the model list when you have an API key configured
 - **Persists your preference** to `~/.pi/free.json` for next startup
-- Shows a notification: "opencode: showing free models" or "opencode: showing all models"
+
 
 ### Probe Commands (Health Check)
 

package/banner.svg

@@ -110,7 +110,7 @@
     <text x="20" y="70" font-family="system-ui, sans-serif" font-size="11" fill="#8b9aaa">Ollama Cloud · ZenMux</text>
     <text x="20" y="90" font-family="system-ui, sans-serif" font-size="11" fill="#8b9aaa">CrofAI · Codestral · LLM7</text>
     <text x="20" y="110" font-family="system-ui, sans-serif" font-size="11" fill="#8b9aaa">DeepInfra · SambaNova</text>
-    <text x="20" y="130" font-family="system-ui, sans-serif" font-size="11" fill="#8b9aaa">Together</text>
+    <text x="20" y="130" font-family="system-ui, sans-serif" font-size="11" fill="#8b9aaa">Together · Novita · FastRouter</text>
   </g>
 
   <g transform="translate(970, 55)">

package/config.ts

@@ -32,6 +32,8 @@ interface PiFreeConfig {
 	deepinfra_api_key?: string;
 	sambanova_api_key?: string;
 	together_api_key?: string;
+	novita_api_key?: string;
+	fastrouter_api_key?: string;
 	kilo_free_only?: boolean;
 	hidden_models?: string[];
 	free_only?: boolean;
@@ -45,6 +47,8 @@ interface PiFreeConfig {
 	deepinfra_show_paid?: boolean;
 	sambanova_show_paid?: boolean;
 	together_show_paid?: boolean;
+	novita_show_paid?: boolean;
+	fastrouter_show_paid?: boolean;
 	openrouter_show_paid?: boolean;
 	opencode_show_paid?: boolean;
 }
@@ -59,6 +63,8 @@ const CONFIG_TEMPLATE: PiFreeConfig = {
 	deepinfra_api_key: "",
 	sambanova_api_key: "",
 	together_api_key: "",
+	novita_api_key: "",
+	fastrouter_api_key: "",
 
 	kilo_free_only: false,
 	hidden_models: [],
@@ -73,6 +79,8 @@ const CONFIG_TEMPLATE: PiFreeConfig = {
 	deepinfra_show_paid: false,
 	sambanova_show_paid: false,
 	together_show_paid: false,
+	novita_show_paid: false,
+	fastrouter_show_paid: false,
 	openrouter_show_paid: false,
 	opencode_show_paid: false,
 };
@@ -210,6 +218,17 @@ export function getTogetherShowPaid(): boolean {
 	return resolveBool("TOGETHER_SHOW_PAID", loadConfigFile().together_show_paid);
 }
 
+export function getNovitaShowPaid(): boolean {
+	return resolveBool("NOVITA_SHOW_PAID", loadConfigFile().novita_show_paid);
+}
+
+export function getFastrouterShowPaid(): boolean {
+	return resolveBool(
+		"FASTROUTER_SHOW_PAID",
+		loadConfigFile().fastrouter_show_paid,
+	);
+}
+
 export function getOllamaShowPaid(): boolean {
 	return resolveBool("OLLAMA_SHOW_PAID", loadConfigFile().ollama_show_paid);
 }
@@ -225,6 +244,41 @@ export function getOpencodeShowPaid(): boolean {
 	return resolveBool("OPENCODE_SHOW_PAID", loadConfigFile().opencode_show_paid);
 }
 
+export function getProviderShowPaid(providerId: string): boolean {
+	switch (providerId) {
+		case "kilo":
+			return getKiloShowPaid();
+		case "cline":
+			return getClineShowPaid();
+		case "zenmux":
+			return getZenmuxShowPaid();
+		case "crofai":
+			return getCrofaiShowPaid();
+		case "codestral":
+			return getCodestralShowPaid();
+		case "llm7":
+			return getLlm7ShowPaid();
+		case "deepinfra":
+			return getDeepinfraShowPaid();
+		case "sambanova":
+			return getSambanovaShowPaid();
+		case "together":
+			return getTogetherShowPaid();
+		case "novita":
+			return getNovitaShowPaid();
+		case "fastrouter":
+			return getFastrouterShowPaid();
+		case "ollama-cloud":
+			return getOllamaShowPaid();
+		case "openrouter":
+			return getOpenrouterShowPaid();
+		case "opencode":
+			return getOpencodeShowPaid();
+		default:
+			return false;
+	}
+}
+
 // =============================================================================
 // Global free-only mode
 // =============================================================================
@@ -273,6 +327,14 @@ export function getTogetherApiKey(): string | undefined {
 	return resolve("TOGETHER_AI_API_KEY", loadConfigFile().together_api_key);
 }
 
+export function getNovitaApiKey(): string | undefined {
+	return resolve("NOVITA_API_KEY", loadConfigFile().novita_api_key);
+}
+
+export function getFastrouterApiKey(): string | undefined {
+	return resolve("FASTROUTER_API_KEY", loadConfigFile().fastrouter_api_key);
+}
+
 export function getOllamaApiKey(): string | undefined {
 	return resolve("OLLAMA_API_KEY", loadConfigFile().ollama_api_key);
 }
@@ -302,12 +364,47 @@ export function getHfToken(): string | undefined {
 	return process.env.HF_TOKEN;
 }
 
+/**
+ * Read an API key from ~/.pi/agent/auth.json.
+ * Pi stores built-in provider keys there (opencode, openrouter, etc.).
+ * Falls back to env var if auth.json is missing or key not found.
+ */
+function readAuthJsonKey(
+	providerId: string,
+	envVar: string,
+): string | undefined {
+	// Check env var first (fast path)
+	const envVal = process.env[envVar];
+	if (envVal) return envVal;
+
+	// Check auth.json
+	try {
+		const authPath = join(PI_DIR, "agent", "auth.json");
+		if (!existsSync(authPath)) return undefined;
+		const raw = readFileSync(authPath, "utf8");
+		const auth = JSON.parse(raw) as Record<
+			string,
+			{ type?: string; key?: string }
+		>;
+		const entry = auth[providerId];
+		if (entry?.key?.trim()) return entry.key;
+	} catch {
+		// auth.json missing or corrupt — silently skip
+	}
+	return undefined;
+}
+
 /**
  * OpenRouter key — pi's built-in provider reads from ~/.pi/agent/auth.json.
- * pi-free only checks the env var to avoid stale keys from free.json.
+ * pi-free checks env var first, then auth.json.
  */
 export function getOpenrouterApiKey(): string | undefined {
-	return process.env.OPENROUTER_API_KEY;
+	return readAuthJsonKey("openrouter", "OPENROUTER_API_KEY");
+}
+
+/** OpenCode key — pi's built-in provider. Read from env or auth.json. */
+export function getOpencodeApiKey(): string | undefined {
+	return readAuthJsonKey("opencode", "OPENCODE_API_KEY");
 }
 
 // =============================================================================

package/constants.ts

@@ -22,6 +22,7 @@ export const PROVIDER_LLM7 = "llm7";
 export const PROVIDER_DEEPINFRA = "deepinfra";
 export const PROVIDER_SAMBANOVA = "sambanova";
 export const PROVIDER_TOGETHER = "together";
+export const PROVIDER_NOVITA = "novita";
 
 export const ALL_UNIQUE_PROVIDERS = [
 	PROVIDER_KILO,
@@ -38,6 +39,7 @@ export const ALL_UNIQUE_PROVIDERS = [
 	PROVIDER_DEEPINFRA,
 	PROVIDER_SAMBANOVA,
 	PROVIDER_TOGETHER,
+	PROVIDER_NOVITA,
 ] as const;
 
 // =============================================================================
@@ -59,6 +61,7 @@ export const BASE_URL_LLM7 = "https://api.llm7.io/v1";
 export const BASE_URL_DEEPINFRA = "https://api.deepinfra.com/v1/openai";
 export const BASE_URL_SAMBANOVA = "https://api.sambanova.ai/v1";
 export const BASE_URL_TOGETHER = "https://api.together.xyz/v1";
+export const BASE_URL_NOVITA = "https://api.novita.ai/openai/v1";
 
 /** Cline fetches free models from OpenRouter */
 export const BASE_URL_OPENROUTER = "https://openrouter.ai/api/v1";
@@ -84,7 +87,6 @@ export const CLINE_AUTH_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
 // =============================================================================
 
 export const NVIDIA_MIN_SIZE_B = 70; // Minimum model size for NVIDIA NIM
-export const DEFAULT_MIN_SIZE_B = 30; // Default minimum model size for filtering
 
 // =============================================================================
 // Timeouts (milliseconds)

package/index.ts

@@ -40,6 +40,7 @@ import llm7 from "./providers/llm7/llm7.ts";
 import deepinfra from "./providers/deepinfra/deepinfra.ts";
 import sambanova from "./providers/sambanova/sambanova.ts";
 import together from "./providers/together/together.ts";
+import novita from "./providers/novita/novita.ts";
 import nvidia from "./providers/nvidia/nvidia.ts";
 import ollama from "./providers/ollama/ollama.ts";
 import zenmux from "./providers/zenmux/zenmux.ts";
@@ -57,7 +58,7 @@ function setupGlobalCommands(pi: ExtensionAPI) {
 		handler: async (_args, ctx) => {
 			const current = getGlobalFreeOnly();
 			const next = !current;
-			applyGlobalFilter(pi, next);
+			applyGlobalFilter(pi, next, { force: true });
 
 			const registry = getProviderRegistry();
 			const providerCount = registry.size;
@@ -210,10 +211,11 @@ export default async function piFreeEntry(pi: ExtensionAPI) {
 		deepinfra(pi),
 		sambanova(pi),
 		together(pi),
+		novita(pi),
 	]);
 
-	// Setup dynamic built-in providers (Mistral, Groq, Cerebras, xAI, Hugging Face)
-	// These only activate if the user has configured API keys (OpenRouter works without key too)
+	// Setup dynamic built-in providers (Mistral, Groq, Cerebras, xAI, Hugging Face,
+	// OpenRouter/OpenCode from Pi auth, and FastRouter public model discovery)
 	const { setupDynamicBuiltInProviders } = await import(
 		"./providers/dynamic-built-in/index.ts"
 	);

package/lib/built-in-toggle.ts

@@ -18,11 +18,24 @@ import type {
 } from "@earendil-works/pi-coding-agent";
 import { getOpencodeShowPaid, getOpenrouterShowPaid } from "../config.ts";
 import { createLogger } from "./logger.ts";
-import { isFreeModel, registerWithGlobalToggle } from "./registry.ts";
+import {
+	getProviderRegistry,
+	isFreeModel,
+	registerWithGlobalToggle,
+} from "./registry.ts";
 import { createToggleState } from "./toggle-state.ts";
+import {
+	OPENCODE_DYNAMIC_API,
+	createOpenCodeSessionTracker,
+	createOpenCodeStreamSimple,
+	isOpenCodeProvider,
+} from "../providers/opencode-session.ts";
 
 const _logger = createLogger("built-in-toggle");
 
+// OpenCode requires per-request ids; see createOpenCodeStreamSimple().
+const _opencodeSession = createOpenCodeSessionTracker();
+
 // =============================================================================
 // Configuration
 // =============================================================================
@@ -34,6 +47,7 @@ interface BuiltInToggleConfig {
 
 const BUILT_IN_TOGGLE_PROVIDERS: BuiltInToggleConfig[] = [
 	{ id: "opencode", getShowPaid: getOpencodeShowPaid },
+	{ id: "opencode-go", getShowPaid: getOpencodeShowPaid },
 	{ id: "openrouter", getShowPaid: getOpenrouterShowPaid },
 ];
 
@@ -55,68 +69,38 @@ let commandsRegistered = false;
 // =============================================================================
 
 export function setupBuiltInProviderToggles(pi: ExtensionAPI): void {
+	const activeConfigs = BUILT_IN_TOGGLE_PROVIDERS.filter(
+		(config) => !getProviderRegistry().has(config.id),
+	);
+
+	if (activeConfigs.length === 0) {
+		_logger.info(
+			"[built-in-toggle] OpenCode/OpenRouter already registered dynamically; skipping fallback capture",
+		);
+		return;
+	}
+
 	// Register toggle commands once (available even before models load)
 	if (!commandsRegistered) {
-		for (const config of BUILT_IN_TOGGLE_PROVIDERS) {
+		for (const config of activeConfigs) {
 			registerToggleCommand(pi, config);
 		}
-		setupStatusBar(pi);
+		setupStatusBar(pi, activeConfigs);
 		commandsRegistered = true;
 	}
 
 	// Capture built-in models on session start and apply initial filter
 	pi.on("session_start", async (_event, ctx) => {
-		const available = ctx.modelRegistry.getAvailable();
-
-		for (const config of BUILT_IN_TOGGLE_PROVIDERS) {
+		for (const config of activeConfigs) {
 			if (providerStates.has(config.id)) {
-				// Already captured this session — skip to avoid re-registering
+				// Already captured — skip to avoid re-registering
 				continue;
 			}
 
-			const providerModels = available.filter(
-				(m: Model<Api>) => m.provider === config.id,
-			);
-			if (providerModels.length === 0) continue;
-
-			const allModels = providerModels.map(modelToProviderConfig);
-			const freeModels = allModels.filter((m) =>
-				isFreeModel({ ...m, provider: config.id }, allModels),
-			);
-
-			const baseUrl = providerModels[0].baseUrl;
-			const api = providerModels[0].api;
-			const apiKeyEnv = getApiKeyEnvForProvider(config.id);
-
-			const reRegister = (models: ProviderModelConfig[]) => {
-				pi.registerProvider(config.id, {
-					baseUrl,
-					apiKey: apiKeyEnv,
-					api,
-					models,
-				});
-			};
-
-			const stored = { free: freeModels, all: allModels };
-			const toggleState = createToggleState<ProviderModelConfig>({
-				providerId: config.id,
-				initialShowPaid: config.getShowPaid(),
-				initialModels: stored,
-			});
-
-			providerStates.set(config.id, {
-				stored,
-				reRegister,
-				toggleState,
-			});
-
-			registerWithGlobalToggle(config.id, stored, reRegister, true);
+			const state = tryCaptureProvider(pi, config, ctx);
+			if (!state) continue;
 
-			_logger.info(
-				`[built-in-toggle] ${config.id}: captured ${allModels.length} models (${freeModels.length} free)`,
-			);
-
-			const applied = toggleState.applyCurrent(reRegister);
+			const applied = state.toggleState.applyCurrent(state.reRegister);
 			_logger.info(
 				`[built-in-toggle] ${config.id}: applied ${applied.mode} mode with ${applied.models.length} models`,
 			);
@@ -124,6 +108,63 @@ export function setupBuiltInProviderToggles(pi: ExtensionAPI): void {
 	});
 }
 
+// =============================================================================
+// On-demand model capture (called by toggle command when state is missing)
+// =============================================================================
+
+function tryCaptureProvider(
+	pi: ExtensionAPI,
+	config: BuiltInToggleConfig,
+	ctx: any,
+): BuiltInProviderState | undefined {
+	const available = ctx.modelRegistry.getAvailable();
+	const providerModels = available.filter(
+		(m: Model<Api>) => m.provider === config.id,
+	);
+	if (providerModels.length === 0) return undefined;
+
+	const allModels = providerModels.map((m: Model<Api>) =>
+		modelToProviderConfig(m, config.id),
+	);
+	const freeModels = allModels.filter((m: ProviderModelConfig) =>
+		isFreeModel({ ...m, provider: config.id }, allModels),
+	);
+
+	const baseUrl = providerModels[0].baseUrl;
+	const api = providerModels[0].api;
+	const apiKeyEnv = getApiKeyEnvForProvider(config.id);
+
+	const reRegister = (models: ProviderModelConfig[]) => {
+		pi.registerProvider(config.id, {
+			baseUrl,
+			apiKey: apiKeyEnv,
+			api: isOpenCodeProvider(config.id) ? OPENCODE_DYNAMIC_API : api,
+			...(isOpenCodeProvider(config.id)
+				? { streamSimple: createOpenCodeStreamSimple(_opencodeSession) }
+				: {}),
+			models,
+		});
+	};
+
+	const stored = { free: freeModels, all: allModels };
+	const toggleState = createToggleState<ProviderModelConfig>({
+		providerId: config.id,
+		initialShowPaid: config.getShowPaid(),
+		initialModels: stored,
+	});
+
+	const state: BuiltInProviderState = { stored, reRegister, toggleState };
+	providerStates.set(config.id, state);
+
+	registerWithGlobalToggle(config.id, stored, reRegister, true);
+
+	_logger.info(
+		`[built-in-toggle] ${config.id}: captured ${allModels.length} models (${freeModels.length} free)`,
+	);
+
+	return state;
+}
+
 // =============================================================================
 // Per-provider toggle command
 // =============================================================================
@@ -136,13 +177,17 @@ function registerToggleCommand(
 	pi.registerCommand(commandName, {
 		description: `Toggle free/paid ${config.id} models`,
 		handler: async (_args, ctx) => {
-			const state = providerStates.get(config.id);
+			let state = providerStates.get(config.id);
 			if (!state) {
-				ctx.ui.notify(
-					`${config.id}: models not loaded yet. Start a session first.`,
-					"warning",
-				);
-				return;
+				// Models may have loaded after session_start — try on-demand capture
+				state = tryCaptureProvider(pi, config, ctx);
+				if (!state) {
+					ctx.ui.notify(
+						`${config.id}: models not loaded yet. Start a session first.`,
+						"warning",
+					);
+					return;
+				}
 			}
 
 			const applied = state.toggleState.toggle(state.reRegister);
@@ -166,8 +211,11 @@ function registerToggleCommand(
 // Helpers
 // =============================================================================
 
-function modelToProviderConfig(m: Model<Api>): ProviderModelConfig {
-	return {
+function modelToProviderConfig(
+	m: Model<Api>,
+	providerId?: string,
+): ProviderModelConfig {
+	const base: ProviderModelConfig = {
 		id: m.id,
 		name: m.name,
 		api: m.api,
@@ -179,18 +227,29 @@ function modelToProviderConfig(m: Model<Api>): ProviderModelConfig {
 		headers: m.headers,
 		compat: (m as any).compat,
 	};
+
+	// Use a custom OpenCode API wrapper so per-request headers are regenerated
+	// for every LLM call instead of being frozen at registration time.
+	if (providerId && isOpenCodeProvider(providerId)) {
+		base.api = OPENCODE_DYNAMIC_API;
+	}
+
+	return base;
 }
 
 // =============================================================================
 // Status bar for provider selection
 // =============================================================================
 
-function setupStatusBar(pi: ExtensionAPI): void {
+function setupStatusBar(
+	pi: ExtensionAPI,
+	configs: BuiltInToggleConfig[],
+): void {
 	pi.on("model_select", (_event, ctx) => {
 		const selected = _event.model?.provider;
 
-		// Clear status for all built-in toggle providers
-		for (const config of BUILT_IN_TOGGLE_PROVIDERS) {
+		// Clear status for all fallback-captured built-in providers
+		for (const config of configs) {
 			if (selected !== config.id) {
 				ctx.ui.setStatus(`${config.id}-status`, undefined);
 			}
@@ -220,6 +279,7 @@ function setupStatusBar(pi: ExtensionAPI): void {
 function getApiKeyEnvForProvider(providerId: string): string {
 	const envMap: Record<string, string> = {
 		opencode: "OPENCODE_API_KEY",
+		"opencode-go": "OPENCODE_API_KEY",
 		openrouter: "OPENROUTER_API_KEY",
 	};
 	return envMap[providerId] || `${providerId.toUpperCase()}_API_KEY`;