Chinesezjc 62275b6cd6 Merge remote-tracking branch 'origin/master' into feat/search-presenter ...

# Conflicts:
#	docs/config-catalog.md
#	docs/cordis-catalog/events.md
#	docs/cordis-catalog/services.md
#	docs/core-data-structures/tools.i18n.yaml
#	docs/core-data-structures/tools.md
#	docs/core-data-structures/tools.zh.md
#	docs/event-producer-consumer.md
#	examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
#	packages/cordis/tool-cordis/src/api-catalog.ts
#	packages/core/tools/README.i18n.yaml
#	packages/core/tools/README.md
#	packages/core/tools/README.zh.md
#	packages/core/tools/src/index.ts
#	packages/core/tools/src/presentation.ts
#	packages/ui/tui/src/components/transcript.ts

2026-07-31 14:40:29 +08:00

..

cookbook

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

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

cordis-catalog

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

2026-07-31 14:40:29 +08:00

cordis-tutorial

fix(cli): close shared config review gaps

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

core-data-structures

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

2026-07-31 14:40:29 +08:00

i18n

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

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

postmortem

docs(i18n): record proofread README pairs

2026-07-29 15:30:44 +08:00

user

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

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

agent-lifecycle.md

refactor(agent): return request retry action

2026-07-27 21:17:49 +08:00

AGENTS.md

docs(notes): archive low-value decision records

2026-07-26 23:06:00 +08:00

architecture.i18n.yaml

Merge commit 'refs/codex/pr1006/master' into worktree/pr1006-merge-20260731

2026-07-31 01:55:19 +08:00

architecture.md

Merge commit 'refs/codex/pr1006/master' into worktree/pr1006-merge-20260731

2026-07-31 01:55:19 +08:00

architecture.zh.md

Merge commit 'refs/codex/pr1006/master' into worktree/pr1006-merge-20260731

2026-07-31 01:55:19 +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 remote-tracking branch 'origin/master' into feat/search-presenter

2026-07-31 14:40:29 +08:00

cordis-primer.i18n.yaml

…

cordis-primer.md

…

cordis-primer.zh.md

…

defensive-patterns.i18n.yaml

docs(security): include password names in scrub rule

2026-07-28 09:40:33 -07:00

defensive-patterns.md

docs(security): include password names in scrub rule

2026-07-28 09:40:33 -07:00

defensive-patterns.zh.md

docs(security): include password names in scrub rule

2026-07-28 09:40:33 -07:00

development.i18n.yaml

fix(docs): align catalogs with consolidated CLI

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

development.md

Merge origin/master into feature/shared-cli-config-foundation

2026-07-30 10:11:38 +08:00

development.zh.md

Merge origin/master into feature/shared-cli-config-foundation

2026-07-30 10:11:38 +08:00

event-producer-consumer.md

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

2026-07-31 14:40:29 +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

merge master and address permission settings review

2026-07-31 13:24:30 +08:00

persistence-catalog.md

merge master and address permission settings review

2026-07-31 13:24:30 +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

fix(fs-search): make glob sampling an explicit choice

2026-07-30 21:14:03 +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

docs: translate remaining non-README documentation

2026-07-26 02:33:29 +08:00

web-styling.md

docs: translate remaining non-README documentation

2026-07-26 02:33:29 +08:00

web-styling.zh.md

docs: translate remaining non-README documentation

2026-07-26 02:33:29 +08:00