Merge remote-tracking branch 'origin/master' into worktree/fix-multi-select-custom-answer

# Conflicts:
#	apps/web/tests/snapshots/question-composer/answered.expected.md
#	apps/web/tests/snapshots/question-composer/session.jsonl
#	docs/core-data-structures/user-interaction.i18n.yaml
#	packages/client/ui-question/README.i18n.yaml
#	packages/host/apiproxy/README.i18n.yaml
#	packages/host/apiproxy/README.md
#	packages/host/apiproxy/README.zh.md
#	packages/ui/tui/README.i18n.yaml
#	packages/ui/user-interaction/README.i18n.yaml

apps/cli/tests/fixtures/composition-echo-llm.ts

@@ -0,0 +1,51 @@
+import type { Context } from 'cordis'
+import type {
+  GenerateOptions,
+  LlmModelInfo,
+  LlmResolvedModelInfo,
+  StreamChunk,
+} from '@deepseek-ai/dsh-llm'
+import { LlmAdapter } from '@deepseek-ai/dsh-llm'
+
+/** Terminal marker the preset smoke waits for before it asks the TUI to exit. */
+export const COMPOSITION_REPLY_TEXT = 'Shipped composition acknowledged.'
+
+// Provider id and model the keyless tail routes `main` to; that overlay is the
+// only caller, so the pair lives here as plain constants.
+const COMPOSITION_PROVIDER = 'composition-keyless'
+const COMPOSITION_MODEL = 'composition-keyless-model'
+
+/**
+ * Network-free adapter for the shipped-composition smoke. It answers every
+ * request — tool-ful agent turns and the tool-less auxiliary calls alike — with
+ * one fixed text and never calls a tool, because the assertion under test is the
+ * assembled tool catalog the loop logs, not any tool's behavior.
+ */
+class CompositionEchoAdapter extends LlmAdapter {
+  override listModels(provider: string): Promise<readonly LlmModelInfo[]> {
+    return Promise.resolve([{ provider, id: COMPOSITION_MODEL, name: 'Preset Keyless' }])
+  }
+
+  override resolveModel(provider: string, model: string): Promise<LlmResolvedModelInfo> {
+    return Promise.resolve({ provider, id: model, name: 'Preset Keyless', context: { contextWindow: 128_000 } })
+  }
+
+  override async * stream(_options: GenerateOptions): AsyncIterable<StreamChunk> {
+    yield { type: 'block-start', index: 0, blockType: 'text' }
+    for (const char of COMPOSITION_REPLY_TEXT) yield { type: 'text-delta', index: 0, text: char }
+    yield { type: 'block-end', index: 0, block: { type: 'text', text: COMPOSITION_REPLY_TEXT } }
+    yield { type: 'usage', usage: { inputTokens: 20, outputTokens: COMPOSITION_REPLY_TEXT.length } }
+    yield { type: 'finish', reason: { kind: 'stop' } }
+  }
+}
+
+export const name = 'composition-echo-llm'
+export const inject = ['llm']
+
+/**
+ * Register the network-free adapter the shipped-composition smoke routes through.
+ * @param ctx - the loader-mounted plugin context.
+ */
+export function apply(ctx: Context): void {
+  ctx.llm.registerAdapter([COMPOSITION_PROVIDER], new CompositionEchoAdapter())
+}

apps/cli/tests/fixtures/composition-keyless-tail.cordis.yml

@@ -0,0 +1,52 @@
+# Keyless tail for the shipped-composition smoke, applied as `--config` so the
+# launcher boots `base.cordis.yml` + `tui.cordis.yml` and then this file.
+#
+# Everything below is test isolation, never composition under test: the model is
+# replaced so no request leaves the process, the settle marker gates the smoke's
+# first prompt, and the session artifacts move into the smoke's temporary
+# workspace so the log inspection can read them.
+
+# A patch's `name` is an assertion rather than a replacement, so the base
+# adapter row is disabled and the scripted one inserted. Relative specifiers
+# resolve against the INCLUDED file's directory (apps/cli/config), not this
+# file's, because the include moves baseUrl there.
+- id: llm-deepseek
+  disabled: true
+
+- insert:
+    - id: composition-echo-llm
+      name: '../tests/fixtures/composition-echo-llm.ts'
+    - id: composition-settled
+      name: '../tests/fixtures/composition-settled.ts'
+
+- id: agent-loop
+  config:
+    agents:
+      - id: main
+        provider: composition-keyless
+        model: composition-keyless-model
+        cwd: !!js process.cwd()
+
+- id: session-persistence-jsonl
+  config:
+    root: './.sessions'
+    compression: none
+
+- id: session-query-sqlite
+  config:
+    path: './.sessions/session-query.db'
+
+# The title call is a second, tool-less request that would race the log
+# inspection for no coverage: the catalog under test rides the agent turn.
+- id: session-title-llm
+  disabled: true
+
+- id: tui
+  config:
+    sessionId: !!js configuredAgentIdentities?.main?.id ?? 'main'
+    welcome: 'composition smoke ready.'
+    showReasoning: true
+
+# HMR watches the repository; a PTY subprocess test must not start a watcher.
+- id: hmr
+  disabled: true

apps/cli/tests/fixtures/composition-settled.ts

@@ -0,0 +1,24 @@
+import type { Context } from 'cordis'
+
+/**
+ * Marker the shipped-composition smoke gates its first prompt on. The TUI renders as soon as
+ * its own fiber starts, so a prompt typed at the banner can reach the loop while
+ * later rows — tool plugins, persistence — are still activating, and would
+ * assemble a partial catalog. Waiting for this line makes the turn observe the
+ * settled tree.
+ */
+export const COMPOSITION_SETTLED_MARKER = 'COMPOSITION_TREE_SETTLED'
+
+export const name = 'composition-settled'
+
+/**
+ * Announce settled Loader activation on the terminal byte stream, after every
+ * entry in the booted tree has started. The write is detached: awaiting the
+ * Loader from inside an entry would wait on this entry's own activation.
+ * @param ctx - the loader-mounted plugin context.
+ */
+export function apply(ctx: Context): void {
+  void ctx.loader.await().then(() => {
+    process.stdout.write(`\n${COMPOSITION_SETTLED_MARKER}\n`)
+  })
+}

apps/cli/tests/fixtures/memory-mcp-base.cordis.yml

@@ -0,0 +1,8 @@
+# Minimal keyless composition for loading example MCP overlays against the
+# package-owned fixture server in memory-mcp-configs.spec.ts. Source builtins
+# keep this unit test independent of prebuilt workspace artifacts.
+- id: system-prompt
+  name: cordis:memory-test-system-prompt
+
+- id: tools
+  name: cordis:memory-test-tools

apps/cli/tests/fixtures/tui-invalid-provider.cordis.yml

@@ -0,0 +1,10 @@
+# An overlay whose `llm-pi-ai` config fails schema validation: `providers` is a
+# dict keyed by provider name, and a list is the shape users reach for. The
+# entry rejects while `ui-tui` — mounted concurrently by the Loader — already
+# holds the terminal, which is the boot failure the fail-loud release hook
+# exists for.
+- id: llm-pi-ai
+  config:
+    providers:
+      - provider: openai
+        apiKey: keyless-invalid-shape