@vibe-forge/workspace-assets 2.0.0 → 2.0.1

package/__tests__/prompt-selection.spec.ts

@@ -435,6 +435,313 @@ describe('resolvePromptAssetSelection', () => {
     expect(options.systemPrompt).not.toContain('<skill-content>\n先读 README.md\n</skill-content>')
   })
 
+  it('appends conventional prompt files when loading a directory entity', async () => {
+    const workspace = await createWorkspace()
+
+    await writeDocument(
+      join(workspace, '.ai/entities/reviewer/README.md'),
+      [
+        '---',
+        'description: 代码评审实体',
+        '---',
+        '基础身份。'
+      ].join('\n')
+    )
+    await writeDocument(
+      join(workspace, '.ai/entities/reviewer/INTRODUCTION.md'),
+      '负责发现行为回归。'
+    )
+    await writeDocument(
+      join(workspace, '.ai/entities/reviewer/PERSONALITY.md'),
+      '说话克制，先给出高风险问题。'
+    )
+    await writeDocument(
+      join(workspace, '.ai/entities/reviewer/MEMORY.md'),
+      '记住上次评审指出过缺少验证。'
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      useDefaultVibeForgeMcpServer: false
+    })
+    const [data, options] = await resolvePromptAssetSelection({
+      bundle,
+      type: 'entity',
+      name: 'reviewer'
+    })
+
+    expect(data.targetBody).toContain('基础身份。')
+    expect(data.targetBody).toContain('## Introduction\n\n负责发现行为回归。')
+    expect(data.targetBody).toContain('## Personality\n\n说话克制，先给出高风险问题。')
+    expect(data.targetBody).toContain('## Memory\n\n记住上次评审指出过缺少验证。')
+    expect(options.systemPrompt).toContain('## Introduction\n\n负责发现行为回归。')
+    expect(data.targetBody.indexOf('基础身份。')).toBeLessThan(data.targetBody.indexOf('## Introduction'))
+    expect(data.targetBody.indexOf('## Introduction')).toBeLessThan(data.targetBody.indexOf('## Personality'))
+    expect(data.targetBody.indexOf('## Personality')).toBeLessThan(data.targetBody.indexOf('## Memory'))
+  })
+
+  it('appends alias prompt files for index json entities', async () => {
+    const workspace = await createWorkspace()
+
+    await writeDocument(
+      join(workspace, '.ai/entities/reviewer/index.json'),
+      JSON.stringify(
+        {
+          description: '代码评审实体',
+          prompt: '基础身份。'
+        },
+        null,
+        2
+      )
+    )
+    await writeDocument(
+      join(workspace, '.ai/entities/reviewer/介绍.md'),
+      '负责发现行为回归。'
+    )
+    await writeDocument(
+      join(workspace, '.ai/entities/reviewer/personality.md'),
+      '说话克制，先给出高风险问题。'
+    )
+    await writeDocument(
+      join(workspace, '.ai/entities/reviewer/记忆.md'),
+      '记住上次评审指出过缺少验证。'
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      useDefaultVibeForgeMcpServer: false
+    })
+    const [data] = await resolvePromptAssetSelection({
+      bundle,
+      type: 'entity',
+      name: 'reviewer'
+    })
+
+    expect(data.targetBody).toContain('基础身份。')
+    expect(data.targetBody).toContain('## Introduction\n\n负责发现行为回归。')
+    expect(data.targetBody).toContain('## Personality\n\n说话克制，先给出高风险问题。')
+    expect(data.targetBody).toContain('## Memory\n\n记住上次评审指出过缺少验证。')
+  })
+
+  it('inherits prompt, rules, and skills from scoped plugin entities', async () => {
+    const workspace = await createWorkspace()
+
+    await installPluginPackage(workspace, '@vibe-forge/plugin-standard-dev', {
+      'package.json': JSON.stringify(
+        {
+          name: '@vibe-forge/plugin-standard-dev',
+          version: '1.0.0'
+        },
+        null,
+        2
+      ),
+      'rules/base-review.md': '---\ndescription: 标准评审规则\n---\n父规则正文',
+      'skills/base-review/SKILL.md': '---\ndescription: 标准评审技能\n---\n父技能正文',
+      'entities/base-reviewer/README.md': [
+        '---',
+        'description: 标准评审实体',
+        'rules:',
+        '  - base-review',
+        'skills:',
+        '  - base-review',
+        'tools:',
+        '  include:',
+        '    - Read',
+        '---',
+        '父实体提示。'
+      ].join('\n')
+    })
+    await writeDocument(
+      join(workspace, '.ai/rules/base-review.md'),
+      '---\ndescription: 同名本地规则\n---\n同名本地规则正文'
+    )
+    await writeDocument(
+      join(workspace, '.ai/rules/frontend.md'),
+      '---\ndescription: 前端规则\n---\n子规则正文'
+    )
+    await writeDocument(
+      join(workspace, '.ai/skills/base-review/SKILL.md'),
+      '---\ndescription: 同名本地技能\n---\n同名本地技能正文'
+    )
+    await writeDocument(
+      join(workspace, '.ai/skills/frontend/SKILL.md'),
+      '---\ndescription: 前端技能\n---\n子技能正文'
+    )
+    await writeDocument(
+      join(workspace, '.ai/entities/frontend-reviewer/README.md'),
+      [
+        '---',
+        'description: 前端评审实体',
+        'extends: std/base-reviewer',
+        'rules:',
+        '  - frontend',
+        'skills:',
+        '  - frontend',
+        'tools:',
+        '  include:',
+        '    - Grep',
+        '---',
+        '子实体提示。'
+      ].join('\n')
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [{
+        plugins: [
+          { id: 'standard-dev', scope: 'std' }
+        ]
+      }, undefined],
+      useDefaultVibeForgeMcpServer: false
+    })
+    const [data, options] = await resolvePromptAssetSelection({
+      bundle,
+      type: 'entity',
+      name: 'frontend-reviewer'
+    })
+    const parentEntityId = bundle.entities.find(asset => asset.displayName === 'std/base-reviewer')?.id
+    const childEntityId = bundle.entities.find(asset => asset.displayName === 'frontend-reviewer')?.id
+
+    expect(data.targetBody).toContain('父实体提示。\n\n子实体提示。')
+    expect(data.targetSkills.map(skill => skill.resolvedName)).toEqual(['std/base-review', 'frontend'])
+    expect(options.systemPrompt).toContain('> 父规则正文')
+    expect(options.systemPrompt).toContain('> 子规则正文')
+    expect(options.systemPrompt).not.toContain('> 同名本地规则正文')
+    expect(options.systemPrompt).not.toContain('<skill-content>\n同名本地技能正文\n</skill-content>')
+    expect(options.tools).toEqual({ include: ['Grep'] })
+    expect(options.promptAssetIds).toEqual(expect.arrayContaining([parentEntityId, childEntityId]))
+  })
+
+  it('composes multiple parent entities in extends order', async () => {
+    const workspace = await createWorkspace()
+
+    await writeDocument(
+      join(workspace, '.ai/entities/base-a.md'),
+      [
+        '---',
+        'description: 父实体 A',
+        'tools:',
+        '  include:',
+        '    - Read',
+        '---',
+        '父实体 A 提示。'
+      ].join('\n')
+    )
+    await writeDocument(
+      join(workspace, '.ai/entities/base-b.md'),
+      [
+        '---',
+        'description: 父实体 B',
+        'tools:',
+        '  include:',
+        '    - Bash',
+        '---',
+        '父实体 B 提示。'
+      ].join('\n')
+    )
+    await writeDocument(
+      join(workspace, '.ai/entities/child.md'),
+      [
+        '---',
+        'description: 子实体',
+        'extends:',
+        '  - base-a',
+        '  - base-b',
+        '---',
+        '子实体提示。'
+      ].join('\n')
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      useDefaultVibeForgeMcpServer: false
+    })
+    const [data, options] = await resolvePromptAssetSelection({
+      bundle,
+      type: 'entity',
+      name: 'child'
+    })
+
+    expect(data.targetBody).toContain('父实体 A 提示。\n\n父实体 B 提示。\n\n子实体提示。')
+    expect(options.tools).toEqual({ include: ['Bash'] })
+  })
+
+  it('lets the current entity replace inherited rules', async () => {
+    const workspace = await createWorkspace()
+
+    await writeDocument(
+      join(workspace, '.ai/rules/base.md'),
+      '---\ndescription: 父规则\n---\n父规则正文'
+    )
+    await writeDocument(
+      join(workspace, '.ai/rules/child.md'),
+      '---\ndescription: 子规则\n---\n子规则正文'
+    )
+    await writeDocument(
+      join(workspace, '.ai/entities/base.md'),
+      [
+        '---',
+        'description: 父实体',
+        'rules:',
+        '  - base',
+        '---',
+        '父实体提示。'
+      ].join('\n')
+    )
+    await writeDocument(
+      join(workspace, '.ai/entities/child.md'),
+      [
+        '---',
+        'description: 子实体',
+        'extends: base',
+        'inherit:',
+        '  rules: replace',
+        'rules:',
+        '  - child',
+        '---',
+        '子实体提示。'
+      ].join('\n')
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      useDefaultVibeForgeMcpServer: false
+    })
+    const [, options] = await resolvePromptAssetSelection({
+      bundle,
+      type: 'entity',
+      name: 'child'
+    })
+
+    expect(options.systemPrompt).toContain('> 子规则正文')
+    expect(options.systemPrompt).toContain('> Use when: 父规则')
+    expect(options.systemPrompt).not.toContain('> 父规则正文')
+  })
+
+  it('rejects circular entity inheritance', async () => {
+    const workspace = await createWorkspace()
+
+    await writeDocument(
+      join(workspace, '.ai/entities/a.md'),
+      '---\ndescription: A\nextends: b\n---\nA'
+    )
+    await writeDocument(
+      join(workspace, '.ai/entities/b.md'),
+      '---\ndescription: B\nextends: a\n---\nB'
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      useDefaultVibeForgeMcpServer: false
+    })
+
+    await expect(resolvePromptAssetSelection({
+      bundle,
+      type: 'entity',
+      name: 'a'
+    })).rejects.toThrow('Circular entity inheritance detected: a -> b -> a')
+  })
+
   it('does not preload all skills when the target entity omits skill references', async () => {
     const workspace = await createWorkspace()
 

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

@@ -0,0 +1,175 @@
+/* eslint-disable import/first -- hoisted vitest mocks must be declared before importing the bundle entrypoint */
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
+import os from 'node:os'
+import path, { join } from 'node:path'
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = 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: mocks.findSkillsCli,
+    installSkillsCliRefToTemp: mocks.installSkillsCliRefToTemp,
+    installSkillsCliSkillToTemp: mocks.installSkillsCliSkillToTemp
+  }
+})
+
+import { buildAdapterAssetPlan, resolveWorkspaceAssetBundle } from '#~/index.js'
+
+import { createWorkspace, writeDocument } from './test-helpers'
+
+describe('skills CLI dependency resolution', () => {
+  let installWorkspace: string
+
+  beforeEach(async () => {
+    installWorkspace = await mkdtemp(path.join(os.tmpdir(), 'vf-skills-cli-dependency-'))
+    vi.clearAllMocks()
+  })
+
+  afterEach(async () => {
+    await rm(installWorkspace, { recursive: true, force: true })
+  })
+
+  it('installs missing bare-name dependencies through skills CLI by default', async () => {
+    const workspace = await createWorkspace()
+    const installedSkillDir = join(installWorkspace, '.agents', 'skills', 'frontend-design')
+    await mkdir(installedSkillDir, { recursive: true })
+    await writeFile(
+      join(installedSkillDir, 'SKILL.md'),
+      '---\nname: frontend-design\ndescription: UI design guidance\n---\nUse strong visual hierarchy.\n'
+    )
+
+    mocks.findSkillsCli.mockResolvedValue([
+      {
+        installRef: 'anthropics/skills@frontend-design',
+        source: 'anthropics/skills',
+        skill: 'frontend-design'
+      }
+    ])
+    mocks.installSkillsCliRefToTemp.mockResolvedValue({
+      tempDir: installWorkspace,
+      installedSkill: {
+        dirName: 'frontend-design',
+        name: 'frontend-design',
+        sourcePath: installedSkillDir
+      }
+    })
+
+    await writeDocument(
+      join(workspace, '.ai/skills/app-builder/SKILL.md'),
+      [
+        '---',
+        'name: app-builder',
+        'description: Build apps',
+        'dependencies:',
+        '  - frontend-design',
+        '---',
+        'Build the app.'
+      ].join('\n')
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [undefined, undefined],
+      useDefaultVibeForgeMcpServer: false
+    })
+
+    await buildAdapterAssetPlan({
+      adapter: 'opencode',
+      bundle,
+      options: {
+        skills: {
+          include: ['app-builder']
+        }
+      }
+    })
+
+    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/skills-cli/skills/latest/default/anthropics/skills/frontend-design/'
+    )
+    expect(mocks.findSkillsCli).toHaveBeenCalledWith({
+      config: undefined,
+      query: 'frontend-design'
+    })
+    expect(mocks.installSkillsCliRefToTemp).toHaveBeenCalledWith({
+      config: undefined,
+      installRef: 'anthropics/skills@frontend-design'
+    })
+  })
+
+  it('merges top-level skillsCli config ahead of legacy skills.cli aliases', async () => {
+    const workspace = await createWorkspace()
+    const installedSkillDir = join(installWorkspace, '.agents', 'skills', 'frontend-design')
+    await mkdir(installedSkillDir, { recursive: true })
+    await writeFile(
+      join(installedSkillDir, 'SKILL.md'),
+      '---\nname: frontend-design\ndescription: UI design guidance\n---\nUse internal design system.\n'
+    )
+
+    mocks.installSkillsCliSkillToTemp.mockResolvedValue({
+      tempDir: installWorkspace,
+      installedSkill: {
+        dirName: 'frontend-design',
+        name: 'frontend-design',
+        sourcePath: installedSkillDir
+      }
+    })
+
+    await writeDocument(
+      join(workspace, '.ai/skills/app-builder/SKILL.md'),
+      [
+        '---',
+        'name: app-builder',
+        'description: Build apps',
+        'dependencies:',
+        '  - example-source/default/public@frontend-design',
+        '---',
+        'Build the app.'
+      ].join('\n')
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [{
+        skills: {
+          cli: {
+            package: 'legacy-skills'
+          }
+        },
+        skillsCli: {
+          package: '@byted/skills',
+          registry: 'https://registry.example.com'
+        }
+      }, undefined],
+      useDefaultVibeForgeMcpServer: false
+    })
+
+    await buildAdapterAssetPlan({
+      adapter: 'opencode',
+      bundle,
+      options: {
+        skills: {
+          include: ['app-builder']
+        }
+      }
+    })
+
+    expect(mocks.installSkillsCliSkillToTemp).toHaveBeenCalledWith({
+      config: {
+        package: '@byted/skills',
+        registry: 'https://registry.example.com'
+      },
+      skill: 'frontend-design',
+      source: 'example-source/default/public'
+    })
+  })
+})

package/__tests__/snapshot.ts

@@ -169,6 +169,7 @@ const summarizeDiagnostics = (
       assetId: assetIdMap.get(diagnostic.assetId) ?? diagnostic.assetId,
       adapter: diagnostic.adapter,
       status: diagnostic.status,
+      source: diagnostic.source,
       reason: diagnostic.reason,
       scope: diagnostic.scope,
       packageId: diagnostic.packageId

package/__tests__/test-helpers.ts

@@ -5,10 +5,14 @@ import { dirname, join } from 'node:path'
 import { afterEach } from 'vitest'
 
 const tempDirs: string[] = []
+const originalRealHome = process.env.__VF_PROJECT_REAL_HOME__
 
 export const createWorkspace = async () => {
   const dir = await mkdtemp(join(tmpdir(), 'workspace-assets-'))
+  const realHome = await mkdtemp(join(tmpdir(), 'workspace-assets-home-'))
   tempDirs.push(dir)
+  tempDirs.push(realHome)
+  process.env.__VF_PROJECT_REAL_HOME__ = realHome
   return dir
 }
 
@@ -32,4 +36,9 @@ export const installPluginPackage = async (
 
 afterEach(async () => {
   await Promise.all(tempDirs.splice(0).map(dir => rm(dir, { recursive: true, force: true })))
+  if (originalRealHome == null) {
+    delete process.env.__VF_PROJECT_REAL_HOME__
+  } else {
+    process.env.__VF_PROJECT_REAL_HOME__ = originalRealHome
+  }
 })

package/__tests__/workspace-assets.snapshot.spec.ts

@@ -189,7 +189,7 @@ describe('workspace assets snapshots', () => {
     })
 
     const adapters = ['claude-code', 'codex', 'gemini', 'opencode'] as const
-    const plans = adapters.map(adapter => (
+    const plans = await Promise.all(adapters.map(adapter => (
       buildAdapterAssetPlan({
         adapter,
         bundle,
@@ -201,7 +201,7 @@ describe('workspace assets snapshots', () => {
           }
         }
       })
-    ))
+    )))
 
     await expect(serializeWorkspaceAssetsSnapshot({
       cwd: workspace,

package/package.json

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