@vibe-forge/workspace-assets 3.4.0-rc.1 → 3.4.0-rc.3

package/__tests__/bundle.spec.ts

@@ -23,6 +23,7 @@ vi.mock('@vibe-forge/utils/skills-cli', async () => {
 })
 
 import { resolveWorkspaceAssetBundle } from '#~/index.js'
+import { resolveProjectSkillsStorePath, writeProjectSkillsLockfile } from '@vibe-forge/utils'
 
 import { createWorkspace, installPluginPackage, writeDocument } from './test-helpers'
 
@@ -579,6 +580,57 @@ describe('resolveWorkspaceAssetBundle', () => {
     expect(skillsCliMocks.installSkillsCliSkillToTemp).not.toHaveBeenCalled()
   })
 
+  it('loads lockfile-managed configured skills from the real home project store', async () => {
+    const workspace = await createWorkspace()
+    const storeHash = 'sha256-home-store'
+    const installDir = resolveProjectSkillsStorePath(
+      {
+        storeHash,
+        workspaceFolder: workspace
+      },
+      'skills',
+      'internal-review'
+    )
+    await writeDocument(
+      join(installDir, 'SKILL.md'),
+      '---\nname: internal-review\ndescription: Existing skill\n---\nExisting content.\n'
+    )
+    await writeProjectSkillsLockfile(workspace, {
+      version: 1,
+      storeHash,
+      skills: {
+        'internal-review': {
+          hash: 'sha256:test',
+          installedAt: '2026-05-19T00:00:00.000Z',
+          installPath: 'skills/internal-review',
+          name: 'internal-review',
+          requested: true,
+          source: 'example-source/default/public'
+        }
+      }
+    })
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [{
+        skills: [
+          {
+            name: 'design-review',
+            source: 'example-source/default/public',
+            rename: 'internal-review'
+          }
+        ]
+      }, undefined],
+      warnMissingConfiguredSkills: true,
+      useDefaultVibeForgeMcpServer: false
+    })
+
+    expect(bundle.skills.find(asset => asset.name === 'internal-review')).toEqual(expect.objectContaining({
+      sourcePath: join(installDir, 'SKILL.md')
+    }))
+    expect(skillsCliMocks.installSkillsCliSkillToTemp).not.toHaveBeenCalled()
+  })
+
   it('loads workspace entities from the env-configured entities dir', async () => {
     const workspace = await createWorkspace()
     const previousEntitiesDir = process.env.__VF_PROJECT_AI_ENTITIES_DIR__

package/__tests__/skill-dependencies-cli.spec.ts

@@ -19,6 +19,8 @@ vi.mock('@vibe-forge/utils/skills-cli', async () => {
   }
 })
 
+import { resolveProjectSkillsStorePath } from '@vibe-forge/utils'
+
 import { buildAdapterAssetPlan, resolveWorkspaceAssetBundle } from '#~/index.js'
 
 import { createWorkspace, installPluginPackage, writeDocument } from './test-helpers'
@@ -136,8 +138,9 @@ describe('materialized skill dependency resolution', () => {
     expect(mocks.findSkillsCli).not.toHaveBeenCalled()
   })
 
-  it('loads plugin dependencies from .ai/skills/.plugins through the lockfile', async () => {
+  it('loads plugin dependencies from the home project store through the lockfile', async () => {
     const workspace = await createWorkspace()
+    const storeHash = 'sha256-store'
     await installPluginPackage(workspace, '@vibe-forge/plugin-review', {
       'package.json': JSON.stringify({ name: '@vibe-forge/plugin-review', version: '1.0.0' }, null, 2),
       'skills/review-helper/SKILL.md': [
@@ -151,20 +154,27 @@ describe('materialized skill dependency resolution', () => {
       ].join('\n')
     })
     await writeDocument(
-      join(workspace, '.ai/skills/.plugins/review/shared-runtime/SKILL.md'),
+      join(
+        resolveProjectSkillsStorePath({
+          storeHash,
+          workspaceFolder: workspace
+        }, 'skills', '.plugins', 'review', 'shared-runtime'),
+        'SKILL.md'
+      ),
       '---\nname: shared-runtime\ndescription: Shared runtime\n---\nShared plugin dependency.\n'
     )
     await writeDocument(
       join(workspace, '.ai/skills.lock.yaml'),
       [
         'version: 1',
+        `storeHash: ${storeHash}`,
         'pluginSkills:',
         '  review/shared-runtime:',
         '    name: shared-runtime',
         '    requested: false',
         '    pluginInstance: review',
         '    pluginInstancePath: "0"',
-        '    installPath: .ai/skills/.plugins/review/shared-runtime',
+        '    installPath: skills/.plugins/review/shared-runtime',
         '    dependencyOf:',
         '      - plugin:review/review-helper',
         '    source: vendor/shared-skills',

package/package.json

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

package/src/bundle-internal.ts

@@ -13,6 +13,7 @@ import {
   readProjectSkillsLockfile,
   resolveProjectAiBaseDir,
   resolveProjectAiEntitiesDir,
+  resolveProjectSkillInstallDir,
   resolveRelativePath,
   resolveSkillsHomeBridge
 } from '@vibe-forge/utils'
@@ -500,7 +501,14 @@ const scanProjectSkillLockfileDocuments = async (cwd: string) => {
   const lockfile = await readProjectSkillsLockfile(cwd)
   const skillPaths: string[] = []
   for (const entry of Object.values(lockfile.skills ?? {})) {
-    const skillPath = resolve(cwd, entry.installPath, 'SKILL.md')
+    const skillPath = resolve(
+      resolveProjectSkillInstallDir({
+        installPath: entry.installPath,
+        storeHash: entry.storeHash ?? lockfile.storeHash,
+        workspaceFolder: cwd
+      }),
+      'SKILL.md'
+    )
     if (await pathExists(skillPath)) {
       skillPaths.push(skillPath)
     }
@@ -522,7 +530,14 @@ const scanPluginDependencySkillDocuments = async (
     ))
     if (instance == null) continue
 
-    const skillPath = resolve(cwd, entry.installPath, 'SKILL.md')
+    const skillPath = resolve(
+      resolveProjectSkillInstallDir({
+        installPath: entry.installPath,
+        storeHash: entry.storeHash ?? lockfile.storeHash,
+        workspaceFolder: cwd
+      }),
+      'SKILL.md'
+    )
     if (await pathExists(skillPath)) {
       documents.push({
         instance,

package/src/configured-skills.ts

@@ -1,6 +1,6 @@
 /* eslint-disable max-lines -- configured skill resolution keeps matching, warnings, and CLI sync policy together. */
 import { access } from 'node:fs/promises'
-import { isAbsolute, join, resolve as resolvePath } from 'node:path'
+import { join } from 'node:path'
 import process from 'node:process'
 
 import type {
@@ -16,9 +16,10 @@ import {
   readProjectSkillsLockfile,
   resolveConfiguredSkillInstalls as resolveDeclaredConfiguredSkillInstalls,
   resolveProjectAiPath,
+  resolveProjectSkillInstallDir,
   toSkillSlug
 } from '@vibe-forge/utils'
-import type { NormalizedProjectSkillInstall, ProjectSkillLockEntry } from '@vibe-forge/utils'
+import type { NormalizedProjectSkillInstall, ProjectSkillLockEntry, ProjectSkillsLockfile } from '@vibe-forge/utils'
 
 interface NormalizedConfiguredSkillCollection {
   include?: ConfiguredSkillCollectionConfig['include']
@@ -106,33 +107,42 @@ const lockEntryMatchesCollection = (
   (collection.version == null || entry.version === collection.version)
 )
 
-const resolveLockEntrySkillPath = (workspaceFolder: string, entry: ProjectSkillLockEntry) => {
-  const installDir = isAbsolute(entry.installPath)
-    ? entry.installPath
-    : resolvePath(workspaceFolder, entry.installPath)
-  return join(installDir, 'SKILL.md')
-}
+const resolveLockEntrySkillPath = (
+  workspaceFolder: string,
+  lockfile: Pick<ProjectSkillsLockfile, 'storeHash'>,
+  entry: ProjectSkillLockEntry
+) =>
+  join(
+    resolveProjectSkillInstallDir({
+      installPath: entry.installPath,
+      storeHash: entry.storeHash ?? lockfile.storeHash,
+      workspaceFolder
+    }),
+    'SKILL.md'
+  )
 
 const hasInstalledCollectionLockEntry = async (params: {
   collection: NormalizedConfiguredSkillCollection
-  entries: Record<string, ProjectSkillLockEntry>
+  lockfile: ProjectSkillsLockfile
   workspaceFolder: string
 }) => {
-  for (const entry of Object.values(params.entries)) {
+  for (const entry of Object.values(params.lockfile.skills ?? {})) {
     if (!lockEntryMatchesCollection(entry, params.collection)) continue
-    if (await pathExists(resolveLockEntrySkillPath(params.workspaceFolder, entry))) return true
+    if (await pathExists(resolveLockEntrySkillPath(params.workspaceFolder, params.lockfile, entry))) return true
   }
 
   return false
 }
 
 const hasInstalledSkillTarget = async (params: {
-  entries: Record<string, ProjectSkillLockEntry>
+  lockfile: ProjectSkillsLockfile
   targetDirName: string
   workspaceFolder: string
 }) => {
-  const entry = params.entries[params.targetDirName]
-  if (entry != null && await pathExists(resolveLockEntrySkillPath(params.workspaceFolder, entry))) return true
+  const entry = params.lockfile.skills?.[params.targetDirName]
+  if (entry != null && await pathExists(resolveLockEntrySkillPath(params.workspaceFolder, params.lockfile, entry))) {
+    return true
+  }
 
   const skillPath = resolveProjectAiPath(
     params.workspaceFolder,
@@ -174,7 +184,7 @@ export const findMissingConfiguredProjectSkills = async (params: {
   for (const skill of installs) {
     if (
       !await hasInstalledSkillTarget({
-        entries: lockfile.skills ?? {},
+        lockfile,
         targetDirName: skill.targetDirName,
         workspaceFolder: params.workspaceFolder
       })
@@ -214,7 +224,7 @@ export const findMissingConfiguredProjectSkillCollections = async (params: {
       if (
         !await hasInstalledCollectionLockEntry({
           collection,
-          entries: lockfile.skills ?? {},
+          lockfile,
           workspaceFolder: params.workspaceFolder
         })
       ) {
@@ -229,7 +239,7 @@ export const findMissingConfiguredProjectSkillCollections = async (params: {
       if (target == null) continue
       if (
         !await hasInstalledSkillTarget({
-          entries: lockfile.skills ?? {},
+          lockfile,
           targetDirName: target.targetDirName,
           workspaceFolder: params.workspaceFolder
         })