merge upstream/dev/friel/fork-context-inherits-parent-model into dev/friel/collab-stack

Browse Source

# Conflicts:
#	codex-rs/core/config.schema.json
#	codex-rs/core/src/agent/role.rs
#	codex-rs/core/src/tools/handlers/multi_agents/spawn.rs
#	codex-rs/core/src/tools/handlers/multi_agents_tests.rs
#	codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs

...

This commit is contained in:

Friel

2026-04-01 00:12:26 +00:00

parent edf3e240a1 3379d411c4

commit d5eccca4cf

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available