byterover-cli 1.8.0 → 2.1.0

package/bin/kill-daemon.js

@@ -0,0 +1,78 @@
+#!/usr/bin/env node
+
+/**
+ * Gracefully stops the running brv daemon.
+ *
+ * Uses the daemon.json PID tracking from brv-transport-client
+ * instead of brute-force pkill. Sends SIGTERM first, then
+ * falls back to SIGKILL after the stop budget (3s).
+ *
+ * Usage:
+ *   node bin/kill-daemon.js          # graceful stop
+ *   npm run dev:kill                 # via npm script
+ *   npm run dev                      # kill + build + run (full cycle)
+ */
+
+import {
+  DAEMON_STOP_BUDGET_MS,
+  DAEMON_STOP_POLL_INTERVAL_MS,
+  discoverDaemon,
+  isProcessAlive,
+} from '@campfirein/brv-transport-client'
+
+function sleep(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms)
+  })
+}
+
+async function waitForProcessExit(pid, deadlineMs, pollMs) {
+  const deadline = Date.now() + deadlineMs
+  while (Date.now() < deadline) {
+    if (!isProcessAlive(pid)) {
+      return true
+    }
+
+    // eslint-disable-next-line no-await-in-loop
+    await sleep(pollMs)
+  }
+
+  return false
+}
+
+const status = discoverDaemon()
+
+// Extract PID from any discovery result that has one
+const pid = status.running
+  ? status.pid
+  : 'pid' in status
+    ? status.pid
+    : undefined
+
+if (pid === undefined || !isProcessAlive(pid)) {
+  console.log('[kill-daemon] No running daemon found')
+} else {
+  console.log(`[kill-daemon] Stopping daemon (PID ${pid})...`)
+
+  let stopped = false
+
+  // Step 1: SIGTERM for graceful shutdown
+  try {
+    process.kill(pid, 'SIGTERM')
+    stopped = await waitForProcessExit(pid, DAEMON_STOP_BUDGET_MS, DAEMON_STOP_POLL_INTERVAL_MS)
+  } catch {
+    stopped = true
+  }
+
+  if (stopped) {
+    console.log('[kill-daemon] Daemon stopped gracefully')
+  } else {
+    // Step 2: SIGKILL fallback
+    try {
+      process.kill(pid, 'SIGKILL')
+      console.log('[kill-daemon] Force killed daemon (SIGKILL)')
+    } catch {
+      console.log('[kill-daemon] Daemon stopped')
+    }
+  }
+}

package/bin/run.js

@@ -2,7 +2,7 @@
 
 process.env.BRV_ENV = 'production'
 
-import {execute} from '@oclif/core'
+import { execute } from '@oclif/core'
 
 // Inject default command 'main' (represents logic of a single 'brv' run) when no args provided
 // process.argv = ['node', 'brv', ...userArgs]
@@ -11,4 +11,4 @@ if (userArgs.length === 0) {
   process.argv.push('main')
 }
 
-await execute({dir: import.meta.url})
+await execute({ dir: import.meta.url })

package/dist/agent/core/domain/blob/types.d.ts

@@ -62,6 +62,12 @@ export interface BlobLogger {
  * SQLite is always used as the backend
  */
 export type BlobStorageConfig = {
+    /**
+     * Explicit path to the SQLite database file.
+     * Takes precedence over storageDir-derived path.
+     * Use this when the database location is managed externally (e.g., XDG storage).
+     */
+    dbPath?: string;
     /**
      * Use in-memory storage (useful for testing)
      * When true, no file is created - data lives only in memory
@@ -84,8 +90,8 @@ export type BlobStorageConfig = {
      */
     maxTotalSize?: number;
     /**
-     * Base directory where blobs/database will be stored
-     * @default '.brv/blobs'
+     * Base directory where blobs/database will be stored.
+     * Required when inMemory is false.
      */
     storageDir?: string;
 };

package/dist/agent/core/domain/llm/index.d.ts

@@ -4,6 +4,6 @@
  * Exports types, registry, and utilities for LLM provider abstraction.
  */
 export { ErrorScope, type ErrorScopeType, ErrorType, type ErrorTypeValue, LLMErrorCode, type LLMErrorCodeType, } from './error-codes.js';
-export { acceptsAnyModel, DEFAULT_CHARS_PER_TOKEN, DEFAULT_MAX_INPUT_TOKENS, getCharsPerToken, getDefaultModelForProvider, getEffectiveMaxInputTokens, getMaxInputTokensForModel, getModelCapabilities, getModelInfo, getModelInfoWithFallback, getProviderFromModel, getSupportedFileTypesForModel, getSupportedModels, isValidProviderModel, LLM_REGISTRY, modelSupportsFileType, } from './registry.js';
+export { acceptsAnyModel, DEFAULT_CHARS_PER_TOKEN, DEFAULT_MAX_INPUT_TOKENS, getCharsPerToken, getDefaultModelForProvider, getEffectiveMaxInputTokens, getMaxInputTokensForModel, getModelCapabilities, getModelInfo, getModelInfoWithFallback, getProviderFromModel, getSupportedFileTypesForModel, getSupportedModels, isValidProviderModel, LLM_REGISTRY, modelSupportsFileType, resolveRegistryProvider, } from './registry.js';
 export { type LLMConfig, LLMConfigBaseSchema, LLMConfigSchema, type LLMUpdates, LLMUpdatesSchema, safeParseLLMConfig, type ValidatedLLMConfig, validateLLMConfig, validateLLMUpdates, } from './schemas.js';
-export { getAllowedMimeTypes, getFileTypeFromMimeType, isSupportedMimeType, LLM_PROVIDERS, type LLMContext, type LLMProvider, type LLMTokenUsage, MIME_TYPE_TO_FILE_TYPE, type ModelCapabilities, type ModelInfo, type ProviderInfo, SUPPORTED_FILE_TYPES, type SupportedFileType, } from './types.js';
+export { getAllowedMimeTypes, getFileTypeFromMimeType, isSupportedMimeType, LLM_PROVIDERS, type LLMContext, type LLMProvider, type LLMTokenUsage, MIME_TYPE_TO_FILE_TYPE, type ModelCapabilities, type ModelInfo, PROVIDER_TYPES, type ProviderInfo, type ProviderType, SUPPORTED_FILE_TYPES, type SupportedFileType, } from './types.js';

package/dist/agent/core/domain/llm/index.js

@@ -6,8 +6,8 @@
 // Error Codes
 export { ErrorScope, ErrorType, LLMErrorCode, } from './error-codes.js';
 // Registry
-export { acceptsAnyModel, DEFAULT_CHARS_PER_TOKEN, DEFAULT_MAX_INPUT_TOKENS, getCharsPerToken, getDefaultModelForProvider, getEffectiveMaxInputTokens, getMaxInputTokensForModel, getModelCapabilities, getModelInfo, getModelInfoWithFallback, getProviderFromModel, getSupportedFileTypesForModel, getSupportedModels, isValidProviderModel, LLM_REGISTRY, modelSupportsFileType, } from './registry.js';
+export { acceptsAnyModel, DEFAULT_CHARS_PER_TOKEN, DEFAULT_MAX_INPUT_TOKENS, getCharsPerToken, getDefaultModelForProvider, getEffectiveMaxInputTokens, getMaxInputTokensForModel, getModelCapabilities, getModelInfo, getModelInfoWithFallback, getProviderFromModel, getSupportedFileTypesForModel, getSupportedModels, isValidProviderModel, LLM_REGISTRY, modelSupportsFileType, resolveRegistryProvider, } from './registry.js';
 // Schemas
 export { LLMConfigBaseSchema, LLMConfigSchema, LLMUpdatesSchema, safeParseLLMConfig, validateLLMConfig, validateLLMUpdates, } from './schemas.js';
 // Types
-export { getAllowedMimeTypes, getFileTypeFromMimeType, isSupportedMimeType, LLM_PROVIDERS, MIME_TYPE_TO_FILE_TYPE, SUPPORTED_FILE_TYPES, } from './types.js';
+export { getAllowedMimeTypes, getFileTypeFromMimeType, isSupportedMimeType, LLM_PROVIDERS, MIME_TYPE_TO_FILE_TYPE, PROVIDER_TYPES, SUPPORTED_FILE_TYPES, } from './types.js';

package/dist/agent/core/domain/llm/registry.d.ts

@@ -104,6 +104,14 @@ export declare function getModelCapabilities(provider: LLMProvider, model: strin
  * @returns Effective max input tokens (min of model limit and configured limit)
  */
 export declare function getEffectiveMaxInputTokens(provider: LLMProvider, model: string, configuredMax?: number): number;
+/**
+ * Resolve a user-facing provider ID (e.g. 'anthropic', 'openrouter', 'google-vertex')
+ * to a registry provider type ('claude' | 'gemini' | 'openai').
+ *
+ * Used by both AgentLLMService (tokenizer/formatter selection) and CipherAgent
+ * (registry-clamped maxInputTokens for map tools).
+ */
+export declare function resolveRegistryProvider(model: string, explicitProvider?: string): LLMProvider;
 /**
  * Check if OpenRouter accepts any model (custom models).
  * OpenRouter can route to many models not in our registry.

package/dist/agent/core/domain/llm/registry.js

@@ -9,7 +9,7 @@
  *
  * Following patterns from Dexto's LLM registry.
  */
-import { LLM_PROVIDERS, } from './types.js';
+import { PROVIDER_TYPES, } from './types.js';
 /** Default fallback for unknown models */
 export const DEFAULT_MAX_INPUT_TOKENS = 128_000;
 export const DEFAULT_CHARS_PER_TOKEN = 4;
@@ -23,8 +23,93 @@ export const DEFAULT_CHARS_PER_TOKEN = 4;
 export const LLM_REGISTRY = {
     claude: {
         defaultModel: '',
-        models: [],
-        supportedFileTypes: [],
+        models: [
+            // Claude 4.x series
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: true, supportsStreaming: true },
+                charsPerToken: 3.5,
+                displayName: 'Claude Opus 4.6',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 128_000,
+                name: 'claude-opus-4-6',
+                supportedFileTypes: ['image', 'pdf'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: true, supportsStreaming: true },
+                charsPerToken: 3.5,
+                displayName: 'Claude Sonnet 4.6',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 64_000,
+                name: 'claude-sonnet-4-6',
+                supportedFileTypes: ['image', 'pdf'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: true, supportsStreaming: true },
+                charsPerToken: 3.5,
+                displayName: 'Claude Haiku 4.5',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 64_000,
+                name: 'claude-haiku-4-5-20251001',
+                supportedFileTypes: ['image', 'pdf'],
+            },
+            // Claude 3.5 series
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: true, supportsStreaming: true },
+                charsPerToken: 3.5,
+                displayName: 'Claude 3.5 Sonnet (Oct 2024)',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 8192,
+                name: 'claude-3-5-sonnet-20241022',
+                supportedFileTypes: ['image', 'pdf'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: true, supportsStreaming: true },
+                charsPerToken: 3.5,
+                displayName: 'Claude 3.5 Sonnet (Jun 2024)',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 8192,
+                name: 'claude-3-5-sonnet-20240620',
+                supportedFileTypes: ['image', 'pdf'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: true, supportsStreaming: true },
+                charsPerToken: 3.5,
+                displayName: 'Claude 3.5 Haiku',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 8192,
+                name: 'claude-3-5-haiku-20241022',
+                supportedFileTypes: ['image', 'pdf'],
+            },
+            // Claude 3 series
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: true, supportsStreaming: true },
+                charsPerToken: 3.5,
+                displayName: 'Claude 3 Opus',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 4096,
+                name: 'claude-3-opus-20240229',
+                supportedFileTypes: ['image', 'pdf'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: true, supportsStreaming: true },
+                charsPerToken: 3.5,
+                displayName: 'Claude 3 Sonnet',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 4096,
+                name: 'claude-3-sonnet-20240229',
+                supportedFileTypes: ['image', 'pdf'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: true, supportsStreaming: true },
+                charsPerToken: 3.5,
+                displayName: 'Claude 3 Haiku',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 4096,
+                name: 'claude-3-haiku-20240307',
+                supportedFileTypes: ['image', 'pdf'],
+            },
+        ],
+        supportedFileTypes: ['image', 'pdf'],
     },
     gemini: {
         defaultModel: 'gemini-3-flash-preview',
@@ -118,10 +203,255 @@ export const LLM_REGISTRY = {
         ],
         supportedFileTypes: ['image', 'pdf', 'audio'],
     },
-    openrouter: {
+    openai: {
         defaultModel: '',
-        models: [],
-        supportedFileTypes: [],
+        models: [
+            // GPT-4.1 series (1M+ context)
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-4.1',
+                maxInputTokens: 1_047_576,
+                maxOutputTokens: 32_768,
+                name: 'gpt-4.1',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-4.1 Mini',
+                maxInputTokens: 1_047_576,
+                maxOutputTokens: 32_768,
+                name: 'gpt-4.1-mini',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-4.1 Nano',
+                maxInputTokens: 1_047_576,
+                maxOutputTokens: 32_768,
+                name: 'gpt-4.1-nano',
+                supportedFileTypes: ['image'],
+            },
+            // GPT-4o series
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-4o',
+                maxInputTokens: 128_000,
+                maxOutputTokens: 16_384,
+                name: 'gpt-4o',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-4o Mini',
+                maxInputTokens: 128_000,
+                maxOutputTokens: 16_384,
+                name: 'gpt-4o-mini',
+                supportedFileTypes: ['image'],
+            },
+            // GPT-4 Turbo
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-4 Turbo',
+                maxInputTokens: 128_000,
+                maxOutputTokens: 4096,
+                name: 'gpt-4-turbo',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-4 Turbo Preview',
+                maxInputTokens: 128_000,
+                maxOutputTokens: 4096,
+                name: 'gpt-4-turbo-preview',
+                supportedFileTypes: ['image'],
+            },
+            // GPT-5 series (400K context)
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-5',
+                maxInputTokens: 400_000,
+                maxOutputTokens: 128_000,
+                name: 'gpt-5',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-5 Mini',
+                maxInputTokens: 400_000,
+                maxOutputTokens: 128_000,
+                name: 'gpt-5-mini',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-5 Nano',
+                maxInputTokens: 400_000,
+                maxOutputTokens: 128_000,
+                name: 'gpt-5-nano',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-5 Codex',
+                maxInputTokens: 400_000,
+                maxOutputTokens: 128_000,
+                name: 'gpt-5-codex',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-5 Pro',
+                maxInputTokens: 400_000,
+                maxOutputTokens: 272_000,
+                name: 'gpt-5-pro',
+                supportedFileTypes: ['image'],
+            },
+            // GPT-5.1 series
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-5.1',
+                maxInputTokens: 400_000,
+                maxOutputTokens: 128_000,
+                name: 'gpt-5.1',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-5.1 Codex',
+                maxInputTokens: 400_000,
+                maxOutputTokens: 128_000,
+                name: 'gpt-5.1-codex',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-5.1 Codex Mini',
+                maxInputTokens: 400_000,
+                maxOutputTokens: 128_000,
+                name: 'gpt-5.1-codex-mini',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-5.1 Codex Max',
+                maxInputTokens: 400_000,
+                maxOutputTokens: 128_000,
+                name: 'gpt-5.1-codex-max',
+                supportedFileTypes: ['image'],
+            },
+            // GPT-5.2 series
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-5.2',
+                maxInputTokens: 400_000,
+                maxOutputTokens: 128_000,
+                name: 'gpt-5.2',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-5.2 Pro',
+                maxInputTokens: 400_000,
+                maxOutputTokens: 128_000,
+                name: 'gpt-5.2-pro',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-5.2 Codex',
+                maxInputTokens: 400_000,
+                maxOutputTokens: 128_000,
+                name: 'gpt-5.2-codex',
+                supportedFileTypes: ['image'],
+            },
+            // GPT-5.3 series
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'GPT-5.3 Codex',
+                maxInputTokens: 400_000,
+                maxOutputTokens: 128_000,
+                name: 'gpt-5.3-codex',
+                supportedFileTypes: ['image'],
+            },
+            // o1 series (200K context)
+            {
+                capabilities: { supportsAudio: false, supportsImages: false, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'o1',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 100_000,
+                name: 'o1',
+                supportedFileTypes: [],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: false, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'o1 Mini',
+                maxInputTokens: 128_000,
+                maxOutputTokens: 65_536,
+                name: 'o1-mini',
+                supportedFileTypes: [],
+            },
+            // o3 series (200K context)
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'o3',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 100_000,
+                name: 'o3',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: false },
+                charsPerToken: 4,
+                displayName: 'o3 Pro',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 100_000,
+                name: 'o3-pro',
+                supportedFileTypes: ['image'],
+            },
+            {
+                capabilities: { supportsAudio: false, supportsImages: false, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'o3 Mini',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 100_000,
+                name: 'o3-mini',
+                supportedFileTypes: [],
+            },
+            // o4 series (200K context)
+            {
+                capabilities: { supportsAudio: false, supportsImages: true, supportsPdf: false, supportsStreaming: true },
+                charsPerToken: 4,
+                displayName: 'o4 Mini',
+                maxInputTokens: 200_000,
+                maxOutputTokens: 100_000,
+                name: 'o4-mini',
+                supportedFileTypes: ['image'],
+            },
+        ],
+        supportedFileTypes: ['image'],
     },
 };
 // ============================================================================
@@ -154,7 +484,7 @@ export function getModelInfoWithFallback(provider, model) {
     return {
         capabilities: {
             supportsAudio: false,
-            supportsImages: provider !== 'openrouter', // Assume basic image support
+            supportsImages: true, // Assume basic image support
             supportsPdf: provider === 'claude' || provider === 'gemini',
             supportsStreaming: true,
         },
@@ -221,7 +551,7 @@ export function getDefaultModelForProvider(provider) {
  */
 export function getProviderFromModel(model) {
     // Check each provider's models
-    for (const provider of LLM_PROVIDERS) {
+    for (const provider of PROVIDER_TYPES) {
         if (getModelInfo(provider, model)) {
             return provider;
         }
@@ -232,8 +562,10 @@ export function getProviderFromModel(model) {
         return 'claude';
     if (lowerModel.startsWith('gemini'))
         return 'gemini';
+    if (lowerModel.startsWith('gpt') || lowerModel.startsWith('o1') || lowerModel.startsWith('o3') || lowerModel.startsWith('o4'))
+        return 'openai';
     if (lowerModel.includes('/'))
-        return 'openrouter'; // OpenRouter uses provider/model format
+        return 'openai'; // OpenRouter uses provider/model format, but underlying API is OpenAI-compatible
     return undefined;
 }
 /**
@@ -279,10 +611,50 @@ export function getModelCapabilities(provider, model) {
  * @returns Effective max input tokens (min of model limit and configured limit)
  */
 export function getEffectiveMaxInputTokens(provider, model, configuredMax) {
-    const modelMax = getMaxInputTokensForModel(provider, model);
-    if (configuredMax === undefined)
-        return modelMax;
-    return Math.min(modelMax, configuredMax);
+    const modelInfo = getModelInfo(provider, model);
+    if (modelInfo) {
+        // Model is known — registry is authoritative; configuredMax can only reduce it (user-defined cap)
+        if (configuredMax === undefined)
+            return modelInfo.maxInputTokens;
+        return Math.min(modelInfo.maxInputTokens, configuredMax);
+    }
+    // Model is unknown (e.g. new OpenRouter model not yet in registry).
+    // Trust configuredMax when provided — it comes from an authoritative source like the OpenRouter API.
+    return configuredMax ?? DEFAULT_MAX_INPUT_TOKENS;
+}
+/**
+ * Resolve a user-facing provider ID (e.g. 'anthropic', 'openrouter', 'google-vertex')
+ * to a registry provider type ('claude' | 'gemini' | 'openai').
+ *
+ * Used by both AgentLLMService (tokenizer/formatter selection) and CipherAgent
+ * (registry-clamped maxInputTokens for map tools).
+ */
+export function resolveRegistryProvider(model, explicitProvider) {
+    // 1. Explicit provider mapping takes priority
+    if (explicitProvider) {
+        if (explicitProvider === 'anthropic')
+            return 'claude';
+        if (explicitProvider === 'google' || explicitProvider === 'google-vertex')
+            return 'gemini';
+        if (['groq', 'mistral', 'openai', 'openai-compatible', 'openrouter', 'xai'].includes(explicitProvider)) {
+            return 'openai';
+        }
+    }
+    // 2. Use registry to detect provider from model name
+    const registryProvider = getProviderFromModel(model);
+    if (registryProvider)
+        return registryProvider;
+    // 3. Fallback to string prefix matching for unknown models
+    const lowerModel = model.toLowerCase();
+    if (lowerModel.startsWith('claude'))
+        return 'claude';
+    if (lowerModel.startsWith('gpt') ||
+        lowerModel.startsWith('o1') ||
+        lowerModel.startsWith('o3') ||
+        lowerModel.startsWith('o4')) {
+        return 'openai';
+    }
+    return 'gemini';
 }
 /**
  * Check if OpenRouter accepts any model (custom models).
@@ -291,5 +663,6 @@ export function getEffectiveMaxInputTokens(provider, model, configuredMax) {
  * @returns true if provider accepts arbitrary models
  */
 export function acceptsAnyModel(provider) {
-    return provider === 'openrouter';
+    // OpenAI provider type accepts arbitrary models (OpenRouter, direct OpenAI, xAI, etc.)
+    return provider === 'openai';
 }