Commit Graph
741 Commits
Author SHA1 Message Date
Tianyi Cui ab6faf78ba Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 15:41:34 +08:00
Tianyi Cui a5e1717059 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 15:31:20 +08:00
Tianyi Cui e3767c64d9 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 15:31:13 +08:00
Tianyi Cui 440afff96e Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
#	packages/ui/stdio-agent/README.md
2026-07-14 15:27:32 +08:00
Tianyi Cui 908603ad73 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 15:26:46 +08:00
Tianyi Cui 29072d9830 Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 15:26:40 +08:00
Tianyi Cui a30660a63f Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
# Conflicts:
#	packages/support/README.md
#	packages/support/acp-snapshot/README.md
2026-07-14 15:26:34 +08:00
Tianyi Cui 2ef709a496 Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory 2026-07-14 15:25:36 +08:00
Tianyi Cui 443526285e Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
# Conflicts:
#	docs/persistence-catalog.md
#	packages/bash/bash/src/session-mode.ts
2026-07-14 15:25:26 +08:00
Tianyi Cui 60260b5d5b Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface 2026-07-14 15:24:54 +08:00
Tianyi Cui a1eaf05e9b Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 14:28:54 +08:00
Tianyi Cui 04c956a900 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/events.md
#	docs/cordis-catalog/services.md
#	docs/event-producer-consumer.md
2026-07-14 14:28:40 +08:00
Tianyi Cui c158f72ac8 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-14 14:27:18 +08:00
Tianyi Cui 5caa9c4f33 Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
#	docs/cordis-catalog/services.md
2026-07-14 14:14:22 +08:00
Tianyi Cui b76c2d9626 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 14:14:09 +08:00
Tianyi Cui 57a5cb4c94 Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 14:14:09 +08:00
Tianyi Cui 36b86fb045 Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory 2026-07-14 14:08:44 +08:00
Tianyi Cui de44558f18 Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher 2026-07-14 14:08:44 +08:00
Tianyi Cui 539850578a fix: reject legacy header deltas on append 2026-07-14 14:06:28 +08:00
Tianyi Cui 89d8d56785 docs: omit model experience for generic packages 2026-07-14 13:31:31 +08:00
Tianyi Cui deee72bdfb Merge remote-tracking branch 'origin/master' into codex/model-experience-readmes-20260712 2026-07-14 13:24:54 +08:00
Tianyi Cui 9035d33237 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 12:47:07 +08:00
Tianyi Cui 6b0de58b1c Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/events.md
#	docs/cordis-catalog/services.md
#	docs/event-producer-consumer.md
2026-07-14 12:46:55 +08:00
Tianyi Cui faf438df58 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-14 12:46:39 +08:00
Tianyi Cui 253f707c35 Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
#	docs/cordis-catalog/services.md
2026-07-14 12:41:47 +08:00
Tianyi Cui c5e32955f8 Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 12:39:44 +08:00
Tianyi Cui 7d40a9a0c5 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 12:39:44 +08:00
Tianyi Cui 85a1bbc7d5 Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher 2026-07-14 12:36:59 +08:00
Tianyi Cui dc67def3f3 Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory 2026-07-14 12:34:31 +08:00
Tianyi Cui 49e45ff184 fix: reject legacy fallback headers 2026-07-14 12:32:44 +08:00
Tianyi Cui 7299cc4b3b Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 12:12:40 +08:00
Tianyi Cui 1818f2e719 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 12:12:40 +08:00
Tianyi Cui 3c691bbc55 Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher 2026-07-14 12:12:40 +08:00
Tianyi Cui dae5fb9fb6 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 12:12:40 +08:00
Tianyi Cui 5c5875ab7e Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 12:12:40 +08:00
Tianyi Cui e218e36e88 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 12:12:40 +08:00
Tianyi Cui bbeeaed43c Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id 2026-07-14 12:12:40 +08:00
Tianyi Cui 38041c43a4 Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory 2026-07-14 12:12:39 +08:00
Tianyi Cui fa9f8a794c Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation 2026-07-14 12:12:39 +08:00
Tianyi Cui 87a7b599a5 Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface 2026-07-14 12:12:27 +08:00
Tianyi Cui 99db6e88ed Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 11:56:52 +08:00
Tianyi Cui e2ba1e61da Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 11:56:47 +08:00
Tianyi Cui 4cdbe564d8 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/config-catalog.md
2026-07-14 11:56:35 +08:00
Tianyi Cui 9272d2871b Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/services.md
2026-07-14 11:56:09 +08:00
Tianyi Cui 633a18269d Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-14 11:53:59 +08:00
Tianyi Cui 99d2d5a092 Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 11:53:55 +08:00
Tianyi Cui 795371a209 Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
# Conflicts:
#	examples/acp-agent/tests/acp.e2e.ts
#	examples/acp-agent/tests/escalation.e2e.ts
#	examples/acp-agent/tests/hooks.e2e.ts
#	packages/support/acp-snapshot/src/harness.ts
2026-07-14 11:53:45 +08:00
Ziya 53556f9712 Merge remote-tracking branch 'upstream/master' into docs/i18n-capability 2026-07-13 20:51:12 -07:00
Tianyi Cui fd5ee06a97 Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory 2026-07-14 11:49:56 +08:00
Tianyi Cui 4d5fb2cb1d Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
# Conflicts:
#	docs/core-data-structures/session.md
#	docs/rfc/implemented/feature/2026-07-06-sandbox.md
#	examples/acp-agent/tests/snapshots/permission-switching/system-prompt.golden.md
#	examples/sandbox-acp-agent/tests/acp.snapshot.ts
#	examples/sandbox-acp-agent/tests/snapshots/mode-switching/session.jsonl
#	packages/core/session/README.md
#	packages/core/session/src/index.ts
#	packages/core/session/src/surface.ts
#	packages/core/session/tests/surface.spec.ts
#	scripts/type-equiv.manifest.json
2026-07-14 11:49:46 +08:00