 Tianyi Cui
|
ca11085a8f
|
Merge remote-tracking branch 'origin/master' into codex/pr357-merge-review-20260719
|
2026-07-19 12:19:28 +08:00 |
|
|
Tianyi Cui
|
0488ec3d3d
|
Merge remote-tracking branch 'origin/master' into codex/retire-subagent-mock
# Conflicts:
# docs/rfc/INDEX.md
|
2026-07-19 12:13:13 +08:00 |
|
|
Tianyi Cui
|
2815d66063
|
Merge remote-tracking branch 'origin/master' into codex/pr357-merge-review-20260719
|
2026-07-19 12:13:09 +08:00 |
|
|
Tianyi Cui
|
ddd3370477
|
test(session-persistence): pin rollback journal permissions
|
2026-07-19 12:12:16 +08:00 |
|
|
Tianyi Cui
|
4dda5b953b
|
refactor(subagent): retire standalone mock package
|
2026-07-19 11:54:37 +08:00 |
|
|
Tianyi Cui
|
176973cb7b
|
docs(session-persistence): clarify SQLite permission limits
|
2026-07-19 11:51:22 +08:00 |
|
|
Tianyi Cui
|
85fc58943e
|
docs(session-persistence): tighten SQLite permission prose
|
2026-07-19 11:37:41 +08:00 |
|
|
Tianyi Cui
|
765dfb2174
|
refactor(session): use one surface manager
|
2026-07-19 11:36:07 +08:00 |
|
|
Tianyi Cui
|
7ba5b95d8e
|
Merge remote-tracking branch 'origin/master' into worktree/fix-sqlite-file-permissions
|
2026-07-19 11:32:58 +08:00 |
|
|
Tianyi Cui
|
202da55bf2
|
Merge remote-tracking branch 'origin/master' into codex/simp-name-front-door-defaults
|
2026-07-19 10:41:41 +08:00 |
|
|
Tianyi Cui
|
969f58ee5d
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-name-front-door-defaults
|
2026-07-19 03:04:20 +08:00 |
|
|
Tianyi Cui
|
438e67225f
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-19 03:04:20 +08:00 |
|
|
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
|
60097258b9
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-name-front-door-defaults
|
2026-07-19 02:39:09 +08:00 |
|
|
Tianyi Cui
|
c7beb041c7
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-19 02:39:09 +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
|
f6d44b74d4
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-name-front-door-defaults
|
2026-07-19 02:21:46 +08:00 |
|
|
Tianyi Cui
|
d41d987de7
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-19 02:21:46 +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
|
fed4cfe8ff
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-name-front-door-defaults
|
2026-07-19 01:57:31 +08:00 |
|
|
Tianyi Cui
|
21e1a08b55
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-19 01:57:27 +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 |
|
 Yichen Jiang
|
619da217d8
|
Merge branch 'master' into worktree/fix-sqlite-file-permissions
|
2026-07-18 21:17:01 +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
|
4863746432
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-name-front-door-defaults
|
2026-07-18 14:52:48 +08:00 |
|
|
Tianyi Cui
|
f7bdc17ee3
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-18 14:52:43 +08:00 |
|