opencode-onboard 0.4.8 → 0.4.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-onboard",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "description": "Prepare any brownfield codebase for AI agent workflows using OpenCode, OpenSpec, and ensemble orchestration.",
   "keywords": [
     "opencode",
@@ -30,6 +30,7 @@
     "chalk": "^5.0.0",
     "execa": "^9.6.1",
     "fs-extra": "^11.0.0",
+    "jsonc-parser": "^3.3.1",
     "ora": "^8.0.0"
   },
   "devDependencies": {

package/src/steps/optimization/codegraph.js

@@ -1,32 +1,35 @@
 import { execa } from 'execa'
 import fse from 'fs-extra'
 import path from 'node:path'
+import { parse as parseJsonc } from 'jsonc-parser'
 import { header, success, warn, error, loading } from '../../utils/exec.js'
 
 /**
  * After codegraph install, it may create an `opencode.jsonc` at the project root.
  * This project uses `.opencode/opencode.json` instead. Merge any MCP config from
  * the rogue file into the correct location and remove it.
+ * Returns true if config was successfully merged (or no rogue file existed), false on parse failure.
  */
 export async function fixCodegraphConfig() {
   const cwd = process.cwd()
   const rogueFile = path.join(cwd, 'opencode.jsonc')
   const correctFile = path.join(cwd, '.opencode', 'opencode.json')
 
-  if (!await fse.pathExists(rogueFile)) return
+  if (!await fse.pathExists(rogueFile)) return true
 
   let rogueContent
   try {
     const raw = await fse.readFile(rogueFile, 'utf-8')
-    // Strip JSONC comments (single-line // and block /* */) before parsing
-    const stripped = raw
-      .replace(/\/\/.*$/gm, '')
-      .replace(/\/\*[\s\S]*?\*\//g, '')
-    rogueContent = JSON.parse(stripped)
+    const errors = []
+    rogueContent = parseJsonc(raw, errors)
+    if (errors.length > 0) throw new Error(`parse errors: ${errors.length}`)
+    if (!rogueContent || typeof rogueContent !== 'object' || Array.isArray(rogueContent)) {
+      throw new Error('unexpected structure')
+    }
   } catch {
     warn('Could not parse opencode.jsonc, removing it')
     await fse.remove(rogueFile)
-    return
+    return false
   }
 
   let correctContent = {}
@@ -34,20 +37,21 @@ export async function fixCodegraphConfig() {
     try {
       correctContent = await fse.readJson(correctFile)
     } catch {
-      correctContent = {}
+      // ignore invalid existing config
     }
   }
 
-  // Merge mcpServers from rogue into correct config
-  if (rogueContent.mcpServers || rogueContent.mcp) {
-    const mcpServers = rogueContent.mcpServers || rogueContent.mcp
-    correctContent.mcpServers = { ...(correctContent.mcpServers || {}), ...mcpServers }
+  const rogueMcp = rogueContent.mcpServers || rogueContent.mcp
+  if (rogueMcp) {
+    correctContent.mcp = { ...(correctContent.mcp || {}), ...rogueMcp }
   }
 
   await fse.ensureDir(path.dirname(correctFile))
   await fse.writeJson(correctFile, correctContent, { spaces: 2 })
   await fse.remove(rogueFile)
   warn('Migrated codegraph config from opencode.jsonc → .opencode/opencode.json (removed opencode.jsonc)')
+
+  return true
 }
 
 export async function installCodegraph(options = {}) {
@@ -73,7 +77,13 @@ export async function installCodegraph(options = {}) {
       return { optedIn: true, installed: false }
     }
 
-    await fixCodegraphConfig()
+    const configFixed = await fixCodegraphConfig()
+
+    if (!configFixed) {
+      warn('codegraph config could not be merged — skipping init')
+      return { optedIn: true, installed: false }
+    }
+
     success(`codegraph configured for opencode (${location})`)
   } catch (err) {
     error(`Failed to install codegraph: ${err.message}`)
@@ -83,7 +93,7 @@ export async function installCodegraph(options = {}) {
   loading('initializing codegraph project index...')
 
   try {
-    const initResult = await execa('codegraph', ['init'], {
+    const initResult = await execa('npx', ['codegraph', 'init'], {
       cwd: process.cwd(),
       reject: false,
       stdio: 'pipe',

package/src/steps/optimization/codegraph.test.js

@@ -29,13 +29,13 @@ describe('fixCodegraphConfig()', () => {
     vi.restoreAllMocks()
   })
 
-  it('does nothing when opencode.jsonc does not exist', async () => {
-    await fixCodegraphConfig()
-    // No error, no file created
+  it('returns true when opencode.jsonc does not exist', async () => {
+    const result = await fixCodegraphConfig()
+    expect(result).toBe(true)
     expect(fs.existsSync(path.join(tmpDir, '.opencode', 'opencode.json'))).toBe(false)
   })
 
-  it('merges mcpServers from opencode.jsonc into .opencode/opencode.json', async () => {
+  it('merges mcpServers from opencode.jsonc into .opencode/opencode.json as mcp', async () => {
     const rogueContent = {
       mcpServers: {
         codegraph: { command: 'codegraph', args: ['mcp'] }
@@ -50,12 +50,31 @@ describe('fixCodegraphConfig()', () => {
       "plugin": ["opencode-plugin-openspec@latest"]
     }))
 
-    await fixCodegraphConfig()
+    const result = await fixCodegraphConfig()
 
+    expect(result).toBe(true)
     expect(fs.existsSync(path.join(tmpDir, 'opencode.jsonc'))).toBe(false)
-    const result = await fse.readJson(path.join(opencodeDir, 'opencode.json'))
-    expect(result.mcpServers.codegraph).toEqual({ command: 'codegraph', args: ['mcp'] })
-    expect(result.plugin).toEqual(["opencode-plugin-openspec@latest"])
+    const readResult = await fse.readJson(path.join(opencodeDir, 'opencode.json'))
+    expect(readResult.mcp.codegraph).toEqual({ command: 'codegraph', args: ['mcp'] })
+    expect(readResult.plugin).toEqual(["opencode-plugin-openspec@latest"])
+  })
+
+  it('handles rogue file with mcp key directly', async () => {
+    const rogueContent = {
+      mcp: {
+        codegraph: { command: 'codegraph', args: ['mcp'] }
+      }
+    }
+    fs.writeFileSync(path.join(tmpDir, 'opencode.jsonc'), JSON.stringify(rogueContent))
+    fs.mkdirSync(path.join(tmpDir, '.opencode'), { recursive: true })
+    fs.writeFileSync(path.join(tmpDir, '.opencode', 'opencode.json'), '{}')
+
+    const result = await fixCodegraphConfig()
+
+    expect(result).toBe(true)
+    expect(fs.existsSync(path.join(tmpDir, 'opencode.jsonc'))).toBe(false)
+    const readResult = await fse.readJson(path.join(tmpDir, '.opencode', 'opencode.json'))
+    expect(readResult.mcp.codegraph.command).toBe('codegraph')
   })
 
   it('handles JSONC with comments', async () => {
@@ -71,18 +90,43 @@ describe('fixCodegraphConfig()', () => {
     fs.mkdirSync(opencodeDir, { recursive: true })
     fs.writeFileSync(path.join(opencodeDir, 'opencode.json'), '{}')
 
-    await fixCodegraphConfig()
+    const result = await fixCodegraphConfig()
+
+    expect(result).toBe(true)
+    expect(fs.existsSync(path.join(tmpDir, 'opencode.jsonc'))).toBe(false)
+    const readResult = await fse.readJson(path.join(opencodeDir, 'opencode.json'))
+    expect(readResult.mcp.codegraph.command).toBe('codegraph')
+  })
+
+  it('handles JSONC with URLs containing //', async () => {
+    const rogueRaw = `{
+  "url": "https://example.com/path",
+  "mcpServers": {
+    "codegraph": { "command": "codegraph", "args": ["mcp"] }
+  }
+}`
+    fs.writeFileSync(path.join(tmpDir, 'opencode.jsonc'), rogueRaw)
+
+    const opencodeDir = path.join(tmpDir, '.opencode')
+    fs.mkdirSync(opencodeDir, { recursive: true })
+    fs.writeFileSync(path.join(opencodeDir, 'opencode.json'), '{}')
+
+    const result = await fixCodegraphConfig()
 
+    // The old regex-based parser would have mangled the URL and failed.
+    // jsonc-parser handles this correctly.
+    expect(result).toBe(true)
     expect(fs.existsSync(path.join(tmpDir, 'opencode.jsonc'))).toBe(false)
-    const result = await fse.readJson(path.join(opencodeDir, 'opencode.json'))
-    expect(result.mcpServers.codegraph.command).toBe('codegraph')
+    const readResult = await fse.readJson(path.join(opencodeDir, 'opencode.json'))
+    expect(readResult.mcp.codegraph.command).toBe('codegraph')
   })
 
-  it('removes unparseable opencode.jsonc and warns', async () => {
+  it('removes unparseable opencode.jsonc, warns, and returns false', async () => {
     fs.writeFileSync(path.join(tmpDir, 'opencode.jsonc'), 'not valid json {{{')
 
-    await fixCodegraphConfig()
+    const result = await fixCodegraphConfig()
 
+    expect(result).toBe(false)
     expect(fs.existsSync(path.join(tmpDir, 'opencode.jsonc'))).toBe(false)
     expect(warn).toHaveBeenCalledWith('Could not parse opencode.jsonc, removing it')
   })
@@ -95,10 +139,11 @@ describe('fixCodegraphConfig()', () => {
     }
     fs.writeFileSync(path.join(tmpDir, 'opencode.jsonc'), JSON.stringify(rogueContent))
 
-    await fixCodegraphConfig()
+    const result = await fixCodegraphConfig()
 
-    const result = await fse.readJson(path.join(tmpDir, '.opencode', 'opencode.json'))
-    expect(result.mcpServers.codegraph.command).toBe('codegraph')
+    expect(result).toBe(true)
+    const readResult = await fse.readJson(path.join(tmpDir, '.opencode', 'opencode.json'))
+    expect(readResult.mcp.codegraph.command).toBe('codegraph')
     expect(fs.existsSync(path.join(tmpDir, 'opencode.jsonc'))).toBe(false)
   })
 })