subconscious-cli 4.0.11 → 4.0.12

package/README.md

@@ -128,7 +128,8 @@ also require `jq`; Cursor and Copilot also require `curl`.
 
 `subc dsh` defaults to the DeepSeek Harness Web UI. It injects an ephemeral
 Cordis overlay containing the active gateway URL, selected model, token limits,
-client header, and every model returned by `/v1/models`; the API key remains in
+client header, and every model from the live catalog (`/v1/models/available`
+when a profile key is present, otherwise public `/v1/models`); the API key remains in
 the process environment and is never written into the overlay. The temporary
 file is removed when Harness exits, and existing `$DSH_HOME` settings are not
 rewritten. Run a one-shot task with `subc dsh headless "PROMPT"`.
@@ -194,9 +195,10 @@ values. A command-line `--model` override has the highest model precedence.
 
 ## Models and endpoint overrides
 
-List the available models with `subc models`. The command fetches the active
-gateway's authenticated `/v1/models` catalog and falls back to the models
-packaged with the CLI when discovery is unavailable:
+List the available models with `subc models`. When the selected profile has an
+API key, the command fetches the key-scoped `/v1/models/available` catalog. If
+that request fails, it falls back to the public `/v1/models` fleet list, then
+to the models packaged with the CLI:
 
 ```text
 subconscious/glm-5.2 (default)

package/bin/agents.js

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'node:url';
 import { c } from './colors.js';
 import { getApiKey } from './auth.js';
 import { profileSettingsForAgent, resolvedProfileValues } from './profiles.js';
-import { resolveModelCatalog } from './models.js';
+import { isLiveModelSource, PUBLIC_CATALOG_FALLBACK_MESSAGE, resolveModelCatalog } from './models.js';
 
 // --- Registry (single source of truth, generated copy shipped in the package).
 const registry = JSON.parse(
@@ -709,7 +709,9 @@ async function resolvedModelsForLaunch(profile, apiKey, selectedModel) {
     selectedModel,
     fallbackModels: PACKAGED_MODELS,
   });
-  if (catalog.error) {
+  if (catalog.source === 'public' && apiKey) {
+    console.error(`  ${c.dim}${PUBLIC_CATALOG_FALLBACK_MESSAGE}${c.reset}\n`);
+  } else if (catalog.error) {
     console.error(
       `  ${c.yellow}Could not fetch the live model catalog; using packaged defaults.${c.reset}`,
     );
@@ -720,7 +722,7 @@ async function resolvedModelsForLaunch(profile, apiKey, selectedModel) {
 
 export function selectLaunchModel(requestedModel, modelSource, catalog) {
   const useLiveDefault =
-    catalog.source === 'gateway' &&
+    isLiveModelSource(catalog.source) &&
     catalog.models.length > 0 &&
     !catalog.models.includes(requestedModel) &&
     (modelSource === 'profile' || modelSource === 'default');

package/bin/cli.js

@@ -323,7 +323,12 @@ async function main() {
       selectedModel,
       fallbackModels: PACKAGED_MODELS,
     });
-    modelsCommand(catalog.models, { selectedModel, error: catalog.error });
+    modelsCommand(catalog.models, {
+      selectedModel,
+      error: catalog.error,
+      source: catalog.source,
+      hasApiKey: Boolean(auth?.key),
+    });
     return;
   }
 

package/bin/models.js

@@ -1,12 +1,22 @@
 /**
  * Resolve the model catalog exposed by an OpenAI-compatible gateway.
  *
- * Live discovery is best-effort: launches should keep working with the
- * packaged registry when the gateway is offline or does not expose /v1/models.
+ * When a profile (or agent) API key is present, prefer the key-scoped
+ * /v1/models/available list. If that request fails, fall back to the public
+ * /v1/models fleet catalog. Launches keep working with the packaged registry
+ * when the gateway is offline or returns nothing usable.
  */
 
 const MODEL_ID_PATTERN = /^[-A-Za-z0-9._:/+]+$/;
 export const DEFAULT_MODEL_FETCH_TIMEOUT_MS = 3000;
+export const AVAILABLE_MODELS_PATH = '/v1/models/available';
+export const PUBLIC_MODELS_PATH = '/v1/models';
+export const PUBLIC_CATALOG_FALLBACK_MESSAGE =
+  'Provisioned catalog unavailable; showing the public model list.';
+
+export function isLiveModelSource(source) {
+  return source === 'available' || source === 'public';
+}
 
 export function normalizeModelIds(modelIds = [], selectedModel) {
   const models = [];
@@ -27,19 +37,37 @@ export function normalizeModelIds(modelIds = [], selectedModel) {
   return models;
 }
 
+function gatewayOrigin(baseUrl) {
+  if (!baseUrl?.trim()) throw new Error('Gateway URL is not configured');
+  return baseUrl.trim().replace(/\/+$/, '');
+}
+
+function modelsEndpoint(baseUrl, path) {
+  const normalizedPath = path.startsWith('/') ? path : `/${path}`;
+  return `${gatewayOrigin(baseUrl)}${normalizedPath}`;
+}
+
 export async function fetchGatewayModels({
   baseUrl,
   apiKey,
+  path = PUBLIC_MODELS_PATH,
   fetchImpl = globalThis.fetch,
   timeoutMs = DEFAULT_MODEL_FETCH_TIMEOUT_MS,
 }) {
-  if (!baseUrl?.trim()) throw new Error('Gateway URL is not configured');
-  if (!apiKey?.trim()) throw new Error('No API key is available for model discovery');
   if (typeof fetchImpl !== 'function') {
     throw new Error('This Node.js version does not support fetch');
   }
 
-  const endpoint = `${baseUrl.trim().replace(/\/+$/, '')}/v1/models`;
+  const endpoint = modelsEndpoint(baseUrl, path);
+  const headers = {
+    Accept: 'application/json',
+    'Cache-Control': 'no-cache, no-store',
+    Pragma: 'no-cache',
+  };
+  if (apiKey?.trim()) {
+    headers.Authorization = `Bearer ${apiKey.trim()}`;
+  }
+
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), timeoutMs);
   timeout.unref?.();
@@ -47,12 +75,7 @@ export async function fetchGatewayModels({
   try {
     const response = await fetchImpl(endpoint, {
       method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${apiKey.trim()}`,
-        'Cache-Control': 'no-cache, no-store',
-        Pragma: 'no-cache',
-      },
+      headers,
       cache: 'no-store',
       signal: controller.signal,
     });
@@ -66,9 +89,7 @@ export async function fetchGatewayModels({
       throw new Error('Model discovery returned an invalid response');
     }
 
-    const models = normalizeModelIds(payload.data.map((model) => model?.id));
-    if (!models.length) throw new Error('Model discovery returned no usable model IDs');
-    return models;
+    return normalizeModelIds(payload.data.map((model) => model?.id));
   } catch (error) {
     if (controller.signal.aborted) {
       throw new Error(`Model discovery timed out after ${timeoutMs}ms`);
@@ -79,6 +100,33 @@ export async function fetchGatewayModels({
   }
 }
 
+async function fetchPublicModels({ baseUrl, fetchImpl, timeoutMs }) {
+  const models = await fetchGatewayModels({
+    baseUrl,
+    path: PUBLIC_MODELS_PATH,
+    fetchImpl,
+    timeoutMs,
+  });
+  if (!models.length) throw new Error('Model discovery returned no usable model IDs');
+  return models;
+}
+
+function packagedCatalog(selectedModel, fallbackModels, error) {
+  return {
+    models: normalizeModelIds([selectedModel, ...fallbackModels], selectedModel),
+    source: 'packaged',
+    error,
+  };
+}
+
+function liveCatalog(models, selectedModel, source) {
+  return {
+    models: normalizeModelIds(models, selectedModel),
+    source,
+    error: null,
+  };
+}
+
 export async function resolveModelCatalog({
   baseUrl,
   apiKey,
@@ -87,18 +135,32 @@ export async function resolveModelCatalog({
   fetchImpl = globalThis.fetch,
   timeoutMs = DEFAULT_MODEL_FETCH_TIMEOUT_MS,
 }) {
+  const key = apiKey?.trim() || '';
+
+  if (key) {
+    try {
+      const discovered = await fetchGatewayModels({
+        baseUrl,
+        apiKey: key,
+        path: AVAILABLE_MODELS_PATH,
+        fetchImpl,
+        timeoutMs,
+      });
+      return liveCatalog(discovered, selectedModel, 'available');
+    } catch (availableError) {
+      try {
+        const discovered = await fetchPublicModels({ baseUrl, fetchImpl, timeoutMs });
+        return liveCatalog(discovered, selectedModel, 'public');
+      } catch {
+        return packagedCatalog(selectedModel, fallbackModels, availableError);
+      }
+    }
+  }
+
   try {
-    const discovered = await fetchGatewayModels({ baseUrl, apiKey, fetchImpl, timeoutMs });
-    return {
-      models: normalizeModelIds(discovered, selectedModel),
-      source: 'gateway',
-      error: null,
-    };
+    const discovered = await fetchPublicModels({ baseUrl, fetchImpl, timeoutMs });
+    return liveCatalog(discovered, selectedModel, 'public');
   } catch (error) {
-    return {
-      models: normalizeModelIds([selectedModel, ...fallbackModels], selectedModel),
-      source: 'packaged',
-      error,
-    };
+    return packagedCatalog(selectedModel, fallbackModels, error);
   }
 }

package/bin/profiles.js

@@ -12,6 +12,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { readFileSync } from 'node:fs';
 import { c } from './colors.js';
+import { PUBLIC_CATALOG_FALLBACK_MESSAGE } from './models.js';
 
 const registry = JSON.parse(
   readFileSync(new URL('./registry.generated.json', import.meta.url), 'utf-8'),
@@ -818,7 +819,9 @@ export function modelsCommand(models = SUPPORTED_MODELS, options = {}) {
     const suffix = model === selectedModel ? ` ${c.dim}(default)${c.reset}` : '';
     console.log(`  ${c.cyan}${model}${c.reset}${suffix}`);
   }
-  if (options.error) {
+  if (options.source === 'public' && options.hasApiKey) {
+    console.error(`\n  ${c.dim}${PUBLIC_CATALOG_FALLBACK_MESSAGE}${c.reset}`);
+  } else if (options.error) {
     console.error(
       `\n  ${c.yellow}Could not fetch the live model catalog; showing packaged defaults.${c.reset}`,
     );

package/bin/tui.js

@@ -140,6 +140,7 @@ export async function createTuiState(profileName = DEFAULT_PROFILE, options = {}
       RUNBOOK_DEFAULTS.GATEWAY_URL,
     gatewayOverridden: Boolean(process.env.SUBCONSCIOUS_BASE_URL?.trim()),
     modelError: catalog.error?.message || '',
+    modelSource: catalog.source,
     agents: agentList().map((agent) => ({
       command: agent.alias,
       name: agent.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "subconscious-cli",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "description": "CLI for Subconscious — run Claude Code, Codex, OpenCode, DeepSeek Harness, Cursor, Copilot, and Pi",
   "bin": {
     "subc": "bin/cli.js"