@vibe-forge/workspace-assets 3.2.2-alpha.3 → 3.3.0-rc.0

package/__tests__/bundle.spec.ts

@@ -22,7 +22,7 @@ vi.mock('@vibe-forge/utils/skills-cli', async () => {
   }
 })
 
-import { buildAdapterAssetPlan, resolveWorkspaceAssetBundle } from '#~/index.js'
+import { resolveWorkspaceAssetBundle } from '#~/index.js'
 
 import { createWorkspace, installPluginPackage, writeDocument } from './test-helpers'
 
@@ -93,6 +93,47 @@ describe('resolveWorkspaceAssetBundle', () => {
     ]))
   })
 
+  it('skips invalid plugin MCP files and keeps resolving other plugin assets', async () => {
+    const workspace = await createWorkspace()
+    const invalidMcpPath = join(
+      workspace,
+      'node_modules/@vibe-forge/plugin-demo/mcp/broken.yaml'
+    )
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+
+    try {
+      await installPluginPackage(workspace, '@vibe-forge/plugin-demo', {
+        'package.json': JSON.stringify(
+          {
+            name: '@vibe-forge/plugin-demo',
+            version: '1.0.0'
+          },
+          null,
+          2
+        ),
+        'mcp/browser.json': JSON.stringify({ command: 'npx', args: ['browser-server'] }, null, 2),
+        'mcp/broken.yaml': 'command: npx\nargs: [broken\n'
+      })
+
+      const bundle = await resolveWorkspaceAssetBundle({
+        cwd: workspace,
+        configs: [{
+          plugins: [
+            { id: 'demo', scope: 'demo' }
+          ]
+        }, undefined],
+        useDefaultVibeForgeMcpServer: false
+      })
+
+      expect(Object.keys(bundle.mcpServers)).toEqual(['demo/browser'])
+      expect(warnSpy.mock.calls.map(([message]) => String(message))).toEqual(expect.arrayContaining([
+        expect.stringContaining(`Ignoring invalid mcpServer asset "${invalidMcpPath}"`)
+      ]))
+    } finally {
+      warnSpy.mockRestore()
+    }
+  })
+
   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__
@@ -187,6 +228,40 @@ describe('resolveWorkspaceAssetBundle', () => {
     }))
   })
 
+  it('skips invalid home-bridged skill frontmatter and keeps resolving other skills', async () => {
+    const workspace = await createWorkspace()
+    const realHome = process.env.__VF_PROJECT_REAL_HOME__
+    const invalidSkillPath = join(realHome!, '.agents/skills/broken/SKILL.md')
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+
+    try {
+      await writeDocument(
+        invalidSkillPath,
+        '---\ndescription: Use minimal writing principles: understand the reader\n---\nBroken skill body'
+      )
+      await writeDocument(
+        join(realHome!, '.agents/skills/research/SKILL.md'),
+        '---\ndescription: Valid skill\n---\nValid skill body'
+      )
+
+      const bundle = await resolveWorkspaceAssetBundle({
+        cwd: workspace,
+        configs: [undefined, undefined],
+        useDefaultVibeForgeMcpServer: false
+      })
+
+      expect(bundle.skills.map(asset => asset.displayName)).toEqual(['research'])
+      expect(warnSpy.mock.calls.map(([message]) => String(message))).toEqual(expect.arrayContaining([
+        expect.stringContaining(`Ignoring invalid skill asset "${invalidSkillPath}"`)
+      ]))
+      expect(warnSpy.mock.calls.map(([message]) => String(message))).toEqual(expect.arrayContaining([
+        expect.stringContaining('quote plain strings containing ": "')
+      ]))
+    } finally {
+      warnSpy.mockRestore()
+    }
+  })
+
   it('can disable the home skill bridge entirely', async () => {
     const workspace = await createWorkspace()
     const realHome = process.env.__VF_PROJECT_REAL_HOME__

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-forge/workspace-assets",
-  "version": "3.2.2-alpha.3",
+  "version": "3.3.0-rc.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": "3.2.3-alpha.3",
-    "@vibe-forge/types": "3.2.3-alpha.1",
-    "@vibe-forge/definition-core": "3.2.0",
-    "@vibe-forge/utils": "3.2.3-alpha.3"
+    "@vibe-forge/config": "3.3.0-rc.0",
+    "@vibe-forge/utils": "3.3.0-rc.0",
+    "@vibe-forge/types": "3.3.0-rc.0",
+    "@vibe-forge/definition-core": "3.3.0-rc.0"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.9"

package/src/bundle-internal.ts

@@ -159,6 +159,20 @@ const warnInvalidHomeSkillRoot = (root: string) => {
   )
 }
 
+const formatErrorMessage = (error: unknown) => (
+  (error instanceof Error ? error.message : String(error))
+    .split(/\r?\n/u)[0]
+    ?.trim() ?? 'Unknown error'
+)
+
+const warnInvalidWorkspaceAsset = (kind: WorkspaceAssetKind, path: string, error: unknown) => {
+  console.warn(
+    `[vibe-forge] Ignoring invalid ${kind} asset "${path}". ` +
+      `${formatErrorMessage(error)}. ` +
+      'Check the asset frontmatter or structured config syntax; quote plain strings containing ": ".'
+  )
+}
+
 const resolveHomeBridgeConfig = (configs: [Config?, Config?]) => {
   const [config, userConfig] = configs
   const projectHomeBridge = resolveSkillsHomeBridge(config)
@@ -221,6 +235,19 @@ const parseFrontmatterDocument = async <TDefinition extends object>(
   }
 }
 
+const parseOptionalDocument = async <TDefinition extends object>(
+  kind: DocumentAssetKind,
+  path: string,
+  parser: (path: string) => Promise<Definition<TDefinition>>
+) => {
+  try {
+    return await parser(path)
+  } catch (error) {
+    warnInvalidWorkspaceAsset(kind, path, error)
+    return undefined
+  }
+}
+
 const parseEntityMarkdownDocument = async (path: string): Promise<Definition<Entity>> => {
   const definition = await parseFrontmatterDocument<Entity>(path)
 
@@ -256,6 +283,15 @@ const parseStructuredMcpFile = async (path: string) => {
     : JSON.parse(raw)
 }
 
+const parseOptionalStructuredMcpFile = async (path: string) => {
+  try {
+    return await parseStructuredMcpFile(path)
+  } catch (error) {
+    warnInvalidWorkspaceAsset('mcpServer', path, error)
+    return undefined
+  }
+}
+
 const createDocumentAsset = <
   TKind extends DocumentAssetKind,
   TDefinition extends { path: string; attributes: { name?: string } },
@@ -659,10 +695,12 @@ export async function collectWorkspaceAssets(params: {
     resolvedBy?: string
   ) => {
     const definitions = await Promise.all(paths.map(path => (
-      parser != null ? parser(path) : parseFrontmatterDocument(path)
+      parseOptionalDocument(kind, path, parser != null ? parser : parseFrontmatterDocument)
     )))
-    const createdAssets = definitions.map(definition =>
-      createDocumentAsset({
+    const createdAssets = definitions.flatMap((definition) => {
+      if (definition == null) return []
+
+      return [createDocumentAsset({
         cwd: params.cwd,
         kind,
         definition,
@@ -670,8 +708,8 @@ export async function collectWorkspaceAssets(params: {
         scope: instance?.scope,
         instance,
         resolvedBy
-      })
-    )
+      })]
+    })
 
     if (kind === 'skill') {
       skillAssets.push(...createdAssets as SkillAsset[])
@@ -770,7 +808,7 @@ export async function collectWorkspaceAssets(params: {
     const instance = flattenedPluginInstances[index]
     const scan = pluginScans[index]
     for (const path of scan.mcpPaths) {
-      const parsed = await parseStructuredMcpFile(path)
+      const parsed = await parseOptionalStructuredMcpFile(path)
       if (!isRecord(parsed)) continue
       const fileName = basename(path, extname(path))
       const name = typeof parsed.name === 'string' && parsed.name.trim() !== ''

package/src/configured-skills.ts

@@ -1,3 +1,4 @@
+/* eslint-disable max-lines -- configured skill resolution keeps matching, warnings, and CLI sync policy together. */
 import { access } from 'node:fs/promises'
 import { isAbsolute, join, resolve as resolvePath } from 'node:path'
 import process from 'node:process'