Commit Graph

669 Commits

Author SHA1 Message Date
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
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
Tianyi Cui
34fe20962f Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface
# Conflicts:
#	packages/core/session/src/surface.ts
2026-07-14 11:39:11 +08:00
Tianyi Cui
8780a73750 Merge branch 'master' into session-query 2026-07-14 10:53:25 +08:00
Tianyi Cui
a52d85b3d7 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 10:35:30 +08:00
Tianyi Cui
0c19d69507 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	packages/core/agent-loop/README.md
2026-07-14 10:35:15 +08:00
Tianyi Cui
e150806171 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 10:30:04 +08:00
Tianyi Cui
816b6e4c68 fix: restore exact config sessions on loop reload 2026-07-14 10:25:49 +08:00
Tianyi Cui
452c7aa5ff Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 09:56:18 +08:00
Tianyi Cui
1c2e2680db Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	packages/core/agent-loop/README.md
2026-07-14 09:55:54 +08:00
Tianyi Cui
772d7c74e0 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 09:55:32 +08:00
Tianyi Cui
6b782b0189 fix: bind stdio to its exact fresh identity 2026-07-14 09:54:34 +08:00
Hypatia May
e9f0c37745 Merge remote-tracking branch 'origin/master' into session-query
# Conflicts:
#	docs/rfc/INDEX.md
#	packages/README.md
2026-07-14 08:36:06 +08:00
Tianyi Cui
c082ae3f61 Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 07:30:07 +08:00
Tianyi Cui
14ed3a9914 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 07:30:06 +08:00
Tianyi Cui
1c595d26a0 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-14 07:30:06 +08:00
Tianyi Cui
99b5f04c9b fix: use unified identity for bash ownership 2026-07-14 07:26:46 +08:00
Tianyi Cui
719452b2ed Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 06:20:27 +08:00
Tianyi Cui
73fe902997 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 06:20:22 +08:00
Tianyi Cui
e9d1e1cdda docs: update ACP ownership routing 2026-07-14 06:19:24 +08:00
Tianyi Cui
edaa9f0eac Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals 2026-07-14 05:52:58 +08:00
Tianyi Cui
06f8ca7fed Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-14 05:52:04 +08:00
Tianyi Cui
8862b2e4fe Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/rfc/implemented/simplification/2026-06-20-unify-agent-and-session-id.md
2026-07-14 05:51:07 +08:00
Tianyi Cui
7d711c44a8 fix: keep remote subagent ids parent-scoped 2026-07-14 05:41:01 +08:00
Tianyi Cui
65521b589f refactor: hide remaining subagent helpers 2026-07-14 02:45:34 +08:00
Tianyi Cui
f85b831bd2 refactor: hide subagent implementation helpers 2026-07-14 02:41:23 +08:00
Tianyi Cui
225796c90d refactor: hide the concrete agent loop 2026-07-14 02:32:35 +08:00
Tianyi Cui
9ebb40b84b fix: keep SDK subagent notifications local 2026-07-14 02:28:04 +08:00
Tianyi Cui
c0c47a94e6 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/rfc/implemented/simplification/2026-06-20-unify-agent-and-session-id.md
2026-07-14 02:27:01 +08:00
Tianyi Cui
17c99efcc1 fix: complete unified subagent identity 2026-07-14 02:24:55 +08:00
Tianyi Cui
61136b22bb refactor: remove UI identity translations 2026-07-14 02:09:09 +08:00
Tianyi Cui
709cc7200e refactor: unify agent and session identity 2026-07-14 01:59:21 +08:00
Tianyi Cui
d7de8a8d13 refactor: narrow compaction surface 2026-07-14 01:24:20 +08:00
Tianyi Cui
c378dbf36a Merge remote-tracking branch 'origin/master' into unify-acp-example 2026-07-14 01:11:37 +08:00
Tianyi Cui
e3d7bb62d8 fix(permission): address human review feedback 2026-07-14 01:09:44 +08:00
Tianyi Cui
f95a411b0a fix: record self-limiting hook snapshot 2026-07-14 01:09:07 +08:00
Tianyi Cui
dbf23bd7b1 Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 01:05:16 +08:00
Tianyi Cui
8f99e424c4 Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher 2026-07-14 01:04:00 +08:00
Tianyi Cui
2a75f0893a Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory 2026-07-14 01:02:41 +08:00
Tianyi Cui
cdc3522e48 Merge remote-tracking branch 'origin/master' into unify-acp-example
# Conflicts:
#	docs/config-catalog.md
#	docs/module-graph.md
#	pnpm-lock.yaml
2026-07-14 00:56:28 +08:00
Tianyi Cui
461c0c598c Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation 2026-07-14 00:54:55 +08:00
Tianyi Cui
36a4b16f18 Merge remote-tracking branch 'origin/master' into codex/simp-session-dead-surface 2026-07-14 00:53:26 +08:00
Tianyi Cui
e0f9805030 Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise 2026-07-14 00:40:14 +08:00