mirror of
https://github.com/openai/codex.git
synced 2026-11-13 22:47:20 +00:00
Benjamin Carlsson
3525845978
## Why `--worktree` previously supported only `codex exec` and `codex exec fork`. Interactive sessions need the same managed checkout support, with configuration and policy resolved for the destination before starting a turn. ## What changed - Enable `codex --worktree` and `codex fork --worktree <session-id>` behind the `worktrees` feature, restricted to local sessions. Interactive forks require an explicit session selector. - Resolve interactive and exec worktree forks from the session's latest saved working directory unless `--cd` is supplied. Keep relative `--add-dir` paths anchored to the invocation directory. - Load interactive destination configuration before telemetry and login policy initialization, and bind checkout ownership before the first turn. - Reject explicitly untrusted sources, including when destination cloud policy or refreshed configuration reveals distrust. Retain unbound interactive checkouts after startup failure and report manual recovery instructions. ## Testing Add CLI integration and TUI tests for startup and named forks, destination instructions and configuration, ownership before the first request, trust enforcement, and retained-checkout recovery. Extend exec coverage for saved fork directories, explicit `--cd`, relative writable roots, and cloud policy rejection. GitOrigin-RevId: 371583f7feca73b218a4ff188b2b85812c8439e6
90 lines
3.7 KiB
TOML
90 lines
3.7 KiB
TOML
[profile.default]
|
|
# Retry once so one transient failure does not fail full-CI outright.
|
|
# Fanout keeps the full-CI shards moving without treating every >30s test as
|
|
# stuck. Keep this aligned with the broader timeout budget we give sharded CI.
|
|
slow-timeout = { period = "30s", terminate-after = 2 }
|
|
retries = 1
|
|
|
|
[profile.default.junit]
|
|
path = "junit.xml"
|
|
|
|
[profile.local]
|
|
inherits = "default"
|
|
|
|
[test-groups.app_server_protocol_codegen]
|
|
max-threads = 1
|
|
|
|
[test-groups.app_server_integration]
|
|
max-threads = 1
|
|
|
|
# Higher concurrency causes integration test timeouts under resource contention
|
|
# on common developer machines.
|
|
[test-groups.app_server_integration_local]
|
|
max-threads = 4
|
|
|
|
[test-groups.core_apply_patch_cli_integration]
|
|
max-threads = 1
|
|
|
|
[test-groups.windows_sandbox_legacy_sessions]
|
|
max-threads = 1
|
|
|
|
[test-groups.windows_process_heavy]
|
|
max-threads = 2
|
|
|
|
[[profile.default.overrides]]
|
|
# Do not add new tests here
|
|
filter = 'test(rmcp_client) | test(humanlike_typing_1000_chars_appears_live_no_placeholder)'
|
|
slow-timeout = { period = "1m", terminate-after = 4 }
|
|
|
|
[[profile.default.overrides]]
|
|
# This end-to-end case launches several CLI subprocesses and checks cloud policy.
|
|
filter = 'package(codex-exec) & test(worktree_start_and_fork_use_host_pool_and_preserve_legacy_resume)'
|
|
slow-timeout = { period = "30s", terminate-after = 4 }
|
|
|
|
[[profile.default.overrides]]
|
|
filter = 'test(approval_matrix_covers_all_modes)'
|
|
slow-timeout = { period = "30s", terminate-after = 2 }
|
|
|
|
[[profile.default.overrides]]
|
|
filter = 'package(codex-app-server-protocol) & (test(typescript_schema_fixtures_match_generated) | test(json_schema_fixtures_match_generated) | test(generate_ts_with_experimental_api_retains_experimental_entries) | test(generated_ts_optional_nullable_fields_only_in_params) | test(generate_json_filters_experimental_fields_and_methods))'
|
|
test-group = 'app_server_protocol_codegen'
|
|
|
|
[[profile.default.overrides]]
|
|
# These integration tests spawn a fresh app-server subprocess per case.
|
|
# Keep the library unit tests parallel.
|
|
filter = 'package(codex-app-server) & kind(test)'
|
|
test-group = 'app_server_integration'
|
|
|
|
[[profile.local.overrides]]
|
|
# Use up to four app-server subprocesses locally. The global nextest pool still
|
|
# limits this to the machine's logical CPU count.
|
|
filter = 'package(codex-app-server) & kind(test)'
|
|
test-group = 'app_server_integration_local'
|
|
|
|
[[profile.default.overrides]]
|
|
# These tests exercise full Codex turns and apply_patch execution, and they are
|
|
# sensitive to Windows runner process-startup stalls when many cases launch at once.
|
|
filter = 'package(codex-core) & kind(test) & test(apply_patch_cli)'
|
|
test-group = 'core_apply_patch_cli_integration'
|
|
|
|
[[profile.default.overrides]]
|
|
# These tests create restricted-token Windows child processes and private desktops.
|
|
# Serialize them to avoid exhausting Windows session/global desktop resources in CI.
|
|
filter = 'package(codex-windows-sandbox) & test(legacy_)'
|
|
test-group = 'windows_sandbox_legacy_sessions'
|
|
|
|
[[profile.default.overrides]]
|
|
# This Codex-home startup path still exceeded the broader Windows-heavy ceiling
|
|
# in both Windows full-CI lanes after contention was reduced.
|
|
platform = 'cfg(windows)'
|
|
filter = 'test(start_thread_uses_all_default_environments_from_codex_home)'
|
|
slow-timeout = { period = "1m", terminate-after = 2 }
|
|
|
|
[[profile.default.overrides]]
|
|
# These Windows-heavy tests spawn subprocesses, session files, or JSON-RPC
|
|
# clients and have been the dominant source of 30s full-CI timeouts.
|
|
platform = 'cfg(windows)'
|
|
filter = 'test(suite::resume::) | test(suite::cli_stream::) | test(suite::auth_env::) | test(start_thread_uses_all_default_environments_from_codex_home) | test(connect_stdio_command_initializes_json_rpc_client_on_windows)'
|
|
test-group = 'windows_process_heavy'
|
|
slow-timeout = { period = "45s", terminate-after = 2 }
|