@vibe-forge/workspace-assets 2.0.2 → 2.0.4-alpha.0

package/__tests__/__snapshots__/workspace-assets-rich.snapshot.json

@@ -467,7 +467,7 @@
       ]
     },
     "options": {
-      "systemPrompt": "<system-prompt>\nThe project system rules are:\n# review\n\n> 必须检查发布改动的回归风险。\n\n# demo/security\n\n> Use when: 插件安全规则\n> Rule file path: node_modules/@vibe-forge/plugin-demo/rules/security.md\n> Only read this rule file when the task matches the scenario above.\n</system-prompt>\n\n\n<system-prompt>\nThe following skill modules are loaded for the project:\n# research\n\n> Skill description: 检索资料\n> Skill file path: .ai/skills/research/SKILL.md\n> Resolve relative paths in the resource content relative to the directory containing this skill file.\n\n<skill-content>\n先阅读 README.md，再补充结论。\n</skill-content>\n</system-prompt>\n\n\n<system-prompt>\nThe project includes the following entities:\n  - architect: 负责拆解方案的实体\n\nWhen solving user problems, you may specify entities through `VibeForge.StartTasks` as needed and have them coordinate multiple entity types to complete the work; use `VibeForge.GetTaskInfo` and `wait` to track progress.\nTask tool guide:\n- Use `VibeForge.StartTasks` to start a new child task when the work should run in a separate entity or workspace, or when it needs to continue independently from the current turn.\n- After starting a task, use `VibeForge.GetTaskInfo` with `{ taskId }` to inspect one task. It is also the right tool when a task seems stalled, failed, or might be waiting for input.\n- By default, `GetTaskInfo` returns the 10 most recent log entries in descending order, so newer entries appear earlier in the `logs` array. Pass `logLimit` to inspect a different number of recent logs, and set `logOrder` to `\"asc\"` when you want the selected log window in oldest-to-newest order.\n- Use `VibeForge.ListTasks` with the same `logLimit` and `logOrder` fields when you need to find a taskId or inspect multiple tasks at once.\n- Use `VibeForge.SendTaskMessage` with `{ taskId, message, mode }` when you want to continue the same task without starting a replacement task.\n- Choose `mode: \"direct\"` when the task is `running` and the new instruction should be delivered immediately into the current task.\n- Choose `mode: \"steer\"` when the task should finish its current run naturally first, and the follow-up should be queued for the same task afterward.\n- Use `VibeForge.SubmitTaskInput` only when `VibeForge.GetTaskInfo` or `VibeForge.ListTasks` shows `pendingInput` or `pendingInteraction`, or the task status is `waiting_input`. Do not use it for ordinary follow-up instructions or queued steer turns.\n- If a task is `completed` or `failed`, start a new task instead of trying to continue the old one.\n- When a task is still making progress, use `wait` between checks instead of repeatedly restarting it.\n</system-prompt>\n\n\n<system-prompt>\nYou are a professional project execution manager who can skillfully direct other entities to work toward your goal. Expectations:\n\n- Never complete code development work alone\n- You must coordinate other developers to complete tasks\n- You must keep them aligned with the goal and verify that their completion reports meet the requirements\n\nChoose the appropriate workflow based on the user's needs and the actual development goal, and use the workflow identifier to locate and load the corresponding definition.\n- Pass the identifier based on the actual need. This is not a path; use the standard workflow loading capability to resolve it.\n- Decide how to pass parameters based on their descriptions and actual usage scenarios.\nThe project includes the following workflows:\n- Workflow name: release\n  - Description: 正式发布流程\n  - Identifier: release\n  - Parameters:\n    - None\n\n- Workflow name: demo/release\n  - Description: 插件发布流程\n  - Identifier: demo/release\n  - Parameters:\n    - None\n\n</system-prompt>\n\n\n执行正式发布，并整理变更摘要。",
+      "systemPrompt": "<system-prompt>\nThe project system rules are:\n# review\n\n> 必须检查发布改动的回归风险。\n\n# demo/security\n\n> Use when: 插件安全规则\n> Rule file path: node_modules/@vibe-forge/plugin-demo/rules/security.md\n> Only read this rule file when the task matches the scenario above.\n</system-prompt>\n\n\n<system-prompt>\nThe following skill modules are loaded for the project:\n# research\n\n> Skill description: 检索资料\n> Skill file path: .ai/skills/research/SKILL.md\n> Resolve relative paths in the resource content relative to the directory containing this skill file.\n\n<skill-content>\n先阅读 README.md，再补充结论。\n</skill-content>\n</system-prompt>\n\n\n<system-prompt>\nThe project includes the following entities:\n  - architect: 负责拆解方案的实体\n\nWhen solving user problems, you may specify entities through `VibeForge.StartTasks` as needed and have them coordinate multiple entity types to complete the work; use `VibeForge.GetTaskInfo` and `wait` to track progress.\nTask tool guide:\n- Use `VibeForge.StartTasks` to start a new child task when the work should run in a separate entity or workspace, or when it needs to continue independently from the current turn.\n- After starting a task, use `VibeForge.GetTaskInfo` with `{ taskId }` to inspect one task. It is also the right tool when a task seems stalled, failed, or might be waiting for input.\n- By default, `GetTaskInfo` returns the 10 most recent log entries in descending order, so newer entries appear earlier in the `logs` array. Pass `logLimit` to inspect a different number of recent logs, and set `logOrder` to `\"asc\"` when you want the selected log window in oldest-to-newest order.\n- Use `VibeForge.ListTasks` with the same `logLimit` and `logOrder` fields when you need to find a taskId or inspect multiple tasks at once.\n- Use `VibeForge.SendTaskMessage` with `{ taskId, message }` only when a task status is `running` and you need to give it another instruction without starting a replacement task.\n- Use `VibeForge.SubmitTaskInput` only when `VibeForge.GetTaskInfo` or `VibeForge.ListTasks` shows `pendingInput` or `pendingInteraction`, or the task status is `waiting_input`. Do not use it for ordinary follow-up instructions.\n- If a task is `completed` or `failed`, start a new task instead of trying to continue the old one.\n- When a task is still making progress, use `wait` between checks instead of repeatedly restarting it.\n</system-prompt>\n\n\n<system-prompt>\nYou are a professional project execution manager who can skillfully direct other entities to work toward your goal. Expectations:\n\n- Never complete code development work alone\n- You must coordinate other developers to complete tasks\n- You must keep them aligned with the goal and verify that their completion reports meet the requirements\n\nChoose the appropriate workflow based on the user's needs and the actual development goal, and use the workflow identifier to locate and load the corresponding definition.\n- Pass the identifier based on the actual need. This is not a path; use the standard workflow loading capability to resolve it.\n- Decide how to pass parameters based on their descriptions and actual usage scenarios.\nThe project includes the following workflows:\n- Workflow name: release\n  - Description: 正式发布流程\n  - Identifier: release\n  - Parameters:\n    - None\n\n- Workflow name: demo/release\n  - Description: 插件发布流程\n  - Identifier: demo/release\n  - Parameters:\n    - None\n\n</system-prompt>\n\n\n执行正式发布，并整理变更摘要。",
       "tools": {
         "include": [
           "Edit",

package/__tests__/adapter-asset-plan.spec.ts

@@ -1,8 +1,24 @@
-/* eslint-disable max-lines -- adapter asset plan scenarios share setup helpers and assertions */
+/* eslint-disable import/first, max-lines -- adapter asset plan scenarios share setup helpers and assertions */
 import { join } from 'node:path'
 
 import { describe, expect, it, vi } from 'vitest'
 
+const skillsCliMocks = vi.hoisted(() => ({
+  findSkillsCli: vi.fn(),
+  installSkillsCliRefToTemp: vi.fn(),
+  installSkillsCliSkillToTemp: vi.fn()
+}))
+
+vi.mock('@vibe-forge/utils/skills-cli', async () => {
+  const actual = await vi.importActual<typeof import('@vibe-forge/utils/skills-cli')>('@vibe-forge/utils/skills-cli')
+  return {
+    ...actual,
+    findSkillsCli: skillsCliMocks.findSkillsCli,
+    installSkillsCliRefToTemp: skillsCliMocks.installSkillsCliRefToTemp,
+    installSkillsCliSkillToTemp: skillsCliMocks.installSkillsCliSkillToTemp
+  }
+})
+
 import { buildAdapterAssetPlan, resolvePromptAssetSelection, resolveWorkspaceAssetBundle } from '#~/index.js'
 
 import { createWorkspace, installPluginPackage, writeDocument } from './test-helpers'
@@ -264,76 +280,62 @@ describe('buildAdapterAssetPlan', () => {
     ]))
   })
 
-  it('keeps explicit registry dependencies ahead of preselected home-bridged skills in overlays', async () => {
+  it('keeps explicit skills CLI dependencies ahead of preselected home-bridged skills in overlays', async () => {
     const workspace = await createWorkspace()
     const realHome = process.env.__VF_PROJECT_REAL_HOME__
-    const fetchMock = vi.fn(async (url: string) => {
-      if (url === 'https://registry.example.test/api/search?q=foo&limit=10') {
-        return new Response(JSON.stringify({
-          skills: [{
-            id: 'anthropics/skills/foo',
-            skillId: 'foo',
-            name: 'foo',
-            source: 'anthropics/skills'
-          }]
-        }))
-      }
-      if (url === 'https://registry.example.test/api/download/anthropics/skills/foo') {
-        return new Response(JSON.stringify({
-          files: [{
-            path: 'SKILL.md',
-            contents: '---\nname: foo\ndescription: Registry foo\n---\nUse the registry definition.\n'
-          }]
-        }))
+    const tempInstallDir = join(workspace, '.tmp-install-skills-cli-foo')
+    const installedSkillDir = join(tempInstallDir, '.agents', 'skills', 'foo')
+    await writeDocument(
+      join(installedSkillDir, 'SKILL.md'),
+      '---\nname: foo\ndescription: Registry foo\n---\nUse the registry definition.\n'
+    )
+    skillsCliMocks.installSkillsCliSkillToTemp.mockResolvedValue({
+      tempDir: tempInstallDir,
+      installedSkill: {
+        dirName: 'foo',
+        name: 'foo',
+        sourcePath: installedSkillDir
       }
-      return new Response('not found', { status: 404 })
     })
-    vi.stubGlobal('fetch', fetchMock)
-
-    try {
-      await writeDocument(
-        join(realHome!, '.agents/skills/foo/SKILL.md'),
-        '---\ndescription: Home foo\n---\nUse the home definition.\n'
-      )
-      await writeDocument(
-        join(workspace, '.ai/skills/app-builder/SKILL.md'),
-        [
-          '---',
-          'name: app-builder',
-          'description: Build apps',
-          'dependencies:',
-          '  - anthropics/skills@foo',
-          '---',
-          'Build the app.'
-        ].join('\n')
-      )
-
-      const bundle = await resolveWorkspaceAssetBundle({
-        cwd: workspace,
-        configs: [{
-          skills: {
-            registry: 'https://registry.example.test'
-          }
-        }, undefined],
-        useDefaultVibeForgeMcpServer: false
-      })
-      const plan = await buildAdapterAssetPlan({
-        adapter: 'opencode',
-        bundle,
-        options: {
-          skills: {
-            include: ['foo', 'app-builder']
-          }
+
+    await writeDocument(
+      join(realHome!, '.agents/skills/foo/SKILL.md'),
+      '---\ndescription: Home foo\n---\nUse the home definition.\n'
+    )
+    await writeDocument(
+      join(workspace, '.ai/skills/app-builder/SKILL.md'),
+      [
+        '---',
+        'name: app-builder',
+        'description: Build apps',
+        'dependencies:',
+        '  - anthropics/skills@foo',
+        '---',
+        'Build the app.'
+      ].join('\n')
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [undefined, undefined],
+      useDefaultVibeForgeMcpServer: false
+    })
+    const plan = await buildAdapterAssetPlan({
+      adapter: 'opencode',
+      bundle,
+      options: {
+        skills: {
+          include: ['foo', 'app-builder']
         }
-      })
+      }
+    })
 
-      const fooOverlays = plan.overlays.filter(entry => entry.kind === 'skill' && entry.targetPath === 'skills/foo')
-      expect(fooOverlays).toHaveLength(1)
-      expect(fooOverlays[0]?.sourcePath).toContain('/.ai/caches/skill-dependencies/registry.example.test/')
-      expect(fooOverlays[0]?.sourcePath).not.toBe(join(realHome!, '.agents/skills/foo'))
-    } finally {
-      vi.unstubAllGlobals()
-    }
+    const fooOverlays = plan.overlays.filter(entry => entry.kind === 'skill' && entry.targetPath === 'skills/foo')
+    expect(fooOverlays).toHaveLength(1)
+    expect(fooOverlays[0]?.sourcePath).toContain(
+      '/.ai/caches/skill-dependencies/skills-cli/skills/latest/default/anthropics/skills/foo'
+    )
+    expect(fooOverlays[0]?.sourcePath).not.toBe(join(realHome!, '.agents/skills/foo'))
   })
 
   it('prunes excluded skill dependency subtrees from selected native overlays', async () => {

package/__tests__/bundle.spec.ts

@@ -1,15 +1,32 @@
-/* eslint-disable max-lines -- bundle coverage keeps related fixture scenarios in one file */
+/* eslint-disable import/first, max-lines -- bundle coverage keeps related fixture scenarios in one file */
 import { join } from 'node:path'
 import process from 'node:process'
 
 import { readFile } from 'node:fs/promises'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
+const skillsCliMocks = vi.hoisted(() => ({
+  findSkillsCli: vi.fn(),
+  installSkillsCliRefToTemp: vi.fn(),
+  installSkillsCliSkillToTemp: vi.fn()
+}))
+
+vi.mock('@vibe-forge/utils/skills-cli', async () => {
+  const actual = await vi.importActual<typeof import('@vibe-forge/utils/skills-cli')>('@vibe-forge/utils/skills-cli')
+  return {
+    ...actual,
+    findSkillsCli: skillsCliMocks.findSkillsCli,
+    installSkillsCliRefToTemp: skillsCliMocks.installSkillsCliRefToTemp,
+    installSkillsCliSkillToTemp: skillsCliMocks.installSkillsCliSkillToTemp
+  }
+})
+
 import { buildAdapterAssetPlan, resolveWorkspaceAssetBundle } from '#~/index.js'
 
 import { createWorkspace, installPluginPackage, writeDocument } from './test-helpers'
 
 afterEach(() => {
+  vi.clearAllMocks()
   vi.unstubAllGlobals()
 })
 
@@ -369,31 +386,23 @@ describe('resolveWorkspaceAssetBundle', () => {
     }))
   })
 
-  it('installs selected missing skill dependencies from an API-compatible registry cache', async () => {
+  it('installs selected missing skill dependencies from the skills CLI cache', async () => {
     const workspace = await createWorkspace()
     const realHome = process.env.__VF_PROJECT_REAL_HOME__
-    const fetchMock = vi.fn(async (url: string) => {
-      if (url === 'https://registry.example.test/api/search?q=frontend-design&limit=10') {
-        return new Response(JSON.stringify({
-          skills: [{
-            id: 'anthropics/skills/frontend-design',
-            skillId: 'frontend-design',
-            name: 'frontend-design',
-            source: 'anthropics/skills'
-          }]
-        }))
-      }
-      if (url === 'https://registry.example.test/api/download/anthropics/skills/frontend-design') {
-        return new Response(JSON.stringify({
-          files: [{
-            path: 'SKILL.md',
-            contents: '---\nname: frontend-design\ndescription: UI design guidance\n---\nUse strong visual hierarchy.\n'
-          }]
-        }))
+    const tempInstallDir = join(workspace, '.tmp-install-skills-cli')
+    const installedSkillDir = join(tempInstallDir, '.agents', 'skills', 'frontend-design')
+    await writeDocument(
+      join(installedSkillDir, 'SKILL.md'),
+      '---\nname: frontend-design\ndescription: UI design guidance\n---\nUse strong visual hierarchy.\n'
+    )
+    skillsCliMocks.installSkillsCliSkillToTemp.mockResolvedValue({
+      tempDir: tempInstallDir,
+      installedSkill: {
+        dirName: 'frontend-design',
+        name: 'frontend-design',
+        sourcePath: installedSkillDir
       }
-      return new Response('not found', { status: 404 })
     })
-    vi.stubGlobal('fetch', fetchMock)
 
     await writeDocument(
       join(realHome!, '.agents/skills/frontend-design/SKILL.md'),
@@ -414,11 +423,7 @@ describe('resolveWorkspaceAssetBundle', () => {
 
     const bundle = await resolveWorkspaceAssetBundle({
       cwd: workspace,
-      configs: [{
-        skills: {
-          registry: 'https://registry.example.test'
-        }
-      }, undefined],
+      configs: [undefined, undefined],
       useDefaultVibeForgeMcpServer: false
     })
 
@@ -427,7 +432,6 @@ describe('resolveWorkspaceAssetBundle', () => {
       resolvedBy: 'home-bridge',
       sourcePath: join(realHome!, '.agents/skills/frontend-design/SKILL.md')
     }))
-    expect(fetchMock).not.toHaveBeenCalled()
 
     await buildAdapterAssetPlan({
       adapter: 'opencode',
@@ -441,13 +445,122 @@ describe('resolveWorkspaceAssetBundle', () => {
 
     const dependency = bundle.skills.find(asset => asset.name === 'frontend-design')
     expect(bundle.skills.map(asset => asset.name).sort()).toEqual(['app-builder', 'frontend-design'])
-    expect(dependency?.sourcePath).toContain('/.ai/caches/skill-dependencies/registry.example.test/')
+    expect(dependency?.sourcePath).toContain(
+      '/.ai/caches/skill-dependencies/skills-cli/skills/latest/default/anthropics/skills/latest/frontend-design/'
+    )
     expect(bundle.skills.find(asset => (
       asset.name === 'frontend-design' && asset.resolvedBy === 'home-bridge'
     ))).toBeUndefined()
-    expect(fetchMock).toHaveBeenCalledWith(
-      'https://registry.example.test/api/download/anthropics/skills/frontend-design',
-      expect.any(Object)
+    expect(skillsCliMocks.findSkillsCli).not.toHaveBeenCalled()
+    expect(skillsCliMocks.installSkillsCliSkillToTemp).toHaveBeenCalledWith({
+      config: undefined,
+      skill: 'frontend-design',
+      source: 'anthropics/skills'
+    })
+  })
+
+  it('installs configured project skills before bundle resolution and rewrites renamed skill names', async () => {
+    const workspace = await createWorkspace()
+    const tempInstallDir = join(workspace, '.tmp-configured-install')
+    const installedSkillDir = join(tempInstallDir, '.agents', 'skills', 'design-review')
+    await writeDocument(
+      join(installedSkillDir, 'SKILL.md'),
+      '---\nname: design-review\ndescription: Review design work\n---\nReview the UI implementation.\n'
+    )
+    skillsCliMocks.installSkillsCliSkillToTemp.mockResolvedValue({
+      tempDir: tempInstallDir,
+      installedSkill: {
+        dirName: 'design-review',
+        name: 'design-review',
+        sourcePath: installedSkillDir
+      }
+    })
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [{
+        skills: [
+          {
+            name: 'design-review',
+            source: 'example-source/default/public',
+            rename: 'internal-review'
+          }
+        ]
+      }, undefined],
+      syncConfiguredSkills: true,
+      useDefaultVibeForgeMcpServer: false
+    })
+
+    expect(bundle.skills.map(asset => asset.name)).toContain('internal-review')
+    expect(skillsCliMocks.installSkillsCliSkillToTemp).toHaveBeenCalledWith({
+      config: undefined,
+      skill: 'design-review',
+      source: 'example-source/default/public'
+    })
+    await expect(readFile(join(workspace, '.ai/skills/internal-review/SKILL.md'), 'utf8')).resolves.toContain(
+      'name: internal-review'
+    )
+  })
+
+  it('skips configured skill reinstalls unless updateConfiguredSkills is enabled', async () => {
+    const workspace = await createWorkspace()
+    await writeDocument(
+      join(workspace, '.ai/skills/internal-review/SKILL.md'),
+      '---\nname: internal-review\ndescription: Existing skill\n---\nExisting content.\n'
+    )
+
+    const skippedBundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [{
+        skills: [
+          {
+            name: 'design-review',
+            source: 'example-source/default/public',
+            rename: 'internal-review'
+          }
+        ]
+      }, undefined],
+      syncConfiguredSkills: true,
+      useDefaultVibeForgeMcpServer: false
+    })
+
+    expect(skippedBundle.skills.map(asset => asset.name)).toContain('internal-review')
+    expect(skillsCliMocks.installSkillsCliSkillToTemp).not.toHaveBeenCalled()
+
+    const tempInstallDir = join(workspace, '.tmp-configured-update')
+    const installedSkillDir = join(tempInstallDir, '.agents', 'skills', 'design-review')
+    await writeDocument(
+      join(installedSkillDir, 'SKILL.md'),
+      '---\nname: design-review\ndescription: Updated skill\n---\nUpdated content.\n'
+    )
+    skillsCliMocks.installSkillsCliSkillToTemp.mockResolvedValueOnce({
+      tempDir: tempInstallDir,
+      installedSkill: {
+        dirName: 'design-review',
+        name: 'design-review',
+        sourcePath: installedSkillDir
+      }
+    })
+
+    await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [{
+        skills: [
+          {
+            name: 'design-review',
+            source: 'example-source/default/public',
+            rename: 'internal-review'
+          }
+        ]
+      }, undefined],
+      syncConfiguredSkills: true,
+      updateConfiguredSkills: true,
+      useDefaultVibeForgeMcpServer: false
+    })
+
+    expect(skillsCliMocks.installSkillsCliSkillToTemp).toHaveBeenCalledTimes(1)
+    await expect(readFile(join(workspace, '.ai/skills/internal-review/SKILL.md'), 'utf8')).resolves.toContain(
+      'Updated content.'
     )
   })
 
@@ -455,28 +568,20 @@ describe('resolveWorkspaceAssetBundle', () => {
     const primary = await createWorkspace()
     const worktree = await createWorkspace()
     const previousPrimaryWorkspace = process.env.__VF_PROJECT_PRIMARY_WORKSPACE_FOLDER__
-    const fetchMock = vi.fn(async (url: string) => {
-      if (url === 'https://registry.example.test/api/search?q=frontend-design&limit=10') {
-        return new Response(JSON.stringify({
-          skills: [{
-            id: 'anthropics/skills/frontend-design',
-            skillId: 'frontend-design',
-            name: 'frontend-design',
-            source: 'anthropics/skills'
-          }]
-        }))
-      }
-      if (url === 'https://registry.example.test/api/download/anthropics/skills/frontend-design') {
-        return new Response(JSON.stringify({
-          files: [{
-            path: 'SKILL.md',
-            contents: '---\nname: frontend-design\ndescription: UI design guidance\n---\nUse primary cache.\n'
-          }]
-        }))
+    const tempInstallDir = join(worktree, '.tmp-install-skills-cli')
+    const installedSkillDir = join(tempInstallDir, '.agents', 'skills', 'frontend-design')
+    await writeDocument(
+      join(installedSkillDir, 'SKILL.md'),
+      '---\nname: frontend-design\ndescription: UI design guidance\n---\nUse primary cache.\n'
+    )
+    skillsCliMocks.installSkillsCliSkillToTemp.mockResolvedValue({
+      tempDir: tempInstallDir,
+      installedSkill: {
+        dirName: 'frontend-design',
+        name: 'frontend-design',
+        sourcePath: installedSkillDir
       }
-      return new Response('not found', { status: 404 })
     })
-    vi.stubGlobal('fetch', fetchMock)
 
     try {
       process.env.__VF_PROJECT_PRIMARY_WORKSPACE_FOLDER__ = primary
@@ -487,7 +592,7 @@ describe('resolveWorkspaceAssetBundle', () => {
           'name: app-builder',
           'description: Build apps',
           'dependencies:',
-          '  - frontend-design',
+          '  - anthropics/skills@frontend-design',
           '---',
           'Build the app.'
         ].join('\n')
@@ -495,11 +600,7 @@ describe('resolveWorkspaceAssetBundle', () => {
 
       const bundle = await resolveWorkspaceAssetBundle({
         cwd: worktree,
-        configs: [{
-          skills: {
-            registry: 'https://registry.example.test'
-          }
-        }, undefined],
+        configs: [undefined, undefined],
         useDefaultVibeForgeMcpServer: false
       })
 
@@ -516,7 +617,7 @@ describe('resolveWorkspaceAssetBundle', () => {
       const dependency = bundle.skills.find(asset => asset.name === 'frontend-design')
       expect(dependency?.sourcePath).toContain(join(
         primary,
-        '.ai/caches/skill-dependencies/registry.example.test/'
+        '.ai/caches/skill-dependencies/skills-cli/skills/latest/default/anthropics/skills/latest/frontend-design/'
       ))
       expect(dependency?.sourcePath).not.toContain(join(worktree, '.ai/caches'))
     } finally {
@@ -530,12 +631,10 @@ describe('resolveWorkspaceAssetBundle', () => {
 
   it('reuses complete skill dependency caches without deleting or downloading them again', async () => {
     const workspace = await createWorkspace()
-    const fetchMock = vi.fn(async () => new Response('not found', { status: 404 }))
-    vi.stubGlobal('fetch', fetchMock)
 
     const cachedSkillPath = join(
       workspace,
-      '.ai/caches/skill-dependencies/registry.example.test/anthropics/skills/frontend-design/SKILL.md'
+      '.ai/caches/skill-dependencies/skills-cli/skills/latest/default/anthropics/skills/latest/frontend-design/SKILL.md'
     )
     await writeDocument(
       cachedSkillPath,
@@ -556,11 +655,7 @@ describe('resolveWorkspaceAssetBundle', () => {
 
     const bundle = await resolveWorkspaceAssetBundle({
       cwd: workspace,
-      configs: [{
-        skills: {
-          registry: 'https://registry.example.test'
-        }
-      }, undefined],
+      configs: [undefined, undefined],
       useDefaultVibeForgeMcpServer: false
     })
 
@@ -574,89 +669,64 @@ describe('resolveWorkspaceAssetBundle', () => {
       }
     })
 
-    expect(fetchMock).not.toHaveBeenCalled()
+    expect(skillsCliMocks.findSkillsCli).not.toHaveBeenCalled()
+    expect(skillsCliMocks.installSkillsCliSkillToTemp).not.toHaveBeenCalled()
     expect(await readFile(cachedSkillPath, 'utf8')).toContain('Use the cached copy.')
     expect(bundle.skills.map(asset => asset.name).sort()).toEqual(['app-builder', 'frontend-design'])
   })
 
-  it('keeps configured registry url search and download endpoints together when env overrides exist', async () => {
+  it('parses registry/source/version dependency specs and forwards them to the skills CLI installer', async () => {
     const workspace = await createWorkspace()
-    const previousDownloadUrl = process.env.SKILLS_DOWNLOAD_URL
-    const fetchMock = vi.fn(async (url: string) => {
-      if (url === 'https://private-registry.example.test/api/search?q=frontend-design&limit=10') {
-        return new Response(JSON.stringify({
-          skills: [{
-            id: 'anthropics/skills/frontend-design',
-            skillId: 'frontend-design',
-            name: 'frontend-design',
-            source: 'anthropics/skills'
-          }]
-        }))
-      }
-      if (url === 'https://private-registry.example.test/api/download/anthropics/skills/frontend-design') {
-        return new Response(JSON.stringify({
-          files: [{
-            path: 'SKILL.md',
-            contents: '---\nname: frontend-design\ndescription: UI design guidance\n---\nUse strong visual hierarchy.\n'
-          }]
-        }))
+    const tempInstallDir = join(workspace, '.tmp-install-skills-cli')
+    const installedSkillDir = join(tempInstallDir, '.agents', 'skills', 'frontend-design')
+    await writeDocument(
+      join(installedSkillDir, 'SKILL.md'),
+      '---\nname: frontend-design\ndescription: UI design guidance\n---\nUse internal design tokens.\n'
+    )
+    skillsCliMocks.installSkillsCliSkillToTemp.mockResolvedValue({
+      tempDir: tempInstallDir,
+      installedSkill: {
+        dirName: 'frontend-design',
+        name: 'frontend-design',
+        sourcePath: installedSkillDir
       }
-      return new Response('not found', { status: 404 })
     })
-    vi.stubGlobal('fetch', fetchMock)
 
-    try {
-      process.env.SKILLS_DOWNLOAD_URL = 'https://env-download.example.test'
-      await writeDocument(
-        join(workspace, '.ai/skills/app-builder/SKILL.md'),
-        [
-          '---',
-          'name: app-builder',
-          'description: Build apps',
-          'dependencies:',
-          '  - frontend-design',
-          '---',
-          'Build the app.'
-        ].join('\n')
-      )
+    await writeDocument(
+      join(workspace, '.ai/skills/app-builder/SKILL.md'),
+      [
+        '---',
+        'name: app-builder',
+        'description: Build apps',
+        'dependencies:',
+        '  - https://registry.example.com@example-source/default/public@frontend-design@1.0.3',
+        '---',
+        'Build the app.'
+      ].join('\n')
+    )
 
-      const bundle = await resolveWorkspaceAssetBundle({
-        cwd: workspace,
-        configs: [{
-          skills: {
-            registry: {
-              url: 'https://private-registry.example.test'
-            }
-          }
-        }, undefined],
-        useDefaultVibeForgeMcpServer: false
-      })
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [undefined, undefined],
+      useDefaultVibeForgeMcpServer: false
+    })
 
-      await buildAdapterAssetPlan({
-        adapter: 'opencode',
-        bundle,
-        options: {
-          skills: {
-            include: ['app-builder']
-          }
+    await buildAdapterAssetPlan({
+      adapter: 'opencode',
+      bundle,
+      options: {
+        skills: {
+          include: ['app-builder']
         }
-      })
-
-      expect(fetchMock).toHaveBeenCalledWith(
-        'https://private-registry.example.test/api/download/anthropics/skills/frontend-design',
-        expect.any(Object)
-      )
-      expect(fetchMock).not.toHaveBeenCalledWith(
-        'https://env-download.example.test/api/download/anthropics/skills/frontend-design',
-        expect.any(Object)
-      )
-    } finally {
-      if (previousDownloadUrl == null) {
-        delete process.env.SKILLS_DOWNLOAD_URL
-      } else {
-        process.env.SKILLS_DOWNLOAD_URL = previousDownloadUrl
       }
-    }
+    })
+
+    expect(skillsCliMocks.installSkillsCliSkillToTemp).toHaveBeenCalledWith({
+      registry: 'https://registry.example.com',
+      skill: 'frontend-design',
+      source: 'example-source/default/public',
+      version: '1.0.3'
+    })
   })
 
   it('loads workspace entities from the env-configured entities dir', async () => {

package/__tests__/prompt-builders.spec.ts

@@ -182,11 +182,9 @@ describe('workspace asset prompt builders', () => {
     expect(prompt).toContain('`logLimit`')
     expect(prompt).toContain('`logOrder`')
     expect(prompt).toContain('`VibeForge.SendTaskMessage`')
-    expect(prompt).toContain('`{ taskId, message, mode }`')
-    expect(prompt).toContain('Choose `mode: "direct"`')
-    expect(prompt).toContain('Choose `mode: "steer"`')
+    expect(prompt).toContain('`{ taskId, message }`')
     expect(prompt).toContain('`VibeForge.SubmitTaskInput`')
-    expect(prompt).toContain('Do not use it for ordinary follow-up instructions or queued steer turns')
+    expect(prompt).toContain('Do not use it for ordinary follow-up instructions')
     expect(prompt).toContain('If a task is `completed` or `failed`')
     expect(prompt).toContain('`wait`')
     expect(prompt).not.toContain('run-tasks')
@@ -215,8 +213,6 @@ describe('workspace asset prompt builders', () => {
     expect(prompt).toContain('`VibeForge.ListTasks`')
     expect(prompt).toContain('`VibeForge.SendTaskMessage`')
     expect(prompt).toContain('`VibeForge.SubmitTaskInput`')
-    expect(prompt).toContain('Choose `mode: "direct"`')
-    expect(prompt).toContain('Choose `mode: "steer"`')
     expect(prompt).toContain('Do not directly edit files inside a registered workspace')
   })