Skip to content

Commit 49e95cc

Browse files
andrewgu-oaicopyberry
andrewgu-oai
authored and
copyberry
committed
Add GPT-6 Sol and Luna to the model catalog (#47332)
## What changed - Add `gpt-6-sol` and `gpt-6-luna` catalog entries and refresh model descriptions. - Offer migrations from `gpt-5.5`, `gpt-5.6-sol`, and `gpt-5.6-terra` to `gpt-6-sol`, and from `gpt-5.6-luna` to `gpt-6-luna`. - Retarget retired `gpt-5.4` and `gpt-5.4-mini` selections to GPT-6 Sol and Luna, respectively. - Recommend `gpt-6-luna` in the rate-limit switch prompt. ## Testing Extend migration tests to cover the new targets, their default reasoning effort, and prompting again after a previously acknowledged migration to an older target. Update model-picker and rate-limit prompt snapshots. GitOrigin-RevId: d3a093d18ce44a903383504ab8f5cbbc911d602d
1 parent 0a73d55 commit 49e95cc

22 files changed

Lines changed: 464 additions & 82 deletions

‎codex-rs/cli/tests/daemon_startup.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ async fn daemon_startup(command: &str) -> Result<()> {
8181
suppress_unstable_features_warning = true\nanalytics.enabled = false\n\
8282
windows.sandbox = \"unelevated\"\n\
8383
tui.disable_paste_burst = true\n\
84+
notice.model_migrations.\"gpt-5.6-terra\" = \"gpt-6-sol\"\n\
8485
[projects.{}]\ntrust_level = \"trusted\"\n",
8586
serde_json::to_string(&workspace_path)?,
8687
),

‎codex-rs/core/tests/suite/snapshots/all__suite__scenarios__astra_async_question_and_answer.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ Scenario: Astra asks who a launch update is for, keeps working, and receives the
77

88
## Window 1
99
-- request 1 (request) --
10-
00:additional_tools/developer (3; hash=6c2ad099cb689791):
10+
00:additional_tools/developer (3; hash=32be5470c6e39932):
1111
- namespace/functions; hash=e7db0a45c4ec3157
1212
- custom/exec
1313
- function/wait
1414
- function/request_user_input
1515
- function/request_user_input_async
1616
- namespace/clock: Tools for reading and waiting on time.; hash=f402e8c5e9b5e317
1717
- function/sleep
18-
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=46d39bbce8bacc3f
18+
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=fd994b11525da73c
1919
- function/followup_task
2020
- function/interrupt_agent
2121
- function/list_agents

‎codex-rs/core/tests/suite/snapshots/all__suite__scenarios__astra_code_mode_call_timing.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ Scenario: Astra receives host and handler timings on completed and failed code-m
66

77
## Window 1
88
-- request 1 (turn) --
9-
00:additional_tools/developer (3; hash=6c2ad099cb689791):
9+
00:additional_tools/developer (3; hash=32be5470c6e39932):
1010
- namespace/functions; hash=e7db0a45c4ec3157
1111
- custom/exec
1212
- function/wait
1313
- function/request_user_input
1414
- function/request_user_input_async
1515
- namespace/clock: Tools for reading and waiting on time.; hash=f402e8c5e9b5e317
1616
- function/sleep
17-
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=46d39bbce8bacc3f
17+
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=fd994b11525da73c
1818
- function/followup_task
1919
- function/interrupt_agent
2020
- function/list_agents

‎codex-rs/core/tests/suite/snapshots/all__suite__scenarios__astra_disabled_executor_skills.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Settings:
1616
text: {"verbosity":"low"}
1717
tool_choice: "auto"
1818
-- request 1 (request) --
19-
00:additional_tools/developer (3; hash=7931c0eb5da2b494):
19+
00:additional_tools/developer (3; hash=61ac4d92c828cbf9):
2020
- namespace/functions; hash=99a630cff25563aa
2121
- custom/exec
2222
- function/wait
2323
- function/request_user_input
2424
- function/request_user_input_async
2525
- namespace/clock: Tools for reading and waiting on time.; hash=f402e8c5e9b5e317
2626
- function/sleep
27-
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=46d39bbce8bacc3f
27+
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=fd994b11525da73c
2828
- function/followup_task
2929
- function/interrupt_agent
3030
- function/list_agents

‎codex-rs/core/tests/suite/snapshots/all__suite__scenarios__astra_kickoff_remote_compaction_windows.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Settings:
1616
text: {"verbosity":"low"}
1717
tool_choice: "auto"
1818
-- request 1 (turn) --
19-
00:additional_tools/developer (3; hash=6c2ad099cb689791):
19+
00:additional_tools/developer (3; hash=32be5470c6e39932):
2020
- namespace/functions; hash=e7db0a45c4ec3157
2121
- custom/exec
2222
- function/wait
2323
- function/request_user_input
2424
- function/request_user_input_async
2525
- namespace/clock: Tools for reading and waiting on time.; hash=f402e8c5e9b5e317
2626
- function/sleep
27-
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=46d39bbce8bacc3f
27+
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=fd994b11525da73c
2828
- function/followup_task
2929
- function/interrupt_agent
3030
- function/list_agents
@@ -190,15 +190,15 @@ Settings:
190190
## Window 2 (after request 3: input diverged at item 02)
191191
Settings: same as window 1
192192
-- request 4 (turn) --
193-
00:additional_tools/developer (3; hash=6c2ad099cb689791):
193+
00:additional_tools/developer (3; hash=32be5470c6e39932):
194194
- namespace/functions; hash=e7db0a45c4ec3157
195195
- custom/exec
196196
- function/wait
197197
- function/request_user_input
198198
- function/request_user_input_async
199199
- namespace/clock: Tools for reading and waiting on time.; hash=f402e8c5e9b5e317
200200
- function/sleep
201-
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=46d39bbce8bacc3f
201+
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=fd994b11525da73c
202202
- function/followup_task
203203
- function/interrupt_agent
204204
- function/list_agents

‎codex-rs/core/tests/suite/snapshots/all__suite__scenarios__astra_plugin_refresh.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Settings:
1616
text: {"verbosity":"low"}
1717
tool_choice: "auto"
1818
-- request 1 (turn) --
19-
00:additional_tools/developer (3; hash=6c2ad099cb689791):
19+
00:additional_tools/developer (3; hash=32be5470c6e39932):
2020
- namespace/functions; hash=e7db0a45c4ec3157
2121
- custom/exec
2222
- function/wait
2323
- function/request_user_input
2424
- function/request_user_input_async
2525
- namespace/clock: Tools for reading and waiting on time.; hash=f402e8c5e9b5e317
2626
- function/sleep
27-
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=46d39bbce8bacc3f
27+
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=fd994b11525da73c
2828
- function/followup_task
2929
- function/interrupt_agent
3030
- function/list_agents
@@ -113,15 +113,15 @@ Settings:
113113
## Window 2 (after request 2: input diverged at item 00)
114114
Settings: same as window 1
115115
-- request 3 (turn) --
116-
00:additional_tools/developer (3; hash=cc439199c15f983f):
116+
00:additional_tools/developer (3; hash=4327e247f74ba810):
117117
- namespace/functions; hash=8c17932a39355f2d
118118
- custom/exec
119119
- function/wait
120120
- function/request_user_input
121121
- function/request_user_input_async
122122
- namespace/clock: Tools for reading and waiting on time.; hash=f402e8c5e9b5e317
123123
- function/sleep
124-
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=46d39bbce8bacc3f
124+
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=fd994b11525da73c
125125
- function/followup_task
126126
- function/interrupt_agent
127127
- function/list_agents

‎codex-rs/core/tests/suite/snapshots/all__suite__scenarios__astra_settings_release_check_tool_shapes.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Settings:
1616
text: {"verbosity":"low"}
1717
tool_choice: "auto"
1818
-- request 1 (turn) --
19-
00:additional_tools/developer (3; hash=cc439199c15f983f):
19+
00:additional_tools/developer (3; hash=4327e247f74ba810):
2020
- namespace/functions; hash=8c17932a39355f2d
2121
- custom/exec
2222
- function/wait
2323
- function/request_user_input
2424
- function/request_user_input_async
2525
- namespace/clock: Tools for reading and waiting on time.; hash=f402e8c5e9b5e317
2626
- function/sleep
27-
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=46d39bbce8bacc3f
27+
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=fd994b11525da73c
2828
- function/followup_task
2929
- function/interrupt_agent
3030
- function/list_agents

‎codex-rs/core/tests/suite/snapshots/all__suite__scenarios__code_mode_catalog_messages.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ Settings:
3232
stream: true
3333
text: {"verbosity":"low"}
3434
tool_choice: "auto"
35-
tools (7; hash=459dc91308e98762):
35+
tools (7; hash=884bfb8fc9050f65):
3636
- custom/exec: Catalog exec instructions. Default yield: 1234 ms. `image(imageUrlOrItem: string | { image_url: s...; hash=a49b91fd82908e18
3737
- function/wait: Catalog wait instructions: resume the yielded cell.; args=[cell_id, max_tokens, terminate, yield_time_ms]; hash=67bc0f04da3505b3
3838
- function/request_user_input: Request user input for one to three short questions and wait for the response. This tool is only ...; args=[questions]; hash=64a729b25c424fc6
3939
- function/request_user_input_async: Ask the user one or more questions during ongoing work. Use this tool only to request missing inf...; args=[questions]; hash=d6d74f33db330162
4040
- namespace/clock: Tools for reading and waiting on time.; hash=f402e8c5e9b5e317
4141
- function/sleep
42-
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=46d39bbce8bacc3f
42+
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=fd994b11525da73c
4343
- function/followup_task
4444
- function/interrupt_agent
4545
- function/list_agents

‎codex-rs/core/tests/suite/snapshots/all__suite__scenarios__multi_agent_catalog_parameters.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Settings:
1616
text: {"verbosity":"low"}
1717
tool_choice: "auto"
1818
-- request 1 (turn) --
19-
00:additional_tools/developer (3; hash=6e5474c6ce389d17):
19+
00:additional_tools/developer (3; hash=48937f38e1083468):
2020
- namespace/functions; hash=e7db0a45c4ec3157
2121
- custom/exec
2222
- function/wait
2323
- function/request_user_input
2424
- function/request_user_input_async
2525
- namespace/clock: Tools for reading and waiting on time.; hash=f402e8c5e9b5e317
2626
- function/sleep
27-
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=8f195b1f18fa3fdb
27+
- namespace/collaboration: Tools for spawning and managing sub-agents.; hash=e7005987945a10f0
2828
- function/followup_task
2929
- function/interrupt_agent
3030
- function/list_agents

‎codex-rs/core/tests/suite/snapshots/all__suite__scenarios__read_only_mcp__read_only_mcp_requests.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Settings:
1616
stream: true
1717
text: {"verbosity":"low"}
1818
tool_choice: "auto"
19-
tools (11; hash=9b0d0ed0803f6b6e):
19+
tools (11; hash=1974ec5490da160d):
2020
- function/exec_command: Runs a command in a PTY, returning output or a session ID for ongoing interaction.; args=[cmd, justification, login, max_output_tokens, prefix_rule, sandbox_permissions, shell, tty, workdir, yield_time_ms]; hash=c04108e51a8548c5
2121
- function/write_stdin: Writes characters to an existing unified exec session and returns recent output.; args=[chars, max_output_tokens, session_id, yield_time_ms]; hash=7fb62d8a3e2df4e2
2222
- function/list_mcp_resources: Lists resources provided by MCP servers. Resources allow servers to share data that provides cont...; args=[cursor, server]; hash=6792edaff13561bd
@@ -25,7 +25,7 @@ Settings:
2525
- function/request_user_input: Request user input for one to three short questions and wait for the response. This tool is only ...; args=[questions]; hash=64a729b25c424fc6
2626
- custom/apply_patch: The `apply_patch` tool can be used to edit files. This is a FREEFORM tool, so do not wrap the pat...; hash=dea9f12b0111a4ba
2727
- function/view_image: View a local image file from the filesystem when visual inspection is needed. Use this for images...; args=[detail, path]; hash=3b766d5bdec5d50e
28-
- namespace/multi_agent_v1: Tools for spawning and managing sub-agents.; hash=da9d426e1cfa71d0
28+
- namespace/multi_agent_v1: Tools for spawning and managing sub-agents.; hash=b109e235997460a9
2929
- function/close_agent
3030
- function/resume_agent
3131
- function/send_input

0 commit comments

Comments
 (0)