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

package/src/adapter-asset-plan.ts

@@ -1,7 +1,8 @@
-import { basename, dirname } from 'node:path'
+import { dirname } from 'node:path'
 
 import type {
   AdapterAssetPlan,
+  AdapterOverlayEntry,
   AssetDiagnostic,
   WorkspaceAssetAdapter,
   WorkspaceAssetBundle,
@@ -9,25 +10,7 @@ import type {
   WorkspaceSkillSelection
 } from '@vibe-forge/types'
 
-import { filterSkillAssets } from './document-assets'
-import { isOpenCodeOverlayAsset } from './internal-types'
-
-const resolveMcpServerSelection = (
-  bundle: WorkspaceAssetBundle,
-  selection: WorkspaceMcpSelection | undefined
-) => {
-  const include = selection?.include ?? (
-    bundle.defaultIncludeMcpServers.length > 0 ? bundle.defaultIncludeMcpServers : undefined
-  )
-  const exclude = selection?.exclude ?? (
-    bundle.defaultExcludeMcpServers.length > 0 ? bundle.defaultExcludeMcpServers : undefined
-  )
-
-  return {
-    include,
-    exclude
-  }
-}
+import { resolveSelectedMcpNames, resolveSelectedSkillAssets } from './selection-internal'
 
 export function buildAdapterAssetPlan(params: {
   adapter: WorkspaceAssetAdapter
@@ -39,136 +22,134 @@ export function buildAdapterAssetPlan(params: {
   }
 }): AdapterAssetPlan {
   const diagnostics: AssetDiagnostic[] = []
-  const promptAssetIdSet = new Set(params.options.promptAssetIds ?? [])
-  const mcpSelection = resolveMcpServerSelection(params.bundle, params.options.mcpServers)
-  const selectedMcpServerNames = Object.keys(params.bundle.mcpServers).filter((name) => {
-    if (mcpSelection.include != null && !mcpSelection.include.includes(name)) return false
-    if (mcpSelection.exclude?.includes(name)) return false
-    return true
-  })
-  const mcpServers = Object.fromEntries(
-    selectedMcpServerNames.map((name) => [name, params.bundle.mcpServers[name].payload.config])
-  )
 
-  for (const assetId of promptAssetIdSet) {
+  for (const assetId of params.options.promptAssetIds ?? []) {
+    const asset = params.bundle.assets.find(item => item.id === assetId)
+    if (asset == null || asset.kind === 'mcpServer') continue
     diagnostics.push({
       assetId,
       adapter: params.adapter,
       status: 'prompt',
-      reason: 'Mapped into the generated system prompt.'
+      reason: 'Mapped into the generated system prompt.',
+      packageId: asset.packageId,
+      scope: asset.scope,
+      instancePath: asset.instancePath,
+      origin: asset.origin,
+      resolvedBy: asset.resolvedBy,
+      taskOverlaySource: asset.taskOverlaySource
     })
   }
 
-  for (const name of selectedMcpServerNames) {
+  const selectedMcpNames = resolveSelectedMcpNames(params.bundle, params.options.mcpServers)
+  const mcpServers = Object.fromEntries(
+    selectedMcpNames.map(name => [name, params.bundle.mcpServers[name].payload.config])
+  )
+
+  selectedMcpNames.forEach((name) => {
+    const asset = params.bundle.mcpServers[name]
     diagnostics.push({
-      assetId: params.bundle.mcpServers[name].id,
+      assetId: asset.id,
       adapter: params.adapter,
       status: params.adapter === 'claude-code' ? 'native' : 'translated',
       reason: params.adapter === 'claude-code'
-        ? 'Mapped into native MCP settings.'
-        : 'Translated into adapter-specific MCP configuration.'
+        ? 'Mapped into adapter MCP settings.'
+        : 'Translated into adapter-specific MCP configuration.',
+      packageId: asset.packageId,
+      scope: asset.scope,
+      instancePath: asset.instancePath,
+      origin: asset.origin,
+      resolvedBy: asset.resolvedBy,
+      taskOverlaySource: asset.taskOverlaySource
     })
-  }
+  })
 
-  for (const hookPlugin of params.bundle.hookPlugins) {
-    const nativeHookReason = params.adapter === 'claude-code'
-      ? 'Mapped into the isolated Claude Code native hooks bridge under .ai/.mock/.claude/settings.json.'
-      : params.adapter === 'codex'
-      ? 'Mapped into the isolated Codex native hooks bridge for SessionStart, UserPromptSubmit, PreToolUse, PostToolUse, and Stop.'
-      : 'Mapped into the isolated OpenCode native hook plugin bridge under .ai/.mock/.config/opencode/plugins.'
+  params.bundle.hookPlugins.forEach((asset) => {
     diagnostics.push({
-      assetId: hookPlugin.id,
+      assetId: asset.id,
       adapter: params.adapter,
       status: 'native',
-      reason: nativeHookReason
+      reason: params.adapter === 'claude-code'
+        ? 'Mapped into the Claude Code native hooks bridge.'
+        : params.adapter === 'codex'
+        ? 'Mapped into the Codex native hooks bridge.'
+        : 'Mapped into the OpenCode native hooks bridge.',
+      packageId: asset.packageId,
+      scope: asset.scope,
+      instancePath: asset.instancePath,
+      origin: asset.origin,
+      resolvedBy: asset.resolvedBy,
+      taskOverlaySource: asset.taskOverlaySource
     })
-  }
+  })
 
-  const overlays: AdapterAssetPlan['overlays'] = []
+  const selectedSkillAssets = resolveSelectedSkillAssets(params.bundle.skills, params.options.skills)
   if (params.adapter === 'opencode') {
-    const skillAssets = filterSkillAssets(params.bundle.skills, params.options.skills)
-    for (const skillAsset of skillAssets) {
-      overlays.push({
-        assetId: skillAsset.id,
-        kind: 'skill',
-        sourcePath: dirname(skillAsset.payload.definition.path),
-        targetPath: `skills/${basename(dirname(skillAsset.payload.definition.path))}`
-      })
+    selectedSkillAssets.forEach((asset) => {
       diagnostics.push({
-        assetId: skillAsset.id,
-        adapter: 'opencode',
-        status: 'native',
-        reason: 'Mirrored into OPENCODE_CONFIG_DIR as a native skill.'
-      })
-    }
-
-    for (const asset of params.bundle.assets) {
-      if (!isOpenCodeOverlayAsset(asset)) continue
-      if (!asset.targets.includes('opencode')) continue
-
-      overlays.push({
         assetId: asset.id,
-        kind: asset.kind,
-        sourcePath: asset.payload.sourcePath,
-        targetPath: asset.payload.targetSubpath
+        adapter: params.adapter,
+        status: 'native',
+        reason: 'Mirrored into OPENCODE_CONFIG_DIR as a native skill.',
+        packageId: asset.packageId,
+        scope: asset.scope,
+        instancePath: asset.instancePath,
+        origin: asset.origin,
+        resolvedBy: asset.resolvedBy,
+        taskOverlaySource: asset.taskOverlaySource
       })
+    })
+    params.bundle.opencodeOverlayAssets.forEach((asset) => {
       diagnostics.push({
         assetId: asset.id,
-        adapter: 'opencode',
+        adapter: params.adapter,
         status: 'native',
-        reason: 'Mirrored into OPENCODE_CONFIG_DIR as a native OpenCode asset.'
+        reason: 'Mirrored into OPENCODE_CONFIG_DIR as a native OpenCode asset.',
+        packageId: asset.packageId,
+        scope: asset.scope,
+        instancePath: asset.instancePath,
+        origin: asset.origin,
+        resolvedBy: asset.resolvedBy,
+        taskOverlaySource: asset.taskOverlaySource
       })
-    }
-  }
-
-  if (params.adapter !== 'claude-code') {
-    for (const asset of params.bundle.assets) {
-      if (asset.kind !== 'nativePlugin' || !asset.enabled || !asset.targets.includes('claude-code')) continue
+    })
+  } else if (params.adapter === 'codex') {
+    params.bundle.opencodeOverlayAssets.forEach((asset) => {
       diagnostics.push({
         assetId: asset.id,
         adapter: params.adapter,
         status: 'skipped',
-        reason: 'Claude marketplace plugin settings do not have a native mapping for this adapter.'
+        reason: 'No stable native Codex mapping exists for this asset kind in V1.',
+        packageId: asset.packageId,
+        scope: asset.scope,
+        instancePath: asset.instancePath,
+        origin: asset.origin,
+        resolvedBy: asset.resolvedBy,
+        taskOverlaySource: asset.taskOverlaySource
       })
-    }
+    })
   }
 
-  if (params.adapter === 'codex') {
-    for (const asset of params.bundle.assets) {
-      if (!['nativePlugin', 'agent', 'command', 'mode'].includes(asset.kind)) continue
-      if (asset.targets.includes('codex')) continue
-      if (asset.kind === 'nativePlugin' && asset.targets.includes('claude-code')) continue
-      diagnostics.push({
+  const overlays: AdapterOverlayEntry[] = params.adapter === 'opencode'
+    ? [
+      ...selectedSkillAssets.map((asset): AdapterOverlayEntry => ({
         assetId: asset.id,
-        adapter: 'codex',
-        status: 'skipped',
-        reason: 'No stable native Codex mapping exists for this asset kind in V1.'
-      })
-    }
-  }
+        kind: 'skill',
+        sourcePath: dirname(asset.sourcePath),
+        targetPath: `skills/${asset.displayName.replaceAll('/', '__')}`
+      })),
+      ...params.bundle.opencodeOverlayAssets.map((asset): AdapterOverlayEntry => ({
+        assetId: asset.id,
+        kind: asset.kind,
+        sourcePath: asset.sourcePath,
+        targetPath: asset.payload.targetSubpath
+      }))
+    ]
+    : []
 
   return {
     adapter: params.adapter,
     diagnostics,
     mcpServers,
-    overlays,
-    native: params.adapter === 'claude-code'
-      ? {
-        enabledPlugins: params.bundle.enabledPlugins,
-        extraKnownMarketplaces: params.bundle.extraKnownMarketplaces
-      }
-      : params.adapter === 'codex' && params.bundle.hookPlugins.length > 0
-      ? {
-        codexHooks: {
-          supportedEvents: [
-            'SessionStart',
-            'UserPromptSubmit',
-            'PreToolUse',
-            'PostToolUse',
-            'Stop'
-          ]
-        }
-      }
-      : {}
+    overlays
   }
 }