creatixchu 481d3c7076 Merge origin/master into worktree/web-multimodal-image-input ...

# Conflicts:
#	docs/architecture.i18n.yaml
#	docs/architecture.md
#	docs/architecture.zh.md
#	docs/cordis-catalog/events.md
#	docs/cordis-catalog/services.md
#	docs/core-data-structures/llm-streaming.i18n.yaml
#	docs/event-producer-consumer.md
#	docs/module-graph.md
#	examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
#	packages/client/connection/src/client/fixture.ts
#	packages/client/connection/tests/node-half.spec.ts
#	packages/client/ui-conversation/README.i18n.yaml
#	packages/client/ui-conversation/README.md
#	packages/client/ui-conversation/README.zh.md
#	packages/compact/compact-basic/README.i18n.yaml
#	packages/llm/llm/README.i18n.yaml
#	scripts/test-invariants.ts

2026-07-31 17:39:06 +08:00

..

fixtures

test(cli): follow consolidated config tree

2026-07-30 10:59:56 +08:00

snapshots

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

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

args.spec.ts

Merge origin/master into worktree/web-multimodal-image-input

2026-07-31 17:39:06 +08:00

built-bin.e2e.ts

feat(cli): dsh --dump-config / --dump-default-config print the composed tree

2026-07-31 16:20:54 +08:00

lazy-search-startup.compat.spec.ts

Merge remote-tracking branch 'origin/master' into mergebot/pr711

2026-07-31 01:28:15 +08:00

pty-harness.ts

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

2026-07-29 23:41:20 +08:00

source-launch.compat.spec.ts

feat(cli): launch dsh source through the tsx ESM hook

2026-07-29 13:15:24 +08:00

telemetry-switch.spec.ts

fix(web): review round 1 — loud opt-out, headless drain, scaffold isolation, docs

2026-07-31 01:34:42 +08:00

trusted-hosts.spec.ts

fix(cli): sample LAN addresses once — trust and the printed LAN URL share the snapshot

2026-07-28 17:47:56 +08:00

tui-keyless-smoke.e2e.ts

feat(cli): move the telemetry row into the shared base — every surface reports

2026-07-31 01:34:43 +08:00

tui.snapshot.ts

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

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