Commit Graph

  • e90c17838f Merge remote-tracking branch 'origin/model-fallback-list' into repair/collab-stack-refresh-20260402 Friel 2026-04-02 11:45:32 +00:00
  • 8eb79aa017 Merge remote-tracking branch 'upstream/dev/codex/add-custom-models-support-in-config.toml-r2' into repair/collab-stack-refresh-20260402 Friel 2026-04-02 11:39:42 +00:00
  • 4f53c8b83a Merge remote-tracking branch 'upstream/dev/friel/fork-context-inherits-parent-model' into repair/collab-stack-refresh-20260402 Friel 2026-04-02 11:38:41 +00:00
  • 4855a58030 Merge remote-tracking branch 'upstream/dev/friel/fork-references' into repair/collab-stack-refresh-20260402 Friel 2026-04-02 11:35:13 +00:00
  • 74b55b30f7 Merge remote-tracking branch 'upstream/dev/codex/add-fork-option-to-codex-exec' into repair/collab-stack-refresh-20260402 Friel 2026-04-02 11:25:00 +00:00
  • decf78bc1e Merge remote-tracking branch 'upstream/friel/auto-unarchive-resume' into repair/collab-stack-refresh-20260402 Friel 2026-04-02 11:24:47 +00:00
  • 068ab89f96 fix jif/fix-pending-race jif-oai 2026-04-02 12:22:51 +02:00
  • 0c9c2298e3 codex: fix CI failure on PR #13825 dev/codex/add-custom-models-support-in-config.toml-r2 Friel 2026-04-02 10:06:04 +00:00
  • 32ff8b94d7 fix jif-oai 2026-04-02 12:04:58 +02:00
  • c7c47d0b2d fix jif-oai 2026-04-02 11:57:48 +02:00
  • c7bc168db7 fix jif-oai 2026-04-02 11:50:52 +02:00
  • 699429edef Merge remote-tracking branch 'upstream/main' into dev/codex/add-custom-models-support-in-config.toml-r2 Friel 2026-04-02 09:44:04 +00:00
  • 5ad191e0e2 Merge remote-tracking branch 'upstream/main' into dev/codex/add-custom-models-support-in-config.toml-r2 Friel 2026-04-02 09:37:37 +00:00
  • 6175239980 fix: pending input race jif-oai 2026-04-02 11:20:21 +02:00
  • 6776e3fc72 Merge upstream/main into dev/friel/fork-references Friel 2026-04-02 09:05:28 +00:00
  • e238542d54 Merge 8ccb31a65e into sapling-pr-archive-bolinfest Michael Bolin 2026-04-02 01:41:48 -07:00
  • 8ccb31a65e refactor: move shell and snapshot code out of codex-core Michael Bolin 2026-04-02 01:41:31 -07:00
  • c1d18ceb6f [codex] Remove codex-core config type shim (#16529) Michael Bolin 2026-04-02 01:19:44 -07:00
  • 3adabaef41 Merge remote-tracking branch 'upstream/main' into repair/fork-context-defaults Friel 2026-04-02 08:15:33 +00:00
  • f0de985865 merge commit for archive created by Sapling Michael Bolin 2026-04-02 00:59:34 -07:00
  • 17a1a48815 config: remove codex-core config type shim Michael Bolin 2026-04-02 00:56:07 -07:00
  • e09cc1bd9d Restore rules_rust patch context indentation Friel 2026-04-02 07:58:13 +00:00
  • da3177871c Merge cfe9a9dba7 into sapling-pr-archive-bolinfest Michael Bolin 2026-04-02 00:56:17 -07:00
  • cfe9a9dba7 config: remove codex-core config type shim Michael Bolin 2026-04-02 00:56:07 -07:00
  • 75bd6a1f29 Fix rules_rust bootstrap patch formatting Friel 2026-04-02 07:55:17 +00:00
  • 9fd1a4b42b Merge remote-tracking branch 'upstream/dev/friel/tui-watchdog-and-subagent-behavior' into tui-watchdog-timer-countdown tui-watchdog-timer-countdown Friel 2026-04-02 07:53:22 +00:00
  • a1cb27538b Merge remote-tracking branch 'upstream/main' into tui-watchdog-timer-countdown Friel 2026-04-02 07:49:53 +00:00
  • 228962d154 Merge ec0c4005fe into sapling-pr-archive-bolinfest Michael Bolin 2026-04-02 00:49:41 -07:00
  • e846fed2b1 fix: move some test utilities out of codex-rs/core/src/tools/spec.rs (#16524) Michael Bolin 2026-04-02 00:49:37 -07:00
  • ec0c4005fe core: prune low-value tests pr16518 Michael Bolin 2026-04-02 00:31:36 -07:00
  • 14dfcc1262 Merge upstream/main into subagent inbox injection Friel 2026-04-02 07:49:01 +00:00
  • f32a5e84bf [codex] Move config types into codex-config (#16523) Michael Bolin 2026-04-02 00:39:20 -07:00
  • d793ed12e3 Merge branch 'main' into model-fallback-list model-fallback-list Friel 2026-04-02 07:35:59 +00:00
  • 07a269417a merge commit for archive created by Sapling Michael Bolin 2026-04-02 00:32:05 -07:00
  • 866d1f5247 fix: move some test utilities out of codex-rs/core/src/tools/spec.rs Michael Bolin 2026-04-02 00:31:53 -07:00
  • 5131e0de45 Move tool registry plan tests into codex-tools (#16521) Michael Bolin 2026-04-02 00:26:51 -07:00
  • 127d60b2bd Merge dadfca7a94 into sapling-pr-archive-bolinfest Michael Bolin 2026-04-02 00:18:33 -07:00
  • dadfca7a94 Move tool registry plan tests into codex-tools Michael Bolin 2026-04-02 00:18:27 -07:00
  • 828b837235 Extract tool registry planning into codex-tools (#16513) Michael Bolin 2026-04-02 00:18:18 -07:00
  • 97992df196 Merge fedd450c2a into sapling-pr-archive-bolinfest Michael Bolin 2026-04-02 00:17:16 -07:00
  • fedd450c2a config: move core config types into codex-config Michael Bolin 2026-04-02 00:17:01 -07:00
  • f7f2efec71 Merge f3d181e256 into sapling-pr-archive-bolinfest Michael Bolin 2026-04-02 00:13:06 -07:00
  • f3d181e256 config: move core config types into codex-config Michael Bolin 2026-04-02 00:12:41 -07:00
  • 00cbe40edd Merge remote-tracking branch 'upstream/dev/friel/tui-collab-foundation' into dev/friel/tui-watchdog-and-subagent-behavior Friel 2026-04-02 07:10:26 +00:00
  • 6509f018c1 merge commit for archive created by Sapling Michael Bolin 2026-04-01 23:55:59 -07:00
  • a826920cd3 Move tool registry plan tests into codex-tools Michael Bolin 2026-04-01 23:48:05 -07:00
  • f1cc81fbc5 Extract tool registry planning into codex-tools Michael Bolin 2026-04-01 23:48:05 -07:00
  • 2c239b7671 fix(exec): preserve prompt stdin append behavior dev/codex/add-fork-option-to-codex-exec Friel 2026-04-02 06:51:14 +00:00
  • bec1ea6330 merge commit for archive created by Sapling Michael Bolin 2026-04-01 23:48:57 -07:00
  • 9a207b21cf Extract tool registry planning into codex-tools Michael Bolin 2026-04-01 23:48:05 -07:00
  • 3893453a9d Merge 98eb3a70d2 into sapling-pr-archive-bolinfest Michael Bolin 2026-04-01 23:38:05 -07:00
  • 98eb3a70d2 core: prune low-value tests Michael Bolin 2026-04-01 23:37:59 -07:00
  • a300284397 merge commit for archive created by Sapling Michael Bolin 2026-04-01 23:36:01 -07:00
  • 52e779d35d fix: add update to Cargo.lock that was missed in #16512 (#16516) Michael Bolin 2026-04-01 23:33:41 -07:00
  • f8e5441897 core: prune low-value tests Michael Bolin 2026-04-01 23:31:32 -07:00
  • 8a74713f06 Merge bdfec7fe7f into sapling-pr-archive-bolinfest Michael Bolin 2026-04-01 23:25:54 -07:00
  • bdfec7fe7f fix: add update to Cargo.lock that was missed in #16512 Michael Bolin 2026-04-01 23:15:56 -07:00
  • 02839f41a2 Merge remote-tracking branch 'upstream/friel/auto-unarchive-resume' into friel/auto-unarchive-resume friel/auto-unarchive-resume Friel 2026-04-02 06:13:08 +00:00
  • 96579cd59a Merge 8e7b90b94b into sapling-pr-archive-bolinfest Michael Bolin 2026-04-01 23:06:56 -07:00
  • 8e7b90b94b Extract tool registry planning into codex-tools Michael Bolin 2026-04-01 23:06:43 -07:00
  • aa2403e2eb core: remove cross-crate re-exports from lib.rs (#16512) Michael Bolin 2026-04-01 23:06:24 -07:00
  • 47bf411c68 merge commit for archive created by Sapling Michael Bolin 2026-04-01 22:42:24 -07:00
  • c15c45d61b fix: eliminate re-exports in codex-rs/core/lib.rs Michael Bolin 2026-04-01 22:40:03 -07:00
  • c952b73961 Merge 79da168be9 into sapling-pr-archive-bolinfest Michael Bolin 2026-04-01 22:40:11 -07:00
  • 79da168be9 fix: eliminate re-exports in codex-rs/core/lib.rs Michael Bolin 2026-04-01 22:40:03 -07:00
  • c0cce6ff7f Merge remote-tracking branch 'upstream/main' into friel/auto-unarchive-resume Friel 2026-04-02 05:36:59 +00:00
  • 9f71d57a65 Extract code-mode nested tool collection into codex-tools (#16509) Michael Bolin 2026-04-01 22:17:55 -07:00
  • 74644b13de tui: allow staged subagent helpers before wiring dev/friel/tui-collab-foundation Friel 2026-04-02 05:13:02 +00:00
  • 9618e3002b test(tui): refresh chatwidget collab test fixtures Friel 2026-04-02 05:01:49 +00:00
  • ac776a53bc Merge 33ba279a49 into sapling-pr-archive-bolinfest Michael Bolin 2026-04-01 21:55:35 -07:00
  • 33ba279a49 Extract code-mode nested tool shaping into codex-tools Michael Bolin 2026-04-01 21:55:28 -07:00
  • cc97982bbb core: use codex-mcp APIs directly (#16510) Michael Bolin 2026-04-01 21:55:22 -07:00
  • 64f745cc86 Merge f61e85dbfb into sapling-pr-archive-bolinfest Michael Bolin 2026-04-01 21:49:23 -07:00
  • f61e85dbfb core: import MCP APIs from codex-mcp Michael Bolin 2026-04-01 21:49:08 -07:00
  • d648014716 Merge 85b6be0503 into sapling-pr-archive-bolinfest Michael Bolin 2026-04-01 21:46:30 -07:00
  • 901b66441d Merge remote-tracking branch 'upstream/main' into dev/friel/tui-collab-foundation Friel 2026-04-02 04:35:59 +00:00
  • 85b6be0503 Extract code-mode nested tool shaping into codex-tools Michael Bolin 2026-04-01 21:27:03 -07:00
  • 1b5a16f05e Extract request_user_input normalization into codex-tools (#16503) Michael Bolin 2026-04-01 21:18:45 -07:00
  • 2880de1903 test(app-server): expect fork-context spawn to inherit parent model Friel 2026-04-02 04:17:36 +00:00
  • 7c1c633f3f core: use codex-tools config types directly (#16504) Michael Bolin 2026-04-01 21:16:44 -07:00
  • 6202d9f055 codex: fix CI failure on PR #16197 Friel 2026-04-02 04:12:00 +00:00
  • e19b351364 Fix paste-driven bottom pane completion teardown (#16202) Eric Traut 2026-04-01 22:03:13 -06:00
  • cb9ef06ecc Fix TUI app-server permission profile conversions (#16284) Eric Traut 2026-04-01 22:00:27 -06:00
  • 42659f250e Merge upstream/main Friel 2026-04-02 03:58:34 +00:00
  • 163d4c1730 Merge bf081b9e28 into sapling-pr-archive-bolinfest Michael Bolin 2026-04-01 20:55:25 -07:00
  • bf081b9e28 core: import tool config types from codex-tools Michael Bolin 2026-04-01 20:55:09 -07:00
  • 03e6cb8cc6 Merge 622273ed82 into sapling-pr-archive-bolinfest Michael Bolin 2026-04-01 20:54:49 -07:00
  • 622273ed82 Extract request_user_input args normalization into codex-tools Michael Bolin 2026-04-01 20:54:25 -07:00
  • d1068e057a Extract tool-suggest wire helpers into codex-tools (#16499) Michael Bolin 2026-04-01 20:49:15 -07:00
  • d70c05423b Add startup worktree MVP mstar/worktree-startup-mvp-main-only starr-openai 2026-04-01 20:45:26 -07:00
  • 81047dd52a multi_agents: add model fallback list spawn retries Friel 2026-04-02 03:14:27 +00:00
  • eb462e8f76 Apply worktree MVP clippy fix starr-openai 2026-04-01 20:43:23 -07:00
  • 48176b3571 merge commit for archive created by Sapling Michael Bolin 2026-04-01 20:34:07 -07:00
  • efa3bfafab Extract tool-suggest wire helpers into codex-tools Michael Bolin 2026-04-01 20:33:09 -07:00
  • 2f6068c279 test(core): stabilize spawn_agent fork_context fixtures Friel 2026-04-02 03:28:35 +00:00
  • c2699c666c fix: guard guardian_command_source_tool_name with cfg(unix) (#16498) Michael Bolin 2026-04-01 20:16:44 -07:00
  • 0b856a4757 Extract tool-search output helpers into codex-tools (#16497) Michael Bolin 2026-04-01 20:16:21 -07:00
  • bc5ca37aee Merge 9e499bb29b into sapling-pr-archive-bolinfest Michael Bolin 2026-04-01 20:05:55 -07:00
  • 9e499bb29b fix: guard guardian_command_source_tool_name with cfg(unix) Michael Bolin 2026-04-01 20:05:48 -07:00
  • 74d7149130 Fix regression: "not available in TUI" error message (#16273) Eric Traut 2026-04-01 21:01:36 -06:00