 Tianyi Cui
|
6d1870c8c1
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/bash/tool-bash/src/index.ts
# packages/ui/stdio-agent/README.md
# packages/ui/stdio-agent/src/index.ts
# packages/ui/stdio/src/index.ts
# packages/workflow/workflow-workerthread/tests/workflow-workerthread.spec.ts
# packages/workflow/workflow/package.json
# scripts/gen-doc-graphs.ts
|
2026-07-15 16:24:43 +08:00 |
|
 Hypatia May
|
e8d066f750
|
feat(core): add post-step request recovery (PR3 phase 1)
|
2026-07-15 16:03:52 +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 |
|
|
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
|
99dccf559a
|
fix(compact): preserve replay ownership (PR2 round 2)
|
2026-07-15 15:13:57 +08:00 |
|
|
Hypatia May
|
f038780ff6
|
feat(llm): add replay token metering (PR2 round 1)
|
2026-07-15 14:47:29 +08:00 |
|
 Yichen Jiang
|
d3f8cb0f23
|
fix: harden replay and pi-ai request boundaries
|
2026-07-15 13:45:19 +08:00 |
|
|
Yichen Jiang
|
f1d39921c9
|
feat(acp): advertise and switch llm models
|
2026-07-15 13:33:42 +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
|
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 |
|
|
Hypatia May
|
edfc4dc4ac
|
Preserve interrupted post-tool context
|
2026-07-15 12:49:50 +08:00 |
|
|
Hypatia May
|
28144077f3
|
Fix deferred injection lifecycle
|
2026-07-15 12:22:39 +08:00 |
|
|
Hypatia May
|
4ce32807e1
|
Fix async injection tool-result ordering
|
2026-07-15 11:12:05 +08:00 |
|
|
Tianyi Cui
|
34344bc4ee
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-14 23:36:15 +08:00 |
|
|
Tianyi Cui
|
9745a0d43a
|
fix: reject empty configured session ids
|
2026-07-14 23:36:04 +08:00 |
|
|
Yichen Jiang
|
815365dbbe
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# docs/persistence-catalog.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/acp-agent/tests/snapshots/advanced-toolchain/session.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
# examples/sandbox-acp-agent/cordis.yml
# examples/sandbox-acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/sandbox-acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/sandbox-acp-agent/tests/snapshots/mode-switching/session.jsonl
# packages/compact/compact-basic/README.md
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/src/loop.ts
# packages/core/agent-loop/tests/properties.spec.ts
# packages/core/session/README.md
# packages/core/session/src/types.ts
# packages/core/session/tests/derived-cache.spec.ts
# packages/llm/llm-deepseek/src/index.ts
# packages/llm/llm-pi-ai/README.md
# packages/llm/llm-pi-ai/src/adapter.ts
# packages/llm/llm-pi-ai/src/convert.ts
# packages/llm/llm-pi-ai/tests/adapter.spec.ts
# packages/llm/llm/README.md
# packages/llm/llm/src/call-config.ts
# packages/llm/llm/src/index.ts
# packages/ui/acp-agent/src/index.ts
# packages/ui/acp/tests/harness.ts
# packages/ui/jsonrpc/README.md
# packages/ui/jsonrpc/src/server.ts
# packages/ui/stdio-agent/README.md
# packages/ui/stdio-agent/src/index.ts
# python/sdk/README.i18n.yaml
|
2026-07-14 22:17:50 +08:00 |
|
|
Yichen Jiang
|
e547980d77
|
feat(llm): route adapters by provider
|
2026-07-14 21:57:52 +08:00 |
|
 Dudu-0223
|
77be4b891b
|
Merge remote-tracking branch 'origin/master' into pr-265
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/rfc/INDEX.md
# examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
# examples/sandbox-acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/sandbox-acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# packages/core/agent-loop/README.md
# packages/core/agent-loop/src/loop.ts
# packages/core/tools/README.md
# packages/core/tools/src/index.ts
# packages/core/tools/src/schema.ts
# packages/ui/acp/src/index.ts
# packages/ui/stdio-agent/README.md
|
2026-07-14 20:49:54 +08:00 |
|
|
Yichen Jiang
|
ee111fd978
|
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
# Conflicts:
# AGENTS.md
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# docs/persistence-catalog.md
# docs/rfc/implemented/architecture/2026-07-05-reconstructable-requests.md
# docs/rfc/implemented/feature/2026-06-15-code-mode.md
# docs/rfc/implemented/feature/2026-06-30-hook-bridges.md
# docs/rfc/implemented/feature/2026-06-30-interception-seams.md
# docs/rfc/implemented/feature/2026-07-08-repeat-tool-guard.md
# docs/rfc/proposed/simplification/2026-07-04-prune-dead-core-spine-surface.md
# examples/AGENTS.md
# examples/acp-agent/cordis.yml
# examples/acp-agent/tests/acp.snapshot.ts
# examples/echo-agent/cordis.yml
# examples/sandbox-acp-agent/cordis.yml
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-core/README.md
# packages/core/agent-core/src/index.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/src/loop.ts
# packages/core/agent-loop/tests/interception.spec.ts
# packages/core/agent/src/types.ts
# packages/core/tools/README.md
# packages/core/tools/src/code-mode.ts
# packages/core/tools/src/index.ts
# packages/fs/fs-local/src/index.ts
# packages/fs/fs/README.md
# packages/fs/fs/src/index.ts
# packages/guard/repeat-tool-guard/README.md
# packages/guard/repeat-tool-guard/src/index.ts
# packages/hooks/hooks-claude/src/index.ts
# packages/hooks/hooks-codex/src/index.ts
# packages/ui/acp-agent/src/index.ts
|
2026-07-14 19:50:25 +08:00 |
|
|
Tianyi Cui
|
93dc0f30a9
|
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
|
2026-07-14 18:58:29 +08:00 |
|
|
Tianyi Cui
|
83271191d1
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/architecture/2026-06-18-agent-lifecycle-and-ownership-seams.md
# docs/rfc/implemented/architecture/2026-06-20-branded-ids.md
# docs/rfc/implemented/simplification/2026-06-20-remove-agent-boundary-mirror-events.md
# docs/rfc/proposed/feature/2026-07-07-claude-code-and-codex-subagent-backends.md
# docs/rfc/proposed/simplification/2026-06-20-unify-agent-and-session-id.md
# packages/bash/tool-bash/README.md
# packages/bash/tool-bash/src/index.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/tests/properties.spec.ts
# packages/core/agent/README.md
# packages/core/agent/src/index.ts
# packages/guard/repeat-tool-guard/src/index.ts
# packages/hooks/hooks-claude/tests/bridge.spec.ts
# packages/subagent/subagent-acp/tests/mock-acp-server.ts
# packages/ui/acp/tests/dispose.spec.ts
# packages/ui/stdio-agent/src/index.ts
# packages/ui/stdio-agent/src/stdio-chat.ts
# packages/ui/stdio-agent/tests/stdio-chat.spec.ts
# packages/util/brand/src/index.ts
|
2026-07-14 18:51:24 +08:00 |
|
|
Tianyi Cui
|
78276c52a7
|
Merge branch 'codex/simp-session-dead-surface' into codex/simp-session-log-representation
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.md
# docs/persistence-catalog.md
# docs/rfc/implemented/architecture/2026-07-05-reconstructable-requests.md
# docs/rfc/implemented/feature/2026-06-18-compaction-capability-seam.md
# docs/rfc/implemented/feature/2026-07-06-explicit-tool-order.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# docs/rfc/implemented/feature/2026-07-07-session-prefix.md
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
# packages/core/agent-loop/src/loop.ts
# packages/core/agent-loop/src/request-log.ts
# packages/core/agent-loop/tests/request-reconstruction.spec.ts
# packages/core/agent/src/types.ts
# packages/core/session/README.md
# packages/core/session/src/request-header.ts
# packages/core/session/src/surface.ts
# packages/core/session/src/tool-pairing.ts
# packages/core/session/src/types.ts
# packages/core/session/tests/surface.spec.ts
# packages/core/session/tests/tool-pairing.spec.ts
# packages/llm/llm/src/call-config.ts
# packages/support/acp-snapshot/src/suite.ts
# packages/support/invariants/README.md
# packages/ui/user-approval/README.md
|
2026-07-14 18:34:34 +08:00 |
|
|
Tianyi Cui
|
32ed403500
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-tools-prompt-surface
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# packages/core/agent-loop/src/loop.ts
# packages/core/session/README.md
# packages/core/session/tests/derived-cache.spec.ts
|
2026-07-14 17:30:34 +08:00 |
|
|
Tianyi Cui
|
4a5463cfc4
|
test: use the public agent type
|
2026-07-14 16:53:38 +08:00 |
|
|
Tianyi Cui
|
f0fc20ca42
|
docs: align prose with runtime contracts
|
2026-07-14 16:21:41 +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
|
d83aa8d11a
|
test: cover exact-id reload cancellation
|
2026-07-14 15:31:00 +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
|
b58cf7ec2f
|
fix: coordinate overlapping configured reloads
|
2026-07-14 14:24:21 +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
|
b47e4c5276
|
fix: suppress teardown startup failures
|
2026-07-14 12:45:12 +08:00 |
|
|
Tianyi Cui
|
91ad787ef4
|
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:26:33 +08:00 |
|
|
Tianyi Cui
|
a25c0f084f
|
fix: totalize configured startup failures
|
2026-07-14 12:25:30 +08:00 |
|
|
Tianyi Cui
|
545c7d57d3
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-14 11:35:51 +08:00 |
|
|
Tianyi Cui
|
7d6ef0a472
|
fix: contain config failure observers
|
2026-07-14 11:33:36 +08:00 |
|
|
Tianyi Cui
|
54bd21cf58
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
|
2026-07-14 11:27:35 +08:00 |
|
|
Tianyi Cui
|
c1fb97c63a
|
fix: surface config startup failures
|
2026-07-14 11:23:38 +08:00 |
|
|
Tianyi Cui
|
7d30906ee4
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
|
2026-07-14 10:54:25 +08:00 |
|
|
Tianyi Cui
|
46b8bce03a
|
fix: join exact session startup on teardown
|
2026-07-14 10:49:15 +08:00 |
|
|
Tianyi Cui
|
03d3e006b3
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-14 10:40:33 +08:00 |
|
|
Tianyi Cui
|
949ee03377
|
test: cover exact session restore failure
|
2026-07-14 10:38:53 +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
|
816b6e4c68
|
fix: restore exact config sessions on loop reload
|
2026-07-14 10:25:49 +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
|
6b782b0189
|
fix: bind stdio to its exact fresh identity
|
2026-07-14 09:54:34 +08:00 |
|
|
Tianyi Cui
|
f55786e154
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
|
2026-07-14 07:15:05 +08:00 |
|
|
Tianyi Cui
|
c2979322c8
|
fix: keep stdio targeting on runtime roots
|
2026-07-14 07:13:42 +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
|
7d711c44a8
|
fix: keep remote subagent ids parent-scoped
|
2026-07-14 05:41:01 +08:00 |
|