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
|
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
|
0f85ae0a9d
|
fix(subagent): identify lifecycle runs explicitly
|
2026-07-18 14:26:14 +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 |
|
Tianyi Cui
|
35473c2701
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# AGENTS.md
# docs/config-catalog.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/cancel/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/code-mode-turn/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/config-options/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/error-finish/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-approved/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-edit/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-policy-reject/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-read-window/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-read/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-terminal-card/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-write-overwrite/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/fs-write/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/handshake/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-block/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-context/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-deny/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-block/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-context/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-stop-continue/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-block/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-context/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-pretool-block/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-block/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-context/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-stop-continue/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/multi-turn/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/repeat-tool-guard/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/skill-load/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/subagent-fork/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/subagent-spawn/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/text-turn/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/todo-plan/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/tool-call-turn/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/workflow-run/stdout.golden.jsonl
# examples/acp-agent/tests/snapshots/workspace-edit/stdout.golden.jsonl
# packages/ui/acp/README.md
# packages/ui/acp/src/index.ts
# packages/ui/jsonrpc/README.md
# packages/ui/jsonrpc/src/server.ts
|
2026-07-18 12:25:33 +08:00 |
|
Tianyi Cui
|
59dc310bb5
|
Merge branch 'codex/simp-agent-entry-state' into codex/simp-unify-agent-session-id
# Conflicts:
# docs/architecture.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/module-graph.md
# examples/coding-agent/tests/code-mode.e2e.ts
# examples/coding-agent/tests/coding-task.e2e.ts
# examples/coding-agent/tests/compaction.e2e.ts
# examples/coding-agent/tests/full-loop.e2e.ts
# examples/coding-agent/tests/todo-write.e2e.ts
# examples/cordis-agent/tests/cordis-tools.e2e.ts
# packages/bash/tool-bash/tests/integration.spec.ts
# packages/bash/tool-bash/tests/tools.spec.ts
# packages/compact/compact-basic/tests/compact-loop-repro.spec.ts
# packages/context/time-context/tests/time-context.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/cordis/tool-cordis/tests/integration.spec.ts
# 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/cancel.spec.ts
# packages/core/agent-loop/tests/config-session-id.spec.ts
# packages/core/agent-loop/tests/contract-regressions.spec.ts
# packages/core/agent-loop/tests/coverage-edges.spec.ts
# packages/core/agent-loop/tests/interception.spec.ts
# packages/core/agent-loop/tests/loop.spec.ts
# packages/core/agent-loop/tests/properties.spec.ts
# packages/core/agent-loop/tests/request-cache.e2e.ts
# packages/core/agent-loop/tests/request-reconstruction.spec.ts
# packages/core/agent-loop/tests/resume.spec.ts
# packages/core/agent-loop/tests/scope-lifecycle.spec.ts
# packages/core/agent-loop/tests/tool-order.spec.ts
# packages/core/agent-loop/tests/turn-stop.spec.ts
# packages/core/agent/src/types.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/tests/agent-core.spec.ts
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
# packages/fs/tool-fs/tests/fs-tools.e2e.ts
# packages/guard/repeat-tool-guard/tests/repeat-tool-guard.spec.ts
# packages/hooks/hooks-claude/tests/bridge.spec.ts
# packages/hooks/hooks-claude/tests/coverage.spec.ts
# packages/hooks/hooks-codex/tests/bridge.spec.ts
# packages/hooks/hooks-codex/tests/coverage.spec.ts
# packages/subagent/subagent-fork/tests/multi-subagent.spec.ts
# packages/subagent/subagent-fork/tests/subagent-fork.spec.ts
# packages/subagent/subagent-inprocess/tests/structured.spec.ts
# packages/subagent/subagent-inprocess/tests/subagent-inprocess.spec.ts
# packages/subagent/subagent-spawn/tests/spawn.e2e.ts
# packages/subagent/subagent-spawn/tests/subagent-spawn.spec.ts
# packages/todo/tool-todo/tests/integration.spec.ts
# packages/ui/acp/tests/dispose.spec.ts
# packages/ui/acp/tests/edges.spec.ts
# packages/workflow/workflow-workerthread/tests/integration.spec.ts
|
2026-07-18 12:21:15 +08:00 |
|
Tianyi Cui
|
f943bc8d4c
|
Merge latest origin/master into token-meter-service
|
2026-07-17 22:38:46 +08:00 |
|
Tianyi Cui
|
1c6a36e4a3
|
Merge origin/master into token-meter-service
|
2026-07-17 22:22:55 +08:00 |
|
Tianyi Cui
|
847a1a1a5a
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# packages/core/session/README.md
# packages/core/session/tests/tool-pairing.spec.ts
# website/zh-CN/api/harness/sessions.md
|
2026-07-17 22:07:37 +08:00 |
|
Tianyi Cui
|
35e45af081
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
|
2026-07-17 21:56:43 +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
|
a770c8b093
|
Merge origin/master into compact-tool-pairing
|
2026-07-17 21:44:30 +08:00 |
|
Tianyi Cui
|
ecd84f7eb9
|
Merge origin/master into compact-tool-pairing
|
2026-07-17 21:36:06 +08:00 |
|
Tianyi Cui
|
a385b3e465
|
Merge remote-tracking branch 'origin/master' into codex/pr358-merge-master-20260717
# Conflicts:
# docs/event-producer-consumer.md
# packages/session-persistence/session-persistence/README.md
|
2026-07-17 21:35:43 +08:00 |
|
Tianyi Cui
|
dc3f61e78b
|
Merge branch 'master' into time-context-history
|
2026-07-17 20:22:31 +08:00 |
|
Dudu-0223
|
a3f62478e1
|
Merge origin/master into codex/truncated-design
|
2026-07-17 18:21:54 +08:00 |
|
Yichen Jiang
|
98ea306c5e
|
fix(session-persistence): retire disposed coordinator state
|
2026-07-17 10:31:44 +08:00 |
|
Hypatia May
|
46e63a004c
|
time-context: durable per-step history (round 1)
|
2026-07-16 17:47:51 +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 |
|
Tianyi Cui
|
72bb02e68e
|
refactor(workspace-context): move package to context group
|
2026-07-16 16:01:06 +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
|
3cccecee0a
|
Merge remote-tracking branch 'origin/master' into compact-tool-pairing
# Conflicts:
# docs/event-producer-consumer.md
|
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
|
694e323403
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.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
# packages/ui/acp/README.md
|
2026-07-15 23:32:16 +08:00 |
|
Tianyi Cui
|
6143537d4e
|
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/core-data-structures/bash.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# 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/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/tests/agent-core.spec.ts
# packages/subagent/tool-subagent/tests/tool-subagent.spec.ts
# packages/util/brand/README.md
# packages/util/brand/src/index.ts
|
2026-07-15 23:29:47 +08:00 |
|
Tianyi Cui
|
6c846531e7
|
Merge current master into PR #106
|
2026-07-15 22:44:47 +08:00 |
|
Tianyi Cui
|
debd4ae5c8
|
Merge branch 'codex/simp-unify-agent-session-id' into codex/simp-ui-identity-residue
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.md
|
2026-07-15 16:26:12 +08:00 |
|
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
|
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 |
|
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
|
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
|
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
|
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 |
|
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 |
|
Hypatia May
|
cc546c4580
|
feat(compact): move pairing helpers (PR1 round 1)
|
2026-07-15 13:22:44 +08:00 |
|
imccyu
|
517964fe84
|
Merge branch 'master' into refactor/agent-leaf-dependencies
|
2026-07-15 13:09:33 +08:00 |
|
Yichen Jiang
|
ca14bcc34b
|
Merge remote-tracking branch 'origin/master' into codex/project-instruction-files
# Conflicts:
# AGENTS.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# packages/fs/fs-local/src/index.ts
# pnpm-lock.yaml
|
2026-07-15 13:07:11 +08:00 |
|
Yichen Jiang
|
df8fe3bde4
|
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
# 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/permission-switching/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
# packages/README.md
|
2026-07-15 11:17:55 +08:00 |
|
Hypatia May
|
4ce32807e1
|
Fix async injection tool-result ordering
|
2026-07-15 11:12:05 +08:00 |
|
Yichen Jiang
|
35cae1d389
|
Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters
# Conflicts:
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.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/code-mode-turn/session.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/session.jsonl
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# examples/acp-agent/tests/snapshots/text-turn/session.jsonl
|
2026-07-15 10:15:06 +08:00 |
|
imccyu
|
80fbeefbd6
|
refactor(ui): extract stdio plugin package
Move the readline front door from stdio-agent into @deepseek-ai/dsh-stdio, keeping the loader shape and the stdio coverage with the new package.
|
2026-07-15 10:04:40 +08:00 |
|
Tianyi Cui
|
77de6497b4
|
Merge remote-tracking branch 'origin/master' into codex/simp-drop-skill-provider-events
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 01:49:41 +08:00 |
|