 Tianyi Cui
|
dc00509910
|
Merge branch 'codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
# Conflicts:
# packages/support/acp-snapshot/README.md
# packages/support/acp-snapshot/src/suite.ts
# packages/support/acp-snapshot/tests/suite.spec.ts
|
2026-07-15 16:03:33 +08:00 |
|
|
Tianyi Cui
|
d0cf9cd411
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
|
2026-07-15 15:56:11 +08:00 |
|
|
Tianyi Cui
|
281eed3e57
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
# Conflicts:
# docs/cordis-catalog/services.md
# docs/rfc/INDEX.md
# docs/rfc/implemented/testing/2026-07-06-pin-request-header-content-in-one-scenario.md
# docs/rfc/proposed/simplification/2026-07-12-simplify-session-log-representation.md
# packages/support/acp-snapshot/README.md
# packages/support/acp-snapshot/src/normalize.ts
# packages/support/acp-snapshot/src/suite.ts
# packages/support/acp-snapshot/tests/fixtures/suite/pin-turn/session.jsonl
# packages/support/acp-snapshot/tests/suite.spec.ts
|
2026-07-15 15:53:56 +08:00 |
|
|
Tianyi Cui
|
e7bae3aa3b
|
Merge branch 'master' into feat/mcp-client
|
2026-07-15 15:50:59 +08:00 |
|
 Yichen Jiang
|
162da52082
|
Merge branch 'master' into worktree/provider-routed-llm-adapters
|
2026-07-15 15:42:19 +08:00 |
|
|
Yichen Jiang
|
4f92ede4a0
|
Merge branch 'master' into codex/rfc-subagent-background-tasks
|
2026-07-15 15:41:56 +08:00 |
|
 Hypatia May
|
a28c9f46d1
|
Merge remote-tracking branch 'origin/master' into debug-pangwenjie
|
2026-07-15 15:39:30 +08:00 |
|
|
Hypatia May
|
a2adaf8087
|
Merge remote-tracking branch 'origin/master' into debug-pangwenjie
|
2026-07-15 15:38:20 +08:00 |
|
|
Yichen Jiang
|
17511ea0d8
|
Merge branch 'master' into codex/rfc-subagent-background-tasks
|
2026-07-15 15:33:53 +08:00 |
|
|
Tianyi Cui
|
dbae83d573
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-assembled-section-order
|
2026-07-15 15:31:29 +08:00 |
|
|
Hypatia May
|
9cddfe7fd7
|
Merge remote-tracking branch 'origin/master' into debug-pangwenjie
# Conflicts:
# docs/event-producer-consumer.md
# packages/core/agent-loop/src/loop.ts
|
2026-07-15 15:31:27 +08:00 |
|
|
Hypatia May
|
e55e96eec6
|
Merge compact-tool-pairing into token-meter-service
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 15:27:10 +08:00 |
|
|
Hypatia May
|
63330ac638
|
Merge origin/master into compact-tool-pairing
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 15:24:59 +08:00 |
|
 TianleLin
|
905b8ead9f
|
Merge branch 'master' into feat/mcp-client
|
2026-07-15 15:22:32 +08:00 |
|
|
Hypatia May
|
99dccf559a
|
fix(compact): preserve replay ownership (PR2 round 2)
|
2026-07-15 15:13:57 +08:00 |
|
|
Tianyi Cui
|
72596afe08
|
Merge branch 'codex/simp-hide-concrete-agent-loop' into codex/simp-hide-subagent-internals
|
2026-07-15 15:08:25 +08:00 |
|
|
Tianyi Cui
|
c2c38b18c4
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# packages/core/agent/src/types.ts
|
2026-07-15 15:08:10 +08:00 |
|
|
Tianyi Cui
|
130140feda
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 15:07:35 +08:00 |
|
|
Tianyi Cui
|
10f50c1b55
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# packages/core/agent/src/types.ts
|
2026-07-15 15:07:11 +08:00 |
|
|
Tianyi Cui
|
af267aa8c0
|
Merge branch 'codex/simp-trim-hook-snapshot-noise' into codex/simp-compaction-surface
|
2026-07-15 15:04:47 +08:00 |
|
|
Tianyi Cui
|
a2acfb858e
|
Merge branch 'codex/simp-shared-acp-test-launcher' into codex/simp-trim-hook-snapshot-noise
|
2026-07-15 15:04:47 +08:00 |
|
|
Tianyi Cui
|
188698723c
|
Merge branch 'codex/simp-snapshot-fixture-inventory' into codex/simp-shared-acp-test-launcher
|
2026-07-15 15:04:47 +08:00 |
|
|
Tianyi Cui
|
17693d20c4
|
Merge remote-tracking branch 'origin/codex/simp-session-log-representation' into codex/simp-snapshot-fixture-inventory
# Conflicts:
# packages/support/acp-snapshot/src/suite.ts
|
2026-07-15 15:04:29 +08:00 |
|
|
Tianyi Cui
|
649865043d
|
docs: preserve prose cleanup in session simplification
|
2026-07-15 14:59:20 +08:00 |
|
|
Hypatia May
|
f038780ff6
|
feat(llm): add replay token metering (PR2 round 1)
|
2026-07-15 14:47:29 +08:00 |
|
|
Tianyi Cui
|
0239ac3752
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-assembled-section-order
|
2026-07-15 14:05:54 +08:00 |
|
|
Tianyi Cui
|
3da772998b
|
Merge branch 'codex/simp-prune-llm-contract' into codex/simp-hide-llm-adapter-helpers
|
2026-07-15 14:04:21 +08:00 |
|
|
Tianyi Cui
|
c122c2f0e6
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-llm-contract
|
2026-07-15 14:02:55 +08:00 |
|
|
Tianyi Cui
|
d711dad726
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-sandbox-surface
|
2026-07-15 14:01:14 +08:00 |
|
|
Yichen Jiang
|
3c7f4d4162
|
Merge branch 'master' into worktree/provider-routed-llm-adapters
|
2026-07-15 13:59:52 +08:00 |
|
|
Tianyi Cui
|
627738c4ed
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-code-runtime-surface
|
2026-07-15 13:58:44 +08:00 |
|
|
Yichen Jiang
|
40336f945a
|
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
|
2026-07-15 13:38:22 +08:00 |
|
|
Yichen Jiang
|
09d9fec6f9
|
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
# Conflicts:
# docs/config-catalog.md
# docs/core-data-structures/bash.md
# packages/bash/bash-local/src/index.ts
# packages/bash/bash/src/types.ts
# packages/bash/bash/tests/service.spec.ts
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
|
2026-07-15 13:38:17 +08:00 |
|
|
Yichen Jiang
|
aa284e0802
|
Merge branch 'master' into codex/project-instruction-files
|
2026-07-15 13:36:53 +08:00 |
|
|
Yichen Jiang
|
28344ac124
|
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
|
2026-07-15 13:35:54 +08:00 |
|
|
Yichen Jiang
|
2ed2fa3896
|
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
# packages/bash/bash-local/tests/run.spec.ts
# packages/bash/tool-bash/src/index.ts
|
2026-07-15 13:34:09 +08:00 |
|
|
Yichen Jiang
|
f1d39921c9
|
feat(acp): advertise and switch llm models
|
2026-07-15 13:33:42 +08:00 |
|
|
Tianyi Cui
|
713b50cc2c
|
Merge remote-tracking branch 'origin/master' into codex/simp-hide-web-provider-helpers
|
2026-07-15 13:32:45 +08:00 |
|
|
Yichen Jiang
|
75331f03a6
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 13:30:40 +08:00 |
|
|
Yichen Jiang
|
3285b77d3c
|
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 13:30:39 +08:00 |
|
|
Tianyi Cui
|
96851da571
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
# Conflicts:
# docs/rfc/INDEX.md
|
2026-07-15 13:28:40 +08:00 |
|
|
Yichen Jiang
|
8a50ddc6f4
|
Merge remote-tracking branch 'origin/codex/agent-session-jsonl-location' into codex/agent-session-jsonl-location
|
2026-07-15 13:28:00 +08:00 |
|
|
Yichen Jiang
|
72105ad89c
|
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
|
2026-07-15 13:27:28 +08:00 |
|
|
Tianyi Cui
|
40065dd4fc
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-sandbox-surface
|
2026-07-15 13:27:16 +08:00 |
|
|
Hypatia May
|
c9efdf68f9
|
Merge remote-tracking branch 'origin/master' into codex/compact-tool-pairing
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 13:26:57 +08:00 |
|
|
Yichen Jiang
|
9e6a2827c6
|
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/README.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/tools/README.md
# packages/core/tools/src/index.ts
# packages/ui/stdio-agent/tests/built-bin.e2e.ts
|
2026-07-15 13:25:44 +08:00 |
|
|
Yichen Jiang
|
6edd4a205b
|
Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location
# Conflicts:
# packages/README.md
|
2026-07-15 13:25:29 +08:00 |
|
|
Tianyi Cui
|
fe2d61198f
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-bash-surface
|
2026-07-15 13:23:16 +08:00 |
|
|
Hypatia May
|
cc546c4580
|
feat(compact): move pairing helpers (PR1 round 1)
|
2026-07-15 13:22:44 +08:00 |
|
|
Tianyi Cui
|
e6edee1d54
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-assembled-section-order
|
2026-07-15 13:21:06 +08:00 |
|