Merge branch 'main' into feat/watch-mode

Author: stefanoamorelli

codex-cli/src/cli.tsx

@@ -494,6 +494,7 @@ async function runQuietMode({
     model: config.model,
     config: config,
     instructions: config.instructions,
+    provider: config.provider,
     approvalPolicy,
     additionalWritableRoots,
     disableResponseStorage: config.disableResponseStorage,

codex-cli/src/components/chat/terminal-chat.tsx

@@ -584,6 +584,7 @@ export default function TerminalChat({
         {overlayMode === "model" && (
           <ModelOverlay
             currentModel={model}
+            providers={config.providers}
             currentProvider={provider}
             hasLastResponse={Boolean(lastResponseId)}
             onSelect={(newModel) => {

codex-cli/src/components/model-overlay.tsx

@@ -3,7 +3,6 @@ import {
   getAvailableModels,
   RECOMMENDED_MODELS as _RECOMMENDED_MODELS,
 } from "../utils/model-utils.js";
-import { providers } from "../utils/providers.js";
 import { Box, Text, useInput } from "ink";
 import React, { useEffect, useState } from "react";
 
@@ -19,13 +18,15 @@ type Props = {
   currentModel: string;
   currentProvider?: string;
   hasLastResponse: boolean;
+  providers?: Record<string, { name: string; baseURL: string; envKey: string }>;
   onSelect: (model: string) => void;
   onSelectProvider?: (provider: string) => void;
   onExit: () => void;
 };
 
 export default function ModelOverlay({
   currentModel,
+  providers = {},
   currentProvider = "openai",
   hasLastResponse,
   onSelect,

codex-cli/src/utils/agent/agent-loop.ts

@@ -543,22 +543,6 @@ export class AgentLoop {
         );
       } else {
         turnInput = [...abortOutputs, ...input].map(stripInternalFields);
-
-        // When response storage is disabled we have to maintain our own
-        // running transcript so that the next request still contains the
-        // full conversational history.  We skipped the transcript update in
-        // the branch above – ensure we do it here as well.
-        if (this.disableResponseStorage) {
-          const newUserItems: Array<ResponseInputItem> = input.filter((it) => {
-            if (it.type === "message" && it.role === "system") {
-              return false;
-            } else if (it.type === "reasoning") {
-              return false;
-            }
-            return true;
-          });
-          this.transcript.push(...newUserItems.map(stripInternalFields));
-        }
       }
 
       this.onLoading(true);

codex-cli/src/utils/agent/exec.ts

@@ -9,6 +9,7 @@ import { exec as rawExec } from "./sandbox/raw-exec.js";
 import { formatCommandForDisplay } from "../../format-command.js";
 import fs from "fs";
 import os from "os";
+import path from "path";
 import { parse } from "shell-quote";
 import { resolvePathAgainstWorkdir } from "src/approvals.js";
 
@@ -63,7 +64,7 @@ export function exec(
 
 export function execApplyPatch(
   patchText: string,
-  workdir: string | undefined,
+  workdir: string | undefined = undefined,
 ): ExecResult {
   // This is a temporary measure to understand what are the common base commands
   // until we start persisting and uploading rollouts
@@ -72,8 +73,20 @@ export function execApplyPatch(
     const result = process_patch(
       patchText,
       (p) => fs.readFileSync(resolvePathAgainstWorkdir(p, workdir), "utf8"),
-      (p, c) =>
-        fs.writeFileSync(resolvePathAgainstWorkdir(p, workdir), c, "utf8"),
+      (p, c) => {
+        const resolvedPath = resolvePathAgainstWorkdir(p, workdir);
+
+        // Ensure the parent directory exists before writing the file. This
+        // mirrors the behaviour of the standalone apply_patch CLI (see
+        // write_file() in apply-patch.ts) and prevents errors when adding a
+        // new file in a not‑yet‑created sub‑directory.
+        const dir = path.dirname(resolvedPath);
+        if (dir !== ".") {
+          fs.mkdirSync(dir, { recursive: true });
+        }
+
+        fs.writeFileSync(resolvedPath, c, "utf8");
+      },
       (p) => fs.unlinkSync(resolvePathAgainstWorkdir(p, workdir)),
     );
     return {

codex-cli/src/utils/config.ts

@@ -42,33 +42,33 @@ export function setApiKey(apiKey: string): void {
 }
 
 export function getBaseUrl(provider: string = "openai"): string | undefined {
-  // If the provider is `openai` and `OPENAI_BASE_URL` is set, use it
-  if (provider === "openai" && OPENAI_BASE_URL !== "") {
-    return OPENAI_BASE_URL;
-  }
-
-  // Check for a PROVIDER-specific override: e.g. OLLAMA_BASE_URL
+  // Check for a PROVIDER-specific override: e.g. OPENAI_BASE_URL or OLLAMA_BASE_URL.
   const envKey = `${provider.toUpperCase()}_BASE_URL`;
   if (process.env[envKey]) {
     return process.env[envKey];
   }
 
-  // Use the default URL from providers if available
-  const providerInfo = providers[provider.toLowerCase()];
+  // Get providers config from config file.
+  const config = loadConfig();
+  const providersConfig = config.providers ?? providers;
+  const providerInfo = providersConfig[provider.toLowerCase()];
   if (providerInfo) {
     return providerInfo.baseURL;
   }
 
-  // If the provider not found in the providers list and `OPENAI_BASE_URL` is set, use it
+  // If the provider not found in the providers list and `OPENAI_BASE_URL` is set, use it.
   if (OPENAI_BASE_URL !== "") {
     return OPENAI_BASE_URL;
   }
 
+  // We tried.
   return undefined;
 }
 
 export function getApiKey(provider: string = "openai"): string | undefined {
-  const providerInfo = providers[provider.toLowerCase()];
+  const config = loadConfig();
+  const providersConfig = config.providers ?? providers;
+  const providerInfo = providersConfig[provider.toLowerCase()];
   if (providerInfo) {
     if (providerInfo.name === "Ollama") {
       return process.env[providerInfo.envKey] ?? "dummy";
@@ -81,12 +81,10 @@ export function getApiKey(provider: string = "openai"): string | undefined {
     return OPENAI_API_KEY;
   }
 
+  // We tried.
   return undefined;
 }
 
-// Formatting (quiet mode-only).
-export const PRETTY_PRINT = Boolean(process.env["PRETTY_PRINT"] || "");
-
 // Represents config as persisted in config.json.
 export type StoredConfig = {
   model?: string;
@@ -98,6 +96,7 @@ export type StoredConfig = {
   notify?: boolean;
   /** Disable server-side response storage (send full transcript each request) */
   disableResponseStorage?: boolean;
+  providers?: Record<string, { name: string; baseURL: string; envKey: string }>;
   history?: {
     maxSize?: number;
     saveHistory?: boolean;
@@ -134,13 +133,17 @@ export type AppConfig = {
 
   /** Enable the "flex-mode" processing mode for supported models (o3, o4-mini) */
   flexMode?: boolean;
+  providers?: Record<string, { name: string; baseURL: string; envKey: string }>;
   history?: {
     maxSize: number;
     saveHistory: boolean;
     sensitivePatterns: Array<string>;
   };
 };
 
+// Formatting (quiet mode-only).
+export const PRETTY_PRINT = Boolean(process.env["PRETTY_PRINT"] || "");
+
 // ---------------------------------------------------------------------------
 // Project doc support (codex.md)
 // ---------------------------------------------------------------------------
@@ -399,6 +402,9 @@ export const loadConfig = (
     };
   }
 
+  // Merge default providers with user configured providers in the config.
+  config.providers = { ...providers, ...storedConfig.providers };
+
   return config;
 };
 
@@ -431,6 +437,7 @@ export const saveConfig = (
   const configToSave: StoredConfig = {
     model: config.model,
     provider: config.provider,
+    providers: config.providers,
     approvalMode: config.approvalMode,
   };