opencode-onboard 0.4.4 → 0.4.5

package/content/AGENTS.md

@@ -356,6 +356,15 @@ Minimal non-negotiables:
 - Use `gh`/`az` CLI for platform operations.
 - In multi-repo source scope, run git operations per repository.
 
+### Config file conflict: `opencode.jsonc` vs `.opencode/opencode.json`
+
+This project uses `.opencode/opencode.json` as the single OpenCode configuration file. Some tools (e.g., codegraph) may create an `opencode.jsonc` file at the project root. **These two files cannot coexist.**
+
+If you detect both `opencode.jsonc` (project root) and `.opencode/opencode.json` exist:
+1. **Stop immediately** and warn the user: "Conflicting OpenCode config files detected. This project uses `.opencode/opencode.json` only. The root `opencode.jsonc` must be removed or its contents merged into `.opencode/opencode.json`."
+2. Do NOT proceed with any task until the conflict is resolved.
+3. If the user asks you to fix it: merge any `mcpServers` or other config from `opencode.jsonc` into `.opencode/opencode.json`, then delete `opencode.jsonc`.
+
 ---
 
 ## Communication Style

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-onboard",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Prepare any brownfield codebase for AI agent workflows using OpenCode, OpenSpec, and ensemble orchestration.",
   "keywords": [
     "opencode",

package/src/steps/optimization/codegraph.js

@@ -1,6 +1,55 @@
 import { execa } from 'execa'
+import fse from 'fs-extra'
+import path from 'node:path'
 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.
+ */
+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
+
+  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)
+  } catch {
+    warn('Could not parse opencode.jsonc, removing it')
+    await fse.remove(rogueFile)
+    return
+  }
+
+  let correctContent = {}
+  if (await fse.pathExists(correctFile)) {
+    try {
+      correctContent = await fse.readJson(correctFile)
+    } catch {
+      correctContent = {}
+    }
+  }
+
+  // Merge mcpServers from rogue into correct config
+  if (rogueContent.mcpServers || rogueContent.mcp) {
+    const mcpServers = rogueContent.mcpServers || rogueContent.mcp
+    correctContent.mcpServers = { ...(correctContent.mcpServers || {}), ...mcpServers }
+  }
+
+  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)')
+}
+
 export async function installCodegraph(options = {}) {
   if (!options.skipHeader) header('Installing codegraph')
 
@@ -23,6 +72,8 @@ export async function installCodegraph(options = {}) {
       warn('codegraph install exited with non-zero code')
       return { optedIn: true, installed: false }
     }
+
+    await fixCodegraphConfig()
     success(`codegraph configured for opencode (${location})`)
   } catch (err) {
     error(`Failed to install codegraph: ${err.message}`)

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

@@ -0,0 +1,104 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
+import fs from 'node:fs'
+import path from 'node:path'
+import os from 'node:os'
+import fse from 'fs-extra'
+
+vi.mock('execa', () => ({ execa: vi.fn() }))
+vi.mock('../../utils/exec.js', () => ({
+  header: vi.fn(),
+  success: vi.fn(),
+  warn: vi.fn(),
+  error: vi.fn(),
+  loading: vi.fn(),
+}))
+
+import { warn } from '../../utils/exec.js'
+import { fixCodegraphConfig } from './codegraph.js'
+
+describe('fixCodegraphConfig()', () => {
+  let tmpDir
+
+  beforeEach(() => {
+    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'codegraph-test-'))
+    vi.spyOn(process, 'cwd').mockReturnValue(tmpDir)
+  })
+
+  afterEach(() => {
+    fs.rmSync(tmpDir, { recursive: true, force: true })
+    vi.restoreAllMocks()
+  })
+
+  it('does nothing when opencode.jsonc does not exist', async () => {
+    await fixCodegraphConfig()
+    // No error, no file created
+    expect(fs.existsSync(path.join(tmpDir, '.opencode', 'opencode.json'))).toBe(false)
+  })
+
+  it('merges mcpServers from opencode.jsonc into .opencode/opencode.json', async () => {
+    const rogueContent = {
+      mcpServers: {
+        codegraph: { command: 'codegraph', args: ['mcp'] }
+      }
+    }
+    fs.writeFileSync(path.join(tmpDir, 'opencode.jsonc'), JSON.stringify(rogueContent))
+
+    const opencodeDir = path.join(tmpDir, '.opencode')
+    fs.mkdirSync(opencodeDir, { recursive: true })
+    fs.writeFileSync(path.join(opencodeDir, 'opencode.json'), JSON.stringify({
+      "$schema": "https://opencode.ai/config.json",
+      "plugin": ["opencode-plugin-openspec@latest"]
+    }))
+
+    await fixCodegraphConfig()
+
+    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"])
+  })
+
+  it('handles JSONC with comments', async () => {
+    const rogueRaw = `{
+  // This is a comment
+  "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'), '{}')
+
+    await fixCodegraphConfig()
+
+    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')
+  })
+
+  it('removes unparseable opencode.jsonc and warns', async () => {
+    fs.writeFileSync(path.join(tmpDir, 'opencode.jsonc'), 'not valid json {{{')
+
+    await fixCodegraphConfig()
+
+    expect(fs.existsSync(path.join(tmpDir, 'opencode.jsonc'))).toBe(false)
+    expect(warn).toHaveBeenCalledWith('Could not parse opencode.jsonc, removing it')
+  })
+
+  it('creates .opencode/opencode.json if it does not exist', async () => {
+    const rogueContent = {
+      mcpServers: {
+        codegraph: { command: 'codegraph', args: ['mcp'] }
+      }
+    }
+    fs.writeFileSync(path.join(tmpDir, 'opencode.jsonc'), JSON.stringify(rogueContent))
+
+    await fixCodegraphConfig()
+
+    const result = await fse.readJson(path.join(tmpDir, '.opencode', 'opencode.json'))
+    expect(result.mcpServers.codegraph.command).toBe('codegraph')
+    expect(fs.existsSync(path.join(tmpDir, 'opencode.jsonc'))).toBe(false)
+  })
+})