Tianyi Cui
|
4466d582c4
|
Merge remote-tracking branch 'origin/feat/plan-mode' into codex/pr239-plan-mode-review-fixes
# Conflicts:
# .agents/notes/implemented/feature/2026-07-07-plan-mode.md
# .agents/notes/implemented/simplification/2026-07-04-fold-stdio-ui-helper.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/plan-mode.e2e.ts
# examples/acp-agent/tests/snapshots/plan-mode/tool-schemas.expected.json
# examples/plan-acp-agent/README.md
# examples/plan-acp-agent/cordis.yml
# examples/plan-acp-agent/tests/acp.snapshot.ts
# scripts/gen-doc-graphs.ts
|
2026-07-21 01:21:33 +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
|
8500974fd4
|
feat: unify JSON value schema DSL
|
2026-07-21 01:11:55 +08:00 |
|
Tianyi Cui
|
3947312432
|
Merge remote-tracking branch 'origin/master' into codex/pr239-parent-retarget-publish
# Conflicts:
# packages/core/tools/tests/gen-tool-catalog.spec.ts
|
2026-07-21 00:58:16 +08:00 |
|
Tianyi Cui
|
c17ef5e8e1
|
Merge remote-tracking branch 'origin/master' into codex/session-scoped-sandbox-roots
|
2026-07-21 00:56:24 +08:00 |
|
Tianyi Cui
|
962c43aa9e
|
Merge remote-tracking branch 'origin/master' into codex/pr239-parent-retarget-publish
# Conflicts:
# docs/capability-seams.md
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/advanced-toolchain/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/bash-spill/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/both-mode-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cancel-tool-calls/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cancel/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/code-mode-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/config-options/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/error-finish/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/escalation-approved/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-edit/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-escalation-approved/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-policy-reject/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-read-window/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-read/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-terminal-card/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-write-overwrite/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/fs-write/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/handshake/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-posttool-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-deny/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-promptsubmit-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-stop-continue/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-posttool-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-pretool-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-block/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-promptsubmit-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/hook-codex-stop-continue/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/model-switching/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/multi-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/parallel-tool-calls/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/permission-switching/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/repeat-tool-guard/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/skill-load/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-depth-two-rejection/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-fork/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-mixed/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-multi/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/subagent-spawn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/text-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/todo-plan/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/tool-call-turn/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workflow-run/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/stdout.expected.jsonl
# examples/acp-agent/tests/snapshots/workspace-edit/stdout.expected.jsonl
# packages/core/tools/tests/gen-tool-catalog.spec.ts
# packages/ui/acp/acp-feature-support.md
# packages/ui/acp/src/index.ts
# scripts/gen-doc-graphs.ts
|
2026-07-21 00:50:00 +08:00 |
|
Tianyi Cui
|
167a5e95e0
|
Merge codex/invariant-service-seam into codex/invariant-service-review-fixes
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-19-package-invariant-runtime-contracts.i18n.yaml
# scripts/test-invariants.spec.ts
# scripts/test-invariants.ts
|
2026-07-21 00:47:02 +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
|
ec98bb4318
|
Merge remote-tracking branch 'origin/master' into codex/session-scoped-sandbox-roots
|
2026-07-21 00:44:38 +08:00 |
|
Tianyi Cui
|
ff21f91a39
|
fix(sandbox): resolve workspace roots per session
|
2026-07-21 00:44:28 +08:00 |
|
Tianyi Cui
|
c3f4332b8d
|
refactor(examples): fold plan mode into ACP demo
|
2026-07-21 00:40:15 +08:00 |
|
Tianyi Cui
|
0022979e4c
|
Merge remote-tracking branch 'origin/master' into codex/pr239-parent-retarget-publish
# Conflicts:
# docs/architecture.md
|
2026-07-21 00:32:01 +08:00 |
|
Tianyi Cui
|
0c08e34a4a
|
fix(invariants): harden runtime contracts and gates
|
2026-07-21 00:25:38 +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
|
897dc82d9b
|
fix(mode): stabilize plan-mode model experience
|
2026-07-20 23:37:01 +08:00 |
|
Tianyi Cui
|
0246806fec
|
Merge origin/master into feat/plan-mode
|
2026-07-20 23:28:07 +08:00 |
|
Tianyi Cui
|
e92b34bd7e
|
fix(invariants): enforce runtime relationships
|
2026-07-20 23:16:08 +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
|
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
|
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 |
|
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 |
|
Tianyi Cui
|
62b40e8634
|
Merge master into worktree-windows-runtime
|
2026-07-20 22:30:29 +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
|
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
|
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 |
|
Tianyi Cui
|
4910cc79d0
|
Merge latest invariant registration gate
# Conflicts:
# docs/event-producer-consumer.md
# packages/examples/stdio-demo/tests/stdio-agent.spec.ts
# packages/examples/tui-demo/src/invariant.ts
|
2026-07-20 21:06:09 +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
|
872072c83a
|
Merge branch 'master' into worktree-windows-runtime
|
2026-07-20 21:03:38 +08:00 |
|
Tianyi Cui
|
7345a68845
|
Merge latest invariant service seam
# Conflicts:
# docs/module-graph.md
# package.json
# packages/examples/tui-demo/package.json
# packages/examples/tui-demo/src/invariant.ts
# packages/ui/stdio/package.json
# packages/ui/stdio/tests/stdio.spec.ts
# packages/ui/stdio/tsconfig.json
# pnpm-lock.yaml
|
2026-07-20 21:02:52 +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
|
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
|
78eb93f7e6
|
Merge branch 'master' into worktree-windows-runtime
|
2026-07-20 20:39:13 +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
|
8ee54bcb22
|
Merge latest invariant registration gate
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-20 20:20:10 +08:00 |
|
Tianyi Cui
|
5f806b96f0
|
Merge latest invariant service seam
|
2026-07-20 20:19:14 +08:00 |
|
Tianyi Cui
|
2c04056348
|
Merge latest master into invariant service seam
|
2026-07-20 20:19:01 +08:00 |
|
Tianyi Cui
|
44ad2ef073
|
Remove the Echo agent
|
2026-07-20 20:16:41 +08:00 |
|
Tianyi Cui
|
d897adac87
|
fix(invariants): keep registration gate final-head clean
|
2026-07-20 20:16:22 +08:00 |
|
Tianyi Cui
|
6cf681df4b
|
Merge branch 'rfc/loop' into codex/goal-domain
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/event-producer-consumer.md
# docs/glossary.md
# docs/module-graph.md
# examples/package.json
# pnpm-lock.yaml
# website/.vitepress/config/api-sidebar.json
# website/zh-CN/api/harness/events.md
|
2026-07-20 20:06:23 +08:00 |
|
Tianyi Cui
|
b8ad62eb35
|
fix(invariants): finish current-master ownership migration
|
2026-07-20 20:04:40 +08:00 |
|
Tianyi Cui
|
153e4b47bd
|
Merge branch 'master' into codex/jsonl-zstd-persistence
|
2026-07-20 19:58:41 +08:00 |
|
Tianyi Cui
|
2191d45ece
|
Merge origin/master into codex/remove-stdio-agent
# Conflicts:
# examples/repl-agent/cordis.yml
|
2026-07-20 19:58:40 +08:00 |
|
Tianyi Cui
|
f78b17a352
|
Merge branch 'codex/invariant-package-registration-gate' into codex/package-invariant-checks
|
2026-07-20 19:55:46 +08:00 |
|
Tianyi Cui
|
82ce9dfe0e
|
Merge branch 'master' into codex/jsonl-zstd-persistence
|
2026-07-20 19:52:47 +08:00 |
|