@plainconceptsplatform/agent-harness 3.2.0 → 3.3.1

package/cli/steps/openspec/index.js

@@ -1,136 +1,136 @@
-import { execa } from "execa"
-import fse from "fs-extra"
-import path from "node:path"
-import { commandExists, error, header, info, loading, success, warn } from "../../utils/exec.js"
-
-
-async function cleanOpenspecFiles() {
-  const cwd = process.cwd()
-  const commandsDir = path.join(cwd, '.opencode', 'commands')
-  const opencodeSkillsDir = path.join(cwd, '.opencode', 'skills')
-  const agentsSkillsDir = path.join(cwd, '.agents', 'skills')
-
-  // Delete opsx-* command files generated by OpenSpec: we use /plan-propose and /plan-apply instead
-  if (await fse.pathExists(commandsDir)) {
-    for (const f of await fse.readdir(commandsDir)) {
-      if (f.startsWith('opsx-') && f.endsWith('.md')) {
-        await fse.remove(path.join(commandsDir, f))
-        info(`Removed generated command: ${f}`)
-      }
-    }
-  }
-
-  // Move .opencode/skills/* to .agents/skills/: skills should be in the universal location
-  if (await fse.pathExists(opencodeSkillsDir)) {
-    await fse.ensureDir(agentsSkillsDir)
-    for (const dir of await fse.readdir(opencodeSkillsDir)) {
-      const src = path.join(opencodeSkillsDir, dir)
-      const dest = path.join(agentsSkillsDir, dir)
-      if (!(await fse.pathExists(dest))) {
-        await fse.move(src, dest)
-        info(`Moved skill: ${dir} → .agents/skills/`)
-      } else {
-        await fse.remove(src)
-      }
-    }
-    // Remove .opencode/skills if now empty
-    const remaining = await fse.readdir(opencodeSkillsDir)
-    if (remaining.length === 0) await fse.remove(opencodeSkillsDir)
-  }
-
-  success('OpenSpec generated files cleaned up')
-}
-
-export const openspecSteps = {
-  check,
-  install,
-  init,
-}
-
-export async function initOpenspec() {
-  header("Step 6, Initializing OpenSpec")
-
-  let openSpec = await openspecSteps.check()
-  if (!openSpec.available) {
-    await openspecSteps.install()
-  }
-
-  openSpec = await openspecSteps.check()
-  if (!openSpec.available) {
-    warn("OpenSpec has not been installed. It is required to create changes.")
-    return { ...openSpec, initialized: false }
-  }
-
-  const initResult = await openspecSteps.init()
-  if (!initResult.initialized) {
-    warn(
-      "OpenSpec has not been initialized. It is required to create changes.",
-    )
-    return { ...openSpec, initialized: false }
-  }
-
-  await cleanOpenspecFiles()
-  return { ...openSpec, initialized: true }
-}
-
-async function install() {
-  info("Installing OpenSpec...")
-  try {
-    const result = await execa(
-      "npm",
-      ["install", "@fission-ai/openspec", "--global"],
-      {
-        cwd: process.cwd(),
-        stdio: "pipe",
-        reject: false,
-      },
-    )
-    if (result.exitCode !== 0) {
-      warn("OpenSpec install failed, check output above")
-    }
-    success("OpenSpec installed")
-  } catch (err) {
-    error(`Failed to run openspec install: ${err.message}`)
-  }
-}
-
-async function check() {
-  loading("Checking OpenSpec...")
-
-  const available = await commandExists("openspec")
-
-  if (available) success("OpenSpec is available")
-  else warn("OpenSpec not found on PATH.")
-
-  return { available }
-}
-
-async function init() {
-  loading("Initializing OpenSpec...")
-  try {
-    const result = await execa(
-      "npx",
-      ["@fission-ai/openspec", "init", "--tools", "opencode", "--force"],
-      {
-        cwd: process.cwd(),
-        reject: false,
-      },
-    )
-
-    if (result.exitCode !== 0) {
-      const stderr = (result.stderr || "").trim()
-      const msg = stderr
-        ? `init failed: ${stderr}`
-        : `init failed with exit code ${result.exitCode}`
-      throw new Error(msg)
-    }
-  } catch (err) {
-    error(`Failed to run openspec init: ${err.message}`)
-    return { initialized: false }
-  }
-
-  success("OpenSpec initialized")
-  return { initialized: true }
-}
-
-
+import { execa } from "execa"
+import fse from "fs-extra"
+import path from "node:path"
+import { commandExists, error, header, info, loading, success, warn } from "../../utils/exec.js"
+
+
+async function cleanOpenspecFiles() {
+  const cwd = process.cwd()
+  const commandsDir = path.join(cwd, '.opencode', 'commands')
+  const opencodeSkillsDir = path.join(cwd, '.opencode', 'skills')
+  const agentsSkillsDir = path.join(cwd, '.agents', 'skills')
+
+  // Delete opsx-* command files generated by OpenSpec: we use /plan-propose and /plan-apply instead
+  if (await fse.pathExists(commandsDir)) {
+    for (const f of await fse.readdir(commandsDir)) {
+      if (f.startsWith('opsx-') && f.endsWith('.md')) {
+        await fse.remove(path.join(commandsDir, f))
+        info(`Removed generated command: ${f}`)
+      }
+    }
+  }
+
+  // Move .opencode/skills/* to .agents/skills/: skills should be in the universal location
+  if (await fse.pathExists(opencodeSkillsDir)) {
+    await fse.ensureDir(agentsSkillsDir)
+    for (const dir of await fse.readdir(opencodeSkillsDir)) {
+      const src = path.join(opencodeSkillsDir, dir)
+      const dest = path.join(agentsSkillsDir, dir)
+      if (!(await fse.pathExists(dest))) {
+        await fse.move(src, dest)
+        info(`Moved skill: ${dir} → .agents/skills/`)
+      } else {
+        await fse.remove(src)
+      }
+    }
+    // Remove .opencode/skills if now empty
+    const remaining = await fse.readdir(opencodeSkillsDir)
+    if (remaining.length === 0) await fse.remove(opencodeSkillsDir)
+  }
+
+  success('OpenSpec generated files cleaned up')
+}
+
+export const openspecSteps = {
+  check,
+  install,
+  init,
+}
+
+export async function initOpenspec() {
+  header("Step 6, Initializing OpenSpec")
+
+  let openSpec = await openspecSteps.check()
+  if (!openSpec.available) {
+    await openspecSteps.install()
+  }
+
+  openSpec = await openspecSteps.check()
+  if (!openSpec.available) {
+    warn("OpenSpec has not been installed. It is required to create changes.")
+    return { ...openSpec, initialized: false }
+  }
+
+  const initResult = await openspecSteps.init()
+  if (!initResult.initialized) {
+    warn(
+      "OpenSpec has not been initialized. It is required to create changes.",
+    )
+    return { ...openSpec, initialized: false }
+  }
+
+  await cleanOpenspecFiles()
+  return { ...openSpec, initialized: true }
+}
+
+async function install() {
+  info("Installing OpenSpec...")
+  try {
+    const result = await execa(
+      "npm",
+      ["install", "@fission-ai/openspec", "--global"],
+      {
+        cwd: process.cwd(),
+        stdio: "pipe",
+        reject: false,
+      },
+    )
+    if (result.exitCode !== 0) {
+      warn("OpenSpec install failed, check output above")
+    }
+    success("OpenSpec installed")
+  } catch (err) {
+    error(`Failed to run openspec install: ${err.message}`)
+  }
+}
+
+async function check() {
+  loading("Checking OpenSpec...")
+
+  const available = await commandExists("openspec")
+
+  if (available) success("OpenSpec is available")
+  else warn("OpenSpec not found on PATH.")
+
+  return { available }
+}
+
+async function init() {
+  loading("Initializing OpenSpec...")
+  try {
+    const result = await execa(
+      "npx",
+      ["@fission-ai/openspec", "init", "--tools", "opencode", "--force"],
+      {
+        cwd: process.cwd(),
+        reject: false,
+      },
+    )
+
+    if (result.exitCode !== 0) {
+      const stderr = (result.stderr || "").trim()
+      const msg = stderr
+        ? `init failed: ${stderr}`
+        : `init failed with exit code ${result.exitCode}`
+      throw new Error(msg)
+    }
+  } catch (err) {
+    error(`Failed to run openspec init: ${err.message}`)
+    return { initialized: false }
+  }
+
+  success("OpenSpec initialized")
+  return { initialized: true }
+}
+
+

package/cli/steps/optimization/codegraph.js

@@ -1,127 +1,141 @@
-import { execa } from 'execa'
-import fse from 'fs-extra'
-import path from 'node:path'
-import { applyEdits, modify, parse as parseJsonc } from 'jsonc-parser'
-import { header, success, warn, error, loading } from '../../utils/exec.js'
-
-/**
- * Normalizes codegraph's MCP entry in the project-level OpenCode config.
- * Older codegraph versions write `mcpServers`; OpenCode expects `mcp`.
- * Returns true if the config was successfully normalized (or no config exists).
- */
-export async function fixCodegraphConfig() {
-  const cwd = process.cwd()
-  const configFile = path.join(cwd, 'opencode.jsonc')
-
-  if (!await fse.pathExists(configFile)) return true
-
-  let configText
-  let config
-  try {
-    configText = await fse.readFile(configFile, 'utf-8')
-    const errors = []
-    config = parseJsonc(configText, errors)
-    if (errors.length > 0) throw new Error(`parse errors: ${errors.length}`)
-    if (!config || typeof config !== 'object' || Array.isArray(config)) {
-      throw new Error('unexpected structure')
-    }
-  } catch {
-    warn('Could not parse opencode.jsonc, leaving it untouched')
-    return false
-  }
-
-  const legacyMcp = config.mcpServers
-  const mcp = config.mcp || {}
-  const entries = { ...legacyMcp, ...mcp }
-  let changed = false
-
-  if (Object.keys(entries).length > 0) {
-    for (const entry of Object.values(entries)) {
-      if (Array.isArray(entry.command) && entry.command[0] === 'codegraph') {
-        entry.command = ['npx', '@colbymchenry/codegraph', ...entry.command.slice(1)]
-        // codegraph defaults to a 30s MCP timeout, which fails under parallel
-        // subagent load. Raise it unless the user has set one explicitly.
-        if (entry.timeout == null) entry.timeout = 120000
-      }
-    }
-    for (const [name, entry] of Object.entries(entries)) {
-      const edits = modify(configText, ['mcp', name], entry, {
-        formattingOptions: { insertSpaces: true, tabSize: 2 },
-      })
-      configText = applyEdits(configText, edits)
-      changed = true
-    }
-  }
-
-  if (legacyMcp) {
-    configText = applyEdits(configText, modify(configText, ['mcpServers'], undefined, {
-      formattingOptions: { insertSpaces: true, tabSize: 2 },
-    }))
-    changed = true
-  }
-
-  if (changed) {
-    await fse.writeFile(configFile, configText, 'utf-8')
-    warn('Normalized codegraph MCP config in opencode.jsonc')
-  }
-
-  return true
-}
-
-export async function installCodegraph(options = {}) {
-  if (!options.skipHeader) header('Installing codegraph')
-
-  const location = options.installScope === 'global' ? 'global' : 'local'
-
-  loading(`configuring codegraph for opencode (${location})...`)
-
-  try {
-    const installResult = await execa(
-      'npx',
-      ['--yes', '@colbymchenry/codegraph', 'install', '--target=opencode', `--location=${location}`, '--yes'],
-      {
-        cwd: process.cwd(),
-        reject: false,
-        stdio: 'pipe',
-      }
-    )
-
-    if (installResult.exitCode !== 0) {
-      warn('codegraph install exited with non-zero code')
-      return { optedIn: true, installed: false }
-    }
-
-    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}`)
-    return { optedIn: true, installed: false }
-  }
-
-  loading('initializing codegraph project index...')
-
-  try {
-    const initResult = await execa('npx', ['@colbymchenry/codegraph', 'init', '-i'], {
-      cwd: process.cwd(),
-      reject: false,
-      stdio: 'pipe',
-    })
-
-    if (initResult.exitCode !== 0) {
-      warn('codegraph init exited with non-zero code')
-      return { optedIn: true, installed: false }
-    }
-    success('codegraph project index initialized')
-  } catch (err) {
-    error(`Failed to initialize codegraph: ${err.message}`)
-    return { optedIn: true, installed: false }
-  }
-
-  return { optedIn: true, installed: true }
-}
+import { execa } from 'execa'
+import fse from 'fs-extra'
+import path from 'node:path'
+import os from 'node:os'
+import { applyEdits, modify, parse as parseJsonc } from 'jsonc-parser'
+import { header, success, warn, error, loading } from '../../utils/exec.js'
+
+/**
+ * Normalizes CodeGraph's MCP command in the selected OpenCode config.
+ * Returns true if the config was successfully normalized (or no config exists).
+ */
+export async function fixCodegraphConfig(location = 'local') {
+  const xdgConfigHome = process.env.XDG_CONFIG_HOME?.trim()
+  const configDir = location === 'global'
+    ? path.join(xdgConfigHome || path.join(os.homedir(), '.config'), 'opencode')
+    : process.cwd()
+  const jsoncFile = path.join(configDir, 'opencode.jsonc')
+  const jsonFile = path.join(configDir, 'opencode.json')
+  const configFile = await fse.pathExists(jsoncFile)
+    ? jsoncFile
+    : await fse.pathExists(jsonFile)
+      ? jsonFile
+      : jsoncFile
+
+  if (!await fse.pathExists(configFile)) return true
+
+  let configText
+  let config
+  try {
+    configText = await fse.readFile(configFile, 'utf-8')
+    const errors = []
+    config = parseJsonc(configText, errors)
+    if (errors.length > 0) throw new Error(`parse errors: ${errors.length}`)
+    if (!config || typeof config !== 'object' || Array.isArray(config)) {
+      throw new Error('unexpected structure')
+    }
+  } catch {
+    warn('Could not parse opencode.jsonc, leaving it untouched')
+    return false
+  }
+
+  const entry = config.mcp?.servers?.codegraph
+  if (!entry || typeof entry !== 'object' || Array.isArray(entry)) return true
+
+  const normalizedEntry = { ...entry }
+  let changed = false
+
+  if (normalizedEntry.type == null) {
+    normalizedEntry.type = 'local'
+    changed = true
+  }
+  if (Array.isArray(normalizedEntry.command) && normalizedEntry.command[0] === 'codegraph') {
+    normalizedEntry.command = ['npx', '--yes', '@colbymchenry/codegraph', ...normalizedEntry.command.slice(1)]
+    changed = true
+  }
+  if (normalizedEntry.timeout == null) {
+    normalizedEntry.timeout = {
+      catalog: 120000,
+      execution: 120000,
+    }
+    changed = true
+  } else if (typeof normalizedEntry.timeout !== 'object' || Array.isArray(normalizedEntry.timeout)) {
+    const timeout = Number.isFinite(normalizedEntry.timeout) && normalizedEntry.timeout > 0
+      ? normalizedEntry.timeout
+      : 120000
+    normalizedEntry.timeout = { catalog: timeout, execution: timeout }
+    changed = true
+  }
+  if (normalizedEntry.codemode !== false) {
+    normalizedEntry.codemode = false
+    changed = true
+  }
+
+  if (changed) {
+    configText = applyEdits(configText, modify(configText, ['mcp', 'servers', 'codegraph'], normalizedEntry, {
+      formattingOptions: { insertSpaces: true, tabSize: 2 },
+    }))
+    await fse.writeFile(configFile, configText, 'utf-8')
+    warn('Normalized codegraph MCP config in opencode.jsonc')
+  }
+
+  return true
+}
+
+export async function installCodegraph(options = {}) {
+  if (!options.skipHeader) header('Installing codegraph')
+
+  const location = options.installScope === 'global' ? 'global' : 'local'
+
+  loading(`configuring codegraph for opencode (${location})...`)
+
+  try {
+    const installResult = await execa(
+      'npx',
+      ['--yes', '@colbymchenry/codegraph', 'install', '--target=opencode', `--location=${location}`, '--yes'],
+      {
+        cwd: process.cwd(),
+        reject: false,
+        stdio: 'pipe',
+      }
+    )
+
+    if (installResult.exitCode !== 0) {
+      warn('codegraph install exited with non-zero code')
+      return { optedIn: true, installed: false }
+    }
+
+    const configFixed = await fixCodegraphConfig(location)
+
+    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}`)
+    return { optedIn: true, installed: false }
+  }
+
+  loading('initializing codegraph project index...')
+
+  try {
+    const initResult = await execa('npx', ['@colbymchenry/codegraph', 'init', '-i'], {
+      cwd: process.cwd(),
+      reject: false,
+      stdio: 'pipe',
+    })
+
+    if (initResult.exitCode !== 0) {
+      warn('codegraph init exited with non-zero code')
+      return { optedIn: true, installed: false }
+    }
+    success('codegraph project index initialized')
+  } catch (err) {
+    error(`Failed to initialize codegraph: ${err.message}`)
+    return { optedIn: true, installed: false }
+  }
+
+  return { optedIn: true, installed: true }
+}