codex_sdk: fix ollama exec routing and example hangs

Author: nshkrdotcom

README.md

@@ -190,10 +190,14 @@ That causes the shared core registry to:
 - validate the local model id
 - keep `gpt-oss:20b` as the default validated OSS model when no explicit model
   is supplied
-- return a payload that renders `--oss --local-provider ollama --model llama3.2`
+- return a payload that renders exec/app-server startup through config-driven
+  model-provider routing such as `--config 'model_provider="ollama"' --config
+  'model="llama3.2"'`
 
 The SDK does not infer those flags on its own.
-- CLI argument rendering only emits `--model` from a non-empty resolved value
+- exec-mode startup also closes stdin on start for one-shot argv-prompt runs so
+  the upstream Codex CLI does not wait for EOF after printing
+  `Reading additional input from stdin...`
 
 If `ollama_base_url:` is supplied, that endpoint is carried inside the
 payload-owned env overrides as `CODEX_OSS_BASE_URL`. Raw Ollama roots are

examples/README.md

@@ -70,6 +70,10 @@ Supported SSH flags for CLI/app-server examples:
 - `--ssh-port <port>`
 - `--ssh-identity-file <path>`
 
+Example SSH runs are intentionally noninteractive. The shared execution surface
+adds `BatchMode=yes` and `ConnectTimeout=10` so unattended example runs fail
+fast instead of hanging on password or connection prompts.
+
 `--cwd` is optional for the exec-backed examples. In SSH mode it becomes
 required for app-server thread demos and raw prompt-mode CLI sessions, because
 those upstream surfaces do not expose `--skip-git-repo-check`. Point it at a
@@ -110,6 +114,8 @@ can behave less reliably under the full Codex agent prompt/tool stack.
 In `--ollama` mode, the runner:
 
 - executes the full CLI-backed example suite against the local Ollama-backed Codex route
+- uses the same config-driven `model_provider="ollama"` / `model="..."` route
+  that current upstream Codex expects for exec/app-server local-model startup
 - keeps app-server examples enabled by configuring `codex app-server` with supported
   `--config` overrides instead of unsupported OSS argv flags
 - uses deterministic local fallbacks where upstream features are not reliable on the

examples/live_config_overrides.exs

@@ -6,7 +6,7 @@ alias CodexExamples.Support
 
 Support.init!()
 
-alias Codex.{Options, Thread}
+alias Codex.Thread
 alias Codex.Config.LayerStack
 
 defmodule LiveConfigOverrides do

examples/live_rate_limits.exs

@@ -6,7 +6,7 @@ alias CodexExamples.Support
 
 Support.init!()
 
-alias Codex.{Error, Events, Items, Options, RunResultStreaming, Thread, TransportError}
+alias Codex.{Error, Events, Items, RunResultStreaming, Thread, TransportError}
 alias Codex.Protocol.RateLimit, as: RateLimitSnapshot
 
 defmodule LiveRateLimits do

examples/live_telemetry_stream.exs

@@ -6,7 +6,7 @@ alias CodexExamples.Support
 
 Support.init!()
 
-alias Codex.{Error, Models, Options, RunResultStreaming, Thread, TransportError}
+alias Codex.{Error, Models, RunResultStreaming, Thread, TransportError}
 alias Codex.ExamplesSupport
 
 defmodule LiveTelemetryStream do

examples/live_tooling_stream.exs

@@ -6,7 +6,7 @@ alias CodexExamples.Support
 
 Support.init!()
 
-alias Codex.{Events, Items, Options, RunResultStreaming, Thread}
+alias Codex.{Events, Items, RunResultStreaming, Thread}
 
 defmodule CodexExamples.LiveToolingStream do
   @moduledoc false

examples/live_usage_and_compaction.exs

@@ -6,7 +6,7 @@ alias CodexExamples.Support
 
 Support.init!()
 
-alias Codex.{Error, Events, Items, Models, Options, RunResultStreaming, Thread, TransportError}
+alias Codex.{Error, Events, Items, Models, RunResultStreaming, Thread, TransportError}
 alias Codex.ExamplesSupport
 
 defmodule LiveUsageAndCompaction do

examples/run_all.sh

@@ -149,7 +149,7 @@ echo
 if [[ "$ollama_enabled" == true ]]; then
   echo "CLI backend: Ollama via Codex OSS"
   echo "CLI model: ${CODEX_MODEL}"
-  echo "CLI route: codex --oss --local-provider ollama --model ${CODEX_MODEL}"
+  echo "CLI route: codex exec --json --config model_provider=\"ollama\" --config model=\"${CODEX_MODEL}\""
   echo "Direct API examples: skipped in --ollama mode because they are OpenAI-only"
   EXAMPLE_TIMEOUT_SECONDS="${CODEX_EXAMPLES_TIMEOUT_SECONDS:-120}"
   echo "Per-example timeout: ${EXAMPLE_TIMEOUT_SECONDS}s"

lib/codex/examples_support.ex

@@ -34,6 +34,10 @@ defmodule Codex.ExamplesSupport do
   end
 
   @context_key {__MODULE__, :ssh_context}
+  @example_ssh_options %{
+    "BatchMode" => "yes",
+    "ConnectTimeout" => 10
+  }
   @ssh_switches [
     cwd: :string,
     danger_full_access: :boolean,
@@ -415,6 +419,7 @@ defmodule Codex.ExamplesSupport do
                |> maybe_put_kw(:ssh_user, effective_user)
                |> maybe_put_kw(:port, ssh_port)
                |> maybe_put_kw(:identity_file, identity_file)
+               |> Keyword.put(:ssh_options, @example_ssh_options)
            ) do
       {:ok,
        %SSHContext{

lib/codex/runtime/exec/profile.ex

@@ -18,8 +18,6 @@ defmodule Codex.Runtime.Exec.Profile do
       args =
         ["exec", "--json"]
         |> Shared.maybe_add_pair("--profile", Keyword.get(opts, :cli_profile))
-        |> Shared.maybe_add_flag("--oss", oss_enabled?(opts))
-        |> Shared.maybe_add_pair("--local-provider", local_provider_value(opts))
         |> Shared.maybe_add_flag("--full-auto", Keyword.get(opts, :full_auto))
         |> Shared.maybe_add_flag(
           "--dangerously-bypass-approvals-and-sandbox",
@@ -32,12 +30,12 @@ defmodule Codex.Runtime.Exec.Profile do
         |> Shared.maybe_add_pair("--cd", Keyword.get(opts, :working_directory))
         |> Shared.maybe_add_repeat("--add-dir", Keyword.get(opts, :additional_directories, []))
         |> Shared.maybe_add_flag("--skip-git-repo-check", Keyword.get(opts, :skip_git_repo_check))
+        |> Shared.maybe_add_repeat("--config", config_values(opts))
         |> Kernel.++(normalize_string_list(Keyword.get(opts, :subcommand_args, [])))
         |> Shared.maybe_add_pair("--continuation-token", Keyword.get(opts, :continuation_token))
         |> Shared.maybe_add_pair("--cancellation-token", Keyword.get(opts, :cancellation_token))
         |> Shared.maybe_add_repeat("--image", Keyword.get(opts, :images, []))
         |> maybe_add_output_schema(Keyword.get(opts, :output_schema))
-        |> Shared.maybe_add_repeat("--config", config_values(opts))
         |> maybe_add_prompt(Keyword.get(opts, :prompt))
 
       {:ok,
@@ -87,12 +85,11 @@ defmodule Codex.Runtime.Exec.Profile do
   defp normalize_string_list(_values), do: []
 
   defp model_value(opts) do
-    Keyword.get(opts, :model) || model_payload_value(opts, :resolved_model)
-  end
-
-  defp oss_enabled?(opts) do
-    payload_backend = model_payload_value(opts, :provider_backend)
-    payload_backend in [:oss, "oss"] || Keyword.get(opts, :oss) == true
+    if local_provider_value(opts) do
+      nil
+    else
+      Keyword.get(opts, :model) || model_payload_value(opts, :resolved_model)
+    end
   end
 
   defp local_provider_value(opts) do
@@ -107,10 +104,25 @@ defmodule Codex.Runtime.Exec.Profile do
       |> List.wrap()
       |> Enum.filter(&(is_binary(&1) and &1 != ""))
 
-    (Keyword.get(opts, :config_values, []) ++ payload_values)
+    (local_model_provider_config_values(opts) ++
+       Keyword.get(opts, :config_values, []) ++
+       payload_values)
     |> Enum.uniq()
   end
 
+  defp local_model_provider_config_values(opts) do
+    model = Keyword.get(opts, :model) || model_payload_value(opts, :resolved_model)
+
+    case {local_provider_value(opts), model} do
+      {provider, model}
+      when is_binary(provider) and provider != "" and is_binary(model) and model != "" ->
+        [~s(model_provider="#{provider}"), ~s(model="#{model}")]
+
+      _other ->
+        []
+    end
+  end
+
   defp model_payload_backend_metadata(opts) do
     opts
     |> Keyword.get(:model_payload, %{})