20 Commits

• [codex] Use expect in integration tests (#28441)

  The workspace denies `clippy::expect_used` in production. Although
  `clippy.toml` allows `expect` in tests, Bazel Clippy compiles
  integration-test helper code in a way that does not receive that
  exemption, which encouraged verbose `unwrap_or_else(... panic!(...))`
  and equivalent `match`/`let else` forms.
  
  This allows `clippy::expect_used` once at each integration-test crate
  root (including aggregated suites and test-support libraries), then
  replaces manual panic-based Result and Option unwraps with
  `expect`/`expect_err`. Standalone `tests/*.rs` files remain their own
  crate roots. Intentional assertion and unexpected-variant panics remain
  unchanged, and the production `expect_used = "deny"` lint remains in
  place.
  
  The cleanup is mechanical and net-negative in line count.

  pakrym-oai · 2026-06-15 21:53:47 -07:00
  e752f7b4ae
• Support --output-schema for exec resume (#23123)

  ## Why
  
  `codex exec resume` should have the same structured-output support as
  top-level `codex exec`. Without `--output-schema`, multi-turn automation
  has to choose between resumed session context and schema-validated JSON
  output.
  
  Fixes #22998.
  
  ## What changed
  
  - Marked `--output-schema` as a global `codex exec` flag so it can be
  passed after `resume`.
  - Reused the existing output schema plumbing so resumed turns attach the
  schema to the final response request while preserving session context.

  Eric Traut · 2026-05-18 08:55:22 -07:00
  af6ffb6ebb
• Remove CODEX_RS_SSE_FIXTURE test hook (#22413)

  ## Why
  
  `CODEX_RS_SSE_FIXTURE` let integration-style CLI, exec, and TUI tests
  bypass the normal Responses transport by reading SSE from local files.
  That kept test-only behavior wired through production client code. The
  affected tests can stay hermetic by using the existing
  `core_test_support::responses` mock server and passing `openai_base_url`
  instead.
  
  ## What Changed
  
  - Removed the `CODEX_RS_SSE_FIXTURE` flag,
  `codex_api::stream_from_fixture`, the `env-flags` dependency, and the
  checked-in SSE fixture files.
  - Repointed the affected core, exec, and TUI tests at `MockServer` with
  the existing SSE event constructors.
  - Removed the Bazel test data plumbing for the deleted fixtures and
  refreshed cargo/Bazel lock state.
  
  ## Verification
  
  - `cargo build -p codex-cli`
  - `cargo test -p codex-api`
  - `cargo test -p codex-core --test all responses_api_stream_cli`
  - `cargo test -p codex-core --test all
  integration_creates_and_checks_session_file`
  - `cargo test -p codex-exec --test all ephemeral`
  - `cargo test -p codex-exec --test all resume`
  - `cargo test -p codex-tui --test all
  resume_startup_does_not_consume_model_availability_nux_count`
  - `just bazel-lock-update`
  - `just bazel-lock-check`
  - `just fix -p codex-api -p codex-core -p codex-exec -p codex-tui`
  - `git diff --check`

  pakrym-oai · 2026-05-13 03:08:01 +00:00
  96833c5b15
• Remove OPENAI_BASE_URL config fallback (#16720)

  The `OPENAI_BASE_URL` environment variable has been a significant
  support issue, so we decided to deprecate it in favor of an
  `openai_base_url` config key. We've had the deprecation warning in place
  for about a month, so users have had time to migrate to the new
  mechanism. This PR removes support for `OPENAI_BASE_URL` entirely.

  Eric Traut · 2026-04-03 15:03:21 -07:00
  4b8bab6ad3
• core: bundle settings diff updates into one dev/user envelope (#12417)

  ## Summary
  - bundle contextual prompt injection into at most one developer message
  plus one contextual user message in both:
    - per-turn settings updates
    - initial context insertion
  - preserve `<model_switch>` across compaction by rebuilding it through
  canonical initial-context injection, instead of relying on
  strip/reattach hacks
  - centralize contextual user fragment detection in one shared definition
  table and reuse it for parsing/compaction logic
  - keep `AGENTS.md` in its natural serialized format:
    - `# AGENTS.md instructions for {dirname}`
    - `<INSTRUCTIONS>...</INSTRUCTIONS>`
  - simplify related tests/helpers and accept the expected snapshot/layout
  updates from bundled multi-part messages
  
  ## Why
  The goal is to converge toward a simpler, more intentional prompt shape
  where contextual updates are consistently represented as one developer
  envelope plus one contextual user envelope, while keeping parsing and
  compaction behavior aligned with that representation.
  
  ## Notable details
  - the temporary `SettingsUpdateEnvelope` wrapper was removed; these
  paths now return `Vec<ResponseItem>` directly
  - local/remote compaction no longer rely on model-switch strip/restore
  helpers
  - contextual user detection is now driven by shared fragment definitions
  instead of ad hoc matcher assembly
  - AGENTS/user instructions are still the same logical context; only the
  synthetic `<user_instructions>` wrapper was replaced by the natural
  AGENTS text format
  
  ## Testing
  - `just fmt`
  - `cargo test -p codex-app-server
  codex_message_processor::tests::extract_conversation_summary_prefers_plain_user_messages
  -- --exact`
  - `cargo test -p codex-core
  compact::tests::collect_user_messages_filters_session_prefix_entries
  --lib -- --exact`
  - `cargo test -p codex-core --test all
  'suite::compact::snapshot_request_shape_pre_turn_compaction_strips_incoming_model_switch'
  -- --exact`
  - `cargo test -p codex-core --test all
  'suite::compact_remote::snapshot_request_shape_remote_pre_turn_compaction_strips_incoming_model_switch'
  -- --exact`
  - `cargo test -p codex-core --test all
  'suite::client::includes_apps_guidance_as_developer_message_when_enabled'
  -- --exact`
  - `cargo test -p codex-core --test all
  'suite::client::includes_developer_instructions_message_in_request' --
  --exact`
  - `cargo test -p codex-core --test all
  'suite::client::includes_user_instructions_message_in_request' --
  --exact`
  - `cargo test -p codex-core --test all
  'suite::client::resume_includes_initial_messages_and_sends_prior_items'
  -- --exact`
  - `cargo test -p codex-core --test all
  'suite::review::review_input_isolated_from_parent_history' -- --exact`
  - `cargo test -p codex-exec --test all
  'suite::resume::exec_resume_last_respects_cwd_filter_and_all_flag' --
  --exact`
  - `cargo test -p core_test_support
  context_snapshot::tests::full_text_mode_preserves_unredacted_text --
  --exact`
  
  ## Notes
  - I also ran several targeted `compact`, `compact_remote`,
  `prompt_caching`, `model_visible_layout`, and `event_mapping` tests
  while iterating on prompt-shape changes.
  - I have not claimed a clean full-workspace `cargo test` from this
  environment because local sandbox/resource conditions have previously
  produced unrelated failures in large workspace runs.

  Charley Cunningham · 2026-02-26 00:12:08 -08:00
  07aefffb1f
• fix: flaky test due to second-resolution for thread ordering (#12692)
  jif-oai · 2026-02-25 09:59:25 +00:00
  a046849438
• fix(exec) Patch resume test race condition (#12648)

  ## Summary
  The test exec_resume_last_respects_cwd_filter_and_all_flag makes one
  session “newest” by resuming it, but rollout updated_at is stored/sorted
  at second precision. On fast CI (especially Windows), the touch could
  land in the same second as initial session creation, making ordering
  nondeterministic.
  
  This change adds a short sleep before the recency-touch step so the
  resumed session is guaranteed to have a later updated_at, preserving the
  intended assertion without changing product behavior.

  Dylan Hurd · 2026-02-23 21:54:25 -08:00
  fbeda61cc3
• feat: land sqlite (#12141)
  jif-oai · 2026-02-23 16:12:23 +00:00
  eace7c6610
• [bazel] Improve runfiles handling (#10098)

  we can't use runfiles directory on Windows due to path lengths, so swap
  to manifest strategy. Parsing the manifest is a bit complex and the
  format is changing in Bazel upstream, so pull in the official Rust
  library (via a small hack to make it importable...) and cleanup all the
  associated logic to work cleanly in both bazel and cargo without extra
  confusion

  zbarsky-openai · 2026-01-29 00:15:44 +00:00
  8497163363
• Fix flakey resume test (#9789)

  Sessions' `updated_at` times are truncated to seconds, with the UUID
  session ID used to break ties. If the two test sessions are created in
  the same second, AND the session B UUID < session A UUID, the test
  fails.
  
  Fix this by mutating the session mtimes, from which we derive the
  updated_at time, to ensure session B is updated_at later than session A.

  gt-oai · 2026-01-26 14:44:37 +00:00
  65c7119fb7
• Made codex exec resume --last consistent with codex resume --last (#9352)

  PR #9245 made `codex resume --last` honor cwd, but I forgot to make the
  same change for `codex exec resume --last`. This PR fixes the
  inconsistency.
  
  This addresses #8700

  Eric Traut · 2026-01-16 08:53:47 -08:00
  9147df0e60
• feat: introduce find_resource! macro that works with Cargo or Bazel (#8879)

  To support Bazelification in https://github.com/openai/codex/pull/8875,
  this PR introduces a new `find_resource!` macro that we use in place of
  our existing logic in tests that looks for resources relative to the
  compile-time `CARGO_MANIFEST_DIR` env var.
  
  To make this work, we plan to add the following to all `rust_library()`
  and `rust_test()` Bazel rules in the project:
  
  ```
  rustc_env = {
      "BAZEL_PACKAGE": native.package_name(),
  },
  ```
  
  Our new `find_resource!` macro reads this value via
  `option_env!("BAZEL_PACKAGE")` so that the Bazel package _of the code
  using `find_resource!`_ is injected into the code expanded from the
  macro. (If `find_resource()` were a function, then
  `option_env!("BAZEL_PACKAGE")` would always be
  `codex-rs/utils/cargo-bin`, which is not what we want.)
  
  Note we only consider the `BAZEL_PACKAGE` value when the `RUNFILES_DIR`
  environment variable is set at runtime, indicating that the test is
  being run by Bazel. In this case, we have to concatenate the runtime
  `RUNFILES_DIR` with the compile-time `BAZEL_PACKAGE` value to build the
  path to the resource.
  
  In testing this change, I discovered one funky edge case in
  `codex-rs/exec-server/tests/common/lib.rs` where we have to _normalize_
  (but not canonicalize!) the result from `find_resource!` because the
  path contains a `common/..` component that does not exist on disk when
  the test is run under Bazel, so it must be semantically normalized using
  the [`path-absolutize`](https://crates.io/crates/path-absolutize) crate
  before it is passed to `dotslash fetch`.
  
  Because this new behavior may be non-obvious, this PR also updates
  `AGENTS.md` to make humans/Codex aware that this API is preferred.

  Michael Bolin · 2026-01-07 18:06:08 -08:00
  f6b563ec64
• Allow global exec flags after resume and fix CI codex build/timeout (#8440)

  **Motivation**
  - Bring `codex exec resume` to parity with top‑level flags so global
  options (git check bypass, json, model, sandbox toggles) work after the
  subcommand, including when outside a git repo.
  
  **Description**
  - Exec CLI: mark `--skip-git-repo-check`, `--json`, `--model`,
  `--full-auto`, and `--dangerously-bypass-approvals-and-sandbox` as
  global so they’re accepted after `resume`.
  - Tests: add `exec_resume_accepts_global_flags_after_subcommand` to
  verify those flags work when passed after `resume`.
  
  **Testing**
  - `just fmt`
  - `cargo test -p codex-exec` (pass; ran with elevated perms to allow
  network/port binds)
  - Manual: exercised `codex exec resume` with global flags after the
  subcommand to confirm behavior.

  Curtis 'Fjord' Hawthorne · 2026-01-05 22:12:09 +00:00
  5f8776d34d
• codex-exec: allow resume --last to read prompt #6717 (#6719)

  ### Description
  
  - codex exec --json resume --last "<prompt>" bailed out because clap
  treated the prompt as SESSION_ID. I removed the conflicts_with flag and
  reinterpret that positional as a prompt when
  --last is set, so the flow now keeps working in JSON mode.
  (codex-rs/exec/src/cli.rs:84-104, codex-rs/exec/src/lib.rs:75-130)
  - Added a regression test that exercises resume --last in JSON mode to
  ensure the prompt is accepted and the rollout file is updated.
  (codex-rs/exec/tests/suite/resume.rs:126-178)
  
  ### Testing
  
    - just fmt
    - cargo test -p codex-exec
    - just fix -p codex-exec
    - cargo test -p codex-exec
  
  #6717
  
  Signed-off-by: Dmitri Khokhlov <dkhokhlov@cribl.io>

  Dmitri Khokhlov · 2025-11-20 13:10:49 -08:00
  e4257f432e
• Update defaults to gpt-5.1 (#6652)

  ## Summary
  - update documentation, example configs, and automation defaults to
  reference gpt-5.1 / gpt-5.1-codex
  - bump the CLI and core configuration defaults, model presets, and error
  messaging to the new models while keeping the model-family/tool coverage
  for legacy slugs
  - refresh tests, fixtures, and TUI snapshots so they expect the upgraded
  defaults
  
  ## Testing
  - `cargo test -p codex-core
  config::tests::test_precedence_fixture_with_gpt5_profile`
  
  
  ------
  [Codex
  Task](https://chatgpt.com/codex/tasks/task_i_6916c5b3c2b08321ace04ee38604fc6b)

  Ahmed Ibrahim · 2025-11-17 17:40:11 -08:00
  ddcc60a085
• feat(tui): clarify Windows auto mode requirements (#5568)

  ## Summary
  - Coerce Windows `workspace-write` configs back to read-only, surface
  the forced downgrade in the approvals popup,
    and funnel users toward WSL or Full Access.
  - Add WSL installation instructions to the Auto preset on Windows while
  keeping the preset available for other
    platforms.
  - Skip the trust-on-first-run prompt on native Windows so new folders
  remain read-only without additional
    confirmation.
  - Expose a structured sandbox policy resolution from config to flag
  Windows downgrades and adjust tests (core,
  exec, TUI) to reflect the new behavior; provide a Windows-only approvals
  snapshot.
  
    ## Testing
    - cargo fmt
  - cargo test -p codex-core
  config::tests::add_dir_override_extends_workspace_writable_roots
  - cargo test -p codex-exec
  suite::resume::exec_resume_preserves_cli_configuration_overrides
  - cargo test -p codex-tui
  chatwidget::tests::approvals_selection_popup_snapshot
  - cargo test -p codex-tui
  approvals_popup_includes_wsl_note_for_auto_mode
    - cargo test -p codex-tui windows_skips_trust_prompt
    - just fix -p codex-core
    - just fix -p codex-tui

  Josh McKinney · 2025-10-28 01:19:32 +00:00
  66a4b89822
• feat: codex exec writes only the final message to stdout (#4644)

  This updates `codex exec` so that, by default, most of the agent's
  activity is written to stderr so that only the final agent message is
  written to stdout. This makes it easier to pipe `codex exec` into
  another tool without extra filtering.
  
  I introduced `#![deny(clippy::print_stdout)]` to help enforce this
  change and renamed the `ts_println!()` macro to `ts_msg()` because (1)
  it no longer calls `println!()` and (2), `ts_eprintln!()` seemed too
  long of a name.
  
  While here, this also adds `-o` as an alias for `--output-last-message`.
  
  Fixes https://github.com/openai/codex/issues/1670

  Michael Bolin · 2025-10-03 16:22:12 +00:00
  042d4d55d9
• Support CODEX_API_KEY for codex exec (#4615)

  Allows to set API key per invocation of `codex exec`

  pakrym-oai · 2025-10-02 09:59:45 -07:00
  2f6fb37d72
• chore: clippy on redundant closure (#4058)

  Add redundant closure clippy rules and let Codex fix it by minimising
  FQP

  jif-oai · 2025-09-22 19:30:16 +00:00
  be366a31ab
• enable-resume (#3537)

  Adding the ability to resume conversations.
  we have one verb `resume`. 
  
  Behavior:
  
  `tui`:
  `codex resume`: opens session picker
  `codex resume --last`: continue last message
  `codex resume <session id>`: continue conversation with `session id`
  
  `exec`:
  `codex resume --last`: continue last conversation
  `codex resume <session id>`: continue conversation with `session id`
  
  Implementation:
  - I added a function to find the path in `~/.codex/sessions/` with a
  `UUID`. This is helpful in resuming with session id.
  - Added the above mentioned flags
  - Added lots of testing

  Ahmed Ibrahim · 2025-09-14 19:33:19 -04:00
  a30e5e40ee