@vibe-forge/workspace-assets 0.9.2 → 0.10.0

package/__tests__/bundle.spec.ts

@@ -1,10 +1,11 @@
 import process from 'node:process'
+import { join } from 'node:path'
 
 import { describe, expect, it } from 'vitest'
 
 import { resolveWorkspaceAssetBundle } from '#~/index.js'
 
-import { createWorkspace, installPluginPackage } from './test-helpers'
+import { createWorkspace, installPluginPackage, writeDocument } from './test-helpers'
 
 describe('resolveWorkspaceAssetBundle', () => {
   it('loads npm plugin assets via the package-id fallback and exposes OpenCode overlays', async () => {
@@ -67,6 +68,58 @@ describe('resolveWorkspaceAssetBundle', () => {
     ]))
   })
 
+  it('auto-loads managed Claude plugins from .ai/plugins as directory plugins', async () => {
+    const workspace = await createWorkspace()
+
+    await writeDocument(
+      join(workspace, '.ai/plugins/demo/.vf-plugin.json'),
+      JSON.stringify(
+        {
+          version: 1,
+          adapter: 'claude',
+          name: 'demo',
+          scope: 'demo',
+          installedAt: new Date().toISOString(),
+          source: {
+            type: 'path',
+            path: './demo'
+          },
+          nativePluginPath: 'native',
+          vibeForgePluginPath: 'vibe-forge'
+        },
+        null,
+        2
+      )
+    )
+    await writeDocument(
+      join(workspace, '.ai/plugins/demo/vibe-forge/skills/research/SKILL.md'),
+      '---\ndescription: 检索资料\n---\n阅读 README.md'
+    )
+    await writeDocument(
+      join(workspace, '.ai/plugins/demo/vibe-forge/mcp/browser.json'),
+      JSON.stringify({ command: 'npx', args: ['browser-server'] }, null, 2)
+    )
+    await writeDocument(
+      join(workspace, '.ai/plugins/demo/vibe-forge/hooks.js'),
+      'module.exports = { name: "demo-managed" }\n'
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [undefined, undefined],
+      useDefaultVibeForgeMcpServer: false
+    })
+
+    expect(bundle.skills.map(asset => asset.displayName)).toContain('demo/research')
+    expect(Object.keys(bundle.mcpServers)).toContain('demo/browser')
+    expect(bundle.hookPlugins).toEqual(expect.arrayContaining([
+      expect.objectContaining({
+        scope: 'demo',
+        origin: 'plugin'
+      })
+    ]))
+  })
+
   it('adds the built-in Vibe Forge MCP server when enabled and omits it when disabled', async () => {
     const workspace = await createWorkspace()
 

package/__tests__/prompt-selection.spec.ts

@@ -389,4 +389,60 @@ describe('resolvePromptAssetSelection', () => {
     expect(options.systemPrompt).toContain('> Skill file path: .ai/skills/research/SKILL.md')
     expect(options.systemPrompt).not.toContain('先读 README.md')
   })
+
+  it('lets spec plugin overrides exclude managed plugins when mode is override', async () => {
+    const workspace = await createWorkspace()
+
+    await writeDocument(
+      join(workspace, '.ai/plugins/demo/.vf-plugin.json'),
+      JSON.stringify({
+        version: 1,
+        adapter: 'claude',
+        name: 'demo',
+        scope: 'demo',
+        installedAt: new Date().toISOString(),
+        source: {
+          type: 'path',
+          path: './demo'
+        },
+        nativePluginPath: 'native',
+        vibeForgePluginPath: 'vibe-forge'
+      }, null, 2)
+    )
+    await writeDocument(
+      join(workspace, '.ai/plugins/demo/vibe-forge/skills/research/SKILL.md'),
+      [
+        '---',
+        'description: 托管插件技能',
+        '---',
+        '先读插件文档'
+      ].join('\n')
+    )
+    await writeDocument(
+      join(workspace, '.ai/specs/isolated/index.md'),
+      [
+        '---',
+        'description: 隔离 spec',
+        'plugins:',
+        '  mode: override',
+        '  list: []',
+        '---',
+        '执行隔离流程'
+      ].join('\n')
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      useDefaultVibeForgeMcpServer: false
+    })
+    const [, options] = await resolvePromptAssetSelection({
+      bundle,
+      type: 'spec',
+      name: 'isolated'
+    })
+
+    expect(bundle.skills.map(asset => asset.displayName)).toContain('demo/research')
+    expect(options.assetBundle?.skills).toEqual([])
+    expect(options.systemPrompt).not.toContain('demo/research')
+  })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-forge/workspace-assets",
-  "version": "0.9.2",
+  "version": "0.10.0",
   "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": "^0.9.0",
-    "@vibe-forge/definition-core": "^0.9.0",
-    "@vibe-forge/utils": "^0.9.0",
-    "@vibe-forge/types": "^0.9.0"
+    "@vibe-forge/definition-core": "^0.10.0",
+    "@vibe-forge/config": "^0.10.0",
+    "@vibe-forge/types": "^0.10.0",
+    "@vibe-forge/utils": "^0.10.0"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.9"

package/src/bundle-internal.ts

@@ -10,11 +10,12 @@ import {
 } from '@vibe-forge/config'
 import type { Config, Definition, Entity, PluginConfig, WorkspaceAsset, WorkspaceAssetKind } from '@vibe-forge/types'
 import { resolveRelativePath } from '@vibe-forge/utils'
+import { listManagedPluginInstalls, toManagedPluginConfig } from '@vibe-forge/utils/managed-plugin'
 import {
   flattenPluginInstances,
   mergePluginConfigs,
   resolveConfiguredPluginInstances,
-  resolvePluginHooksEntryPath
+  resolvePluginHooksEntryPathForInstance
 } from '@vibe-forge/utils/plugin-resolver'
 import type { ResolvedPluginInstance } from '@vibe-forge/utils/plugin-resolver'
 import { glob } from 'fast-glob'
@@ -341,6 +342,7 @@ export async function collectWorkspaceAssets(params: {
   configs?: [Config?, Config?]
   plugins?: PluginConfig
   overlaySource?: string
+  includeManagedPlugins?: boolean
   useDefaultVibeForgeMcpServer?: boolean
 }): Promise<{
   assets: WorkspaceAsset[]
@@ -357,7 +359,13 @@ export async function collectWorkspaceAssets(params: {
   specs: Array<Extract<WorkspaceAsset, { kind: 'spec' }>>
 }> {
   const [config, userConfig] = params.configs ?? await loadWorkspaceConfig(params.cwd)
-  const pluginConfigs = params.plugins ?? mergePluginConfigs(config?.plugins, userConfig?.plugins)
+  const managedPluginConfigs = params.includeManagedPlugins === false
+    ? undefined
+    : toManagedPluginConfig(await listManagedPluginInstalls(params.cwd))
+  const pluginConfigs = mergePluginConfigs(
+    params.plugins ?? mergePluginConfigs(config?.plugins, userConfig?.plugins),
+    managedPluginConfigs
+  )
   const pluginInstances = await resolveConfiguredPluginInstances({
     cwd: params.cwd,
     plugins: pluginConfigs,
@@ -493,9 +501,7 @@ export async function collectWorkspaceAssets(params: {
   }
 
   const hookPlugins = flattenedPluginInstances
-    .filter(instance =>
-      instance.packageId != null && resolvePluginHooksEntryPath(params.cwd, instance.packageId) != null
-    )
+    .filter(instance => resolvePluginHooksEntryPathForInstance(params.cwd, instance) != null)
     .map(instance => createHookPluginAsset(instance))
   assets.push(...hookPlugins)
 

package/src/bundle.ts

@@ -7,6 +7,7 @@ export async function resolveWorkspaceAssetBundle(params: {
   configs?: [Config?, Config?]
   plugins?: PluginConfig
   overlaySource?: string
+  includeManagedPlugins?: boolean
   useDefaultVibeForgeMcpServer?: boolean
 }): Promise<WorkspaceAssetBundle> {
   const collected = await collectWorkspaceAssets(params)

package/src/prompt-selection.ts

@@ -69,7 +69,8 @@ export async function resolvePromptAssetSelection(params: {
       effectiveBundle = await resolveWorkspaceAssetBundle({
         cwd: params.bundle.cwd,
         plugins: resolvePluginOverlay(params.bundle.pluginConfigs, pluginOverlay),
-        overlaySource: `${params.type}:${baseTarget.displayName}`
+        overlaySource: `${params.type}:${baseTarget.displayName}`,
+        includeManagedPlugins: pluginOverlay.mode !== 'override'
       })
     }
 

package/src/selection-internal.ts

@@ -219,11 +219,7 @@ export const resolveSelectedMcpNames = (
   const includeRefs = selection?.include ??
     (bundle.defaultIncludeMcpServers.length > 0 ? bundle.defaultIncludeMcpServers : undefined)
   const excludeRefs = selection?.exclude ??
-    (
-      selection?.include == null && bundle.defaultExcludeMcpServers.length > 0
-        ? bundle.defaultExcludeMcpServers
-        : undefined
-    )
+    (bundle.defaultExcludeMcpServers.length > 0 ? bundle.defaultExcludeMcpServers : undefined)
 
   const resolveRefs = (refs: string[] | undefined) => {
     if (refs == null || refs.length === 0) return undefined

package/__tests__/selection-internal.spec.ts

@@ -1,42 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import type { WorkspaceAssetBundle } from '@vibe-forge/types'
-
-import { resolveSelectedMcpNames } from '#~/selection-internal.js'
-
-const createBundle = (): WorkspaceAssetBundle => ({
-  cwd: '/tmp/workspace',
-  pluginConfigs: [],
-  pluginInstances: [],
-  assets: [],
-  rules: [],
-  specs: [],
-  entities: [],
-  skills: [],
-  hookPlugins: [],
-  opencodeOverlayAssets: [],
-  defaultIncludeMcpServers: [],
-  defaultExcludeMcpServers: ['TypeScriptLanguageService'],
-  mcpServers: {
-    TypeScriptLanguageService: {
-      kind: 'mcpServer',
-      id: 'mcp:TypeScriptLanguageService',
-      scope: 'workspace',
-      name: 'TypeScriptLanguageService',
-      displayName: 'TypeScriptLanguageService',
-      source: '/tmp/workspace/.ai.config.json',
-      command: 'node',
-      args: ['tslspmcp']
-    }
-  }
-})
-
-describe('resolveSelectedMcpNames', () => {
-  it('lets an explicit include override default excludes', () => {
-    const selected = resolveSelectedMcpNames(createBundle(), {
-      include: ['TypeScriptLanguageService']
-    })
-
-    expect(selected).toEqual(['TypeScriptLanguageService'])
-  })
-})