Yichen Jiang
|
da8c0ab092
|
fix(session-reference): bind snapshots to prompts
|
2026-07-22 17:34:31 +08:00 |
|
Yichen Jiang
|
b964e81c11
|
Merge remote-tracking branch 'origin/master' into worktree/session-reference
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/src/loop.ts
# packages/core/agent-loop/tests/contract-regressions.spec.ts
# packages/core/agent/src/types.ts
# packages/ui/tui/tests/harness.ts
# scripts/type-equiv.manifest.json
|
2026-07-21 21:57:21 +08:00 |
|
Yichen Jiang
|
8bc62e1013
|
Merge remote-tracking branch 'origin/master' into worktree/session-reference
# Conflicts:
# .agents/notes/implemented/feature/2026-06-18-compaction-capability-seam.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/compact/compact-basic/src/region.ts
# packages/compact/compact/README.md
# packages/compact/compact/tests/compact.spec.ts
# packages/examples/acp-demo/package.json
# packages/ui/tui/README.md
# packages/ui/tui/package.json
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/harness.ts
# packages/ui/tui/tests/tui.spec.ts
|
2026-07-21 21:10:42 +08:00 |
|
Tianyi Cui
|
70e50cd9be
|
Merge commit 'refs/codex/unblock/master-current' into HEAD
# Conflicts:
# docs/event-producer-consumer.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/fs-escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# packages/context/workspace-context/tests/workspace-context.spec.ts
# packages/core/agent/src/index.ts
# packages/support/invariants/tests/invariants.spec.ts
# packages/ui/acp/src/index.ts
# packages/ui/tui/tests/harness.ts
# packages/ui/tui/tests/tui.spec.ts
|
2026-07-21 20:20:53 +08:00 |
|
Yichen Jiang
|
32d786c439
|
feat(session): add cross-session references
|
2026-07-21 16:46:48 +08:00 |
|
Tianyi Cui
|
d6bebc18f8
|
Merge remote-tracking branch 'origin/codex/enforce-tool-cancellation' into worktree/explicit-turn-signal
# Conflicts:
# docs/architecture.md
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# packages/core/agent-loop/README.md
# packages/core/agent-loop/src/agent.ts
# packages/core/agent/README.md
# packages/core/agent/src/types.ts
# packages/ui/acp/src/index.ts
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/harness.ts
|
2026-07-21 12:48:46 +08:00 |
|
Tianyi Cui
|
43d50a38b1
|
Merge remote-tracking branch 'origin/master' into codex/enforce-tool-cancellation
# Conflicts:
# docs/architecture.md
# packages/core/agent-loop/README.md
|
2026-07-21 12:30:08 +08:00 |
|
Tianyi Cui
|
55ef21d9d5
|
Merge origin/master into codex/invariant-service-seam
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/package.json
# packages/examples/agent-spine-demo/src/index.ts
# packages/examples/tui-demo/package.json
# packages/support/invariants/src/scoped-events.generated.ts
# packages/ui/acp/package.json
# packages/ui/tui/package.json
# packages/ui/tui/tests/tui.spec.ts
# pnpm-lock.yaml
|
2026-07-21 01:13:28 +08:00 |
|
Tianyi Cui
|
72f0019c4e
|
Merge remote-tracking branch 'origin/codex/enforce-tool-cancellation' into worktree/explicit-turn-signal
# Conflicts:
# docs/architecture.md
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# docs/persistence-catalog.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/README.md
# packages/core/agent-loop/src/loop.ts
# packages/core/agent/README.md
# packages/examples/cli-demo/src/cli.ts
# packages/ui/tui/tests/tui.spec.ts
|
2026-07-21 00:02:17 +08:00 |
|
Tianyi Cui
|
a9a9d40cb1
|
Merge branch 'codex/commands' into codex/goal-commands
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# packages/examples/acp-demo/README.md
# packages/examples/acp-demo/src/index.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/agent-spine-demo/package.json
# packages/examples/agent-spine-demo/src/index.ts
|
2026-07-20 23:10:33 +08:00 |
|
Tianyi Cui
|
4311aaabb0
|
Merge remote-tracking branch 'origin/master' into codex/enforce-tool-cancellation
# Conflicts:
# docs/cookbook/adding-a-tool.i18n.yaml
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# packages/bash/tool-bash/src/index.ts
# packages/core/agent-loop/README.md
# packages/core/tools/README.md
# packages/core/tools/tests/scoped.spec.ts
# packages/fs/tool-fs-search/tests/tools.spec.ts
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/tools.md
|
2026-07-20 23:00:21 +08:00 |
|
Tianyi Cui
|
023cde5d82
|
Merge latest master into invariant service seam
|
2026-07-20 22:49:27 +08:00 |
|
Yichen Jiang
|
a92d2e5f34
|
Merge origin/master into worktree/explicit-turn-signal
|
2026-07-20 21:38:49 +08:00 |
|
Tianyi Cui
|
8c12f8945e
|
Merge latest master into codex/llm-error-recovery-rfc
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# docs/persistence-catalog.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/src/loop.ts
# packages/core/agent/src/types.ts
# packages/examples/agent-spine-demo/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/llm/llm-deepseek/README.md
# packages/llm/llm-deepseek/src/adapter.ts
# packages/llm/llm-deepseek/tests/adapter.spec.ts
# packages/llm/llm/README.md
# packages/llm/llm/src/error.ts
# packages/llm/llm/tests/service.spec.ts
# packages/sandbox/sandbox-policy/tsconfig.json
# packages/ui/stdio/README.md
# packages/ui/stdio/src/index.ts
# packages/ui/stdio/tests/stdio.spec.ts
# packages/ui/tui/src/index.ts
# pnpm-lock.yaml
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/llm.md
|
2026-07-20 20:59:11 +08:00 |
|
Tianyi Cui
|
d121f87def
|
Merge branch 'codex/commands' into codex/goal-commands
# Conflicts:
# .agents/notes/implemented/feature/2026-06-30-interception-seams.md
# docs/core-data-structures/core.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/both-mode-turn/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/model-switching/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/permission-switching/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/skill-load/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/text-turn/tool-schemas.expected.json
# examples/acp-agent/tests/snapshots/workspace-edit/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/workspace-edit/tool-schemas.expected.json
|
2026-07-20 20:55:50 +08:00 |
|
Tianyi Cui
|
2f3ca3027b
|
Merge remote-tracking branch 'origin/master' into codex/invariant-service-seam
|
2026-07-20 19:42:41 +08:00 |
|
Tianyi Cui
|
3293d56a06
|
fix: clarify provider retry delay contract
|
2026-07-20 18:38:22 +08:00 |
|
pku-xht
|
0891465ee0
|
Merge origin/master into codex/send-one-turn
|
2026-07-20 11:52:30 +08:00 |
|
Tianyi Cui
|
3b0b0cefeb
|
feat: implement bounded LLM request recovery
|
2026-07-20 03:34:19 +08:00 |
|
Tianyi Cui
|
207692bc16
|
feat(goal): add human goal command
|
2026-07-19 23:55:33 +08:00 |
|
Tianyi Cui
|
e8b95c8754
|
feat(tools): require cancellation signal on every invocation
|
2026-07-19 23:38:54 +08:00 |
|
Tianyi Cui
|
9d310ecc27
|
feat(invariants): add package-owned service seam
|
2026-07-19 19:19:57 +08:00 |
|
Tianyi Cui
|
5cc18ea7db
|
Merge remote-tracking branch 'origin/master' into codex/enforce-tool-cancellation
# Conflicts:
# packages/core/agent-loop/tests/tool-calls.spec.ts
|
2026-07-19 18:12:13 +08:00 |
|
Tianyi Cui
|
7be78c7d4c
|
Merge latest origin/master into compact-post-step-overflow-recovery
# Conflicts:
# docs/agent-lifecycle.md
# docs/architecture.md
# docs/cookbook/extension-cookbook.i18n.yaml
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/rfc/INDEX.md
# docs/rfc/implemented/architecture/2026-07-05-reconstructable-requests.md
# docs/rfc/implemented/architecture/2026-07-15-replay-token-meter-service.i18n.yaml
# docs/rfc/implemented/architecture/2026-07-15-replay-token-meter-service.md
# docs/rfc/implemented/architecture/2026-07-15-replay-token-meter-service.zh.md
# docs/rfc/implemented/feature/2026-06-18-compaction-capability-seam.md
# docs/rfc/implemented/feature/2026-07-07-session-prefix.md
# packages/compact/compact-basic/README.md
# packages/compact/compact-basic/src/config.ts
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/src/summarizer.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
# packages/compact/compact-basic/tests/compact-loop-repro.spec.ts
# packages/compact/compact/README.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/src/loop.ts
# packages/core/agent-loop/tests/cancel.spec.ts
# packages/llm/llm-deepseek/src/adapter.ts
# packages/llm/llm-pi-ai/README.md
# packages/llm/llm-pi-ai/src/stream.ts
# packages/llm/llm-pi-ai/tests/convert.spec.ts
# packages/llm/llm/README.md
# packages/llm/llm/src/index.ts
# packages/llm/llm/tests/service.spec.ts
# scripts/gen-doc-graphs.ts
|
2026-07-19 12:06:23 +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
|
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 |
|
Yichen Jiang
|
5190e10d27
|
Merge latest agent execution context base
|
2026-07-18 21:42:38 +08:00 |
|
Yichen Jiang
|
cddb79e844
|
Merge branch 'worktree/agent-execution-context-rfc' into worktree/explicit-turn-signal
|
2026-07-18 21:33:17 +08:00 |
|
Yichen Jiang
|
0e4785cdb7
|
Merge origin/master into worktree/agent-execution-context-rfc
|
2026-07-18 21:20:30 +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
|
2db38ecf05
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/event-producer-consumer.md
# packages/core/agent-loop/README.md
# packages/core/agent-loop/tests/contract-regressions.spec.ts
|
2026-07-18 14:52:34 +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
|
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
|
6f01d4d099
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/event-producer-consumer.md
# examples/coding-agent/tests/code-mode.e2e.ts
# examples/coding-agent/tests/harness.ts
# examples/coding-agent/tests/resume.e2e.ts
# examples/cordis-agent/tests/harness.ts
# packages/bash/tool-bash/tests/integration.spec.ts
# packages/compact/compact-basic/tests/compact-loop-repro.spec.ts
# packages/cordis/tool-cordis/tests/integration.spec.ts
# packages/core/agent-loop/tests/contract-regressions.spec.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/todo/tool-todo/tests/integration.spec.ts
|
2026-07-18 12:33:49 +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 |
|
Yichen Jiang
|
be3d2076b8
|
Merge origin/master into worktree/agent-execution-context-rfc
|
2026-07-17 23:25:01 +08:00 |
|
Tianyi Cui
|
f943bc8d4c
|
Merge latest origin/master into token-meter-service
|
2026-07-17 22:38:46 +08:00 |
|
Tianyi Cui
|
3e07f9b270
|
Merge latest origin/master into parallel-tool-call
|
2026-07-17 22:28:38 +08:00 |
|
pku-xht
|
aa4e629874
|
feat(agent-loop): give each send its own turn
|
2026-07-17 17:14:52 +08:00 |
|
Yichen Jiang
|
c238992fbb
|
feat(core): make turn cancellation explicit
|
2026-07-16 18:14:13 +08:00 |
|
Yichen Jiang
|
7bcae0cd64
|
feat(core): add agent execution context
|
2026-07-16 16:29:46 +08:00 |
|
Dudu-0223
|
3bed1a644f
|
Merge origin/master into parallel-tool-call
|
2026-07-16 14:56:02 +08:00 |
|
Dudu-0223
|
91da66e715
|
refactor(agent-loop): simplify parallel tool-call cap config
|
2026-07-16 14:36:16 +08:00 |
|
Tianyi Cui
|
c2cf2cbbd8
|
test(agent-loop): name regression contracts
|
2026-07-16 02:05:44 +08:00 |
|
Tianyi Cui
|
2a6fef66ef
|
test(agent-loop): remove review bookkeeping
|
2026-07-16 00:52:49 +08:00 |
|
Hypatia May
|
d66c926d7a
|
fix(agent): preserve lifecycle recovery boundaries (PR3 round 2)
|
2026-07-15 17:43:33 +08:00 |
|
Tianyi Cui
|
9082cebc56
|
Merge branch 'codex/simp-ui-identity-residue' into codex/simp-hide-concrete-agent-loop
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-15 16:27:37 +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
|
e8d066f750
|
feat(core): add post-step request recovery (PR3 phase 1)
|
2026-07-15 16:03:52 +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 |
|