free-coding-models 0.5.89 → 0.5.91

package/src/core/provider-key-tester.js

@@ -27,7 +27,7 @@
  *          runProviderKeyTest, PROVIDER_AUTH_ENDPOINTS
  */
 
-import { ping } from './ping.js'
+import { ping, getProviderSessionHeaders, resolveCloudflareUrl } from './ping.js'
 import { sleep } from './shared-helpers.js'
 
 // ─── Constants ────────────────────────────────────────────────────────────────
@@ -295,12 +295,19 @@ export async function runProviderKeyTest(apiKey, providerKey, source, options =
 
   // 📖 Slow path: ping-based verification (providers without auth endpoint or timeouts).
   const discoveredModelIds = []
-  const modelsUrl = buildProviderModelsUrl(source?.url)
+  // 📖 Cloudflare's models URL is account-scoped (issue #181): resolve the
+  // 📖 {$CLOUDFLARE_ACCOUNT_ID} placeholder so discovery reaches the real API
+  // 📖 instead of 404ing on the raw catalog URL and silently falling back.
+  const modelsUrl = providerKey === 'cloudflare'
+    ? resolveCloudflareUrl(buildProviderModelsUrl(source?.url) || '')
+    : buildProviderModelsUrl(source?.url)
   let discoveryNote = ''
 
   if (modelsUrl) {
     try {
-      const headers = { Authorization: `Bearer ${apiKey}` }
+      // 📖 Mandatory per-provider headers (issue #181): OpenCode Zen gates every
+      // 📖 request (model discovery included) behind `x-opencode-session`.
+      const headers = { Authorization: `Bearer ${apiKey}`, ...getProviderSessionHeaders(providerKey) }
       if (providerKey === 'openrouter') {
         headers['HTTP-Referer'] = 'https://github.com/vava-nessa/free-coding-models'
         headers['X-Title'] = 'free-coding-models'

package/src/core/provider-metadata.js

@@ -228,7 +228,7 @@ export const PROVIDER_METADATA = {
     label: 'Cloudflare Workers AI',
     color: chalk.rgb(255, 204, 128),
     signupUrl: 'https://dash.cloudflare.com',
-    signupHint: 'Create AI API token + set CLOUDFLARE_ACCOUNT_ID',
+    signupHint: 'Create AI API token (account id auto-discovered; CLOUDFLARE_ACCOUNT_ID optional)',
     rateLimits: 'Free: 10k neurons/day, text-gen 300 RPM',
   },
   perplexity: {

package/src/core/router-daemon.js

@@ -47,7 +47,7 @@ import {
   normalizeRouterConfig,
   saveConfig,
 } from './config.js'
-import { buildChatCompletionPingBody, ping, resolveCloudflareUrl, shouldUseDisabledThinkingForProvider } from './ping.js'
+import { buildChatCompletionPingBody, ping, resolveCloudflareUrl, shouldUseDisabledThinkingForProvider, getProviderSessionHeaders } from './ping.js'
 import { benchmarkModel, BENCHMARK_TIMEOUT_MS } from './benchmark.js'
 import { loadChangelog } from './changelog-loader.js'
 import { sendUsageTelemetry } from './telemetry.js'
@@ -689,6 +689,11 @@ export function cloneHeadersForUpstream(reqHeaders, apiKey, providerKey) {
     headers['HTTP-Referer'] = 'https://github.com/vava-nessa/free-coding-models'
     headers['X-Title'] = 'free-coding-models'
   }
+  // 📖 Mandatory per-provider headers (issue #181): OpenCode Zen rejects every
+  // 📖 request without `x-opencode-session` with HTTP 400 MissingSessionID.
+  // 📖 This function builds headers for BOTH health probes and real forwarded
+  // 📖 traffic, so applying it here covers every upstream call in one place.
+  Object.assign(headers, getProviderSessionHeaders(providerKey))
   return headers
 }
 
@@ -4378,6 +4383,9 @@ export function createDefaultProbeFn(apiKeys) {
         headers['HTTP-Referer'] = 'https://github.com/vava-nessa/free-coding-models'
         headers['X-Title'] = 'free-coding-models'
       }
+      // 📖 Mandatory per-provider headers (issue #181): OpenCode Zen 400s without
+      // 📖 `x-opencode-session`, so default-set probes must carry it too.
+      Object.assign(headers, getProviderSessionHeaders(provider))
     }
     const started = Date.now()
     try {

package/src/tui/overlays.js

@@ -25,6 +25,7 @@ import { renderRouterV2Dashboard as renderRouterV2DashboardOverlay } from '../co
 import { renderPlayground as renderPlaygroundOverlay } from '../core/playground.js'
 import { themeColors, getThemeStatusLabel, getProviderRgb } from './theme.js'
 import { getProviderBillingNote, getProviderLabelWithBilling } from '../core/provider-metadata.js'
+import { pickAccountIdFromSettings } from '../core/cloudflare-account.js'
 import { detectTerminalCapabilities } from '../core/utils.js'
 import { truncateAnsiWidth, loadChangelogCached } from './render-helpers.js'
 import { COMMAND_PALETTE_MAX_RESULTS } from './command-palette.js'
@@ -222,9 +223,14 @@ export function createOverlayRenderers(state, deps) {
       lines.push(themeColors.dim(`  2) ${selectedMeta.signupHint || 'Generate an API key and paste it with Enter on this row'}`))
       lines.push(themeColors.dim(`  3) Press ${themeColors.hotkey('T')} to test your key. Status: ${setupStatus}`))
       if (selectedProviderKey === 'cloudflare') {
-        const hasAccountId = Boolean((process.env.CLOUDFLARE_ACCOUNT_ID || '').trim())
-        const accountIdStatus = hasAccountId ? themeColors.success('CLOUDFLARE_ACCOUNT_ID detected ✅') : themeColors.warning('Set CLOUDFLARE_ACCOUNT_ID ⚠')
-        lines.push(themeColors.dim(`  4) Export ${themeColors.hotkey('CLOUDFLARE_ACCOUNT_ID')} in your shell. Status: ${accountIdStatus}`))
+        // 📖 Account id resolution has fallbacks since issue #181: env var,
+        // 📖 stored config setting, or zero-setup auto-discovery from the API key.
+        const hasEnvAccountId = Boolean((process.env.CLOUDFLARE_ACCOUNT_ID || '').trim())
+        const hasStoredAccountId = Boolean(pickAccountIdFromSettings(state.config?.settings))
+        const accountIdStatus = (hasEnvAccountId || hasStoredAccountId)
+          ? themeColors.success('account id detected ✅')
+          : themeColors.warning('will be auto-discovered from your API key (or export CLOUDFLARE_ACCOUNT_ID) ⚠')
+        lines.push(themeColors.dim(`  4) Cloudflare's endpoint is account-scoped. Account id: ${accountIdStatus}`))
       }
       const testDetail = state.settingsTestDetails?.[selectedProviderKey]
       if (testDetail) {