@plainconceptsplatform/agent-harness 3.1.1 → 3.3.0

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 }
+}

package/cli/steps/optimization/detect.js

@@ -1,66 +1,66 @@
-import fse from 'fs-extra'
-import path from 'node:path'
-import { parse } from 'jsonc-parser'
-
-/**
- * Work out which optional tools a project actually has, rather than trusting
- * the flags in harness.json.
- *
- * Those flags drift. Numa and Odissey both had codegraph and agentmemory MCP
- * servers enabled in opencode.jsonc and the humanizer and simple-english skills
- * installed, while harness.json recorded `codegraph: false`, `memory: false` and
- * no humanizer key at all. patchGuardrails believed the config and emptied those
- * marker sections, so agents lost the guidance for tools the project was running.
- *
- * Detection only ever turns a tool ON. A flag that is already true is left
- * alone, because some of these install globally and cannot be seen from inside
- * the repository at all.
- */
-
-function mcpServers(cwd) {
-  const configPath = path.join(cwd, 'opencode.jsonc')
-  if (!fse.pathExistsSync(configPath)) return {}
-  const errors = []
-  const parsed = parse(fse.readFileSync(configPath, 'utf-8'), errors)
-  if (errors.length > 0 || typeof parsed !== 'object' || parsed === null) return {}
-  return parsed.mcp ?? {}
-}
-
-function hasSkill(cwd, name) {
-  return fse.pathExistsSync(path.join(cwd, '.agents', 'skills', name))
-}
-
-/** An MCP server counts as present unless it is explicitly disabled. */
-function hasMcp(servers, name) {
-  const server = servers[name]
-  if (!server) return false
-  return server.enabled !== false
-}
-
-export function detectInstalledTools(cwd = process.cwd()) {
-  const servers = mcpServers(cwd)
-  return {
-    // rtk is a global CLI with nothing to find in the repo, so it is not
-    // detectable here and the saved flag stands on its own.
-    codegraph: hasMcp(servers, 'codegraph') || fse.pathExistsSync(path.join(cwd, '.codegraph')),
-    memory: hasMcp(servers, 'agentmemory'),
-    simpleEnglish: hasSkill(cwd, 'simple-english'),
-    humanizer: hasSkill(cwd, 'humanizer'),
-    quota: fse.pathExistsSync(path.join(cwd, '.opencode', 'opencode-quota')),
-  }
-}
-
-/**
- * Saved flags merged with what is on disk. Detection can only add, so a tool
- * recorded as enabled stays enabled even when nothing local proves it.
- */
-export function reconcileTools(saved = {}, cwd = process.cwd()) {
-  const detected = detectInstalledTools(cwd)
-  const merged = { ...saved }
-  for (const [key, present] of Object.entries(detected)) {
-    if (present) merged[key] = true
-  }
-  // simpleEnglish replaced caveman; honour the old key one last time.
-  if (saved.caveman) merged.simpleEnglish = true
-  return merged
-}
+import fse from 'fs-extra'
+import path from 'node:path'
+import { parse } from 'jsonc-parser'
+
+/**
+ * Work out which optional tools a project actually has, rather than trusting
+ * the flags in harness.json.
+ *
+ * Those flags drift. Numa and Odissey both had codegraph and agentmemory MCP
+ * servers enabled in opencode.jsonc and the humanizer and simple-english skills
+ * installed, while harness.json recorded `codegraph: false`, `memory: false` and
+ * no humanizer key at all. patchGuardrails believed the config and emptied those
+ * marker sections, so agents lost the guidance for tools the project was running.
+ *
+ * Detection only ever turns a tool ON. A flag that is already true is left
+ * alone, because some of these install globally and cannot be seen from inside
+ * the repository at all.
+ */
+
+function mcpServers(cwd) {
+  const configPath = path.join(cwd, 'opencode.jsonc')
+  if (!fse.pathExistsSync(configPath)) return {}
+  const errors = []
+  const parsed = parse(fse.readFileSync(configPath, 'utf-8'), errors)
+  if (errors.length > 0 || typeof parsed !== 'object' || parsed === null) return {}
+  return parsed.mcp ?? {}
+}
+
+function hasSkill(cwd, name) {
+  return fse.pathExistsSync(path.join(cwd, '.agents', 'skills', name))
+}
+
+/** An MCP server counts as present unless it is explicitly disabled. */
+function hasMcp(servers, name) {
+  const server = servers[name]
+  if (!server) return false
+  return server.enabled !== false
+}
+
+export function detectInstalledTools(cwd = process.cwd()) {
+  const servers = mcpServers(cwd)
+  return {
+    // rtk is a global CLI with nothing to find in the repo, so it is not
+    // detectable here and the saved flag stands on its own.
+    codegraph: hasMcp(servers, 'codegraph') || fse.pathExistsSync(path.join(cwd, '.codegraph')),
+    memory: hasMcp(servers, 'agentmemory'),
+    simpleEnglish: hasSkill(cwd, 'simple-english'),
+    humanizer: hasSkill(cwd, 'humanizer'),
+    quota: fse.pathExistsSync(path.join(cwd, '.opencode', 'opencode-quota')),
+  }
+}
+
+/**
+ * Saved flags merged with what is on disk. Detection can only add, so a tool
+ * recorded as enabled stays enabled even when nothing local proves it.
+ */
+export function reconcileTools(saved = {}, cwd = process.cwd()) {
+  const detected = detectInstalledTools(cwd)
+  const merged = { ...saved }
+  for (const [key, present] of Object.entries(detected)) {
+    if (present) merged[key] = true
+  }
+  // simpleEnglish replaced caveman; honour the old key one last time.
+  if (saved.caveman) merged.simpleEnglish = true
+  return merged
+}

package/cli/steps/optimization/humanizer.js

@@ -1,17 +1,17 @@
-import { addSkillToLock } from './skills-lock.js'
-import { header, success, info } from '../../utils/exec.js'
-
-const SKILL_ENTRY = {
-  source: 'blader/humanizer',
-  sourceType: 'github',
-  skillPath: 'SKILL.md',
-}
-
-export async function installHumanizer(options = {}) {
-  if (!options.skipHeader) header('Installing humanizer')
-
-  info('Adding humanizer to skills-lock.json for batch install')
-  await addSkillToLock('humanizer', SKILL_ENTRY)
-  success('humanizer queued for installation')
-  return { optedIn: true, installed: true }
-}
+import { addSkillToLock } from './skills-lock.js'
+import { header, success, info } from '../../utils/exec.js'
+
+const SKILL_ENTRY = {
+  source: 'blader/humanizer',
+  sourceType: 'github',
+  skillPath: 'SKILL.md',
+}
+
+export async function installHumanizer(options = {}) {
+  if (!options.skipHeader) header('Installing humanizer')
+
+  info('Adding humanizer to skills-lock.json for batch install')
+  await addSkillToLock('humanizer', SKILL_ENTRY)
+  success('humanizer queued for installation')
+  return { optedIn: true, installed: true }
+}