subconscious-cli 4.1.4 → 5.0.0

package/bin/models.js

@@ -18,6 +18,27 @@ export function isLiveModelSource(source) {
   return source === 'available' || source === 'public';
 }
 
+export function isAbortError(error) {
+  return error?.name === 'AbortError' || error?.code === 'ABORT_ERR';
+}
+
+function linkAbortSignal(controller, signal) {
+  if (!signal) return () => {};
+  if (signal.aborted) {
+    controller.abort();
+    return () => {};
+  }
+  const onAbort = () => controller.abort();
+  signal.addEventListener('abort', onAbort, { once: true });
+  return () => signal.removeEventListener('abort', onAbort);
+}
+
+function abortError(message) {
+  const error = new Error(message);
+  error.name = 'AbortError';
+  return error;
+}
+
 export function normalizeModelIds(modelIds = [], selectedModel) {
   const models = [];
   const seen = new Set();
@@ -53,6 +74,7 @@ export async function fetchGatewayModels({
   path = PUBLIC_MODELS_PATH,
   fetchImpl = globalThis.fetch,
   timeoutMs = DEFAULT_MODEL_FETCH_TIMEOUT_MS,
+  signal,
 }) {
   if (typeof fetchImpl !== 'function') {
     throw new Error('This Node.js version does not support fetch');
@@ -71,14 +93,26 @@ export async function fetchGatewayModels({
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), timeoutMs);
   timeout.unref?.();
+  const unlink = linkAbortSignal(controller, signal);
 
   try {
-    const response = await fetchImpl(endpoint, {
-      method: 'GET',
-      headers,
-      cache: 'no-store',
-      signal: controller.signal,
+    if (signal?.aborted) throw abortError('Model discovery was cancelled');
+    const aborted = new Promise((_, reject) => {
+      const fail = () => {
+        if (signal?.aborted) reject(abortError('Model discovery was cancelled'));
+        else reject(new Error(`Model discovery timed out after ${timeoutMs}ms`));
+      };
+      controller.signal.addEventListener('abort', fail, { once: true });
     });
+    const response = await Promise.race([
+      fetchImpl(endpoint, {
+        method: 'GET',
+        headers,
+        cache: 'no-store',
+        signal: controller.signal,
+      }),
+      aborted,
+    ]);
 
     if (!response.ok) {
       throw new Error(`Model discovery returned HTTP ${response.status}`);
@@ -91,21 +125,24 @@ export async function fetchGatewayModels({
 
     return normalizeModelIds(payload.data.map((model) => model?.id));
   } catch (error) {
+    if (signal?.aborted) throw abortError('Model discovery was cancelled');
     if (controller.signal.aborted) {
       throw new Error(`Model discovery timed out after ${timeoutMs}ms`);
     }
     throw error;
   } finally {
+    unlink();
     clearTimeout(timeout);
   }
 }
 
-async function fetchPublicModels({ baseUrl, fetchImpl, timeoutMs }) {
+async function fetchPublicModels({ baseUrl, fetchImpl, timeoutMs, signal }) {
   const models = await fetchGatewayModels({
     baseUrl,
     path: PUBLIC_MODELS_PATH,
     fetchImpl,
     timeoutMs,
+    signal,
   });
   if (!models.length) throw new Error('Model discovery returned no usable model IDs');
   return models;
@@ -134,6 +171,7 @@ export async function resolveModelCatalog({
   fallbackModels = [],
   fetchImpl = globalThis.fetch,
   timeoutMs = DEFAULT_MODEL_FETCH_TIMEOUT_MS,
+  signal,
 }) {
   const key = apiKey?.trim() || '';
 
@@ -145,22 +183,26 @@ export async function resolveModelCatalog({
         path: AVAILABLE_MODELS_PATH,
         fetchImpl,
         timeoutMs,
+        signal,
       });
       return liveCatalog(discovered, selectedModel, 'available');
     } catch (availableError) {
+      if (isAbortError(availableError) || signal?.aborted) throw availableError;
       try {
-        const discovered = await fetchPublicModels({ baseUrl, fetchImpl, timeoutMs });
+        const discovered = await fetchPublicModels({ baseUrl, fetchImpl, timeoutMs, signal });
         return liveCatalog(discovered, selectedModel, 'public');
-      } catch {
+      } catch (publicError) {
+        if (isAbortError(publicError) || signal?.aborted) throw publicError;
         return packagedCatalog(selectedModel, fallbackModels, availableError);
       }
     }
   }
 
   try {
-    const discovered = await fetchPublicModels({ baseUrl, fetchImpl, timeoutMs });
+    const discovered = await fetchPublicModels({ baseUrl, fetchImpl, timeoutMs, signal });
     return liveCatalog(discovered, selectedModel, 'public');
   } catch (error) {
+    if (isAbortError(error) || signal?.aborted) throw error;
     return packagedCatalog(selectedModel, fallbackModels, error);
   }
 }

package/bin/opencode-provider.js

@@ -0,0 +1,61 @@
+import { modelSupportsVision } from './model-capabilities.js';
+
+export const OPENCODE_PROVIDER_ID = 'subconscious';
+export const OPENCODE_PROVIDER_NAME = 'Subconscious Gateway';
+
+const ACRONYMS = new Set(['gpt', 'oss', 'api', 'gguf', 'ggml', 'nomic', 'vl', 'it', 'mlx']);
+
+function formatToken(token) {
+  const lower = token.toLowerCase();
+  if (ACRONYMS.has(lower)) return token.toUpperCase();
+  if (/^\d+[bkmg]$/i.test(token)) return token.toUpperCase();
+  if (/^q\d+$/i.test(token)) return token.toUpperCase();
+  if (/^\d+\.\d+/.test(token)) return token;
+  if (/^[a-z]\d+[a-z]$/i.test(token) || /^\d+[a-z]$/i.test(token)) return token.toUpperCase();
+  return token.charAt(0).toUpperCase() + token.slice(1).toLowerCase();
+}
+
+/** Drop the subconscious/ prefix, then capitalize each dash-separated token. */
+export function opencodeModelDisplayName(modelId) {
+  const text = String(modelId ?? '').trim();
+  const slug = text.startsWith('subconscious/') ? text.slice('subconscious/'.length) : text;
+  return slug.split(/[-_]/).filter(Boolean).map(formatToken).join(' ');
+}
+
+export function buildOpenCodeModels(modelIds, { context, output }) {
+  return Object.fromEntries(
+    modelIds.map((id) => [
+      id,
+      {
+        name: opencodeModelDisplayName(id),
+        tools: true,
+        limit: { context, output },
+        ...(modelSupportsVision(id)
+          ? { attachment: true, modalities: { input: ['text', 'image'], output: ['text'] } }
+          : {}),
+      },
+    ]),
+  );
+}
+
+export function buildOpenCodeConfig({ baseUrl, model, modelIds, context, output }) {
+  return {
+    $schema: 'https://opencode.ai/config.json',
+    disabled_providers: ['subconscious-cli'],
+    provider: {
+      [OPENCODE_PROVIDER_ID]: {
+        npm: '@ai-sdk/openai-compatible',
+        name: OPENCODE_PROVIDER_NAME,
+        whitelist: [...modelIds],
+        options: {
+          baseURL: `${baseUrl}/v1`,
+          apiKey: '{env:SUBCONSCIOUS_API_KEY}',
+          headers: { 'x-subconscious-client': 'opencode' },
+          modelsDiscovery: { enabled: false },
+        },
+        models: buildOpenCodeModels(modelIds, { context, output }),
+      },
+    },
+    model: `${OPENCODE_PROVIDER_ID}/${model}`,
+  };
+}

package/bin/runbook/claude-code/run.sh

@@ -216,6 +216,11 @@ export ANTHROPIC_DEFAULT_FABLE_MODEL="${ANTHROPIC_DEFAULT_FABLE_MODEL:-$FABLE_MO
 export ANTHROPIC_DEFAULT_FABLE_MODEL_NAME="${ANTHROPIC_DEFAULT_FABLE_MODEL_NAME:-$FABLE_MODEL_NAME}"
 export ANTHROPIC_DEFAULT_FABLE_MODEL_DESCRIPTION="${ANTHROPIC_DEFAULT_FABLE_MODEL_DESCRIPTION:-$FABLE_MODEL_DESCRIPTION}"
 export CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY="${CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY:-0}"
+# Gateway upstreams can't perform Anthropic's server-side auto mode classifier
+# checks; opting out avoids the "isn't eligible for no-charge classifier
+# requests" fallback and keeps classifier requests billed locally.
+# https://code.claude.com/docs/en/auto-mode-classifier-billing
+export CLAUDE_CODE_AUTO_MODE_SERVER="${CLAUDE_CODE_AUTO_MODE_SERVER:-0}"
 export CLAUDE_CODE_SUBAGENT_MODEL="${CLAUDE_CODE_SUBAGENT_MODEL:-$MODEL}"
 export CLAUDE_CODE_MAX_CONCURRENT_SUBAGENTS="${MAX_CONCURRENT_SUBAGENTS}"
 export CLAUDE_CODE_MAX_SUBAGENT_SPAWN_DEPTH="${MAX_SUBAGENT_SPAWN_DEPTH}"

package/bin/runbook/opencode/install.sh

@@ -55,6 +55,7 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/../model-capabilities.generated.sh"
+source "${SCRIPT_DIR}/provider.sh"
 
 # Load shared env from SUBC_ENV_FILE, or a sibling .env / env.example.
 SHARED_ENV="${SUBC_ENV_FILE:-${SCRIPT_DIR}/../.env}"
@@ -147,19 +148,7 @@ while IFS= read -r model_id; do
   add_supported_model "$model_id"
 done <<< "${SUBCONSCIOUS_MODELS:-$DEFAULT_SUBCONSCIOUS_MODELS}"
 
-MODELS_JSON=""
-for model_id in "${SUPPORTED_MODELS[@]}"; do
-  vision_fields=""
-  if subc_model_supports_vision "$model_id"; then
-    vision_fields=',"attachment":true,"modalities":{"input":["text","image"],"output":["text"]}'
-  fi
-  model_json="\"${model_id}\":{\"name\":\"${model_id}\",\"tools\":true,\"limit\":{\"context\":${CONTEXT_LIMIT},\"output\":${OUTPUT_LIMIT}}${vision_fields}}"
-  if [[ -n "$MODELS_JSON" ]]; then
-    MODELS_JSON="${MODELS_JSON},${model_json}"
-  else
-    MODELS_JSON="$model_json"
-  fi
-done
+subc_opencode_build_models_json
 
 OPENCODE_DIR="${HOME}/.opencode"
 OPENCODE_CONFIG="${OPENCODE_DIR}/opencode.json"
@@ -186,34 +175,21 @@ require_cmds() {
 write_config() {
   mkdir -p "$OPENCODE_DIR"
   local base_url="${GATEWAY_URL%/}/v1"
-  local provider
-  provider=$(cat <<EOF
-{
-  "npm": "@ai-sdk/openai-compatible",
-  "name": "Subconscious Gateway",
-  "options": {
-    "baseURL": "${base_url}",
-    "apiKey": "{env:SUBCONSCIOUS_API_KEY}",
-    "headers": {
-      "x-subconscious-client": "opencode"
-    }
-  },
-  "models": {${MODELS_JSON}}
-}
-EOF
-)
+  local provider selected_model
+  provider="$(subc_opencode_build_provider_json "$base_url")"
+  selected_model="${SUBC_OPENCODE_PROVIDER_ID}/${MODEL}"
   if [[ -f "$OPENCODE_CONFIG" ]]; then
     local tmp
     tmp="$(mktemp)"
-    jq --argjson provider "$provider" --arg model "subconscious/${MODEL}" '
+    jq --argjson provider "$provider" --arg model "$selected_model" --arg provider_id "$SUBC_OPENCODE_PROVIDER_ID" '
       .provider = (.provider // {})
-      | .provider.subconscious = $provider
+      | .provider[$provider_id] = $provider
       | .model = $model
     ' "$OPENCODE_CONFIG" >"$tmp"
     mv "$tmp" "$OPENCODE_CONFIG"
   else
-    jq -n --argjson provider "$provider" --arg model "subconscious/${MODEL}" \
-      '{ "$schema": "https://opencode.ai/config.json", provider: {subconscious: $provider}, model: $model }' \
+    jq -n --argjson provider "$provider" --arg model "$selected_model" --arg provider_id "$SUBC_OPENCODE_PROVIDER_ID" \
+      '{ "$schema": "https://opencode.ai/config.json", provider: {($provider_id): $provider}, model: $model }' \
       >"$OPENCODE_CONFIG"
   fi
   local env_file="${OPENCODE_DIR}/subconscious.env"
@@ -240,7 +216,7 @@ uninstall_config() {
     local tmp
     tmp="$(mktemp)"
     jq '
-      del(.provider.subconscious)
+      del(.provider.subconscious, .provider["subconscious-cli"])
       | if ((.model // "") | tostring | startswith("subconscious/")) then del(.model) else . end
     ' "$OPENCODE_CONFIG" >"$tmp"
     mv "$tmp" "$OPENCODE_CONFIG"

package/bin/runbook/opencode/provider.sh

@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+# Shared OpenCode provider metadata for subc launch and install paths.
+
+# OpenCode groups /models entries by provider.name. Keep this stable and human
+# readable.
+SUBC_OPENCODE_PROVIDER_ID="subconscious"
+SUBC_OPENCODE_PROVIDER_NAME="Subconscious Gateway"
+
+subc_opencode_model_display_name() {
+  local slug="${1:-}"
+  slug="${slug#subconscious/}"
+  echo "$slug" | awk -F '[-_]' '
+    function format_token(token, lower) {
+      lower = tolower(token)
+      if (lower ~ /^(gpt|oss|api|gguf|ggml|nomic|vl|it|mlx)$/) return toupper(token)
+      if (token ~ /^[0-9]+[bBkKmMgG]$/) return toupper(token)
+      if (token ~ /^[qQ][0-9]+$/) return toupper(token)
+      if (token ~ /^[0-9]+\.[0-9]+/) return token
+      if (token ~ /^[A-Za-z][0-9]+[A-Za-z]$/ || token ~ /^[0-9]+[A-Za-z]$/) return toupper(token)
+      return toupper(substr(token, 1, 1)) tolower(substr(token, 2))
+    }
+    {
+      out = ""
+      for (i = 1; i <= NF; i++) {
+        if ($i == "") continue
+        out = out (out == "" ? "" : " ") format_token($i)
+      }
+      print out
+    }
+  '
+}
+
+subc_opencode_build_whitelist_json() {
+  local model_id
+  WHITELIST_JSON=""
+  for model_id in "${SUPPORTED_MODELS[@]}"; do
+    if [[ -n "$WHITELIST_JSON" ]]; then
+      WHITELIST_JSON="${WHITELIST_JSON},\"${model_id}\""
+    else
+      WHITELIST_JSON="\"${model_id}\""
+    fi
+  done
+  WHITELIST_JSON="[${WHITELIST_JSON}]"
+}
+
+subc_opencode_build_models_json() {
+  local model_id display_name vision_fields model_json
+  MODELS_JSON=""
+  for model_id in "${SUPPORTED_MODELS[@]}"; do
+    display_name="$(subc_opencode_model_display_name "$model_id")"
+    vision_fields=""
+    if subc_model_supports_vision "$model_id"; then
+      vision_fields=',"attachment":true,"modalities":{"input":["text","image"],"output":["text"]}'
+    fi
+    model_json="\"${model_id}\":{\"name\":\"${display_name}\",\"tools\":true,\"limit\":{\"context\":${CONTEXT_LIMIT},\"output\":${OUTPUT_LIMIT}}${vision_fields}}"
+    if [[ -n "$MODELS_JSON" ]]; then
+      MODELS_JSON="${MODELS_JSON},${model_json}"
+    else
+      MODELS_JSON="$model_json"
+    fi
+  done
+  subc_opencode_build_whitelist_json
+}
+
+subc_opencode_build_config_json() {
+  local base_url="${1:?base url required}"
+  local model="${2:?model required}"
+  cat <<EOF
+{"\$schema":"https://opencode.ai/config.json","disabled_providers":["subconscious-cli"],"provider":{"${SUBC_OPENCODE_PROVIDER_ID}":{"npm":"@ai-sdk/openai-compatible","name":"${SUBC_OPENCODE_PROVIDER_NAME}","whitelist":${WHITELIST_JSON},"options":{"baseURL":"${base_url}","apiKey":"{env:SUBCONSCIOUS_API_KEY}","headers":{"x-subconscious-client":"opencode"},"modelsDiscovery":{"enabled":false}},"models":{${MODELS_JSON}}}},"model":"${SUBC_OPENCODE_PROVIDER_ID}/${model}"}
+EOF
+}
+
+subc_opencode_build_provider_json() {
+  local base_url="${1:?base url required}"
+  cat <<EOF
+{
+  "npm": "@ai-sdk/openai-compatible",
+  "name": "${SUBC_OPENCODE_PROVIDER_NAME}",
+  "whitelist": ${WHITELIST_JSON},
+  "options": {
+    "baseURL": "${base_url}",
+    "apiKey": "{env:SUBCONSCIOUS_API_KEY}",
+    "headers": {
+      "x-subconscious-client": "opencode"
+    },
+    "modelsDiscovery": {
+      "enabled": false
+    }
+  },
+  "models": {${MODELS_JSON}}
+}
+EOF
+}

package/bin/runbook/opencode/run.sh

@@ -19,6 +19,7 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/../model-capabilities.generated.sh"
+source "${SCRIPT_DIR}/provider.sh"
 
 # Load shared env from SUBC_ENV_FILE, or a sibling .env / env.example.
 SHARED_ENV="${SUBC_ENV_FILE:-${SCRIPT_DIR}/../.env}"
@@ -58,19 +59,7 @@ while IFS= read -r model_id; do
   add_supported_model "$model_id"
 done <<< "${SUBCONSCIOUS_MODELS:-$DEFAULT_SUBCONSCIOUS_MODELS}"
 
-MODELS_JSON=""
-for model_id in "${SUPPORTED_MODELS[@]}"; do
-  vision_fields=""
-  if subc_model_supports_vision "$model_id"; then
-    vision_fields=',"attachment":true,"modalities":{"input":["text","image"],"output":["text"]}'
-  fi
-  model_json="\"${model_id}\":{\"name\":\"${model_id}\",\"tools\":true,\"limit\":{\"context\":${CONTEXT_LIMIT},\"output\":${OUTPUT_LIMIT}}${vision_fields}}"
-  if [[ -n "$MODELS_JSON" ]]; then
-    MODELS_JSON="${MODELS_JSON},${model_json}"
-  else
-    MODELS_JSON="$model_json"
-  fi
-done
+subc_opencode_build_models_json
 
 if [[ -z "$GATEWAY_URL" || -z "$API_KEY" ]]; then
   echo "error: GATEWAY_URL and API_KEY must be set in ../.env" >&2
@@ -96,15 +85,11 @@ if [[ "${BASH_SOURCE[0]:-$0}" == "${0}" ]]; then
 fi
 
 BASE_URL="${GATEWAY_URL%/}/v1"
-RUNTIME_PROVIDER_ID="subconscious-cli"
 
 export SUBCONSCIOUS_API_KEY="$API_KEY"
 # Compaction reporting needs the plugin on disk; this launch path writes nothing.
 export SUBCONSCIOUS_GATEWAY_URL="${GATEWAY_URL%/}"
-export OPENCODE_CONFIG_CONTENT=$(cat <<EOF
-{"\$schema":"https://opencode.ai/config.json","disabled_providers":["subconscious"],"provider":{"${RUNTIME_PROVIDER_ID}":{"npm":"@ai-sdk/openai-compatible","name":"Subconscious Gateway","options":{"baseURL":"${BASE_URL}","apiKey":"{env:SUBCONSCIOUS_API_KEY}","headers":{"x-subconscious-client":"opencode"}},"models":{${MODELS_JSON}}}},"model":"${RUNTIME_PROVIDER_ID}/${MODEL}"}
-EOF
-)
+export OPENCODE_CONFIG_CONTENT="$(subc_opencode_build_config_json "$BASE_URL" "$MODEL")"
 
 # If sourced, just export env and return.
 if [[ "${BASH_SOURCE[0]:-$0}" != "${0}" ]]; then