Files
dev/scripts
zeekay 2c43ec7ebd Merge remote-tracking branch 'openai/main'
# Conflicts:
#	.github/workflows/Dockerfile.bazel
#	.github/workflows/ci.yml
#	.github/workflows/issue-deduplicator.yml
#	.github/workflows/rust-release-windows.yml
#	.github/workflows/rust-release.yml
#	.vscode/settings.json
#	codex-cli/package.json
#	codex-rs/Cargo.lock
#	codex-rs/core/Cargo.toml
#	codex-rs/core/src/codex.rs
#	codex-rs/core/src/features.rs
#	codex-rs/core/src/features/legacy.rs
#	codex-rs/core/src/mcp_connection_manager.rs
#	codex-rs/core/src/memories/storage.rs
#	codex-rs/core/src/models_manager/manager.rs
#	codex-rs/core/src/tools/handlers/collab.rs
#	codex-rs/core/src/tools/handlers/mod.rs
#	codex-rs/core/src/tools/handlers/search_tool_bm25.rs
#	codex-rs/core/src/tools/runtimes/shell.rs
#	codex-rs/core/src/tools/spec.rs
#	codex-rs/core/tests/common/apps_test_server.rs
#	codex-rs/core/tests/common/context_snapshot.rs
#	codex-rs/core/tests/common/responses.rs
#	codex-rs/core/tests/suite/client.rs
#	codex-rs/core/tests/suite/compact.rs
#	codex-rs/core/tests/suite/compact_remote.rs
#	codex-rs/core/tests/suite/mod.rs
#	codex-rs/core/tests/suite/model_switching.rs
#	codex-rs/core/tests/suite/model_tools.rs
#	codex-rs/core/tests/suite/search_tool.rs
#	codex-rs/core/tests/suite/shell_snapshot.rs
#	codex-rs/core/tests/suite/snapshots/all__suite__compact__manual_compact_with_history_shapes.snap
#	codex-rs/core/tests/suite/snapshots/all__suite__compact__manual_compact_without_prev_user_shapes.snap
#	codex-rs/core/tests/suite/snapshots/all__suite__compact__mid_turn_compaction_shapes.snap
#	codex-rs/core/tests/suite/snapshots/all__suite__compact__pre_sampling_model_switch_compaction_shapes.snap
#	codex-rs/core/tests/suite/snapshots/all__suite__compact__pre_turn_compaction_context_window_exceeded_shapes.snap
#	codex-rs/core/tests/suite/snapshots/all__suite__compact__pre_turn_compaction_including_incoming_shapes.snap
#	codex-rs/core/tests/suite/snapshots/all__suite__compact_remote__remote_manual_compact_with_history_shapes.snap
#	codex-rs/core/tests/suite/snapshots/all__suite__compact_remote__remote_manual_compact_without_prev_user_shapes.snap
#	codex-rs/core/tests/suite/snapshots/all__suite__compact_remote__remote_mid_turn_compaction_shapes.snap
#	codex-rs/core/tests/suite/snapshots/all__suite__compact_remote__remote_pre_turn_compaction_context_window_exceeded_shapes.snap
#	codex-rs/core/tests/suite/snapshots/all__suite__compact_remote__remote_pre_turn_compaction_failure_shapes.snap
#	codex-rs/core/tests/suite/snapshots/all__suite__compact_remote__remote_pre_turn_compaction_including_incoming_shapes.snap
#	codex-rs/otel/src/lib.rs
#	codex-rs/skills/src/assets/samples/skill-creator/scripts/package_skill.py
#	codex-rs/skills/src/assets/samples/skill-installer/scripts/list-curated-skills.py
#	codex-rs/tui/src/bottom_pane/chat_composer.rs
#	codex-rs/tui/src/chatwidget.rs
#	codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__unified_exec_begin_restores_working_status.snap
#	codex-rs/tui/src/lib.rs
#	defs.bzl
#	docs/config.md
#	docs/install.md
#	sdk/typescript/package.json
2026-03-09 12:01:27 -07:00
..