@vibe-forge/workspace-assets 0.9.1-alpha.0 → 0.9.2-alpha.0

package/__tests__/snapshot.ts

@@ -1,5 +1,6 @@
 import process from 'node:process'
 
+import { resolveDocumentName, resolveSpecIdentifier } from '@vibe-forge/definition-core'
 import type {
   AdapterAssetPlan,
   AssetDiagnostic,
@@ -14,27 +15,17 @@ import type {
   WorkspaceAssetBundle,
   WorkspaceAssetKind
 } from '@vibe-forge/types'
-import { resolveDocumentName, resolveSpecIdentifier } from '@vibe-forge/utils'
-
-import { isOpenCodeOverlayAsset } from '#~/internal-types.js'
 
 const sortStrings = (values: string[]) => [...values].sort((left, right) => left.localeCompare(right))
 
-const isConfigNativePluginAsset = (
-  asset: Extract<WorkspaceAsset, { kind: 'nativePlugin' }>
-): asset is Extract<WorkspaceAsset, { kind: 'nativePlugin' }> & {
-  payload: {
-    name: string
-    enabled: boolean
-  }
-} => !isOpenCodeOverlayAsset(asset)
-
 const sanitizeValue = (
   value: string,
   cwd: string
 ) => (
   value
+    .replaceAll(`/private${cwd}`, '<workspace>')
     .replaceAll(cwd, '<workspace>')
+    .replaceAll(`/private${process.execPath}`, '<node-path>')
     .replaceAll(process.execPath, '<node-path>')
 )
 
@@ -99,104 +90,75 @@ const summarizeDefinition = (
   body: definition.body.trim()
 })
 
-const summarizeDocumentAsset = (
-  asset: Extract<WorkspaceAsset, { kind: 'rule' | 'spec' | 'entity' | 'skill' }>,
+const buildSnapshotAssetId = (
+  asset: WorkspaceAsset,
   cwd: string
+) => (
+  `${asset.kind}:${asset.origin}:${asset.instancePath ?? 'workspace'}:${asset.displayName}:${
+    sanitizeValue(asset.sourcePath, cwd)
+  }`
+)
+
+const summarizeBaseAsset = (
+  asset: WorkspaceAsset,
+  cwd: string,
+  assetIdMap?: Map<string, string>
 ) => ({
-  id: asset.id,
+  id: assetIdMap?.get(asset.id) ?? buildSnapshotAssetId(asset, cwd),
   kind: asset.kind,
+  name: asset.name,
+  displayName: asset.displayName,
   origin: asset.origin,
   scope: asset.scope,
-  pluginId: asset.pluginId,
-  enabled: asset.enabled,
-  targets: sortStrings(asset.targets),
+  sourcePath: sanitizeValue(asset.sourcePath, cwd),
+  instancePath: asset.instancePath,
+  packageId: asset.packageId,
+  resolvedBy: asset.resolvedBy,
+  taskOverlaySource: asset.taskOverlaySource
+})
+
+const summarizeDocumentAsset = (
+  asset: Extract<WorkspaceAsset, { kind: 'rule' | 'spec' | 'entity' | 'skill' }>,
+  cwd: string,
+  assetIdMap?: Map<string, string>
+) => ({
+  ...summarizeBaseAsset(asset, cwd, assetIdMap),
   definition: summarizeDefinition(asset.kind, asset.payload.definition, cwd)
 })
 
 const summarizeMcpServer = (
   asset: Extract<WorkspaceAsset, { kind: 'mcpServer' }>,
-  cwd: string
+  cwd: string,
+  assetIdMap?: Map<string, string>
 ) => ({
-  id: asset.id,
-  origin: asset.origin,
-  scope: asset.scope,
-  pluginId: asset.pluginId,
-  enabled: asset.enabled,
-  targets: sortStrings(asset.targets),
-  name: asset.payload.name,
+  ...summarizeBaseAsset(asset, cwd, assetIdMap),
   config: normalizeValue(asset.payload.config, cwd)
 })
 
 const summarizeHookPlugin = (
   asset: Extract<WorkspaceAsset, { kind: 'hookPlugin' }>,
-  cwd: string
+  cwd: string,
+  assetIdMap?: Map<string, string>
 ) => ({
-  id: asset.id,
-  origin: asset.origin,
-  scope: asset.scope,
-  pluginId: asset.pluginId,
-  enabled: asset.enabled,
-  targets: sortStrings(asset.targets),
+  ...summarizeBaseAsset(asset, cwd, assetIdMap),
   packageName: asset.payload.packageName,
   config: normalizeValue(asset.payload.config, cwd)
 })
 
-const summarizeNativePlugin = (
-  asset: Extract<WorkspaceAsset, { kind: 'nativePlugin' }>,
-  cwd: string
-) => {
-  if (isOpenCodeOverlayAsset(asset)) {
-    return {
-      id: asset.id,
-      kind: asset.kind,
-      origin: asset.origin,
-      scope: asset.scope,
-      pluginId: asset.pluginId,
-      enabled: asset.enabled,
-      targets: sortStrings(asset.targets),
-      entryName: asset.payload.entryName,
-      sourcePath: sanitizeValue(asset.payload.sourcePath, cwd),
-      targetSubpath: asset.payload.targetSubpath
-    }
-  }
-
-  return {
-    id: asset.id,
-    kind: asset.kind,
-    origin: asset.origin,
-    scope: asset.scope,
-    pluginId: asset.pluginId,
-    enabled: asset.enabled,
-    targets: sortStrings(asset.targets),
-    name: isConfigNativePluginAsset(asset) ? asset.payload.name : undefined
-  }
-}
-
-const summarizeOverlayAsset = (
-  asset:
-    | Extract<WorkspaceAsset, { kind: 'agent' | 'command' | 'mode' }>
-    | Extract<WorkspaceAsset, { kind: 'nativePlugin' }>,
-  cwd: string
-) => {
-  if (!isOpenCodeOverlayAsset(asset)) {
-    return summarizeNativePlugin(asset, cwd)
-  }
-
-  return {
-    id: asset.id,
-    kind: asset.kind,
-    origin: asset.origin,
-    scope: asset.scope,
-    pluginId: asset.pluginId,
-    enabled: asset.enabled,
-    targets: sortStrings(asset.targets),
-    entryName: asset.payload.entryName,
-    sourcePath: sanitizeValue(asset.payload.sourcePath, cwd),
-    targetSubpath: asset.payload.targetSubpath
-  }
-}
+const summarizeOpenCodeOverlayAsset = (
+  asset: Extract<WorkspaceAsset, { kind: 'agent' | 'command' | 'mode' | 'nativePlugin' }>,
+  cwd: string,
+  assetIdMap?: Map<string, string>
+) => ({
+  ...summarizeBaseAsset(asset, cwd, assetIdMap),
+  entryName: asset.payload.entryName,
+  targetSubpath: asset.payload.targetSubpath
+})
 
-const summarizeDiagnostics = (diagnostics: AssetDiagnostic[]) => (
+const summarizeDiagnostics = (
+  diagnostics: AssetDiagnostic[],
+  assetIdMap: Map<string, string>
+) => (
   [...diagnostics]
     .sort((left, right) => {
       const assetIdDiff = left.assetId.localeCompare(right.assetId)
@@ -204,29 +166,31 @@ const summarizeDiagnostics = (diagnostics: AssetDiagnostic[]) => (
       return left.status.localeCompare(right.status)
     })
     .map(diagnostic => ({
-      assetId: diagnostic.assetId,
+      assetId: assetIdMap.get(diagnostic.assetId) ?? diagnostic.assetId,
       adapter: diagnostic.adapter,
       status: diagnostic.status,
-      reason: diagnostic.reason
+      reason: diagnostic.reason,
+      scope: diagnostic.scope,
+      packageId: diagnostic.packageId
     }))
 )
 
 const summarizePlan = (
   plan: AdapterAssetPlan,
-  cwd: string
+  cwd: string,
+  assetIdMap: Map<string, string>
 ) => ({
   adapter: plan.adapter,
   mcpServers: normalizeValue(plan.mcpServers, cwd),
   overlays: [...plan.overlays]
     .sort((left, right) => left.assetId.localeCompare(right.assetId))
     .map(entry => ({
-      assetId: entry.assetId,
+      assetId: assetIdMap.get(entry.assetId) ?? entry.assetId,
       kind: entry.kind,
       sourcePath: sanitizeValue(entry.sourcePath, cwd),
       targetPath: entry.targetPath
     })),
-  native: normalizeValue(plan.native, cwd),
-  diagnostics: summarizeDiagnostics(plan.diagnostics)
+  diagnostics: summarizeDiagnostics(plan.diagnostics, assetIdMap)
 })
 
 const summarizeSelection = (
@@ -237,7 +201,8 @@ const summarizeSelection = (
     mcpServers?: Filter
     promptAssetIds?: string[]
   },
-  cwd: string
+  cwd: string,
+  assetIdMap: Map<string, string>
 ) => ({
   resolution: {
     rules: resolution.rules.map(rule => summarizeDefinition('rule', rule, cwd)),
@@ -246,13 +211,15 @@ const summarizeSelection = (
     skills: resolution.skills.map(skill => summarizeDefinition('skill', skill, cwd)),
     specs: resolution.specs.map(spec => summarizeDefinition('spec', spec, cwd)),
     targetBody: resolution.targetBody.trim(),
-    promptAssetIds: sortStrings(resolution.promptAssetIds)
+    promptAssetIds: sortStrings(resolution.promptAssetIds.map(assetId => assetIdMap.get(assetId) ?? assetId))
   },
   options: {
     systemPrompt: options.systemPrompt?.trim(),
     tools: sortFilter(options.tools),
     mcpServers: sortFilter(options.mcpServers),
-    promptAssetIds: options.promptAssetIds == null ? undefined : sortStrings(options.promptAssetIds)
+    promptAssetIds: options.promptAssetIds == null
+      ? undefined
+      : sortStrings(options.promptAssetIds.map(assetId => assetIdMap.get(assetId) ?? assetId))
   }
 })
 
@@ -271,56 +238,39 @@ export const serializeWorkspaceAssetsSnapshot = (params: {
   plans: AdapterAssetPlan[]
 }) => {
   const { bundle, cwd } = params
-  const overlayAssets = bundle.assets.filter((
-    asset
-  ): asset is
-    | Extract<WorkspaceAsset, { kind: 'agent' | 'command' | 'mode' }>
-    | Extract<WorkspaceAsset, { kind: 'nativePlugin' }> => (
-      asset.kind === 'agent' ||
-      asset.kind === 'command' ||
-      asset.kind === 'mode' ||
-      (asset.kind === 'nativePlugin' && isOpenCodeOverlayAsset(asset))
-    )
-  )
-  const claudeNativePlugins = bundle.assets.filter((
-    asset
-  ): asset is Extract<WorkspaceAsset, { kind: 'nativePlugin' }> => (
-    asset.kind === 'nativePlugin' && !isOpenCodeOverlayAsset(asset)
-  ))
+  const assetIdMap = new Map(bundle.assets.map(asset => [asset.id, buildSnapshotAssetId(asset, cwd)]))
 
   const snapshot = {
     bundle: {
       cwd: '<workspace>',
-      enabledPlugins: normalizeValue(bundle.enabledPlugins, cwd),
-      extraKnownMarketplaces: normalizeValue(bundle.extraKnownMarketplaces, cwd),
+      pluginConfigs: normalizeValue(bundle.pluginConfigs, cwd),
+      pluginInstances: normalizeValue(bundle.pluginInstances, cwd),
       defaultIncludeMcpServers: sortStrings(bundle.defaultIncludeMcpServers),
       defaultExcludeMcpServers: sortStrings(bundle.defaultExcludeMcpServers),
-      rules: bundle.rules.map(rule => summarizeDocumentAsset(rule, cwd)),
-      specs: bundle.specs.map(spec => summarizeDocumentAsset(spec, cwd)),
-      entities: bundle.entities.map(entity => summarizeDocumentAsset(entity, cwd)),
-      skills: bundle.skills.map(skill => summarizeDocumentAsset(skill, cwd)),
+      rules: bundle.rules.map(rule => summarizeDocumentAsset(rule, cwd, assetIdMap)),
+      specs: bundle.specs.map(spec => summarizeDocumentAsset(spec, cwd, assetIdMap)),
+      entities: bundle.entities.map(entity => summarizeDocumentAsset(entity, cwd, assetIdMap)),
+      skills: bundle.skills.map(skill => summarizeDocumentAsset(skill, cwd, assetIdMap)),
       mcpServers: Object.values(bundle.mcpServers)
         .sort((left, right) => left.payload.name.localeCompare(right.payload.name))
-        .map(server => summarizeMcpServer(server, cwd)),
+        .map(server => summarizeMcpServer(server, cwd, assetIdMap)),
       hookPlugins: bundle.hookPlugins
         .sort((left, right) => left.id.localeCompare(right.id))
-        .map(plugin => summarizeHookPlugin(plugin, cwd)),
-      claudeNativePlugins: claudeNativePlugins
-        .sort((left, right) => left.id.localeCompare(right.id))
-        .map(asset => summarizeNativePlugin(asset, cwd)),
-      opencodeOverlayAssets: overlayAssets
+        .map(plugin => summarizeHookPlugin(plugin, cwd, assetIdMap)),
+      opencodeOverlayAssets: bundle.opencodeOverlayAssets
         .sort((left, right) => left.id.localeCompare(right.id))
-        .map(asset => summarizeOverlayAsset(asset, cwd))
+        .map(asset => summarizeOpenCodeOverlayAsset(asset, cwd, assetIdMap))
     },
     selection: summarizeSelection(
       params.selection.resolution,
       params.selection.options,
-      cwd
+      cwd,
+      assetIdMap
     ),
     plans: Object.fromEntries(
       [...params.plans]
         .sort((left, right) => left.adapter.localeCompare(right.adapter))
-        .map(plan => [plan.adapter, summarizePlan(plan, cwd)])
+        .map(plan => [plan.adapter, summarizePlan(plan, cwd, assetIdMap)])
     )
   }
 

package/__tests__/test-helpers.ts

@@ -17,6 +17,19 @@ export const writeDocument = async (filePath: string, content: string) => {
   await writeFile(filePath, content)
 }
 
+export const installPluginPackage = async (
+  workspace: string,
+  packageName: string,
+  files: Record<string, string>
+) => {
+  const packageDir = join(workspace, 'node_modules', ...packageName.split('/'))
+  await Promise.all(
+    Object.entries(files).map(async ([relativePath, content]) => {
+      await writeDocument(join(packageDir, relativePath), content)
+    })
+  )
+}
+
 afterEach(async () => {
   await Promise.all(tempDirs.splice(0).map(dir => rm(dir, { recursive: true, force: true })))
 })

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

@@ -8,7 +8,7 @@ import type { Config } from '@vibe-forge/types'
 import { buildAdapterAssetPlan, resolvePromptAssetSelection, resolveWorkspaceAssetBundle } from '#~/index.js'
 
 import { serializeWorkspaceAssetsSnapshot } from './snapshot'
-import { createWorkspace, writeDocument } from './test-helpers'
+import { createWorkspace, installPluginPackage, writeDocument } from './test-helpers'
 
 const resolveSnapshotPath = (name: string) => (
   fileURLToPath(new URL(`./__snapshots__/${name}.snapshot.json`, import.meta.url))
@@ -19,43 +19,33 @@ describe('workspace assets snapshots', () => {
     const workspace = await createWorkspace()
 
     const projectConfig: Config = {
-      plugins: {
-        logger: {
-          level: 'info'
+      plugins: [
+        {
+          id: 'logger'
+        },
+        {
+          id: 'demo',
+          scope: 'demo'
         }
-      },
-      enabledPlugins: {
-        logger: true,
-        demo: true,
-        legacy: false,
-        telemetry: true
-      },
+      ],
       mcpServers: {
         docs: {
           command: 'npx',
           args: ['docs-server']
         }
       },
-      defaultIncludeMcpServers: ['docs', 'browser'],
-      extraKnownMarketplaces: {
-        internal: {
-          source: {
-            source: 'git',
-            url: 'https://plugins.internal.example.com'
-          }
-        }
-      }
+      defaultIncludeMcpServers: ['docs', 'demo/browser']
     }
 
     const userConfig: Config = {
-      plugins: {
-        telemetry: {
-          mode: 'summary'
+      plugins: [
+        {
+          id: 'telemetry',
+          options: {
+            mode: 'summary'
+          }
         }
-      },
-      enabledPlugins: {
-        telemetry: true
-      },
+      ],
       mcpServers: {
         notes: {
           command: 'node',
@@ -65,33 +55,79 @@ describe('workspace assets snapshots', () => {
       defaultExcludeMcpServers: ['notes']
     }
 
-    await writeDocument(
-      join(workspace, '.ai/rules/review.md'),
-      [
+    await installPluginPackage(workspace, '@vibe-forge/plugin-demo', {
+      'package.json': JSON.stringify(
+        {
+          name: '@vibe-forge/plugin-demo',
+          version: '1.0.0'
+        },
+        null,
+        2
+      ),
+      'hooks.js': 'module.exports = {}\n',
+      'rules/security.md': [
         '---',
-        'description: 项目评审规则',
-        'always: true',
+        'description: 插件安全规则',
         '---',
-        '必须检查发布改动的回归风险。'
-      ].join('\n')
-    )
-    await writeDocument(
-      join(workspace, '.ai/plugins/demo/rules/review.md'),
-      [
+        '上线前要检查权限与密钥暴露。'
+      ].join('\n'),
+      'specs/release/index.md': [
         '---',
-        'description: 插件评审规则',
-        'always: true',
+        'description: 插件发布流程',
         '---',
-        '这是插件内的 review 规则，不应覆盖项目规则。'
-      ].join('\n')
-    )
+        '插件 release 不应直接替代项目 release。'
+      ].join('\n'),
+      'skills/audit/SKILL.md': [
+        '---',
+        'description: 审计输出',
+        '---',
+        '检查最终输出是否覆盖风险项。'
+      ].join('\n'),
+      'mcp/browser.json': JSON.stringify(
+        {
+          name: 'browser',
+          command: 'npx',
+          args: ['browser-mcp']
+        },
+        null,
+        2
+      ),
+      'opencode/agents/release-helper.md': '# release-helper\n',
+      'opencode/commands/review.md': '# review\n',
+      'opencode/modes/strict.md': '# strict\n',
+      'opencode/plugins/demo-plugin.js': 'export default {}\n'
+    })
+    await installPluginPackage(workspace, '@vibe-forge/plugin-logger', {
+      'package.json': JSON.stringify(
+        {
+          name: '@vibe-forge/plugin-logger',
+          version: '1.0.0'
+        },
+        null,
+        2
+      ),
+      'hooks.js': 'module.exports = {}\n'
+    })
+    await installPluginPackage(workspace, '@vibe-forge/plugin-telemetry', {
+      'package.json': JSON.stringify(
+        {
+          name: '@vibe-forge/plugin-telemetry',
+          version: '1.0.0'
+        },
+        null,
+        2
+      ),
+      'hooks.js': 'module.exports = {}\n'
+    })
+
     await writeDocument(
-      join(workspace, '.ai/plugins/demo/rules/security.md'),
+      join(workspace, '.ai/rules/review.md'),
       [
         '---',
-        'description: 插件安全规则',
+        'description: 项目评审规则',
+        'always: true',
         '---',
-        '上线前要检查权限与密钥暴露。'
+        '必须检查发布改动的回归风险。'
       ].join('\n')
     )
     await writeDocument(
@@ -106,9 +142,9 @@ describe('workspace assets snapshots', () => {
         'mcpServers:',
         '  include:',
         '    - docs',
-        '    - browser',
+        '    - demo/browser',
         '  exclude:',
-        '    - browser',
+        '    - demo/browser',
         'tools:',
         '  include:',
         '    - Read',
@@ -117,15 +153,6 @@ describe('workspace assets snapshots', () => {
         '执行正式发布，并整理变更摘要。'
       ].join('\n')
     )
-    await writeDocument(
-      join(workspace, '.ai/plugins/demo/specs/release/index.md'),
-      [
-        '---',
-        'description: 插件发布流程',
-        '---',
-        '插件 release 不应覆盖项目 release。'
-      ].join('\n')
-    )
     await writeDocument(
       join(workspace, '.ai/entities/architect/README.md'),
       [
@@ -144,52 +171,6 @@ describe('workspace assets snapshots', () => {
         '先阅读 README.md，再补充结论。'
       ].join('\n')
     )
-    await writeDocument(
-      join(workspace, '.ai/plugins/demo/skills/research/SKILL.md'),
-      [
-        '---',
-        'description: 插件 research',
-        '---',
-        '插件 research 不应覆盖项目 skill。'
-      ].join('\n')
-    )
-    await writeDocument(
-      join(workspace, '.ai/plugins/demo/skills/audit/SKILL.md'),
-      [
-        '---',
-        'description: 审计输出',
-        '---',
-        '检查最终输出是否覆盖风险项。'
-      ].join('\n')
-    )
-    await writeDocument(
-      join(workspace, '.ai/plugins/demo/mcp/browser.json'),
-      JSON.stringify(
-        {
-          name: 'browser',
-          command: 'npx',
-          args: ['browser-mcp']
-        },
-        null,
-        2
-      )
-    )
-    await writeDocument(
-      join(workspace, '.ai/plugins/demo/opencode/plugins/demo-plugin.js'),
-      'export default {};\n'
-    )
-    await writeDocument(
-      join(workspace, '.ai/plugins/demo/opencode/agents/release-helper.md'),
-      '# release-helper\n'
-    )
-    await writeDocument(
-      join(workspace, '.ai/plugins/demo/opencode/commands/review.md'),
-      '# review\n'
-    )
-    await writeDocument(
-      join(workspace, '.ai/plugins/demo/opencode/modes/strict.md'),
-      '# strict\n'
-    )
 
     const bundle = await resolveWorkspaceAssetBundle({
       cwd: workspace,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-forge/workspace-assets",
-  "version": "0.9.1-alpha.0",
+  "version": "0.9.2-alpha.0",
   "description": "Workspace asset resolution and adapter asset planning for Vibe Forge",
   "imports": {
     "#~/*.js": {
@@ -25,18 +25,19 @@
     },
     "./package.json": "./package.json"
   },
-  "scripts": {
-    "test": "pnpm -C ../.. exec vitest run --workspace vitest.workspace.ts --project bundler packages/workspace-assets/__tests__"
-  },
   "dependencies": {
-    "@vibe-forge/config": "workspace:^",
-    "@vibe-forge/definition-loader": "workspace:^",
-    "@vibe-forge/types": "workspace:^",
-    "@vibe-forge/utils": "workspace:^",
     "fast-glob": "^3.3.3",
-    "js-yaml": "^4.1.1"
+    "front-matter": "^4.0.2",
+    "js-yaml": "^4.1.1",
+    "@vibe-forge/utils": "^0.9.0",
+    "@vibe-forge/definition-core": "^0.9.0",
+    "@vibe-forge/types": "^0.9.0",
+    "@vibe-forge/config": "^0.9.1-alpha.0"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.9"
+  },
+  "scripts": {
+    "test": "pnpm -C ../.. exec vitest run --workspace vitest.workspace.ts --project bundler packages/workspace-assets/__tests__"
   }
-}
+}