@plainconceptsplatform/agent-harness 3.9.0 → 3.11.0

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

package/cli/steps/optimization/index.js

@@ -1,158 +1,158 @@
-import { checkbox, confirm } from '@inquirer/prompts'
-import { execa } from 'execa'
-import fse from 'fs-extra'
-import path from 'path'
-import { fileURLToPath } from 'url'
-import { code, commandExists, header, info, loading, success, warn } from '../../utils/exec.js'
-import { installSimpleEnglish } from './simple-english.js'
-import { installCodegraph } from './codegraph.js'
-import { installMemory } from './memory.js'
-import { installHumanizer } from './humanizer.js'
-import { patchGuardrails } from './patch-guardrails.js'
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-const OPTIMIZATION_PRESET_PATH = path.resolve(__dirname, '../../presets/optimization.json')
-const optimizationPreset = await fse.readJson(OPTIMIZATION_PRESET_PATH)
-
-export async function checkRtk(options = {}) {
-  if (!options.skipHeader) header('Checking rtk')
-
-  let shouldCheck = true
-  if (!options.skipPrompt) {
-    info('Recommended: install and verify rtk for safer agent CLI command execution.')
-    shouldCheck = await confirm({
-      message: 'Check rtk now?',
-      default: true,
-    })
-  }
-
-  if (!shouldCheck) {
-    warn('Skipped rtk check (you can install it later)')
-    return { optedIn: false, checked: false, available: false }
-  }
-
-  loading('checking rtk...')
-
-  const available = await commandExists('rtk')
-
-  if (available) {
-    success('rtk is available')
-    return { optedIn: true, checked: true, available: true }
-  }
-
-  warn('rtk not found on PATH.')
-  console.log()
-  info('rtk is required for agents to run CLI commands safely.')
-  info('Install it from: https://github.com/rtk-ai/rtk#pre-built-binaries')
-  console.log()
-  info('After installing, verify with:')
-  code(['rtk --version'])
-  return { optedIn: true, checked: true, available: false }
-}
-
-export async function tokenOptimizationStep(options = {}) {
-  header('Step 8, Token optimization tools')
-
-  const defaultSelected = optimizationPreset.choices
-    .filter(choice => choice.checked)
-    .map(choice => choice.value)
-  let selected = defaultSelected
-
-  if (!options.skipPrompt && process.stdin.isTTY) {
-    info(optimizationPreset.info)
-    // Abort the prompt via signal instead of racing it: a raced prompt keeps
-    // stdin in raw mode after "losing" and rejects unhandled on a later Ctrl+C.
-    const controller = new AbortController()
-    const timer = setTimeout(() => controller.abort(), optimizationPreset.timeoutMs)
-    try {
-      selected = await checkbox(
-        {
-          message: optimizationPreset.message,
-          choices: optimizationPreset.choices,
-        },
-        { signal: controller.signal },
-      )
-    } catch (err) {
-      if (err.name !== 'AbortPromptError') throw err
-      selected = defaultSelected
-      info('No response: continuing with the recommended defaults.')
-    } finally {
-      clearTimeout(timer)
-    }
-  }
-
-  loading('applying token optimization selections...')
-
-  const installScope = options.ctx?.installScope || 'local'
-
-  const has = value => selected.includes(value)
-
-  const rtk = has('rtk')
-    ? await checkRtk({ skipHeader: true, skipPrompt: true })
-    : { optedIn: false, checked: false, available: false }
-
-  const simpleEnglish = has('simpleEnglish')
-    ? await installSimpleEnglish({
-      skipHeader: true,
-      skipPrompt: true,
-      installScope,
-    })
-    : { optedIn: false, installed: false }
-
-  const codegraph = has('codegraph')
-    ? await installCodegraph({ skipHeader: true, installScope })
-    : { optedIn: false, installed: false }
-
-  const memory = has('memory')
-    ? await installMemory({ skipHeader: true })
-    : { optedIn: false, installed: false }
-
-  const humanizer = has('humanizer')
-    ? await installHumanizer({ skipHeader: true, installScope })
-    : { optedIn: false, installed: false }
-
-  // Run a single npx skills experimental_install to pick up all skills
-  // that were added to skills-lock.json by the individual installers above.
-  await syncSkillsLock()
-
-  // Patch guardrails skill with selected tool guidance sections
-  await patchGuardrails({
-    rtk: rtk.available,
-    codegraph: codegraph.optedIn,
-    memory: memory.optedIn,
-    simpleEnglish: simpleEnglish.installed,
-    humanizer: humanizer.optedIn,
-  })
-
-  if (selected.length === 0) warn('No token optimization tools selected')
-  else success('Token optimization step completed')
-
-  return { rtk, simpleEnglish, codegraph, memory, humanizer }
-}
-
-async function syncSkillsLock() {
-  const destLock = path.join(process.cwd(), 'skills-lock.json')
-  if (!await fse.pathExists(destLock)) {
-    info('No skills-lock.json found, skipping skills sync')
-    return
-  }
-
-  loading('syncing skills via npx skills experimental_install...')
-  try {
-    const result = await execa('npx', ['skills', 'experimental_install', '--yes'], {
-      cwd: process.cwd(),
-      reject: false,
-      stdio: 'pipe',
-      timeout: 600000,
-    })
-
-    if (result.exitCode === 0) {
-      success('Skills synced from skills-lock.json')
-    } else {
-      const errLine = result.stderr?.trim().split('\n').slice(-3).join('\n')
-      warn(`npx skills experimental_install exited with non-zero code${errLine ? `: ${errLine}` : ''}`)
-    }
-  } catch (err) {
-    warn(`npx skills experimental_install failed: ${err.message}`)
-  }
-}
+import { checkbox, confirm } from '@inquirer/prompts'
+import { execa } from 'execa'
+import fse from 'fs-extra'
+import path from 'path'
+import { fileURLToPath } from 'url'
+import { code, commandExists, header, info, loading, success, warn } from '../../utils/exec.js'
+import { installSimpleEnglish } from './simple-english.js'
+import { installCodegraph } from './codegraph.js'
+import { installMemory } from './memory.js'
+import { installHumanizer } from './humanizer.js'
+import { patchGuardrails } from './patch-guardrails.js'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const OPTIMIZATION_PRESET_PATH = path.resolve(__dirname, '../../presets/optimization.json')
+const optimizationPreset = await fse.readJson(OPTIMIZATION_PRESET_PATH)
+
+export async function checkRtk(options = {}) {
+  if (!options.skipHeader) header('Checking rtk')
+
+  let shouldCheck = true
+  if (!options.skipPrompt) {
+    info('Recommended: install and verify rtk for safer agent CLI command execution.')
+    shouldCheck = await confirm({
+      message: 'Check rtk now?',
+      default: true,
+    })
+  }
+
+  if (!shouldCheck) {
+    warn('Skipped rtk check (you can install it later)')
+    return { optedIn: false, checked: false, available: false }
+  }
+
+  loading('checking rtk...')
+
+  const available = await commandExists('rtk')
+
+  if (available) {
+    success('rtk is available')
+    return { optedIn: true, checked: true, available: true }
+  }
+
+  warn('rtk not found on PATH.')
+  console.log()
+  info('rtk is required for agents to run CLI commands safely.')
+  info('Install it from: https://github.com/rtk-ai/rtk#pre-built-binaries')
+  console.log()
+  info('After installing, verify with:')
+  code(['rtk --version'])
+  return { optedIn: true, checked: true, available: false }
+}
+
+export async function tokenOptimizationStep(options = {}) {
+  header('Step 8, Token optimization tools')
+
+  const defaultSelected = optimizationPreset.choices
+    .filter(choice => choice.checked)
+    .map(choice => choice.value)
+  let selected = defaultSelected
+
+  if (!options.skipPrompt && process.stdin.isTTY) {
+    info(optimizationPreset.info)
+    // Abort the prompt via signal instead of racing it: a raced prompt keeps
+    // stdin in raw mode after "losing" and rejects unhandled on a later Ctrl+C.
+    const controller = new AbortController()
+    const timer = setTimeout(() => controller.abort(), optimizationPreset.timeoutMs)
+    try {
+      selected = await checkbox(
+        {
+          message: optimizationPreset.message,
+          choices: optimizationPreset.choices,
+        },
+        { signal: controller.signal },
+      )
+    } catch (err) {
+      if (err.name !== 'AbortPromptError') throw err
+      selected = defaultSelected
+      info('No response: continuing with the recommended defaults.')
+    } finally {
+      clearTimeout(timer)
+    }
+  }
+
+  loading('applying token optimization selections...')
+
+  const installScope = options.ctx?.installScope || 'local'
+
+  const has = value => selected.includes(value)
+
+  const rtk = has('rtk')
+    ? await checkRtk({ skipHeader: true, skipPrompt: true })
+    : { optedIn: false, checked: false, available: false }
+
+  const simpleEnglish = has('simpleEnglish')
+    ? await installSimpleEnglish({
+      skipHeader: true,
+      skipPrompt: true,
+      installScope,
+    })
+    : { optedIn: false, installed: false }
+
+  const codegraph = has('codegraph')
+    ? await installCodegraph({ skipHeader: true, installScope })
+    : { optedIn: false, installed: false }
+
+  const memory = has('memory')
+    ? await installMemory({ skipHeader: true })
+    : { optedIn: false, installed: false }
+
+  const humanizer = has('humanizer')
+    ? await installHumanizer({ skipHeader: true, installScope })
+    : { optedIn: false, installed: false }
+
+  // Run a single npx skills experimental_install to pick up all skills
+  // that were added to skills-lock.json by the individual installers above.
+  await syncSkillsLock()
+
+  // Patch guardrails skill with selected tool guidance sections
+  await patchGuardrails({
+    rtk: rtk.available,
+    codegraph: codegraph.optedIn,
+    memory: memory.optedIn,
+    simpleEnglish: simpleEnglish.installed,
+    humanizer: humanizer.optedIn,
+  })
+
+  if (selected.length === 0) warn('No token optimization tools selected')
+  else success('Token optimization step completed')
+
+  return { rtk, simpleEnglish, codegraph, memory, humanizer }
+}
+
+async function syncSkillsLock() {
+  const destLock = path.join(process.cwd(), 'skills-lock.json')
+  if (!await fse.pathExists(destLock)) {
+    info('No skills-lock.json found, skipping skills sync')
+    return
+  }
+
+  loading('syncing skills via npx skills experimental_install...')
+  try {
+    const result = await execa('npx', ['skills', 'experimental_install', '--yes'], {
+      cwd: process.cwd(),
+      reject: false,
+      stdio: 'pipe',
+      timeout: 600000,
+    })
+
+    if (result.exitCode === 0) {
+      success('Skills synced from skills-lock.json')
+    } else {
+      const errLine = result.stderr?.trim().split('\n').slice(-3).join('\n')
+      warn(`npx skills experimental_install exited with non-zero code${errLine ? `: ${errLine}` : ''}`)
+    }
+  } catch (err) {
+    warn(`npx skills experimental_install failed: ${err.message}`)
+  }
+}