Merge remote-tracking branch 'origin/master' into worktree/provider-routed-llm-adapters

# Conflicts:
#	docs/config-catalog.md
#	packages/examples/acp-demo/tests/acp-agent.spec.ts
#	packages/examples/stdio-demo/README.md
#	packages/examples/stdio-demo/src/index.ts
#	packages/examples/stdio-demo/tests/stdio-agent.spec.ts

examples/acp-agent/README.md

@@ -11,7 +11,7 @@ The leaf config loads the ACP app, DeepSeek adapter, sandboxed bash, approval an
 
 ## stdout is the protocol
 
-This example loads **no stdout logger** — `stdout` carries the JSON-RPC frames, and any other write corrupts them. `@deepseek-ai/dsh-acp-agent` includes no logger entry, so this leaf has none to get wrong by default; do not add one (use a stderr exporter if you need logs).
+This example loads **no stdout logger** — `stdout` carries the JSON-RPC frames, and any other write corrupts them. `@deepseek-ai/dsh-acp-demo` includes no logger entry, so this leaf has none to get wrong by default; do not add one (use a stderr exporter if you need logs).
 
 ## Zed configuration
 

examples/acp-agent/advanced.cordis.snapshot.yml

@@ -8,7 +8,7 @@
         name: '@deepseek-ai/dsh-llm-deepseek'
         disabled: true
       - id: acp-agent
-        name: '@deepseek-ai/dsh-acp-agent'
+        name: '@deepseek-ai/dsh-acp-demo'
         config:
           provider: deepseek
           model: deepseek-v4-flash

examples/acp-agent/advanced.cordis.yml

@@ -6,7 +6,7 @@
     path: ./cordis.yml
     patches:
       - id: acp-agent
-        name: '@deepseek-ai/dsh-acp-agent'
+        name: '@deepseek-ai/dsh-acp-demo'
         config:
           provider: deepseek
           model: deepseek-v4-flash

examples/acp-agent/both-mode.cordis.snapshot.yml

@@ -10,7 +10,7 @@
         name: '@deepseek-ai/dsh-llm-deepseek'
         disabled: true
       - id: acp-agent
-        name: '@deepseek-ai/dsh-acp-agent'
+        name: '@deepseek-ai/dsh-acp-demo'
         config:
           provider: deepseek
           model: deepseek-v4-flash

examples/acp-agent/both-mode.cordis.yml

@@ -8,7 +8,7 @@
     path: ./cordis.yml
     patches:
       - id: acp-agent
-        name: '@deepseek-ai/dsh-acp-agent'
+        name: '@deepseek-ai/dsh-acp-demo'
         config:
           provider: deepseek
           model: deepseek-v4-flash

examples/acp-agent/code-mode.cordis.snapshot.yml

@@ -10,7 +10,7 @@
         name: '@deepseek-ai/dsh-llm-deepseek'
         disabled: true
       - id: acp-agent
-        name: '@deepseek-ai/dsh-acp-agent'
+        name: '@deepseek-ai/dsh-acp-demo'
         config:
           provider: deepseek
           model: deepseek-v4-flash

examples/acp-agent/code-mode.cordis.yml

@@ -9,7 +9,7 @@
     path: ./cordis.yml
     patches:
       - id: acp-agent
-        name: '@deepseek-ai/dsh-acp-agent'
+        name: '@deepseek-ai/dsh-acp-demo'
         config:
           provider: deepseek
           model: deepseek-v4-flash

examples/acp-agent/composition.md

@@ -18,9 +18,9 @@ flowchart LR
   cfg --> plugin_acp_approval
   plugin_acp_permission["permission<br/>@deepseek-ai/dsh-permission"]
   cfg --> plugin_acp_permission
-  plugin_acp_acp_agent["acp-agent<br/>@deepseek-ai/dsh-acp-agent"]
+  plugin_acp_acp_agent["acp-agent<br/>@deepseek-ai/dsh-acp-demo"]
   cfg --> plugin_acp_acp_agent
-  plugin_acp_acp_agent --> bundle_agent_core["@deepseek-ai/dsh-agent-core"]
+  plugin_acp_acp_agent --> bundle_agent_core["@deepseek-ai/dsh-agent-spine-demo"]
   plugin_acp_acp_agent --> bundle_jsonl["@deepseek-ai/dsh-session-persistence-jsonl"]
   plugin_acp_acp_agent --> frontdoor_acp["@deepseek-ai/dsh-acp<br/>JSON-RPC stdio bridge<br/>sessions created by client"]
   bundle_agent_core --> spine_llm["ctx.llm"]
@@ -58,7 +58,7 @@ flowchart LR
 | `bash` | `@deepseek-ai/dsh-bash-sandbox` |
 | `approval` | `@deepseek-ai/dsh-user-approval` |
 | `permission` | `@deepseek-ai/dsh-permission` |
-| `acp-agent` | `@deepseek-ai/dsh-acp-agent` |
+| `acp-agent` | `@deepseek-ai/dsh-acp-demo` |
 | `subagent` | `@deepseek-ai/dsh-subagent` |
 | `subagent-spawn` | `@deepseek-ai/dsh-subagent-spawn` |
 | `subagent-fork` | `@deepseek-ai/dsh-subagent-fork` |

examples/acp-agent/cordis.yml

@@ -34,7 +34,7 @@
 # Persistence root: $DSH_SNAPSHOT_SESSIONS_ROOT when the snapshot harness sets it
 # (so it can harvest / isolate the log), else ./.sessions for the demo.
 - id: acp-agent
-  name: '@deepseek-ai/dsh-acp-agent'
+  name: '@deepseek-ai/dsh-acp-demo'
   config:
     provider: deepseek
     model: deepseek-v4-flash

examples/acp-agent/tests/acp.e2e.ts

@@ -23,7 +23,7 @@ import {
  */
 
 // The child runs from a temp cwd, so its bin and config path are absolute.
-const binScript = fileURLToPath(new URL('../../../packages/ui/acp-agent/src/bin.ts', import.meta.url))
+const binScript = fileURLToPath(new URL('../../../packages/examples/acp-demo/src/bin.ts', import.meta.url))
 const configPath = fileURLToPath(new URL('../cordis.yml', import.meta.url))
 // Resolve tsx absolutely because the subprocess runs outside the repo.
 const tsxLoader = fileURLToPath(import.meta.resolve('tsx'))

examples/acp-agent/tests/acp.snapshot.ts

@@ -13,11 +13,11 @@ import { defineAcpSnapshotSuite, type Scenario, type SnapshotSuiteOptions } from
  * docs/rfc/implemented/testing/2026-06-19-acp-snapshot-tests.md.
  */
 
-// The dsh-acp-agent bin (the demo:acp entry), this example's cordis.yml, and
+// The dsh-acp-demo bin (the demo:acp entry), this example's cordis.yml, and
 // the repo-root tsconfig (four levels up from examples/acp-agent/tests) — all
 // ABSOLUTE: the subprocess cwd is a temp dir outside the repo.
 const AGENT = {
-  binScript: fileURLToPath(new URL('../../../packages/ui/acp-agent/src/bin.ts', import.meta.url)),
+  binScript: fileURLToPath(new URL('../../../packages/examples/acp-demo/src/bin.ts', import.meta.url)),
   configPath: fileURLToPath(new URL('../cordis.yml', import.meta.url)),
   tsconfigPath: fileURLToPath(new URL('../../../tsconfig.json', import.meta.url)),
 }

examples/acp-agent/tests/escalation.e2e.ts

@@ -26,7 +26,7 @@ import {
  * or runner support self-skip; real denial markers remain on sandbox e2e tiers.
  */
 
-const binScript = fileURLToPath(new URL('../../../packages/ui/acp-agent/src/bin.ts', import.meta.url))
+const binScript = fileURLToPath(new URL('../../../packages/examples/acp-demo/src/bin.ts', import.meta.url))
 const configPath = fileURLToPath(new URL('../cordis.yml', import.meta.url))
 const tsxLoader = fileURLToPath(import.meta.resolve('tsx'))
 // The subprocess runs from a temp cwd outside the repo; point tsx at the repo

examples/acp-agent/tests/hooks.e2e.ts

@@ -23,7 +23,7 @@ import {
  * The test owns and disposes the ACP subprocess.
  */
 
-const binScript = fileURLToPath(new URL('../../../packages/ui/acp-agent/src/bin.ts', import.meta.url))
+const binScript = fileURLToPath(new URL('../../../packages/examples/acp-demo/src/bin.ts', import.meta.url))
 const configPath = fileURLToPath(new URL('../cordis.yml', import.meta.url))
 const tsxLoader = fileURLToPath(import.meta.resolve('tsx'))
 const repoTsconfig = fileURLToPath(new URL('../../../tsconfig.json', import.meta.url))