@vibe-forge/workspace-assets 0.11.1 → 1.0.0

package/__tests__/__snapshots__/workspace-assets-rich.snapshot.json

@@ -696,6 +696,126 @@
         }
       ]
     },
+    "gemini": {
+      "adapter": "gemini",
+      "mcpServers": {
+        "docs": {
+          "args": [
+            "docs-server"
+          ],
+          "command": "npx"
+        }
+      },
+      "overlays": [],
+      "diagnostics": [
+        {
+          "assetId": "agent:plugin:1:demo/release-helper:<workspace>/node_modules/@vibe-forge/plugin-demo/opencode/agents/release-helper.md",
+          "adapter": "gemini",
+          "status": "skipped",
+          "reason": "No stable native Gemini mapping exists for this asset kind in V1.",
+          "scope": "demo",
+          "packageId": "@vibe-forge/plugin-demo"
+        },
+        {
+          "assetId": "command:plugin:1:demo/review:<workspace>/node_modules/@vibe-forge/plugin-demo/opencode/commands/review.md",
+          "adapter": "gemini",
+          "status": "skipped",
+          "reason": "No stable native Gemini mapping exists for this asset kind in V1.",
+          "scope": "demo",
+          "packageId": "@vibe-forge/plugin-demo"
+        },
+        {
+          "assetId": "entity:workspace:workspace:architect:<workspace>/.ai/entities/architect/README.md",
+          "adapter": "gemini",
+          "status": "prompt",
+          "reason": "Mapped into the generated system prompt."
+        },
+        {
+          "assetId": "hookPlugin:plugin:0:logger:<workspace>/node_modules/@vibe-forge/plugin-logger",
+          "adapter": "gemini",
+          "status": "native",
+          "reason": "Mapped into the Gemini native hooks bridge.",
+          "packageId": "@vibe-forge/plugin-logger"
+        },
+        {
+          "assetId": "hookPlugin:plugin:1:demo/demo:<workspace>/node_modules/@vibe-forge/plugin-demo",
+          "adapter": "gemini",
+          "status": "native",
+          "reason": "Mapped into the Gemini native hooks bridge.",
+          "scope": "demo",
+          "packageId": "@vibe-forge/plugin-demo"
+        },
+        {
+          "assetId": "hookPlugin:plugin:2:telemetry:<workspace>/node_modules/@vibe-forge/plugin-telemetry",
+          "adapter": "gemini",
+          "status": "native",
+          "reason": "Mapped into the Gemini native hooks bridge.",
+          "packageId": "@vibe-forge/plugin-telemetry"
+        },
+        {
+          "assetId": "mcpServer:workspace:workspace:docs:<workspace>/.ai.config.json",
+          "adapter": "gemini",
+          "status": "translated",
+          "reason": "Translated into adapter-specific MCP configuration."
+        },
+        {
+          "assetId": "mode:plugin:1:demo/strict:<workspace>/node_modules/@vibe-forge/plugin-demo/opencode/modes/strict.md",
+          "adapter": "gemini",
+          "status": "skipped",
+          "reason": "No stable native Gemini mapping exists for this asset kind in V1.",
+          "scope": "demo",
+          "packageId": "@vibe-forge/plugin-demo"
+        },
+        {
+          "assetId": "nativePlugin:plugin:1:demo/demo-plugin:<workspace>/node_modules/@vibe-forge/plugin-demo/opencode/plugins/demo-plugin.js",
+          "adapter": "gemini",
+          "status": "skipped",
+          "reason": "No stable native Gemini mapping exists for this asset kind in V1.",
+          "scope": "demo",
+          "packageId": "@vibe-forge/plugin-demo"
+        },
+        {
+          "assetId": "rule:plugin:1:demo/security:<workspace>/node_modules/@vibe-forge/plugin-demo/rules/security.md",
+          "adapter": "gemini",
+          "status": "prompt",
+          "reason": "Mapped into the generated system prompt.",
+          "scope": "demo",
+          "packageId": "@vibe-forge/plugin-demo"
+        },
+        {
+          "assetId": "rule:workspace:workspace:review:<workspace>/.ai/rules/review.md",
+          "adapter": "gemini",
+          "status": "prompt",
+          "reason": "Mapped into the generated system prompt."
+        },
+        {
+          "assetId": "skill:workspace:workspace:research:<workspace>/.ai/skills/research/SKILL.md",
+          "adapter": "gemini",
+          "status": "native",
+          "reason": "Symlinked into GEMINI_CLI_HOME as a native Gemini skill."
+        },
+        {
+          "assetId": "skill:workspace:workspace:research:<workspace>/.ai/skills/research/SKILL.md",
+          "adapter": "gemini",
+          "status": "prompt",
+          "reason": "Mapped into the generated system prompt."
+        },
+        {
+          "assetId": "spec:plugin:1:demo/release:<workspace>/node_modules/@vibe-forge/plugin-demo/specs/release/index.md",
+          "adapter": "gemini",
+          "status": "prompt",
+          "reason": "Mapped into the generated system prompt.",
+          "scope": "demo",
+          "packageId": "@vibe-forge/plugin-demo"
+        },
+        {
+          "assetId": "spec:workspace:workspace:release:<workspace>/.ai/specs/release/index.md",
+          "adapter": "gemini",
+          "status": "prompt",
+          "reason": "Mapped into the generated system prompt."
+        }
+      ]
+    },
     "opencode": {
       "adapter": "opencode",
       "mcpServers": {

package/__tests__/adapter-asset-plan.spec.ts

@@ -179,4 +179,240 @@ describe('buildAdapterAssetPlan', () => {
       })
     ]))
   })
+
+  it('builds copilot native skill overlays and translated runtime diagnostics', async () => {
+    const workspace = await createWorkspace()
+
+    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-demo', {
+      'package.json': JSON.stringify(
+        {
+          name: '@vibe-forge/plugin-demo',
+          version: '1.0.0'
+        },
+        null,
+        2
+      ),
+      'opencode/commands/review.md': '# review\n'
+    })
+    await writeDocument(
+      join(workspace, '.ai/skills/research/SKILL.md'),
+      '---\ndescription: 检索资料\n---\n阅读 README.md'
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [{
+        plugins: [
+          { id: 'logger' },
+          { id: 'demo', scope: 'demo' }
+        ],
+        mcpServers: {
+          docs: {
+            command: 'npx',
+            args: ['docs-server']
+          }
+        }
+      }, undefined],
+      useDefaultVibeForgeMcpServer: false
+    })
+    const researchSkillId = bundle.skills.find(asset => asset.name === 'research')?.id
+    const loggerHookPluginId = bundle.hookPlugins.find(asset => asset.packageId === '@vibe-forge/plugin-logger')?.id
+    const demoCommandId = bundle.opencodeOverlayAssets.find(asset => asset.kind === 'command')?.id
+    const docsMcpId = bundle.mcpServers.docs?.id
+    expect(researchSkillId).toBeDefined()
+    expect(loggerHookPluginId).toBeDefined()
+    expect(demoCommandId).toBeDefined()
+    expect(docsMcpId).toBeDefined()
+
+    const [, resolvedOptions] = await resolvePromptAssetSelection({
+      bundle,
+      type: undefined,
+      name: undefined,
+      adapter: 'copilot',
+      input: {
+        skills: {
+          include: ['research']
+        }
+      }
+    })
+    const plan = buildAdapterAssetPlan({
+      adapter: 'copilot',
+      bundle,
+      options: {
+        promptAssetIds: resolvedOptions.promptAssetIds,
+        mcpServers: resolvedOptions.mcpServers,
+        skills: {
+          include: ['research']
+        }
+      }
+    })
+
+    expect(plan.mcpServers).toHaveProperty('docs')
+    expect(plan.overlays).toEqual([
+      expect.objectContaining({
+        assetId: researchSkillId,
+        kind: 'skill',
+        targetPath: 'skills/research'
+      })
+    ])
+    expect(plan.diagnostics).toEqual(expect.arrayContaining([
+      expect.objectContaining({
+        assetId: researchSkillId,
+        adapter: 'copilot',
+        status: 'native'
+      }),
+      expect.objectContaining({
+        assetId: loggerHookPluginId,
+        adapter: 'copilot',
+        status: 'translated'
+      }),
+      expect.objectContaining({
+        assetId: docsMcpId,
+        adapter: 'copilot',
+        status: 'translated'
+      }),
+      expect.objectContaining({
+        assetId: demoCommandId,
+        adapter: 'copilot',
+        status: 'skipped'
+      })
+    ]))
+    expect(plan.diagnostics).not.toEqual(expect.arrayContaining([
+      expect.objectContaining({
+        assetId: researchSkillId,
+        adapter: 'copilot',
+        status: 'prompt'
+      })
+    ]))
+  })
+
+  it('builds kimi overlays for native skills and native hooks', async () => {
+    const workspace = await createWorkspace()
+
+    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-demo', {
+      'package.json': JSON.stringify(
+        {
+          name: '@vibe-forge/plugin-demo',
+          version: '1.0.0'
+        },
+        null,
+        2
+      ),
+      'opencode/commands/review.md': '# review\n'
+    })
+    await writeDocument(
+      join(workspace, '.ai/skills/research/SKILL.md'),
+      '---\ndescription: 检索资料\n---\n阅读 README.md'
+    )
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [{
+        plugins: [
+          { id: 'logger' },
+          { id: 'demo', scope: 'demo' }
+        ],
+        mcpServers: {
+          docs: {
+            command: 'npx',
+            args: ['docs-server']
+          }
+        }
+      }, undefined],
+      useDefaultVibeForgeMcpServer: false
+    })
+    const loggerHookPluginId = bundle.hookPlugins.find(asset => asset.packageId === '@vibe-forge/plugin-logger')?.id
+    const demoCommandId = bundle.opencodeOverlayAssets.find(asset => asset.kind === 'command')?.id
+
+    const plan = buildAdapterAssetPlan({
+      adapter: 'kimi',
+      bundle,
+      options: {
+        skills: {
+          include: ['research']
+        }
+      }
+    })
+
+    expect(plan.overlays).toEqual(expect.arrayContaining([
+      expect.objectContaining({
+        kind: 'skill',
+        targetPath: 'research'
+      })
+    ]))
+    expect(plan.diagnostics).toEqual(expect.arrayContaining([
+      expect.objectContaining({
+        adapter: 'kimi',
+        assetId: loggerHookPluginId,
+        status: 'native'
+      }),
+      expect.objectContaining({
+        adapter: 'kimi',
+        assetId: demoCommandId,
+        status: 'skipped'
+      })
+    ]))
+  })
+
+  it('marks Gemini hook plugins as native bridge assets', async () => {
+    const workspace = await createWorkspace()
+
+    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'
+    })
+
+    const bundle = await resolveWorkspaceAssetBundle({
+      cwd: workspace,
+      configs: [{
+        plugins: [{ id: 'logger' }]
+      }, undefined],
+      useDefaultVibeForgeMcpServer: false
+    })
+    const loggerHookPluginId = bundle.hookPlugins.find(asset => asset.packageId === '@vibe-forge/plugin-logger')?.id
+
+    const plan = buildAdapterAssetPlan({
+      adapter: 'gemini',
+      bundle,
+      options: {}
+    })
+
+    expect(plan.diagnostics).toEqual(expect.arrayContaining([
+      expect.objectContaining({
+        adapter: 'gemini',
+        assetId: loggerHookPluginId,
+        status: 'native',
+        reason: 'Mapped into the Gemini native hooks bridge.'
+      })
+    ]))
+  })
 })

package/__tests__/adapter-capabilities.spec.ts

@@ -0,0 +1,14 @@
+import { describe, expect, it } from 'vitest'
+
+import { resolveNativeSkillDiagnosticReason, supportsNativeProjectSkills } from '#~/adapter-capabilities.js'
+
+describe('adapter native skill capabilities', () => {
+  it('treats gemini as a native skill adapter', () => {
+    expect(supportsNativeProjectSkills('gemini')).toBe(true)
+    expect(resolveNativeSkillDiagnosticReason('gemini')).toContain('Gemini')
+  })
+
+  it('does not treat codex as a native skill adapter', () => {
+    expect(supportsNativeProjectSkills('codex')).toBe(false)
+  })
+})

package/__tests__/bundle.spec.ts

@@ -68,6 +68,63 @@ describe('resolveWorkspaceAssetBundle', () => {
     ]))
   })
 
+  it('loads workspace assets from the env-configured ai base dir', async () => {
+    const workspace = await createWorkspace()
+    const previousBaseDir = process.env.__VF_PROJECT_AI_BASE_DIR__
+
+    try {
+      process.env.__VF_PROJECT_AI_BASE_DIR__ = '.vf'
+      await writeDocument(join(workspace, '.vf/rules/review.md'), '---\ndescription: 评审规则\n---\n必须检查风险')
+      await writeDocument(
+        join(workspace, '.vf/skills/research/SKILL.md'),
+        '---\ndescription: 检索资料\n---\n阅读 README.md'
+      )
+
+      const bundle = await resolveWorkspaceAssetBundle({
+        cwd: workspace,
+        configs: [undefined, undefined],
+        useDefaultVibeForgeMcpServer: false
+      })
+
+      expect(bundle.rules.map(asset => asset.displayName)).toEqual(['review'])
+      expect(bundle.skills.map(asset => asset.displayName)).toEqual(['research'])
+    } finally {
+      if (previousBaseDir == null) {
+        delete process.env.__VF_PROJECT_AI_BASE_DIR__
+      } else {
+        process.env.__VF_PROJECT_AI_BASE_DIR__ = previousBaseDir
+      }
+    }
+  })
+
+  it('loads workspace entities from the env-configured entities dir', async () => {
+    const workspace = await createWorkspace()
+    const previousEntitiesDir = process.env.__VF_PROJECT_AI_ENTITIES_DIR__
+
+    try {
+      process.env.__VF_PROJECT_AI_ENTITIES_DIR__ = 'agents'
+      await writeDocument(
+        join(workspace, '.ai/agents/reviewer/README.md'),
+        '---\ndescription: 负责代码评审\n---\n检查风险'
+      )
+
+      const bundle = await resolveWorkspaceAssetBundle({
+        cwd: workspace,
+        configs: [undefined, undefined],
+        useDefaultVibeForgeMcpServer: false
+      })
+
+      expect(bundle.entities.map(asset => asset.displayName)).toEqual(['reviewer'])
+      expect(bundle.entities[0]?.sourcePath).toContain('/.ai/agents/reviewer/README.md')
+    } finally {
+      if (previousEntitiesDir == null) {
+        delete process.env.__VF_PROJECT_AI_ENTITIES_DIR__
+      } else {
+        process.env.__VF_PROJECT_AI_ENTITIES_DIR__ = previousEntitiesDir
+      }
+    }
+  })
+
   it('auto-loads managed Claude plugins from .ai/plugins as directory plugins', async () => {
     const workspace = await createWorkspace()
 

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

@@ -188,7 +188,7 @@ describe('workspace assets snapshots', () => {
       }
     })
 
-    const adapters = ['claude-code', 'codex', 'opencode'] as const
+    const adapters = ['claude-code', 'codex', 'gemini', 'opencode'] as const
     const plans = adapters.map(adapter => (
       buildAdapterAssetPlan({
         adapter,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-forge/workspace-assets",
-  "version": "0.11.1",
+  "version": "1.0.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.11.1",
-    "@vibe-forge/definition-core": "^0.11.0",
-    "@vibe-forge/types": "^0.11.2",
-    "@vibe-forge/utils": "^0.11.1"
+    "@vibe-forge/config": "^1.0.0",
+    "@vibe-forge/definition-core": "^1.0.0",
+    "@vibe-forge/types": "^1.0.0",
+    "@vibe-forge/utils": "^1.0.0"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.9"

package/src/adapter-asset-plan.ts

@@ -68,11 +68,17 @@ export function buildAdapterAssetPlan(params: {
     diagnostics.push({
       assetId: asset.id,
       adapter: params.adapter,
-      status: 'native',
+      status: params.adapter === 'copilot' ? 'translated' : 'native',
       reason: params.adapter === 'claude-code'
         ? 'Mapped into the Claude Code native hooks bridge.'
         : params.adapter === 'codex'
         ? 'Mapped into the Codex native hooks bridge.'
+        : params.adapter === 'gemini'
+        ? 'Mapped into the Gemini native hooks bridge.'
+        : params.adapter === 'copilot'
+        ? 'Handled by the Vibe Forge task hook bridge.'
+        : params.adapter === 'kimi'
+        ? 'Mapped into the Kimi native hooks bridge.'
         : 'Mapped into the OpenCode native hooks bridge.',
       packageId: asset.packageId,
       scope: asset.scope,
@@ -115,13 +121,32 @@ export function buildAdapterAssetPlan(params: {
         taskOverlaySource: asset.taskOverlaySource
       })
     })
-  } else if (params.adapter === 'codex') {
+  } else if (params.adapter === 'codex' || params.adapter === 'copilot' || params.adapter === 'kimi') {
     params.bundle.opencodeOverlayAssets.forEach((asset) => {
       diagnostics.push({
         assetId: asset.id,
         adapter: params.adapter,
         status: 'skipped',
-        reason: 'No stable native Codex mapping exists for this asset kind in V1.',
+        reason: params.adapter === 'codex'
+          ? 'No stable native Codex mapping exists for this asset kind in V1.'
+          : params.adapter === 'copilot'
+          ? 'No stable native Copilot mapping exists for this asset kind in V1.'
+          : 'No stable native Kimi 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
+      })
+    })
+  } else if (params.adapter === 'gemini') {
+    params.bundle.opencodeOverlayAssets.forEach((asset) => {
+      diagnostics.push({
+        assetId: asset.id,
+        adapter: params.adapter,
+        status: 'skipped',
+        reason: 'No stable native Gemini mapping exists for this asset kind in V1.',
         packageId: asset.packageId,
         scope: asset.scope,
         instancePath: asset.instancePath,
@@ -132,14 +157,15 @@ export function buildAdapterAssetPlan(params: {
     })
   }
 
+  const selectedSkillOverlays = selectedSkillAssets.map((asset): AdapterOverlayEntry => ({
+    assetId: asset.id,
+    kind: 'skill',
+    sourcePath: dirname(asset.sourcePath),
+    targetPath: `skills/${asset.displayName.replaceAll('/', '__')}`
+  }))
   const overlays: AdapterOverlayEntry[] = params.adapter === 'opencode'
     ? [
-      ...selectedSkillAssets.map((asset): AdapterOverlayEntry => ({
-        assetId: asset.id,
-        kind: 'skill',
-        sourcePath: dirname(asset.sourcePath),
-        targetPath: `skills/${asset.displayName.replaceAll('/', '__')}`
-      })),
+      ...selectedSkillOverlays,
       ...params.bundle.opencodeOverlayAssets.map((asset): AdapterOverlayEntry => ({
         assetId: asset.id,
         kind: asset.kind,
@@ -147,6 +173,15 @@ export function buildAdapterAssetPlan(params: {
         targetPath: asset.payload.targetSubpath
       }))
     ]
+    : params.adapter === 'copilot'
+    ? selectedSkillOverlays
+    : params.adapter === 'kimi'
+    ? selectedSkillAssets.map((asset): AdapterOverlayEntry => ({
+      assetId: asset.id,
+      kind: 'skill',
+      sourcePath: dirname(asset.sourcePath),
+      targetPath: asset.displayName.replaceAll('/', '__')
+    }))
     : []
 
   return {

package/src/adapter-capabilities.ts

@@ -1,6 +1,6 @@
 import type { WorkspaceAssetAdapter } from '@vibe-forge/types'
 
-const NATIVE_SKILL_ADAPTERS = new Set<WorkspaceAssetAdapter>(['claude-code', 'opencode'])
+const NATIVE_SKILL_ADAPTERS = new Set<WorkspaceAssetAdapter>(['claude-code', 'copilot', 'gemini', 'kimi', 'opencode'])
 
 export const supportsNativeProjectSkills = (adapter?: string): adapter is WorkspaceAssetAdapter =>
   adapter != null && NATIVE_SKILL_ADAPTERS.has(adapter as WorkspaceAssetAdapter)
@@ -8,5 +8,11 @@ export const supportsNativeProjectSkills = (adapter?: string): adapter is Worksp
 export const resolveNativeSkillDiagnosticReason = (adapter: WorkspaceAssetAdapter) => (
   adapter === 'claude-code'
     ? 'Synced into the Claude mock home as a native skill.'
+    : adapter === 'copilot'
+    ? 'Staged for Copilot CLI native skill discovery.'
+    : adapter === 'gemini'
+    ? 'Symlinked into GEMINI_CLI_HOME as a native Gemini skill.'
+    : adapter === 'kimi'
+    ? 'Staged into a Kimi --skills-dir directory as a native skill.'
     : 'Mirrored into OPENCODE_CONFIG_DIR as a native skill.'
 )

package/src/bundle-internal.ts

@@ -9,7 +9,7 @@ import {
   resolveDefaultVibeForgeMcpServerConfig
 } from '@vibe-forge/config'
 import type { Config, Definition, Entity, PluginConfig, WorkspaceAsset, WorkspaceAssetKind } from '@vibe-forge/types'
-import { resolveRelativePath } from '@vibe-forge/utils'
+import { resolveProjectAiBaseDir, resolveProjectAiEntitiesDir, resolveRelativePath } from '@vibe-forge/utils'
 import { listManagedPluginInstalls, toManagedPluginConfig } from '@vibe-forge/utils/managed-plugin'
 import {
   flattenPluginInstances,
@@ -217,13 +217,15 @@ const createOpenCodeOverlayAsset = <TKind extends OpenCodeOverlayKind>(params: {
 } as OpenCodeOverlayAsset<TKind>)
 
 const scanWorkspaceDocuments = async (cwd: string) => {
+  const aiBaseDir = resolveProjectAiBaseDir(cwd, process.env)
+  const entitiesDir = resolveProjectAiEntitiesDir(cwd, process.env)
   const [rulePaths, skillPaths, specPaths, entityDocPaths, entityJsonPaths, mcpPaths] = await Promise.all([
-    glob(['.ai/rules/*.md'], { cwd, absolute: true }),
-    glob(['.ai/skills/*/SKILL.md'], { cwd, absolute: true }),
-    glob(['.ai/specs/*.md', '.ai/specs/*/index.md'], { cwd, absolute: true }),
-    glob(['.ai/entities/*.md', '.ai/entities/*/README.md'], { cwd, absolute: true }),
-    glob(['.ai/entities/*/index.json'], { cwd, absolute: true }),
-    glob(['.ai/mcp/*.json', '.ai/mcp/*.yaml', '.ai/mcp/*.yml'], { cwd, absolute: true })
+    glob(['rules/*.md'], { cwd: aiBaseDir, absolute: true }),
+    glob(['skills/*/SKILL.md'], { cwd: aiBaseDir, absolute: true }),
+    glob(['specs/*.md', 'specs/*/index.md'], { cwd: aiBaseDir, absolute: true }),
+    glob(['*.md', '*/README.md'], { cwd: entitiesDir, absolute: true }),
+    glob(['*/index.json'], { cwd: entitiesDir, absolute: true }),
+    glob(['mcp/*.json', 'mcp/*.yaml', 'mcp/*.yml'], { cwd: aiBaseDir, absolute: true })
   ])
 
   return {
@@ -441,7 +443,7 @@ export async function collectWorkspaceAssets(params: {
         name: DEFAULT_VIBE_FORGE_MCP_SERVER_NAME,
         config: defaultVibeForgeMcpServer,
         origin: 'workspace',
-        sourcePath: resolve(params.cwd, '.ai')
+        sourcePath: resolveProjectAiBaseDir(params.cwd, process.env)
       }))
     }
   }

package/src/internal-types.ts

@@ -1,3 +1,5 @@
 import type { WorkspaceAsset } from '@vibe-forge/types'
 
-export const isOpenCodeOverlayAsset = (asset: WorkspaceAsset) => asset.kind === 'nativePlugin'
+export const isOpenCodeOverlayAsset = (
+  asset: WorkspaceAsset
+): asset is Extract<WorkspaceAsset, { kind: 'nativePlugin' }> => asset.kind === 'nativePlugin'

package/src/selection-internal.ts

@@ -139,7 +139,10 @@ export const resolveRuleSelection = async (
   bundle: WorkspaceAssetBundle,
   refs: RuleReference[] | string[] | undefined,
   currentInstancePath?: string
-) => {
+): Promise<{
+  assets: Array<Extract<WorkspaceAsset, { kind: 'rule' }>>
+  remoteDefinitions: Definition<Rule>[]
+}> => {
   const assets: Array<Extract<WorkspaceAsset, { kind: 'rule' }>> = []
   const remoteDefinitions: Definition<Rule>[] = []
   const seen = new Set<string>()
@@ -199,7 +202,7 @@ export const resolveExcludedSkillRefs = (selection: string[] | SkillSelection |
 export const resolveSelectedSkillAssets = (
   assets: Array<Extract<WorkspaceAsset, { kind: 'skill' }>>,
   selection?: WorkspaceSkillSelection
-) => {
+): Array<Extract<WorkspaceAsset, { kind: 'skill' }>> => {
   if (selection == null) return assets
 
   const included = selection.include != null && selection.include.length > 0