Tianyi Cui
fed32c767d
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
2026-07-22 23:12:20 +08:00
Tianyi Cui
1429c5d22f
Merge remote-tracking branch 'origin/master' into codex/tool-json-schema-dsl
2026-07-22 23:03:02 +08:00
Tianyi Cui
d99094b1ac
Merge updated rfc/pty into feature/persistent-pty-sessions
...
# Conflicts:
# docs/architecture.i18n.yaml
# docs/core-data-structures/core.md
# pnpm-lock.yaml
# scripts/gen-cordis-catalog.ts
2026-07-22 22:43:20 +08:00
Tianyi Cui
a838af896e
Merge refreshed schema DSL into canonical tool outputs
...
# Conflicts:
# packages/bash/tool-bash/tests/tools.spec.ts
2026-07-22 22:03:54 +08:00
Tianyi Cui
ec51c1acb0
Merge latest master into schema DSL
2026-07-22 21:54:32 +08:00
Tianyi Cui
db21dcfeae
Merge remote-tracking branch 'origin/master' into codex/session-scoped-sandbox-roots
2026-07-22 21:41:53 +08:00
Tianyi Cui
4444768521
Merge refreshed schema DSL into canonical tool output
2026-07-22 21:38:41 +08:00
Tianyi Cui
10a55d7a27
Merge remote-tracking branch 'origin/master' into codex/session-scoped-sandbox-roots
...
# Conflicts:
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.i18n.yaml
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.md
# .agents/notes/implemented/feature/2026-07-14-cross-family-fs-sandbox.zh.md
# examples/acp-agent/README.md
# packages/examples/agent-spine-demo/package.json
# packages/fs/fs-sandbox/src/index.ts
# packages/fs/tool-fs-search/tests/tools.spec.ts
# packages/support/acp-snapshot/README.md
# packages/support/acp-snapshot/src/suite.ts
# pnpm-lock.yaml
# scripts/type-equiv.manifest.json
2026-07-22 21:37:30 +08:00
Tianyi Cui
906dad12f7
Merge latest master into schema DSL
2026-07-22 21:35:03 +08:00
Tianyi Cui
54bc084e5d
Merge refreshed schema DSL into canonical tool output
...
# Conflicts:
# docs/config-catalog.md
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.jsonl
# packages/context/workspace-context/tests/workspace-context.spec.ts
# packages/core/tools/tests/tools.spec.ts
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/tui.snapshot.ts
2026-07-22 21:31:16 +08:00
Tianyi Cui
1167ea71b7
Merge latest master through rfc/pty into feature/persistent-pty-sessions
...
# Conflicts:
# docs/module-graph.md
2026-07-22 21:21:58 +08:00
Tianyi Cui
c848c7b15e
Merge refreshed rfc/pty into feature/persistent-pty-sessions
...
# Conflicts:
# docs/architecture.md
# docs/capability-seams.md
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/module-graph.md
# docs/tool-catalog.md
# examples/acp-agent/tests/acp.snapshot.ts
# examples/headless-agent/tests/headless.snapshot.ts
# examples/package.json
# packages/README.md
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/tools/tests/gen-tool-catalog.spec.ts
# pnpm-lock.yaml
# pnpm-workspace.yaml
# scripts/gen-tool-catalog.ts
# scripts/type-equiv.manifest.json
# website/.vitepress/config/api-sidebar.json
2026-07-22 21:12:16 +08:00
Tianyi Cui
edba5e861a
Merge latest master into tool JSON schema DSL
...
# Conflicts:
# examples/tui-agent/tests/snapshots/cordis-dynamic-toolchain/terminal.expected.txt
2026-07-22 21:11:49 +08:00
Tianyi Cui
9c6099fbbd
Merge branch 'master' into worktree/run-all-gates
2026-07-22 21:10:45 +08:00
Tianyi Cui
6456162827
Merge latest master into tool JSON schema DSL
2026-07-22 21:06:33 +08:00
Tianyi Cui
c8389ccecf
Merge latest master into tool JSON schema DSL
...
# Conflicts:
# examples/acp-agent/tests/snapshots/advanced-toolchain/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/both-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/code-mode-turn/system-prompt.expected.md
# examples/acp-agent/tests/snapshots/code-mode-workspace-context/system-prompt.expected.md
2026-07-22 20:58:17 +08:00
Tianyi Cui
a9a47452de
Merge latest master into check-all recovery
2026-07-22 20:57:39 +08:00
Tianyi Cui
a37cc9d92b
Merge remote-tracking branch 'origin/master' into worktree/pr504-retarget-latest-master
2026-07-22 20:57:26 +08:00
Tianyi Cui
78c2741d3e
Merge remote-tracking branch 'origin/master' into worktree/pr504-retarget-latest-master
...
# Conflicts:
# docs/event-producer-consumer.md
# examples/tui-agent/README.md
# examples/tui-agent/composition.md
# examples/tui-agent/cordis.yml
# examples/tui-agent/tests/snapshots/multi-turn-conversation/terminal.expected.txt
# examples/tui-agent/tests/tui-keyless-smoke.e2e.ts
# packages/ui/tui/README.md
# vitest.config.ts
2026-07-22 20:55:12 +08:00
Tianyi Cui
069313b156
Merge branch 'master' into worktree/docs-service-reference
2026-07-22 20:48:29 +08:00
Tianyi Cui
b44f8539e6
Merge latest master into tui-staging-merge-1
2026-07-22 20:45:24 +08:00
Tianyi Cui
b2b63b5b2e
Merge latest master into check-all recovery
2026-07-22 20:42:28 +08:00
Tianyi Cui
35056ad179
Merge current master into CI optimization
2026-07-22 20:34:44 +08:00
kingwl
fd5a76160d
Merge remote-tracking branch 'origin/master' into feat/plan-mode
...
17 master merges (GUI host/web stack, compact header, dshweb, fast local
hooks, windows coverage skips, worktree runtime). Conflicts:
- packages/ui/user-interaction/src/index.ts: master extracted the question
types to types.ts; took the re-export and grafted our detail field (the
plan-review payload) into the extracted AskUserQuestionItem.
- generated catalogs regenerated over both sides.
The module graph crossed mermaid's default 500-edge render guard with the
GUI packages plus our plan-mode edges; raised maxEdges in verify-mermaid
(a secure config settable only at initialize).
Note: the remote branch also renamed packages/mode -> packages/plan
(PR #512 plan-mode-simplification, fast-forwarded before this merge).
2026-07-22 19:42:14 +08:00
Tianyi Cui
e9d3821578
Merge PR #500 into CI optimization
2026-07-22 18:31:28 +08:00
Tianyi Cui
fe273bd9dd
refactor: name the all-gates mode check-all
2026-07-22 18:27:31 +08:00
Yichen Jiang
e844125d7d
docs: enforce canonical website projection
2026-07-22 18:17:42 +08:00
Tianyi Cui
c5d1f5c4ae
Merge branch 'master' into feat/plan-mode
2026-07-22 18:05:28 +08:00
Tianyi Cui
197cae8bdd
fix: expose the manual gate set without changing hooks
2026-07-22 18:01:54 +08:00
Tianyi Cui
6d054fd31b
Merge PR #500 head into all-gates recovery
...
# Conflicts:
# package.json
# scripts/run-gates.ts
2026-07-22 17:56:29 +08:00
Tianyi Cui
41609c4ce4
ci: consolidate primary checks on one larger runner
2026-07-22 17:53:01 +08:00
Tianyi Cui
8b1f9a4697
Merge current codex/tool-json-schema-dsl into codex/canonical-tool-output
2026-07-22 17:48:46 +08:00
Tianyi Cui
400e7021fc
Merge current PR #500 into codex/tool-json-schema-dsl
2026-07-22 17:48:22 +08:00
Tianyi Cui
2405570ac8
chore: restore opt-in all-gates command
2026-07-22 17:42:23 +08:00
imccyu
7c8baee14f
ci: gates add manual-push
2026-07-22 17:41:08 +08:00
imccyu
ae44063a51
Merge remote-tracking branch 'origin/master' into worktree-dshweb
2026-07-22 17:35:49 +08:00
imccyu
5b16107b6a
fix: remove pre-push gates for web
2026-07-22 17:35:42 +08:00
Tianyi Cui
25f06b4e29
chore(install): flag TypeScript extraction
2026-07-22 17:31:10 +08:00
Tianyi Cui
ec533d0a77
Merge latest master into tui-staging-merge-1
2026-07-22 17:25:35 +08:00
Tianyi Cui
41e8d6c862
Merge updated codex/tool-json-schema-dsl into codex/canonical-tool-output
2026-07-22 17:24:45 +08:00
Tianyi Cui
b8a9b42726
Merge updated PR #500 into codex/tool-json-schema-dsl
2026-07-22 17:24:13 +08:00
Tianyi Cui
319005d56b
Merge latest origin/master into worktree/ci-under-minute
2026-07-22 17:20:09 +08:00
Tianyi Cui
8739abdbfe
Merge origin/master into worktree/ci-under-minute
2026-07-22 17:15:46 +08:00
Tianyi Cui
4cd5f21c08
Merge branch 'codex/tool-json-schema-dsl' into codex/canonical-tool-output
2026-07-22 17:05:38 +08:00
imccyu
2431caa9ab
fix: ci docs/lint
...
fix: ci docs/lint
ci: coverage
2026-07-22 17:03:10 +08:00
Tianyi Cui
c3fb3de64f
Merge PR #500 into codex/tool-json-schema-dsl
...
# Conflicts:
# docs/cordis-catalog/services.md
# scripts/type-equiv.manifest.json
2026-07-22 16:57:45 +08:00
Tianyi Cui
f4185122dc
refactor(plan): remove generic mode abstraction
2026-07-22 16:57:23 +08:00
Tianyi Cui
11236c46fb
docs: record final larger-runner evidence
2026-07-22 16:55:39 +08:00
Tianyi Cui
d7e0104a72
ci: unpack bubblewrap without package transaction
2026-07-22 16:45:59 +08:00
Tianyi Cui
31c0589439
chore: keep local git hooks fast
2026-07-22 16:37:20 +08:00
