Merge branch 'stack/agent-profiles-3-wire' into stack/agent-profiles-5-web-ui

# Conflicts:
#	apps/cli/tests/web-agent-presets.e2e.ts
#	packages/host/apiproxy/tests/api-proxy-agent-preset.spec.ts

apps/cli/config/agent-presets/cordis/agent.cordis.yml

@@ -234,20 +234,14 @@
 # in the user's skill root: it documents THIS deployment's two planes, and a
 # preset is the unit that gets copied and edited. `baseUrl` is the preset's
 # own directory, so the root resolves wherever the preset is installed.
-- id: skills
-  name: cordis:group
-  group: true
-  isolate:
-    skills: true
+# Both rows register into THIS preset's layer of the host skill registry, so
+# they need no realm; the agent's merged catalog also carries whatever the
+# deployment registered globally (repository plugins).
+- id: skill-local
+  name: '@deepseek-ai/dsh-skill-local'
   config:
-    - id: skill
-      name: '@deepseek-ai/dsh-skill'
+    customSkillDirs:
+      - !!js "process.getBuiltinModule('node:url').fileURLToPath(new URL('skills/', baseUrl))"
 
-    - id: skill-local
-      name: '@deepseek-ai/dsh-skill-local'
-      config:
-        customSkillDirs:
-          - !!js "process.getBuiltinModule('node:url').fileURLToPath(new URL('skills/', baseUrl))"
-
-    - id: tool-skill
-      name: '@deepseek-ai/dsh-tool-skill'
+- id: tool-skill
+  name: '@deepseek-ai/dsh-tool-skill'

apps/cli/config/agent-presets/standard/agent.cordis.yml

@@ -77,20 +77,16 @@
 
 # ── skills ──────────────────────────────────────────────────────────────────
 
-- id: skills
-  name: cordis:group
-  group: true
-  isolate:
-    skills: true
-  config:
-    - id: skill
-      name: '@deepseek-ai/dsh-skill'
+# The skill REGISTRY lives in the host composition and is layered per scope:
+# these rows register into THIS preset's layer of it, so they need no realm.
+# `skill-local` contributes local-root discovery for agents on this preset, and
+# `tool-skill` gives them the catalog and loader; the merged catalog also
+# carries whatever the deployment registered globally (repository plugins).
+- id: skill-local
+  name: '@deepseek-ai/dsh-skill-local'
 
-    - id: skill-local
-      name: '@deepseek-ai/dsh-skill-local'
-
-    - id: tool-skill
-      name: '@deepseek-ai/dsh-tool-skill'
+- id: tool-skill
+  name: '@deepseek-ai/dsh-tool-skill'
 
 # ── goals ───────────────────────────────────────────────────────────────────