Commit Graph

1759 Commits

Author SHA1 Message Date
Tianyi Cui
c1f7b8bd0f Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-19 03:04:20 +08:00
Tianyi Cui
896ac6219b Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-19 03:04:19 +08:00
Tianyi Cui
5767a8d467 Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id 2026-07-19 03:04:19 +08:00
Tianyi Cui
1e4de0deaa fix(sdk): pin generated project build tool 2026-07-19 03:02:42 +08:00
Tianyi Cui
7e0bf44f09 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-19 02:39:09 +08:00
Tianyi Cui
a656ab4120 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue 2026-07-19 02:39:09 +08:00
Tianyi Cui
0c84c2a842 Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id 2026-07-19 02:39:09 +08:00
Tianyi Cui
8209532bb4 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-19 02:39:09 +08:00
Tianyi Cui
255dacd301 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-19 02:39:08 +08:00
Tianyi Cui
900fbc1ad9 Merge remote-tracking branch 'origin/master' into codex/simp-drop-unused-schema-default 2026-07-19 02:28:15 +08:00
Tianyi Cui
43b07d374e Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	packages/ui/acp/src/index.ts
2026-07-19 02:21:21 +08:00
Tianyi Cui
9f1a69366b docs: tighten identity bridge prose 2026-07-19 02:18:59 +08:00
Tianyi Cui
08c17ef48b Merge remote-tracking branch 'origin/master' into codex/simp-hide-llm-adapter-helpers 2026-07-19 02:18:50 +08:00
Tianyi Cui
7b076a1e01 Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract 2026-07-19 02:10:25 +08:00
Tianyi Cui
18653a9ff7 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
#	packages/core/agent-loop/tests/agent.spec.ts
#	packages/core/agent-loop/tests/contract-regressions.spec.ts
#	website/zh-CN/api/harness/agent-loop.md
#	website/zh-CN/api/harness/events.md
2026-07-19 01:57:18 +08:00
Tianyi Cui
b61e68ae8c Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-19 01:55:29 +08:00
Tianyi Cui
f65f4b82d7 Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/services.md
#	packages/core/agent-loop/README.md
#	packages/core/agent-loop/src/agent.ts
#	packages/core/agent-loop/src/index.ts
#	packages/core/agent-loop/tests/agent.spec.ts
#	packages/core/agent-loop/tests/contract-regressions.spec.ts
#	website/zh-CN/api/harness/agent-loop.md
2026-07-19 01:54:03 +08:00
Tianyi Cui
a45f0d73f3 Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-19 01:47:42 +08:00
Tianyi Cui
3c03ca8a3c Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-19 01:47:42 +08:00
Tianyi Cui
2704cab46f Merge remote-tracking branch 'origin/master' into codex/simp-shared-acp-test-launcher 2026-07-19 01:44:38 +08:00
Tianyi Cui
c866aa8ca6 Merge remote-tracking branch 'origin/master' into codex/simp-snapshot-fixture-inventory 2026-07-19 01:33:26 +08:00
Tianyi Cui
78f68dbbb9 docs(agent-loop): track scheduler drain follow-up 2026-07-18 20:35:58 +08:00
Tianyi Cui
3b52d216f3 Merge branch 'master' into parallel-tool-call 2026-07-18 20:18:24 +08:00
Tianyi Cui
2b4641799e docs: expand session persistence event catalog 2026-07-18 15:11:51 +08:00
Tianyi Cui
50f0291b93 Merge latest origin/master into parallel-tool-call
# Conflicts:
#	docs/architecture.md
#	examples/acp-agent/tests/snapshots/bash-spill/session.jsonl
#	examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
#	examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
#	examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
#	packages/core/agent-loop/src/loop.ts
2026-07-18 15:09:39 +08:00
Tianyi Cui
21ec178841 docs: tighten parallel tool-call prose 2026-07-18 14:59:26 +08:00
Tianyi Cui
7d9f0431fc Merge remote-tracking branch 'origin/master' into codex/simp-drop-unused-schema-default 2026-07-18 14:52:54 +08:00
Tianyi Cui
45600e74e4 Merge branch 'codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers 2026-07-18 14:52:54 +08:00
Tianyi Cui
90cbe2573b Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract 2026-07-18 14:52:54 +08:00
Tianyi Cui
2db38ecf05 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
#	docs/event-producer-consumer.md
#	packages/core/agent-loop/README.md
#	packages/core/agent-loop/tests/contract-regressions.spec.ts
2026-07-18 14:52:34 +08:00
Tianyi Cui
7d34e33b9e Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/event-producer-consumer.md
2026-07-18 14:51:21 +08:00
Tianyi Cui
d2426fed5d Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
#	docs/cordis-catalog/events.md
#	docs/event-producer-consumer.md
#	packages/core/agent-loop/src/agent.ts
#	packages/core/agent-loop/tests/contract-regressions.spec.ts
#	packages/core/agent-loop/tests/loop.spec.ts
#	website/zh-CN/api/harness/events.md
2026-07-18 14:50:55 +08:00
Tianyi Cui
68544463df Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-18 14:48:27 +08:00
Tianyi Cui
30a3a6db58 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-18 14:48:20 +08:00
Tianyi Cui
a9734b9868 Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher 2026-07-18 14:48:20 +08:00
Tianyi Cui
cde31a18a7 Merge remote-tracking branch 'origin/master' into codex/simp-snapshot-fixture-inventory 2026-07-18 14:48:14 +08:00
Tianyi Cui
f4eb811139 Merge remote-tracking branch 'origin/master' into codex/simp-drop-unused-schema-default 2026-07-18 14:29:41 +08:00
Tianyi Cui
665f54e404 Merge branch 'codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers 2026-07-18 14:29:34 +08:00
Tianyi Cui
4694582170 Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract 2026-07-18 14:28:54 +08:00
Tianyi Cui
a42c77f883 Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop 2026-07-18 14:27:53 +08:00
Tianyi Cui
1febeb8428 test(jsonrpc): configure built scope probe 2026-07-18 14:26:48 +08:00
Tianyi Cui
0f85ae0a9d fix(subagent): identify lifecycle runs explicitly 2026-07-18 14:26:14 +08:00
Tianyi Cui
5af8b38b36 Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
#	docs/testing.md
2026-07-18 14:05:54 +08:00
Tianyi Cui
a8150815ba Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
#	packages/subagent/subagent-acp/package.json
#	packages/subagent/subagent-acp/tests/mock-acp-server.ts
#	pnpm-lock.yaml
#	website/zh-CN/api/harness/agents.md
2026-07-18 14:01:03 +08:00
Tianyi Cui
1c54b2904e Merge branch 'codex/simp-compaction-surface' into codex/simp-agent-entry-state 2026-07-18 13:54:35 +08:00
Tianyi Cui
b5b456cad4 Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface 2026-07-18 13:53:50 +08:00
Tianyi Cui
e846a115f2 test(acp-snapshot): cover pre-spawn launch failure 2026-07-18 13:51:44 +08:00
Tianyi Cui
9e1975b080 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-18 13:47:53 +08:00
Tianyi Cui
93a4bebbb5 Merge remote-tracking branch 'origin/master' into codex/simp-snapshot-fixture-inventory 2026-07-18 13:43:12 +08:00
Tianyi Cui
aacedf2700 Merge current master into debug-pangwenjie
# Conflicts:
#	docs/cordis-catalog/events.md
#	docs/core-data-structures/core.md
#	docs/core-data-structures/tools.md
#	docs/event-producer-consumer.md
#	docs/rfc/implemented/feature/2026-06-30-interception-seams.md
#	docs/tool-execution-pipeline.md
#	packages/core/agent-loop/src/agent.ts
#	packages/core/agent-loop/src/loop.ts
#	packages/core/agent-loop/tests/loop.spec.ts
#	packages/core/agent/README.md
#	packages/core/tools/src/index.ts
#	scripts/gen-doc-graphs.ts
2026-07-18 13:39:12 +08:00