Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks

Browse Source

# Conflicts:
#	examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
#	examples/acp-agent/tests/snapshots/code-mode-turn/session.jsonl
#	examples/acp-agent/tests/snapshots/skill-load/session.jsonl
#	examples/acp-agent/tests/snapshots/text-turn/session.jsonl
#	examples/sandbox-acp-agent/tests/snapshots/escalation-approved/session.jsonl
#	examples/sandbox-acp-agent/tests/snapshots/escalation-rejected/session.jsonl
#	examples/sandbox-acp-agent/tests/snapshots/mode-switching/session.jsonl

...

This commit is contained in:

Yichen Jiang

2026-07-12 16:09:22 +08:00

parent bd9abba638 4cda9dd03d

commit 2688df99cd

38 changed files with 776 additions and 191 deletions

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

examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl

+1 -1

File diff suppressed because one or more lines are too long