 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 |
|
|
Tianyi Cui
|
72c6696e4f
|
Merge branch 'master' into worktree/routed-model-compaction-policy
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-21 19:23:54 +08:00 |
|
|
Tianyi Cui
|
373bf333ac
|
docs: refresh config catalog for replay capacity
|
2026-07-21 19:05:40 +08:00 |
|
|
Tianyi Cui
|
39eb6e21cd
|
Merge current master into invariant service seam
|
2026-07-21 18:35:24 +08:00 |
|
|
Tianyi Cui
|
78f8a3f5d9
|
Merge branch 'master' into worktree/routed-model-compaction-policy
|
2026-07-21 18:30:57 +08:00 |
|
|
Tianyi Cui
|
071fe76755
|
Merge latest master into invariant service seam
|
2026-07-21 18:27:46 +08:00 |
|
|
Tianyi Cui
|
8a93072537
|
Merge origin/master into worktree/tui-session-controls
|
2026-07-21 18:12:11 +08:00 |
|
|
Tianyi Cui
|
c9a8c58467
|
Merge origin/master into lsp
|
2026-07-21 17:58:46 +08:00 |
|
 Yichen Jiang
|
49a9bca9f6
|
fix: validate compaction config pairs
|
2026-07-21 14:49:57 +08:00 |
|
|
Tianyi Cui
|
2fd995bf3c
|
fix(lsp): align operations and harden lifecycle
|
2026-07-21 13:29:40 +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 |
|
|
Yichen Jiang
|
7e43f8661c
|
Merge branch 'master' into fix/acp-subagent-cwd
|
2026-07-21 12:29:50 +08:00 |
|
|
Yichen Jiang
|
b6f6c58435
|
Merge remote-tracking branch 'origin/master' into worktree/routed-model-compaction-policy
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-10-after-call-compaction-pressure-and-overflow-recovery.i18n.yaml
# .agents/notes/implemented/architecture/2026-07-10-after-call-compaction-pressure-and-overflow-recovery.md
# .agents/notes/implemented/architecture/2026-07-10-after-call-compaction-pressure-and-overflow-recovery.zh.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# examples/headless-agent/tests/harness.ts
# examples/repl-agent/cordis.yml
# packages/compact/compact-basic/README.md
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
# packages/compact/compact-basic/tests/loader-composition.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/llm/README.md
# packages/llm/llm-deepseek/src/adapter.ts
# packages/llm/llm-pi-ai/src/adapter.ts
# packages/llm/llm/README.md
# packages/llm/llm/src/index.ts
# scripts/gen-cordis-catalog.ts
# website/zh-CN/api/harness/events.md
# website/zh-CN/api/harness/llm.md
# website/zh-CN/api/harness/token-meter.md
# website/zh-CN/guide/config.md
|
2026-07-21 10:17:55 +08:00 |
|
|
Yichen Jiang
|
a37e2e0f16
|
Merge remote-tracking branch 'origin/master' into worktree/tui-session-controls
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/ui/acp/src/index.ts
# packages/ui/tui/README.md
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/harness.ts
# packages/ui/tui/tests/plugin-shape.spec.ts
# packages/ui/tui/tests/snapshots/disposed-terminal.expected.txt
# packages/ui/tui/tests/snapshots/errors-and-help.expected.txt
# packages/ui/tui/tests/tui.spec.ts
|
2026-07-21 10:15:49 +08:00 |
|
 Dudu-0223
|
2a55f6b684
|
Merge origin/master into lsp
|
2026-07-21 09:57:36 +08:00 |
|
|
Tianyi Cui
|
d3ae708384
|
Merge origin/master into codex/invariant-service-seam
# Conflicts:
# docs/module-graph.md
|
2026-07-21 01:23:19 +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
|
4e7a687c0b
|
Merge origin/master into codex/invariant-service-seam
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/cordis-catalog/services.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/support/invariants/package.json
# packages/support/invariants/src/scoped-events.generated.ts
# packages/support/invariants/tests/invariants.spec.ts
# packages/support/invariants/tsconfig.json
# pnpm-lock.yaml
|
2026-07-21 00:44:39 +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
|
cbae54c184
|
Merge branch 'codex/goal-commands' into codex/ralph-tool
# Conflicts:
# docs/module-graph.md
|
2026-07-20 23:15:34 +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
|
22fa51845e
|
Merge branch 'codex/goal-session' into codex/commands
# Conflicts:
# docs/config-catalog.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# packages/ui/acp/README.md
# packages/ui/tui/README.md
|
2026-07-20 23:03:55 +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
|
f98f0e9838
|
Merge branch 'codex/goal-tools' into codex/goal-session
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
# packages/core/agent-loop/README.md
# packages/core/agent/README.md
|
2026-07-20 22:57:14 +08:00 |
|
|
Tianyi Cui
|
ea530241d8
|
Merge branch 'codex/goal-domain' into codex/goal-tools
# Conflicts:
# docs/cordis-catalog/events.md
# docs/event-producer-consumer.md
|
2026-07-20 22:50:36 +08:00 |
|
|
Tianyi Cui
|
023cde5d82
|
Merge latest master into invariant service seam
|
2026-07-20 22:49:27 +08:00 |
|
|
Yichen Jiang
|
a5404ec25e
|
Merge remote-tracking branch 'origin/master' into worktree/tui-session-controls
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/ui/acp/src/index.ts
# packages/ui/tui/README.md
# packages/ui/tui/src/index.ts
# packages/ui/tui/tsconfig.json
|
2026-07-20 22:47:55 +08:00 |
|
|
Tianyi Cui
|
076e46ebc0
|
Merge branch 'rfc/loop' into codex/goal-domain
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.md
|
2026-07-20 22:46:26 +08:00 |
|
|
Yichen Jiang
|
2c075711eb
|
feat(tui): add session controls and compact views
|
2026-07-20 22:44:01 +08:00 |
|
|
Tianyi Cui
|
1b04e8eb2b
|
Merge branch 'codex/goal-commands' into codex/ralph-tool
# Conflicts:
# examples/repl-agent/README.md
# examples/repl-agent/composition.md
# examples/repl-agent/cordis.yml
|
2026-07-20 22:25:16 +08:00 |
|
|
Tianyi Cui
|
5c301febbf
|
Merge branch 'codex/commands' into codex/goal-commands
# Conflicts:
# docs/architecture.md
# docs/config-catalog.md
# docs/cookbook/extension-cookbook.i18n.yaml
# docs/module-graph.md
# packages/examples/README.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
|
2026-07-20 22:18:20 +08:00 |
|
|
Tianyi Cui
|
78472196c8
|
Merge branch 'codex/goal-session' into codex/commands
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/module-graph.md
# knip.json
# packages/examples/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/examples/tui-demo/package.json
# packages/ui/README.md
# packages/ui/tui/src/index.ts
|
2026-07-20 22:05:51 +08:00 |
|
|
Tianyi Cui
|
41196b7e4f
|
Merge branch 'codex/goal-tools' into codex/goal-session
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-20 21:55:13 +08:00 |
|
|
Tianyi Cui
|
9d0a75b154
|
Merge branch 'codex/goal-domain' into codex/goal-tools
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-20 21:44:06 +08:00 |
|
|
Yichen Jiang
|
a92d2e5f34
|
Merge origin/master into worktree/explicit-turn-signal
|
2026-07-20 21:38:49 +08:00 |
|
|
Tianyi Cui
|
11afddf61d
|
Merge branch 'rfc/loop' into codex/goal-domain
# Conflicts:
# docs/event-producer-consumer.md
# knip.json
|
2026-07-20 21:37:04 +08:00 |
|
|
Yichen Jiang
|
e7220ccef4
|
Merge branch 'master' into fix/acp-subagent-cwd
|
2026-07-20 21:11:13 +08:00 |
|
|
Tianyi Cui
|
30d2ec4a95
|
Merge branch 'codex/goal-commands' into codex/ralph-tool
# Conflicts:
# 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
# scripts/gen-tool-catalog.ts
|
2026-07-20 21:05:05 +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
|
6a9e52acbc
|
Merge latest master into invariant service seam
# Conflicts:
# .agents/notes/implemented/feature/2026-06-18-compaction-capability-seam.md
# docs/capability-seams.md
# docs/event-producer-consumer.md
# packages/examples/agent-spine-demo/README.md
# packages/examples/stdio-demo/tests/built-bin.e2e.ts
# scripts/gen-doc-graphs.ts
|
2026-07-20 20:58:46 +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
|
dfc401a66a
|
Merge branch 'codex/goal-session' into codex/commands
# Conflicts:
# docs/event-producer-consumer.md
# website/.vitepress/config/api-sidebar.json
# website/zh-CN/api/harness/events.md
|
2026-07-20 20:43:02 +08:00 |
|
|
Tianyi Cui
|
eb5ae54a79
|
Merge branch 'codex/goal-tools' into codex/goal-session
# Conflicts:
# .agents/notes/implemented/feature/2026-07-19-persisted-same-session-goal-domain.i18n.yaml
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/package.json
# packages/core/agent/README.md
# packages/core/agent/src/types.ts
# website/zh-CN/api/harness/events.md
|
2026-07-20 20:35:15 +08:00 |
|
|
Tianyi Cui
|
08ee06cdaf
|
Merge latest master into invariant service seam
|
2026-07-20 20:29:19 +08:00 |
|
|
Tianyi Cui
|
a86b4c19f5
|
Merge remote-tracking branch 'origin/master' into codex/remove-stdio-agent
# Conflicts:
# docs/config-catalog.md
# docs/event-producer-consumer.md
# packages/core/agent-loop/tests/config-session-id.spec.ts
# packages/ui/stdio/README.md
# packages/ui/stdio/src/index.ts
# packages/ui/stdio/tests/stdio.spec.ts
|
2026-07-20 20:29:08 +08:00 |
|
|
Tianyi Cui
|
3e3f9a911d
|
Merge branch 'codex/goal-domain' into codex/goal-tools
# Conflicts:
# docs/event-producer-consumer.md
# docs/module-graph.md
# packages/core/agent/README.md
# website/zh-CN/api/harness/events.md
|
2026-07-20 20:21:01 +08:00 |
|
|
Tianyi Cui
|
e5ac87454b
|
Merge remote-tracking branch 'origin/master' into codex/remove-stdio-agent
# Conflicts:
# AGENTS.md
# docs/config-catalog.md
# examples/echo-agent/README.md
# packages/examples/stdio-demo/README.md
# packages/examples/stdio-demo/src/index.ts
# packages/examples/stdio-demo/tests/built-bin.e2e.ts
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
# scripts/run-gates.ts
|
2026-07-20 20:20:21 +08:00 |
|
|
Tianyi Cui
|
2c04056348
|
Merge latest master into invariant service seam
|
2026-07-20 20:19:01 +08:00 |
|
|
Tianyi Cui
|
710c62474a
|
Merge branch 'master' into fetch-failed-diagnostics
|
2026-07-20 20:10:57 +08:00 |
|