@vibe-forge/workspace-assets 2.0.2 → 2.0.3

package/__tests__/skill-dependencies.spec.ts

@@ -0,0 +1,80 @@
+import { join } from 'node:path'
+
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+import { buildAdapterAssetPlan, resolveWorkspaceAssetBundle } from '#~/index.js'
+import { normalizeSkillDependency } from '#~/skill-dependencies.js'
+
+import { createWorkspace, writeDocument } from './test-helpers'
+
+afterEach(() => {
+  vi.unstubAllGlobals()
+})
+
+describe('skill dependency normalization', () => {
+  it('parses legacy non-structured registry strings', () => {
+    expect(
+      normalizeSkillDependency('https://bnpm.byted.org@skills.byted.org/lynx/skills@lynx-devtool@1.0.3')
+    ).toEqual({
+      ref: 'https://bnpm.byted.org@skills.byted.org/lynx/skills@lynx-devtool@1.0.3',
+      name: 'lynx-devtool',
+      source: 'lynx/skills',
+      registry: 'https://skills.byted.org',
+      version: '1.0.3',
+      packageRegistry: 'https://bnpm.byted.org'
+    })
+  })
+
+  it('installs legacy non-structured registry dependencies through the skill registry API', async () => {
+    const workspace = await createWorkspace()
+    const fetchMock = vi.fn(async (url: string) => {
+      if (url === 'https://skills.byted.org/api/download/lynx/skills/lynx-devtool?version=1.0.3') {
+        return new Response(JSON.stringify({
+          files: [{
+            path: 'SKILL.md',
+            contents: '---\nname: lynx-devtool\ndescription: Lynx device debugging\n---\nUse devtool.\n'
+          }]
+        }))
+      }
+      return new Response('not found', { status: 404 })
+    })
+    vi.stubGlobal('fetch', fetchMock)
+
+    await writeDocument(
+      join(workspace, '.ai/skills/debug-lynx/SKILL.md'),
+      [
+        '---',
+        'name: debug-lynx',
+        'description: Debug Lynx on device',
+        'dependencies:',
+        '  - https://bnpm.byted.org@skills.byted.org/lynx/skills@lynx-devtool@1.0.3',
+        '---',
+        'Run the full debugging workflow.'
+      ].join('\n')
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [undefined, undefined],
+      useDefaultVibeForgeMcpServer: false
+    })
+
+    await buildAdapterAssetPlan({
+      adapter: 'opencode',
+      bundle,
+      options: {
+        skills: {
+          include: ['debug-lynx']
+        }
+      }
+    })
+
+    expect(fetchMock).toHaveBeenCalledWith(
+      'https://skills.byted.org/api/download/lynx/skills/lynx-devtool?version=1.0.3',
+      expect.any(Object)
+    )
+    expect(bundle.skills.find(asset => asset.name === 'lynx-devtool')?.sourcePath).toContain(
+      '/.ai/caches/skill-dependencies/skills.byted.org/lynx/skills/lynx-devtool/1.0.3/'
+    )
+  })
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-forge/workspace-assets",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Workspace asset resolution and adapter asset planning for Vibe Forge",
   "imports": {
     "#~/*.js": {
@@ -30,9 +30,9 @@
     "fast-glob": "^3.3.3",
     "front-matter": "^4.0.2",
     "js-yaml": "^4.1.1",
-    "@vibe-forge/definition-core": "^2.0.0",
     "@vibe-forge/types": "^2.0.2",
-    "@vibe-forge/utils": "^2.0.3"
+    "@vibe-forge/utils": "^2.0.3",
+    "@vibe-forge/definition-core": "^2.0.0"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.9"

package/src/skill-dependencies.ts

@@ -17,6 +17,8 @@ export interface NormalizedSkillDependency {
   name: string
   source?: string
   registry?: string
+  version?: string
+  packageRegistry?: string
 }
 
 interface DependencyExpansionParams {
@@ -42,6 +44,29 @@ const toSkillSlug = (value: string) => (
     .replace(/^-|-$/g, '')
 )
 
+const trimSlashes = (value: string) => value.replace(/^\/+|\/+$/g, '')
+
+const normalizeLegacyUrl = (value: string) => {
+  const trimmed = value.trim()
+  if (trimmed === '') return undefined
+  const candidate = /^[a-z][a-z\d+.-]*:\/\//i.test(trimmed) ? trimmed : `https://${trimmed}`
+  try {
+    return new URL(candidate)
+  } catch {
+    return undefined
+  }
+}
+
+const buildDependencyRef = (params: {
+  name: string
+  source?: string
+  version?: string
+}) => (
+  params.source == null
+    ? (params.version == null ? params.name : `${params.name}@${params.version}`)
+    : `${params.source}@${params.name}${params.version == null ? '' : `@${params.version}`}`
+)
+
 const resolveUniqueSkillByName = (assets: SkillAsset[], name: string) => {
   const nameSlug = toSkillSlug(name)
   const matches = assets.filter(asset => asset.name === name || toSkillSlug(asset.name) === nameSlug)
@@ -138,8 +163,38 @@ const createRegistrySkillAsset = (params: {
   } satisfies SkillAsset
 }
 
+const parseLegacyRegistryDependency = (value: string): NormalizedSkillDependency | undefined => {
+  const ref = value.trim()
+  const segments = ref.split('@').map(segment => segment.trim())
+  if (segments.length < 3) return undefined
+
+  const hasVersion = segments.length >= 4
+  const nameIndex = hasVersion ? segments.length - 2 : segments.length - 1
+  const packageRegistry = normalizeLegacyUrl(segments[0] ?? '')
+  const sourceUrl = normalizeLegacyUrl(segments.slice(1, nameIndex).join('@'))
+  const name = asNonEmptyString(segments[nameIndex])
+  const version = hasVersion ? asNonEmptyString(segments[segments.length - 1]) : undefined
+
+  if (packageRegistry == null || sourceUrl == null || name == null) return undefined
+
+  const source = trimSlashes(sourceUrl.pathname)
+  if (source === '') return undefined
+
+  return {
+    ref,
+    name,
+    source,
+    registry: sourceUrl.origin,
+    ...(version == null ? {} : { version }),
+    packageRegistry: packageRegistry.toString().replace(/\/+$/, '')
+  }
+}
+
 const parseStringDependency = (value: string): NormalizedSkillDependency => {
   const ref = value.trim()
+  const legacyRegistryDependency = parseLegacyRegistryDependency(ref)
+  if (legacyRegistryDependency != null) return legacyRegistryDependency
+
   const atIndex = ref.lastIndexOf('@')
   if (atIndex > 0 && atIndex < ref.length - 1) {
     return {
@@ -174,11 +229,17 @@ export const normalizeSkillDependency = (value: unknown): NormalizedSkillDepende
   if (name == null) return undefined
 
   const source = asNonEmptyString(record.source)
+  const version = asNonEmptyString(record.version)
   return {
-    ref: source == null ? name : `${source}@${name}`,
+    ref: buildDependencyRef({
+      name,
+      ...(source == null ? {} : { source }),
+      ...(version == null ? {} : { version })
+    }),
     name,
     ...(source == null ? {} : { source }),
-    ...(asNonEmptyString(record.registry) == null ? {} : { registry: asNonEmptyString(record.registry) })
+    ...(asNonEmptyString(record.registry) == null ? {} : { registry: asNonEmptyString(record.registry) }),
+    ...(version == null ? {} : { version })
   }
 }
 

package/src/skill-registry.ts

@@ -60,6 +60,13 @@ const toCacheSegment = (value: string) => (
     .replace(/^-+|-+$/g, '') || 'registry'
 )
 
+const appendVersionQuery = (url: string, version?: string) => {
+  if (version == null || version.trim() === '') return url
+  const parsed = new URL(url)
+  parsed.searchParams.set('version', version.trim())
+  return parsed.toString()
+}
+
 const resolveConfiguredRegistry = (
   projectConfig: Config | undefined,
   userConfig: Config | undefined
@@ -146,7 +153,10 @@ const resolveRegistrySkillTarget = async (
     }
   }
 
-  const searchUrl = `${registry.searchBaseUrl}/api/search?q=${encodeURIComponent(dependency.name)}&limit=10`
+  const searchUrl = appendVersionQuery(
+    `${registry.searchBaseUrl}/api/search?q=${encodeURIComponent(dependency.name)}&limit=10`,
+    dependency.version
+  )
   const searchResult = await fetchJson<{
     skills?: RegistrySearchSkill[]
   }>(searchUrl)
@@ -230,6 +240,7 @@ const buildInstallDir = (params: {
   registry: RegistryOptions
   source: string
   slug: string
+  version?: string
 }) => {
   let registryKey = params.registry.downloadBaseUrl
   try {
@@ -244,7 +255,8 @@ const buildInstallDir = (params: {
     'skill-dependencies',
     toCacheSegment(registryKey),
     ...params.source.split('/').map(toCacheSegment),
-    toCacheSegment(params.slug)
+    toCacheSegment(params.slug),
+    ...(params.version == null ? [] : [toCacheSegment(params.version)])
   )
 }
 
@@ -267,14 +279,18 @@ export const installRegistrySkillDependency = async (params: {
     throw new Error(`Skill dependency source ${target.source} must use owner/repo format`)
   }
 
-  const downloadUrl = `${registry.downloadBaseUrl}/api/download/${encodeURIComponent(owner)}/${
-    encodeURIComponent(repo)
-  }/${encodeURIComponent(target.slug)}`
+  const downloadUrl = appendVersionQuery(
+    `${registry.downloadBaseUrl}/api/download/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/${
+      encodeURIComponent(target.slug)
+    }`,
+    params.dependency.version
+  )
   const installDir = buildInstallDir({
     cwd: params.cwd,
     registry,
     source: target.source,
-    slug: target.slug
+    slug: target.slug,
+    version: params.dependency.version
   })
   const skillPath = resolve(installDir, 'SKILL.md')