@machina.ai/cell-cli-core 1.49.0-rc5 → 1.50.0-rc1

package/dist/docs/CHANGES.md

@@ -123,6 +123,29 @@ stored separately in `config.yml`.
   device flow Keycloak (mensaje "Open URL..." al iniciar sesión) a stderr cuando
   el CLI corre con `--acp`, garantizando un stream stdout limpio.
 
+### 5. Universal OpenAI & xAI Compatibility Adapters under Keycloak SSO
+
+- **Problem**: Cell CLI was designed to interface natively with Gemini models.
+  Environments utilizing OpenAI or xAI models under a unified Keycloak proxy
+  could not use the CLI.
+- **Solution**: Implemented a universal, lightweight, and stateless
+  compatibility adapter (`OpenAiCompatibleContentGenerator`) that translates
+  Gemini-formatted contents, system instructions, and tool definitions into
+  OpenAI-compatible formats and parses standard OpenAI outputs back to Gemini
+  parts and usage metadata.
+- **Key Improvements**:
+  - **Stateless Tool Call Correlation**: Reconstructs and matches multi-turn
+    tool call IDs (`call_0`, `call_1`, etc.) dynamically without requiring
+    session/state cache.
+  - **Recursive Schema Translation**: Automatically maps uppercase Gemini schema
+    types (`STRING`, `OBJECT`, etc.) to lowercase standards required by OpenAI.
+  - **SSE Streaming Support**: Fully supports real-time Server-Sent Events
+    stream chunk parsing and return.
+  - **Transparent Model Routing**: Seamlessly hooks into
+    `createContentGenerator` to route all Keycloak-authenticated requests with
+    model names formatted as `{provider}/{model}` (e.g., `openai/gpt-4o`,
+    `xai/grok-2`) directly to the compatibility adapter.
+
 ## Name and Variable Renaming
 
 The following table documents the major renaming changes from "Gemini" to "Cell"

package/dist/docs/adr/001-openai-xai-compatible-adapters.md

@@ -0,0 +1,75 @@
+# Universal OpenAI & xAI Compatibility Adapters under Keycloak SSO
+
+- Status: Accepted
+- Deciders: Cell CLI Core Team
+- Date: 2026-07-11
+
+## Context and Problem Statement
+
+Currently, Cell CLI interacts natively with Gemini models via the Google Gen AI
+SDK. To enable organizations using OpenAI-compatible or xAI endpoints hosted
+through unified Keycloak proxies to utilize Cell CLI, we need a universal,
+stateless compatibility adapter.
+
+All communication must flow exclusively through the configured Keycloak
+authentication proxy, appending `/cell/{provider}/v1/chat/completions` to the
+proxy's base URL and forwarding Keycloak SSO headers.
+
+## Decision Drivers
+
+- **Zero State Retention:** The adapter must remain entirely stateless, avoiding
+  any cache or session storage between separate generator invocations to
+  maintain clean horizontal scalability and thread safety.
+- **Payload Fidelity:** Convert Gemini-formatted prompts (system instructions,
+  user/model history, schemas, tool definitions) accurately to OpenAI-compatible
+  payloads, and parse standard OpenAI completions back to Gemini parts and usage
+  metadata.
+- **De-novo Tool ID Correlation:** Map sequential `tool_call_id`s across
+  multi-turn histories during pure payload scans without persisting state.
+- **Maintainability:** Minimal impact on the core Gemini engine; transparent
+  routing of provider-prefixed models.
+
+## Considered Options
+
+1. **Option 1: Add a native OpenAI SDK dependency**
+   - _Pros:_ Reuses official OpenAI client wrappers.
+   - _Cons:_ Significantly increases NPM package weight, introduces potential
+     dependency conflicts, and complicates stateless stream handling over the
+     unified Keycloak proxy.
+2. **Option 2: Stateless lightweight compatibility generator adapter (Chosen)**
+   - _Pros:_ Zero extra dependencies, fully stateless, lightweight (`fetch`
+     based), allows recursive, custom-tailored schema mappings and deterministic
+     multi-turn tool call correlation.
+   - _Cons:_ Requires manually maintaining payload translations for text, tools,
+     and streaming chunks.
+
+## Decision Outcome
+
+We choose **Option 2: Stateless lightweight compatibility generator adapter**.
+
+### Implementation Details
+
+- **Validation Bypass:** Allow model names formatted as `{provider}/{model}`
+  when configured with `AuthType.KEYCLOAK`.
+- **Stateless Tool Call ID Correlation:** Reconstruct and match `tool_call_id`s
+  (`call_0`, `call_1`, ...) on every single payload scan by tracing
+  conversational history turns sequentially.
+- **SSE Stream Parser:** Efficiently stream OpenAI Server-Sent Events, yielding
+  parsed completion chunks and formatting them back to Gemini-compatible
+  `GenerateContentResponse` shapes.
+
+## Pros and Cons of the Chosen Option
+
+### Pros
+
+- Extends the CLI to support OpenAI and xAI out-of-the-box without increasing
+  bundle size.
+- Purely functional, keeping the runtime footprint minimal and highly
+  thread-safe.
+- Correctly aligns with the established composition/delegation architectural
+  principles of Cell CLI.
+
+### Cons
+
+- Stream chunks must be parsed line-by-line which we resolved using a standard
+  TextDecoder buffer stream loop.

package/dist/index.d.ts

@@ -5,7 +5,7 @@
  */
 export * from './src/index.js';
 export { Storage } from './src/config/storage.js';
-export { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, AUTO_GEMINI_3_5_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, DEFAULT_GEMINI_EMBEDDING_MODEL, GEMMA_4_31B_IT_MODEL, GEMMA_4_26B_A4B_IT_MODEL, GEMINI_3_5_FLASH_MODEL, } from './src/config/models.js';
+export { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, AUTO_GEMINI_3_5_MODEL, AUTO_GROK_4_5_MODEL, AUTO_GPT_5_6_FRONTIER_MODEL, AUTO_GPT_5_4_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, DEFAULT_GEMINI_EMBEDDING_MODEL, GEMMA_4_31B_IT_MODEL, GEMMA_4_26B_A4B_IT_MODEL, GEMINI_3_5_FLASH_MODEL, } from './src/config/models.js';
 export { serializeTerminalToObject, type AnsiOutput, type AnsiLine, type AnsiToken, } from './src/utils/terminalSerializer.js';
 export { DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD } from './src/config/config.js';
 export { detectIdeFromEnv } from './src/ide/detect-ide.js';

package/dist/index.js

@@ -5,7 +5,7 @@
  */
 export * from './src/index.js';
 export { Storage } from './src/config/storage.js';
-export { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, AUTO_GEMINI_3_5_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, DEFAULT_GEMINI_EMBEDDING_MODEL, GEMMA_4_31B_IT_MODEL, GEMMA_4_26B_A4B_IT_MODEL, GEMINI_3_5_FLASH_MODEL, } from './src/config/models.js';
+export { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, AUTO_GEMINI_3_5_MODEL, AUTO_GROK_4_5_MODEL, AUTO_GPT_5_6_FRONTIER_MODEL, AUTO_GPT_5_4_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, DEFAULT_GEMINI_EMBEDDING_MODEL, GEMMA_4_31B_IT_MODEL, GEMMA_4_26B_A4B_IT_MODEL, GEMINI_3_5_FLASH_MODEL, } from './src/config/models.js';
 export { serializeTerminalToObject, } from './src/utils/terminalSerializer.js';
 export { DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD } from './src/config/config.js';
 export { detectIdeFromEnv } from './src/ide/detect-ide.js';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,qBAAqB,EACrB,0BAA0B,EAC1B,+BAA+B,EAC/B,8BAA8B,EAC9B,oBAAoB,EACpB,wBAAwB,EACxB,sBAAsB,GACvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,yBAAyB,GAI1B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,sCAAsC,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,EACrB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,cAAc,kCAAkC,CAAC;AAEjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,qBAAqB,EACrB,mBAAmB,EACnB,2BAA2B,EAC3B,kBAAkB,EAClB,0BAA0B,EAC1B,+BAA+B,EAC/B,8BAA8B,EAC9B,oBAAoB,EACpB,wBAAwB,EACxB,sBAAsB,GACvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,yBAAyB,GAI1B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,sCAAsC,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,EACrB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,cAAc,kCAAkC,CAAC;AAEjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC"}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@machina.ai/cell-cli-core",
-  "version": "1.49.0-rc5",
+  "version": "1.50.0-rc1",
   "description": "Cell CLI Core",
   "repository": {
     "type": "git",

package/dist/src/agents/agentLoader.d.ts

@@ -97,8 +97,8 @@ declare const localAgentSchema: z.ZodObject<{
         stdio?: boolean | undefined;
         description?: string | undefined;
         timeout?: number | undefined;
-        trust?: boolean | undefined;
         headers?: Record<string, string> | undefined;
+        trust?: boolean | undefined;
         auth?: {
             type: "google-credentials";
             scopes?: string[] | undefined;
@@ -129,8 +129,8 @@ declare const localAgentSchema: z.ZodObject<{
         stdio?: boolean | undefined;
         description?: string | undefined;
         timeout?: number | undefined;
-        trust?: boolean | undefined;
         headers?: Record<string, string> | undefined;
+        trust?: boolean | undefined;
         auth?: {
             type: "google-credentials";
             scopes?: string[] | undefined;
@@ -174,8 +174,8 @@ declare const localAgentSchema: z.ZodObject<{
         stdio?: boolean | undefined;
         description?: string | undefined;
         timeout?: number | undefined;
-        trust?: boolean | undefined;
         headers?: Record<string, string> | undefined;
+        trust?: boolean | undefined;
         auth?: {
             type: "google-credentials";
             scopes?: string[] | undefined;
@@ -217,8 +217,8 @@ declare const localAgentSchema: z.ZodObject<{
         stdio?: boolean | undefined;
         description?: string | undefined;
         timeout?: number | undefined;
-        trust?: boolean | undefined;
         headers?: Record<string, string> | undefined;
+        trust?: boolean | undefined;
         auth?: {
             type: "google-credentials";
             scopes?: string[] | undefined;

package/dist/src/code_assist/types.d.ts

@@ -304,6 +304,7 @@ export declare const RequiredMcpServerConfigSchema: z.ZodObject<{
     url: string;
     description?: string | undefined;
     timeout?: number | undefined;
+    headers?: Record<string, string> | undefined;
     trust?: boolean | undefined;
     includeTools?: string[] | undefined;
     excludeTools?: string[] | undefined;
@@ -315,12 +316,12 @@ export declare const RequiredMcpServerConfigSchema: z.ZodObject<{
     } | undefined;
     targetAudience?: string | undefined;
     targetServiceAccount?: string | undefined;
-    headers?: Record<string, string> | undefined;
 }, {
     type: "http" | "sse";
     url: string;
     description?: string | undefined;
     timeout?: number | undefined;
+    headers?: Record<string, string> | undefined;
     trust?: boolean | undefined;
     includeTools?: string[] | undefined;
     excludeTools?: string[] | undefined;
@@ -332,7 +333,6 @@ export declare const RequiredMcpServerConfigSchema: z.ZodObject<{
     } | undefined;
     targetAudience?: string | undefined;
     targetServiceAccount?: string | undefined;
-    headers?: Record<string, string> | undefined;
 }>;
 export type RequiredMcpServerConfig = z.infer<typeof RequiredMcpServerConfigSchema>;
 export declare const McpConfigDefinitionSchema: z.ZodObject<{
@@ -385,6 +385,7 @@ export declare const McpConfigDefinitionSchema: z.ZodObject<{
         url: string;
         description?: string | undefined;
         timeout?: number | undefined;
+        headers?: Record<string, string> | undefined;
         trust?: boolean | undefined;
         includeTools?: string[] | undefined;
         excludeTools?: string[] | undefined;
@@ -396,12 +397,12 @@ export declare const McpConfigDefinitionSchema: z.ZodObject<{
         } | undefined;
         targetAudience?: string | undefined;
         targetServiceAccount?: string | undefined;
-        headers?: Record<string, string> | undefined;
     }, {
         type: "http" | "sse";
         url: string;
         description?: string | undefined;
         timeout?: number | undefined;
+        headers?: Record<string, string> | undefined;
         trust?: boolean | undefined;
         includeTools?: string[] | undefined;
         excludeTools?: string[] | undefined;
@@ -413,7 +414,6 @@ export declare const McpConfigDefinitionSchema: z.ZodObject<{
         } | undefined;
         targetAudience?: string | undefined;
         targetServiceAccount?: string | undefined;
-        headers?: Record<string, string> | undefined;
     }>>>;
 }, "strip", z.ZodTypeAny, {
     mcpServers?: Record<string, {
@@ -428,6 +428,7 @@ export declare const McpConfigDefinitionSchema: z.ZodObject<{
         url: string;
         description?: string | undefined;
         timeout?: number | undefined;
+        headers?: Record<string, string> | undefined;
         trust?: boolean | undefined;
         includeTools?: string[] | undefined;
         excludeTools?: string[] | undefined;
@@ -439,7 +440,6 @@ export declare const McpConfigDefinitionSchema: z.ZodObject<{
         } | undefined;
         targetAudience?: string | undefined;
         targetServiceAccount?: string | undefined;
-        headers?: Record<string, string> | undefined;
     }> | undefined;
 }, {
     mcpServers?: Record<string, {
@@ -454,6 +454,7 @@ export declare const McpConfigDefinitionSchema: z.ZodObject<{
         url: string;
         description?: string | undefined;
         timeout?: number | undefined;
+        headers?: Record<string, string> | undefined;
         trust?: boolean | undefined;
         includeTools?: string[] | undefined;
         excludeTools?: string[] | undefined;
@@ -465,7 +466,6 @@ export declare const McpConfigDefinitionSchema: z.ZodObject<{
         } | undefined;
         targetAudience?: string | undefined;
         targetServiceAccount?: string | undefined;
-        headers?: Record<string, string> | undefined;
     }> | undefined;
 }>;
 export type McpConfigDefinition = z.infer<typeof McpConfigDefinitionSchema>;
@@ -523,6 +523,7 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 url: string;
                 description?: string | undefined;
                 timeout?: number | undefined;
+                headers?: Record<string, string> | undefined;
                 trust?: boolean | undefined;
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
@@ -534,12 +535,12 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 } | undefined;
                 targetAudience?: string | undefined;
                 targetServiceAccount?: string | undefined;
-                headers?: Record<string, string> | undefined;
             }, {
                 type: "http" | "sse";
                 url: string;
                 description?: string | undefined;
                 timeout?: number | undefined;
+                headers?: Record<string, string> | undefined;
                 trust?: boolean | undefined;
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
@@ -551,7 +552,6 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 } | undefined;
                 targetAudience?: string | undefined;
                 targetServiceAccount?: string | undefined;
-                headers?: Record<string, string> | undefined;
             }>>>;
         }, "strip", z.ZodTypeAny, {
             mcpServers?: Record<string, {
@@ -566,6 +566,7 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 url: string;
                 description?: string | undefined;
                 timeout?: number | undefined;
+                headers?: Record<string, string> | undefined;
                 trust?: boolean | undefined;
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
@@ -577,7 +578,6 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 } | undefined;
                 targetAudience?: string | undefined;
                 targetServiceAccount?: string | undefined;
-                headers?: Record<string, string> | undefined;
             }> | undefined;
         }, {
             mcpServers?: Record<string, {
@@ -592,6 +592,7 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 url: string;
                 description?: string | undefined;
                 timeout?: number | undefined;
+                headers?: Record<string, string> | undefined;
                 trust?: boolean | undefined;
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
@@ -603,7 +604,6 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 } | undefined;
                 targetAudience?: string | undefined;
                 targetServiceAccount?: string | undefined;
-                headers?: Record<string, string> | undefined;
             }> | undefined;
         }>>;
         requiredMcpConfig: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
@@ -636,6 +636,7 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
             url: string;
             description?: string | undefined;
             timeout?: number | undefined;
+            headers?: Record<string, string> | undefined;
             trust?: boolean | undefined;
             includeTools?: string[] | undefined;
             excludeTools?: string[] | undefined;
@@ -647,12 +648,12 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
             } | undefined;
             targetAudience?: string | undefined;
             targetServiceAccount?: string | undefined;
-            headers?: Record<string, string> | undefined;
         }, {
             type: "http" | "sse";
             url: string;
             description?: string | undefined;
             timeout?: number | undefined;
+            headers?: Record<string, string> | undefined;
             trust?: boolean | undefined;
             includeTools?: string[] | undefined;
             excludeTools?: string[] | undefined;
@@ -664,7 +665,6 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
             } | undefined;
             targetAudience?: string | undefined;
             targetServiceAccount?: string | undefined;
-            headers?: Record<string, string> | undefined;
         }>>>;
     }, "strip", z.ZodTypeAny, {
         mcpEnabled?: boolean | undefined;
@@ -681,6 +681,7 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 url: string;
                 description?: string | undefined;
                 timeout?: number | undefined;
+                headers?: Record<string, string> | undefined;
                 trust?: boolean | undefined;
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
@@ -692,7 +693,6 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 } | undefined;
                 targetAudience?: string | undefined;
                 targetServiceAccount?: string | undefined;
-                headers?: Record<string, string> | undefined;
             }> | undefined;
         } | undefined;
         requiredMcpConfig?: Record<string, {
@@ -700,6 +700,7 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
             url: string;
             description?: string | undefined;
             timeout?: number | undefined;
+            headers?: Record<string, string> | undefined;
             trust?: boolean | undefined;
             includeTools?: string[] | undefined;
             excludeTools?: string[] | undefined;
@@ -711,7 +712,6 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
             } | undefined;
             targetAudience?: string | undefined;
             targetServiceAccount?: string | undefined;
-            headers?: Record<string, string> | undefined;
         }> | undefined;
     }, {
         mcpEnabled?: boolean | undefined;
@@ -728,6 +728,7 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 url: string;
                 description?: string | undefined;
                 timeout?: number | undefined;
+                headers?: Record<string, string> | undefined;
                 trust?: boolean | undefined;
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
@@ -739,7 +740,6 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 } | undefined;
                 targetAudience?: string | undefined;
                 targetServiceAccount?: string | undefined;
-                headers?: Record<string, string> | undefined;
             }> | undefined;
         } | undefined;
         requiredMcpConfig?: Record<string, {
@@ -747,6 +747,7 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
             url: string;
             description?: string | undefined;
             timeout?: number | undefined;
+            headers?: Record<string, string> | undefined;
             trust?: boolean | undefined;
             includeTools?: string[] | undefined;
             excludeTools?: string[] | undefined;
@@ -758,7 +759,6 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
             } | undefined;
             targetAudience?: string | undefined;
             targetServiceAccount?: string | undefined;
-            headers?: Record<string, string> | undefined;
         }> | undefined;
     }>>;
     cliFeatureSetting: z.ZodOptional<z.ZodObject<{
@@ -798,6 +798,7 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 url: string;
                 description?: string | undefined;
                 timeout?: number | undefined;
+                headers?: Record<string, string> | undefined;
                 trust?: boolean | undefined;
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
@@ -809,7 +810,6 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 } | undefined;
                 targetAudience?: string | undefined;
                 targetServiceAccount?: string | undefined;
-                headers?: Record<string, string> | undefined;
             }> | undefined;
         } | undefined;
         requiredMcpConfig?: Record<string, {
@@ -817,6 +817,7 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
             url: string;
             description?: string | undefined;
             timeout?: number | undefined;
+            headers?: Record<string, string> | undefined;
             trust?: boolean | undefined;
             includeTools?: string[] | undefined;
             excludeTools?: string[] | undefined;
@@ -828,7 +829,6 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
             } | undefined;
             targetAudience?: string | undefined;
             targetServiceAccount?: string | undefined;
-            headers?: Record<string, string> | undefined;
         }> | undefined;
     } | undefined;
     cliFeatureSetting?: {
@@ -854,6 +854,7 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 url: string;
                 description?: string | undefined;
                 timeout?: number | undefined;
+                headers?: Record<string, string> | undefined;
                 trust?: boolean | undefined;
                 includeTools?: string[] | undefined;
                 excludeTools?: string[] | undefined;
@@ -865,7 +866,6 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
                 } | undefined;
                 targetAudience?: string | undefined;
                 targetServiceAccount?: string | undefined;
-                headers?: Record<string, string> | undefined;
             }> | undefined;
         } | undefined;
         requiredMcpConfig?: Record<string, {
@@ -873,6 +873,7 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
             url: string;
             description?: string | undefined;
             timeout?: number | undefined;
+            headers?: Record<string, string> | undefined;
             trust?: boolean | undefined;
             includeTools?: string[] | undefined;
             excludeTools?: string[] | undefined;
@@ -884,7 +885,6 @@ export declare const AdminControlsSettingsSchema: z.ZodObject<{
             } | undefined;
             targetAudience?: string | undefined;
             targetServiceAccount?: string | undefined;
-            headers?: Record<string, string> | undefined;
         }> | undefined;
     } | undefined;
     cliFeatureSetting?: {

package/dist/src/config/config.d.ts

@@ -461,6 +461,8 @@ export interface ConfigParameters {
     includeDirectories?: string[];
     bugCommand?: BugCommandSettings;
     model: string;
+    localModelUrl?: string;
+    localModelApiKey?: string;
     disableLoopDetection?: boolean;
     maxSessionTurns?: number;
     acpMode?: boolean;
@@ -556,6 +558,7 @@ export interface ConfigParameters {
     worktreeSettings?: WorktreeSettings;
     modelSteering?: boolean;
     onModelChange?: (model: string) => void;
+    onLocalModelConfigChange?: (url: string | undefined, apiKey: string | undefined) => void;
     mcpEnabled?: boolean;
     extensionsEnabled?: boolean;
     agents?: AgentSettings;
@@ -644,6 +647,8 @@ export declare class Config implements McpContext, AgentLoopContext {
     private readonly cwd;
     private readonly bugCommand;
     private model;
+    private localModelUrl?;
+    private localModelApiKey?;
     private readonly disableLoopDetection;
     private hasAccessToPreviewModel;
     private readonly noBrowser;
@@ -731,6 +736,7 @@ export declare class Config implements McpContext, AgentLoopContext {
     private experimentsPromise;
     private hookSystem?;
     private readonly onModelChange;
+    private readonly onLocalModelConfigChange;
     private readonly onReload;
     private readonly billing;
     private readonly vertexAiRouting;
@@ -826,6 +832,9 @@ export declare class Config implements McpContext, AgentLoopContext {
     getDiscoveryMaxDirs(): number;
     getContentGeneratorConfig(): ContentGeneratorConfig;
     getModel(): string;
+    getLocalModelUrl(): string | undefined;
+    getLocalModelApiKey(): string | undefined;
+    setLocalModelConfig(url: string | undefined, apiKey: string | undefined, isTemporary?: boolean): void;
     getDisableLoopDetection(): boolean;
     setModel(newModel: string, isTemporary?: boolean): void;
     activateFallbackMode(model: string, failedModel?: string): void;

package/dist/src/config/config.js

@@ -277,6 +277,8 @@ export class Config {
     cwd;
     bugCommand;
     model;
+    localModelUrl;
+    localModelApiKey;
     disableLoopDetection;
     // null = unknown (quota not fetched); true = has access; false = definitively no access
     hasAccessToPreviewModel = null;
@@ -375,6 +377,7 @@ export class Config {
     experimentsPromise;
     hookSystem;
     onModelChange;
+    onLocalModelConfigChange;
     onReload;
     billing;
     vertexAiRouting;
@@ -522,6 +525,8 @@ export class Config {
         this.fileDiscoveryService = params.fileDiscoveryService ?? null;
         this.bugCommand = params.bugCommand;
         this.model = params.model;
+        this.localModelUrl = params.localModelUrl;
+        this.localModelApiKey = params.localModelApiKey;
         this.disableLoopDetection = params.disableLoopDetection ?? false;
         this._activeModel = params.model;
         this.enableAgents = params.enableAgents ?? true;
@@ -749,6 +754,7 @@ export class Config {
         }
         this.experiments = params.experiments;
         this.onModelChange = params.onModelChange;
+        this.onLocalModelConfigChange = params.onLocalModelConfigChange;
         this.onReload = params.onReload;
         this.billing = {
             overageStrategy: params.billing?.overageStrategy ?? 'ask',
@@ -1146,6 +1152,19 @@ export class Config {
     getModel() {
         return this.model;
     }
+    getLocalModelUrl() {
+        return this.localModelUrl;
+    }
+    getLocalModelApiKey() {
+        return this.localModelApiKey;
+    }
+    setLocalModelConfig(url, apiKey, isTemporary = true) {
+        this.localModelUrl = url;
+        this.localModelApiKey = apiKey;
+        if (this.onLocalModelConfigChange && !isTemporary) {
+            this.onLocalModelConfigChange(url, apiKey);
+        }
+    }
     getDisableLoopDetection() {
         return this.disableLoopDetection ?? false;
     }
@@ -1158,6 +1177,20 @@ export class Config {
             this.lastEmittedQuotaRemaining = undefined;
             this.lastEmittedQuotaLimit = undefined;
             this.emitQuotaChangedEvent();
+            if (this.contentGeneratorConfig) {
+                // Promise.resolve normalizes both real async returns and test mocks
+                // that may return a bare value/undefined.
+                void Promise.resolve(createContentGenerator(this.contentGeneratorConfig, this, this.getSessionId()))
+                    .then((generator) => {
+                    if (generator) {
+                        this.contentGenerator = generator;
+                        this.baseLlmClient = new BaseLlmClient(generator, this);
+                    }
+                })
+                    .catch((err) => {
+                    debugLogger.error('Failed to recreate content generator on model change', err);
+                });
+            }
         }
         if (this.onModelChange && !isTemporary) {
             this.onModelChange(newModel);