Huanqi Cao 8f9804f9ab merge: refresh against the advancing master ...

Merges master (default-workspace-write-ui, installer-adopt-checkout,
remove-scoped-bash, goal-clear-single-flight, frontend-plugin-loader,
install-interface-choice, …).

Conflict resolutions:
- apps/cli/tests/shipped-composition.e2e.ts: keep the fixed glob/grep
  roster assertion; master's workspace-write composition now confines
  tool-bash, so the escalation pair is pinned present (my earlier
  absence pin is superseded) together with master's permission facts.
- even-out-shipped-tool-rosters note: both sides edited it; the merged
  text keeps both sets of changes and the pair is re-recorded.

2026-08-01 22:22:27 +08:00

..

cookbook

Merge remote-tracking branch 'origin/master' into feat/search-presenter

2026-07-31 11:31:32 +08:00

cordis-catalog

Merge pull request #1082 from deepseek-harness/worktree/fix-web-duplicate-folder-names-20260731

2026-07-31 19:37:38 +08:00

cordis-tutorial

fix(cli): close shared config review gaps

2026-07-30 14:56:39 +08:00

core-data-structures

Merge latest master into manual compaction

2026-07-31 17:57:11 +08:00

i18n

Merge branch 'worktree-llm-dynamic-config' into worktree-llm-web-config

2026-07-30 15:18:26 +08:00

postmortem

…

user

Merge branch 'worktree-llm-dynamic-config' into worktree-llm-web-config

2026-07-30 20:15:40 +08:00

agent-lifecycle.md

…

AGENTS.md

…

architecture.i18n.yaml

Merge latest master into manual compaction

2026-07-31 17:57:11 +08:00

architecture.md

Merge latest master into manual compaction

2026-07-31 17:57:11 +08:00

architecture.zh.md

Merge latest master into manual compaction

2026-07-31 17:57:11 +08:00

capability-seams.md

Merge branch 'worktree-llm-dynamic-config' into worktree-llm-web-config

2026-07-30 20:15:40 +08:00

config-catalog.md

merge: refresh against the advancing master

2026-08-01 22:22:27 +08:00

cordis-paper.pdf

docs: add cordis paper

2026-07-31 15:54:36 +08:00

cordis-primer.i18n.yaml

…

cordis-primer.md

…

cordis-primer.zh.md

…

defensive-patterns.i18n.yaml

…

defensive-patterns.md

…

defensive-patterns.zh.md

…

development.i18n.yaml

docs: evaluate SPDX conjunctions and read every Python manifest

2026-07-30 19:54:27 -07:00

development.md

docs: evaluate SPDX conjunctions and read every Python manifest

2026-07-30 19:54:27 -07:00

development.zh.md

docs: evaluate SPDX conjunctions and read every Python manifest

2026-07-30 19:54:27 -07:00

event-producer-consumer.md

Merge latest master into manual compaction

2026-07-31 17:57:11 +08:00

glossary.i18n.yaml

…

glossary.md

…

glossary.zh.md

…

graph-atlas.md

fix(docs): align catalogs with consolidated CLI

2026-07-30 10:34:21 +08:00

module-graph.md

feat(fs-search): spawn the packaged ripgrep binary through the subprocess seam

2026-08-01 18:04:38 +08:00

persistence-catalog.md

Merge latest master into manual compaction

2026-07-31 17:57:11 +08:00

testing.i18n.yaml

Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation

2026-07-30 15:00:42 +08:00

testing.md

Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation

2026-07-30 15:00:42 +08:00

testing.zh.md

Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation

2026-07-30 15:00:42 +08:00

tool-catalog.md

feat(fs-search): spawn the packaged ripgrep binary through the subprocess seam

2026-08-01 18:04:38 +08:00

tool-execution-pipeline.md

…

typert-catalog-integration-design.i18n.yaml

refactor(cordis): generate catalogs from Typert models

2026-07-29 23:55:12 +08:00

typert-catalog-integration-design.md

refactor(cordis): generate catalogs from Typert models

2026-07-29 23:55:12 +08:00

typert-catalog-integration-design.zh.md

refactor(cordis): generate catalogs from Typert models

2026-07-29 23:55:12 +08:00

web-styling.i18n.yaml

…

web-styling.md

…

web-styling.zh.md

…