 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 |
|
|
Tianyi Cui
|
06ea8643ff
|
Merge newest origin/master into token-meter-service
|
2026-07-17 22:49:54 +08:00 |
|
|
Tianyi Cui
|
f943bc8d4c
|
Merge latest origin/master into token-meter-service
|
2026-07-17 22:38:46 +08:00 |
|
|
Tianyi Cui
|
7a2d5cd28d
|
Merge master into codex/simp-session-log-representation
|
2026-07-17 22:33:42 +08:00 |
|
|
Tianyi Cui
|
1c6a36e4a3
|
Merge origin/master into token-meter-service
|
2026-07-17 22:22:55 +08:00 |
|
|
Tianyi Cui
|
53680ee6bc
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/context/time-context/tests/time-context.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/session/README.md
# packages/core/session/src/types.ts
# packages/core/session/tests/surface.spec.ts
# packages/examples/acp-demo/tests/acp-agent.spec.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
# packages/hooks/hooks-claude/tests/coverage.spec.ts
# packages/hooks/hooks-codex/tests/coverage.spec.ts
# packages/session-query/session-query/tests/session-query.spec.ts
# packages/support/invariants/tests/invariants.spec.ts
# packages/ui/acp/tests/harness.ts
|
2026-07-17 21:56:10 +08:00 |
|
|
Tianyi Cui
|
ce393ccb93
|
Merge master into codex/simp-session-log-representation
|
2026-07-17 21:51:36 +08:00 |
|
|
Tianyi Cui
|
e01b5dc354
|
Merge origin/master into session-query-trace
|
2026-07-17 18:41:42 +08:00 |
|
 Dudu-0223
|
a3f62478e1
|
Merge origin/master into codex/truncated-design
|
2026-07-17 18:21:54 +08:00 |
|
 Yichen Jiang
|
97190c81ba
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/event-producer-consumer.md
# 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
|
2026-07-16 16:39:13 +08:00 |
|
 Hypatia May
|
8d0d9bdd1d
|
Merge remote-tracking branch 'origin/compact-tool-pairing' into token-meter-service
# Conflicts:
# docs/capability-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# packages/cordis/tool-cordis/src/api-catalog.ts
|
2026-07-16 10:04:17 +08:00 |
|
|
Hypatia May
|
8184332918
|
Merge remote-tracking branch 'origin/master' into session-query-trace
# Conflicts:
# packages/README.md
# packages/support/invariants/src/index.ts
|
2026-07-16 09:55:02 +08:00 |
|
|
hypatiamay
|
5dd37a4f99
|
Merge branch 'master' into debug-pangwenjie
|
2026-07-16 09:49:28 +08:00 |
|
|
Tianyi Cui
|
08dbb74ce1
|
Merge remote-tracking branch 'origin/master' into codex/simp-session-log-representation
# Conflicts:
# docs/tool-catalog.md
# 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
# examples/acp-agent/tests/snapshots/permission-switching/session.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/system-prompt.golden.md
|
2026-07-15 23:18:26 +08:00 |
|
|
Tianyi Cui
|
6c846531e7
|
Merge current master into PR #106
|
2026-07-15 22:44:47 +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 |
|
|
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 |
|
|
Yichen Jiang
|
3c7f4d4162
|
Merge branch 'master' into worktree/provider-routed-llm-adapters
|
2026-07-15 13:59:52 +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
|
aa284e0802
|
Merge branch 'master' into codex/project-instruction-files
|
2026-07-15 13:36:53 +08:00 |
|
|
Yichen Jiang
|
f1d39921c9
|
feat(acp): advertise and switch llm models
|
2026-07-15 13:33:42 +08:00 |
|
|
Hypatia May
|
c3d5568efd
|
Document deferred injection ordering
|
2026-07-15 12:31:25 +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 |
|
|
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 |
|
|
Yichen Jiang
|
9956528495
|
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/bash.md
# docs/event-producer-consumer.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# docs/rfc/proposed/architecture/2026-06-20-generic-long-running-tool-runtime.md
# examples/AGENTS.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/advanced-toolchain/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/permission-switching/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/system-prompt.golden.md
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/system-prompt.golden.md
# examples/coding-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/bash/bash-local/README.md
# packages/bash/bash-local/src/index.ts
# packages/bash/bash-local/tests/executor.spec.ts
# packages/bash/bash-sandbox/README.md
# packages/bash/bash-sandbox/src/index.ts
# packages/bash/bash/README.md
# packages/bash/bash/src/index.ts
# packages/bash/bash/src/types.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
# packages/core/agent-core/README.md
# packages/core/agent-core/src/index.ts
# packages/subagent/subagent/README.md
# packages/subagent/tool-subagent/README.md
# packages/subagent/tool-subagent/src/index.ts
# packages/ui/acp-agent/README.md
# packages/ui/acp/README.md
# packages/ui/stdio-agent/README.md
# packages/util/brand/src/index.ts
# scripts/doc-budgets.manifest.json
|
2026-07-14 18:05:46 +08:00 |
|
|
Tianyi Cui
|
92c52eec20
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/web.md
# docs/rfc/implemented/simplification/2026-07-04-drop-unconsumed-web-observation-surface.md
# packages/web/tool-web/tests/integration.spec.ts
# packages/web/web-fetch-local/README.md
# packages/web/web-fetch-local/src/provider.ts
# packages/web/web/src/types.ts
|
2026-07-14 17:57:50 +08:00 |
|
|
Hypatia May
|
97f5ec95cd
|
Merge remote-tracking branch 'origin/master' into session-query-trace
# Conflicts:
# docs/cordis-catalog/services.md
# packages/core/session/README.md
# packages/support/invariants/src/index.ts
# packages/support/invariants/tests/invariants.spec.ts
|
2026-07-14 17:31:46 +08:00 |
|
|
Tianyi Cui
|
f0fc20ca42
|
docs: align prose with runtime contracts
|
2026-07-14 16:21:41 +08:00 |
|
|
Tianyi Cui
|
1ab64dba62
|
Merge remote-tracking branch 'origin/master' into codex/trim-ai-prose
# Conflicts:
# docs/config-catalog.md
# docs/development.i18n.yaml
# docs/development.zh.md
# docs/rfc/implemented/feature/2026-06-14-acp-agent-client-protocol.md
# docs/rfc/implemented/feature/2026-07-06-sandbox.md
# examples/AGENTS.md
# examples/README.md
# examples/acp-agent/README.md
# examples/acp-agent/cordis.yml
# examples/acp-agent/tests/acp.e2e.ts
# examples/acp-agent/tests/escalation.e2e.ts
# examples/sandbox-acp-agent/README.md
# examples/sandbox-acp-agent/cordis.snapshot.yml
# examples/sandbox-acp-agent/cordis.yml
# examples/sandbox-acp-agent/tests/acp.snapshot.ts
# packages/ui/acp-agent/src/bin.ts
# packages/ui/acp/README.md
# packages/ui/jsonrpc-agent/README.md
# packages/ui/jsonrpc-agent/src/bin.ts
# scripts/verify-translation-pairing.ts
|
2026-07-14 12:34:14 +08:00 |
|
|
Tianyi Cui
|
414f696a74
|
Merge remote-tracking branch 'origin/master' into codex/simp-prune-web-seam-fields
|
2026-07-14 11:58:31 +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 |
|
|
Dudu-0223
|
8ab39267f3
|
Merge remote-tracking branch 'origin/master' into codex/truncated-design
# Conflicts:
# docs/rfc/INDEX.md
|
2026-07-14 11:06:41 +08:00 |
|
|
Tianyi Cui
|
3ab35de64f
|
refactor: prune unused web seam fields
|
2026-07-14 04:17:38 +08:00 |
|
|
Tianyi Cui
|
1123e946c0
|
refactor: simplify session log representation
|
2026-07-13 23:56:10 +08:00 |
|
|
Tianyi Cui
|
148046b9c8
|
docs: rebalance prose cleanup and add trimming skill
|
2026-07-13 23:27:00 +08:00 |
|
|
Yichen Jiang
|
aa62b5109a
|
Fix workspace context review findings
|
2026-07-13 16:31:03 +08:00 |
|
|
Tianyi Cui
|
c45d7927cf
|
docs: tighten prose audit after master retarget
|
2026-07-13 16:24:32 +08:00 |
|
|
Yichen Jiang
|
e2bc79a0ef
|
Merge remote-tracking branch 'origin/master' into codex/rfc-subagent-background-tasks
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# docs/tool-catalog.md
# packages/bash/tool-bash/tests/integration.spec.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/core/agent-core/tests/agent-core.spec.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/src/index.ts
# packages/core/agent/README.md
# packages/core/agent/src/index.ts
# packages/core/agent/tests/agent.spec.ts
# packages/subagent/subagent/README.md
# packages/subagent/subagent/src/index.ts
# packages/subagent/tool-subagent/README.md
# packages/subagent/tool-subagent/src/index.ts
# pnpm-lock.yaml
# scripts/doc-budgets.manifest.json
|
2026-07-13 15:57:17 +08:00 |
|
|
Hypatia May
|
3d3789bf2d
|
Merge remote-tracking branch 'origin/session-query' into session-query-trace-filter
# Conflicts:
# docs/config-catalog.md
# docs/core-data-structures/core.md
# docs/rfc/INDEX.md
# packages/support/invariants/src/index.ts
|
2026-07-13 14:55:25 +08:00 |
|
|
Yichen Jiang
|
adf6b8a1ab
|
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
# 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
# docs/rfc/implemented/feature/2026-06-15-code-mode.md
# docs/rfc/implemented/feature/2026-06-30-interception-seams.md
# docs/rfc/proposed/simplification/2026-07-04-prune-dead-core-spine-surface.md
# docs/tool-execution-pipeline.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-core/tests/agent-core.spec.ts
# packages/core/agent-loop/src/agent.ts
# packages/core/agent/README.md
# packages/core/session/src/index.ts
# packages/core/tools/README.md
# packages/core/tools/src/index.ts
# pnpm-lock.yaml
# scripts/gen-doc-graphs.ts
# scripts/type-equiv.manifest.json
|
2026-07-13 14:37:32 +08:00 |
|
|
Hypatia May
|
00bfc03d20
|
Merge remote-tracking branch 'origin/master' into session-query
# Conflicts:
# docs/core-data-structures/core.md
# docs/module-graph.md
# docs/rfc/INDEX.md
# vendor/README.md
|
2026-07-13 14:27:31 +08:00 |
|
|
Dudu-0223
|
f859332e9c
|
Merge remote-tracking branch 'origin/master' into codex/truncated-design
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/rfc/INDEX.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# pnpm-lock.yaml
|
2026-07-13 14:23:52 +08:00 |
|
|
Yichen Jiang
|
768c79fd45
|
Fix Code Mode workspace context propagation
|
2026-07-13 13:56:45 +08:00 |
|
|
Hypatia May
|
320de5466a
|
feat(session-query): add relationship tracing (round 1)
|
2026-07-13 13:44:01 +08:00 |
|
|
Tianyi Cui
|
6a8118c967
|
docs: align scoped runtime contracts
|
2026-07-13 13:41:27 +08:00 |
|
|
Tianyi Cui
|
e04ec07345
|
refactor(core): remove owner-final assembly machinery
|
2026-07-13 13:09:41 +08:00 |
|