Yichen Jiang 3957ce007a Merge branch 'worktree-llm-dynamic-config' into worktree-llm-web-config ...

# Conflicts:
#	apps/cli/cordis.yml
#	apps/cli/package.json
#	apps/cli/tests/tui-keyless-smoke.e2e.ts
#	apps/web/tests/details-session-lifecycle.e2e.ts
#	apps/web/tests/snapshots/code-mode-round/ui.expected.md
#	apps/web/tests/snapshots/cordis-tool-round/ui.expected.md
#	apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
#	apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md
#	apps/web/tests/snapshots/lifecycle-chrome/reloaded.expected.md
#	apps/web/tests/snapshots/live-interactions/cancel.expected.md
#	apps/web/tests/snapshots/live-interactions/error-auth.expected.md
#	apps/web/tests/snapshots/live-interactions/retry.expected.md
#	apps/web/tests/snapshots/message-actions/ui.expected.md
#	apps/web/tests/snapshots/question-composer/answered.expected.md
#	apps/web/tests/snapshots/seeded-history/ui.expected.md
#	apps/web/tests/snapshots/steering/mid-steer.expected.md
#	apps/web/tests/snapshots/steering/settled.expected.md
#	docs/cordis-catalog/events.md
#	docs/cordis-catalog/services.md
#	docs/event-producer-consumer.md
#	docs/user/guide/config.i18n.yaml
#	docs/user/guide/config.md
#	docs/user/guide/config.zh.md
#	docs/user/guide/index.i18n.yaml
#	docs/user/guide/index.md
#	docs/user/guide/index.zh.md
#	examples/acp-agent/tests/snapshots/subagent-fork/session.1.jsonl
#	examples/acp-agent/tests/snapshots/subagent-mixed/session.2.jsonl
#	examples/cordis-agent/cordis.yml
#	examples/cordis-agent/tests/cordis-tools.e2e.ts
#	examples/headless-agent/tests/semantic-checkpoint-snapshots/tool-outcome-unknown/session.expected.jsonl
#	examples/headless-agent/tests/subagent-inheritance-snapshots/parent-override/parent.expected.jsonl
#	examples/tui-agent/code-mode.cordis.yml
#	examples/tui-agent/cordis.yml
#	packages/examples/tui-demo/README.md
#	packages/examples/tui-demo/README.zh.md
#	packages/host/apiproxy/README.i18n.yaml
#	packages/pty/tool-bash-persistent/README.i18n.yaml
#	packages/ui/tui/tests/snapshots/status-diagnostics-narrow.expected.txt
#	packages/ui/tui/tests/snapshots/status-diagnostics.expected.txt
#	pnpm-lock.yaml
#	scripts/snapshots/python-sdk-single-exe/advanced/result.json
#	scripts/snapshots/python-sdk-single-exe/advanced/session.1.jsonl
#	scripts/snapshots/python-sdk-single-exe/advanced/session.2.jsonl
#	scripts/snapshots/python-sdk-single-exe/advanced/session.jsonl

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

..

cookbook

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

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

cordis-catalog

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

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

cordis-tutorial

fix(cli): close shared config review gaps

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

core-data-structures

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

2026-07-30 20:15:40 +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

refactor(agent): scope queue actions to edit and remove

2026-07-30 01:58:51 +08:00

architecture.md

refactor(agent): scope queue actions to edit and remove

2026-07-30 01:58:51 +08:00

architecture.zh.md

refactor(agent): scope queue actions to edit and remove

2026-07-30 01:58:51 +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 branch 'worktree-llm-dynamic-config' into worktree-llm-web-config

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

cordis-primer.i18n.yaml

docs(i18n): clarify Cordis and test wording

2026-07-24 14:21:15 +08:00

cordis-primer.md

Merge remote-tracking branch 'origin/master' into worktree/pr343-retarget-latest-master

2026-07-23 13:40:29 +08:00

cordis-primer.zh.md

docs(i18n): clarify Cordis and test wording

2026-07-24 14:21:15 +08:00

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 branch 'worktree-llm-dynamic-config' into worktree-llm-web-config

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

glossary.i18n.yaml

docs: align Goal Round step cardinality

2026-07-24 12:10:40 +08:00

glossary.md

docs: align Goal Round step cardinality

2026-07-24 12:10:40 +08:00

glossary.zh.md

docs(i18n): allow zero-step Goal Rounds

2026-07-23 21:13:34 +08:00

graph-atlas.md

fix(docs): align catalogs with consolidated CLI

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

module-graph.md

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

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

persistence-catalog.md

refactor(session): rename the seed boundary to end-seed

2026-07-30 15:32:06 +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

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

2026-07-30 16:11:21 +08:00

tool-execution-pipeline.md

Merge remote-tracking branch 'origin/master' into feat/send-unify

2026-07-23 22:41:45 +08:00

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