Merge origin/master into codex/dsh-badge-plugin

apps/cli/tests/fixtures/dsh-badge/snapshot.ts

@@ -9,8 +9,12 @@ import type {} from '@deepseek-ai/dsh-tools'
 
 const overlayPath = process.argv[2]
 if (overlayPath === undefined) throw new Error('dsh-badge snapshot requires an overlay path')
-const baseConfigPath = fileURLToPath(new URL('../../../config/base.cordis.yml', import.meta.url))
-const ctx = await boot('dsh-badge-snapshot', baseConfigPath, loadOverlayPatches('dsh-badge-snapshot', overlayPath))
+const rootConfigPath = fileURLToPath(new URL('../../../../../packages/bundle/base/tests/fixtures/root.cordis.yml', import.meta.url))
+const basePatchPath = fileURLToPath(new URL('../../../../../packages/bundle/base/cordis.patch.yml', import.meta.url))
+const ctx = await boot('dsh-badge-snapshot', rootConfigPath, [
+  ...loadOverlayPatches('dsh-badge-snapshot', basePatchPath),
+  ...loadOverlayPatches('dsh-badge-snapshot', overlayPath),
+])
 
 try {
   const agentId = SessionId('dsh-badge-snapshot')

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

@@ -1,4 +1,4 @@
-# Invalid raw overlay used to prove boot failures settle and exit.
+# Invalid `--patch` overlay used to prove boot failures settle and exit.
 
 - id: llm-pi-ai
   config:

apps/cli/tests/fixtures/raw-overlay.cordis.yml

@@ -1,12 +0,0 @@
-# Raw CLI overlay used by the built config-dump acceptance test.
-
-- id: agent-loop
-  config:
-    agents:
-      - id: configured
-        provider: configured-provider
-        model: configured-model
-
-- id: absent-row
-  config:
-    value: unmatched