opencode-onboard 0.4.2 → 0.4.4

package/src/steps/openspec/ensemble.test.js

@@ -1,79 +1,79 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
-import fs from 'node:fs'
-import path from 'node:path'
-import os from 'node:os'
-import { patchApplyFile, APPLY_TARGETS } from './ensemble.js'
-
-describe('patchApplyFile()', () => {
-  let tmpDir
-
-  beforeEach(() => {
-    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'openspec-test-'))
-  })
-
-  afterEach(() => {
-    fs.rmSync(tmpDir, { recursive: true, force: true })
-  })
-
-  it('returns ok:false when file does not exist', async () => {
-    const result = await patchApplyFile(path.join(tmpDir, 'missing.md'))
-
-    expect(result).toEqual({ ok: false, reason: 'missing-file' })
-  })
-
-  it('returns ok:false when Step 6 is not found', async () => {
-    const filePath = path.join(tmpDir, 'opsx-apply.md')
-    fs.writeFileSync(filePath, 'Some other content without Step 6', 'utf-8')
-
-    const result = await patchApplyFile(filePath)
-
-    expect(result).toEqual({ ok: false, reason: 'missing-step-6' })
-  })
-
-  it('patches file with ENSEMBLE_SECTION when Step 6 found', async () => {
-    const filePath = path.join(tmpDir, 'opsx-apply.md')
-    const original = `Some header
-
-6. **Implement**
-   Old implementation here.
-
-**Fluid Workflow Integration**
-   Fluid section content.
-`
-    fs.writeFileSync(filePath, original, 'utf-8')
-
-    const result = await patchApplyFile(filePath)
-
-    expect(result.ok).toBe(true)
-    const patched = fs.readFileSync(filePath, 'utf-8')
-    expect(patched).toContain('**Implement via ensemble team**')
-    expect(patched).toContain('6. **Implement via ensemble team**')
-    expect(patched).toContain('**Fluid Workflow Integration**')
-  })
-
-  it('removes original Step 6 content before patching', async () => {
-    const filePath = path.join(tmpDir, 'SKILL.md')
-    const original = `Steps:
-
-6. **Implement**
-   Do things directly.
-
-7. **Quality check**
-`
-    fs.writeFileSync(filePath, original, 'utf-8')
-
-    await patchApplyFile(filePath)
-
-    const patched = fs.readFileSync(filePath, 'utf-8')
-    expect(patched).not.toContain('Do things directly.')
-    expect(patched).toContain('NEVER implement tasks directly')
-  })
-})
-
-describe('APPLY_TARGETS', () => {
-  it('contains expected OpenSpec apply file paths', () => {
-    expect(APPLY_TARGETS).toHaveLength(2)
-    expect(APPLY_TARGETS).toContain(path.join('.opencode', 'commands', 'opsx-apply.md'))
-    expect(APPLY_TARGETS).toContain(path.join('.opencode', 'skills', 'openspec-apply-change', 'SKILL.md'))
-  })
-})
+import { describe, it, expect, beforeEach, afterEach } from 'vitest'
+import fs from 'node:fs'
+import path from 'node:path'
+import os from 'node:os'
+import { patchApplyFile, APPLY_TARGETS } from './ensemble.js'
+
+describe('patchApplyFile()', () => {
+  let tmpDir
+
+  beforeEach(() => {
+    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'openspec-test-'))
+  })
+
+  afterEach(() => {
+    fs.rmSync(tmpDir, { recursive: true, force: true })
+  })
+
+  it('returns ok:false when file does not exist', async () => {
+    const result = await patchApplyFile(path.join(tmpDir, 'missing.md'))
+
+    expect(result).toEqual({ ok: false, reason: 'missing-file' })
+  })
+
+  it('returns ok:false when Step 6 is not found', async () => {
+    const filePath = path.join(tmpDir, 'opsx-apply.md')
+    fs.writeFileSync(filePath, 'Some other content without Step 6', 'utf-8')
+
+    const result = await patchApplyFile(filePath)
+
+    expect(result).toEqual({ ok: false, reason: 'missing-step-6' })
+  })
+
+  it('patches file with ENSEMBLE_SECTION when Step 6 found', async () => {
+    const filePath = path.join(tmpDir, 'opsx-apply.md')
+    const original = `Some header
+
+6. **Implement**
+   Old implementation here.
+
+**Fluid Workflow Integration**
+   Fluid section content.
+`
+    fs.writeFileSync(filePath, original, 'utf-8')
+
+    const result = await patchApplyFile(filePath)
+
+    expect(result.ok).toBe(true)
+    const patched = fs.readFileSync(filePath, 'utf-8')
+    expect(patched).toContain('**Implement via ensemble team**')
+    expect(patched).toContain('6. **Implement via ensemble team**')
+    expect(patched).toContain('**Fluid Workflow Integration**')
+  })
+
+  it('removes original Step 6 content before patching', async () => {
+    const filePath = path.join(tmpDir, 'SKILL.md')
+    const original = `Steps:
+
+6. **Implement**
+   Do things directly.
+
+7. **Quality check**
+`
+    fs.writeFileSync(filePath, original, 'utf-8')
+
+    await patchApplyFile(filePath)
+
+    const patched = fs.readFileSync(filePath, 'utf-8')
+    expect(patched).not.toContain('Do things directly.')
+    expect(patched).toContain('NEVER implement tasks directly')
+  })
+})
+
+describe('APPLY_TARGETS', () => {
+  it('contains expected OpenSpec apply file paths', () => {
+    expect(APPLY_TARGETS).toHaveLength(2)
+    expect(APPLY_TARGETS).toContain(path.join('.opencode', 'commands', 'opsx-apply.md'))
+    expect(APPLY_TARGETS).toContain(path.join('.opencode', 'skills', 'openspec-apply-change', 'SKILL.md'))
+  })
+})

package/src/steps/openspec/index.js

@@ -1,32 +1,121 @@
-import { execa } from 'execa'
-import path from 'node:path'
-import { error, header, success, warn } from '../../utils/exec.js'
-import { APPLY_TARGETS, patchApplyFile } from './ensemble.js'
-
-export async function initOpenspec() {
-  header('Step 6, Initializing OpenSpec');
-
-  try {
-    const result = await execa('npx', ['@fission-ai/openspec', 'init', '--tools', 'opencode', '--force'], {
-      cwd: process.cwd(),
-      stdio: 'pipe',
-      reject: false,
-    });
-
-    if (result.exitCode === 0) success('OpenSpec initialized');
-    else warn('OpenSpec init exited with non-zero code, check output above');
-  } catch (err) {
-    error(`Failed to run openspec init: ${err.message}`);
-  }
-
-  for (const rel of APPLY_TARGETS) {
-    const abs = path.join(process.cwd(), rel);
-    try {
-      const res = await patchApplyFile(abs);
-      if (res.ok) success(`Patched ensemble implementation section in ${rel}`);
-      else warn(`Could not patch ${rel} (${res.reason})`);
-    } catch (err) {
-      warn(`Could not patch ${rel}: ${err.message}`);
-    }
-  }
-}
+import { execa } from "execa"
+import path from "node:path"
+import { commandExists, error, header, info, loading, success, warn} from "../../utils/exec.js"
+import { APPLY_TARGETS, patchApplyFile } from "./ensemble.js"
+
+export const openspecSteps = {
+  check,
+  install,
+  init,
+  patch,
+}
+
+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, patched: 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, patched: false }
+  }
+
+  const patchesResult = await openspecSteps.patch()
+  return {
+    ...openSpec,
+    initialized: true,
+    patched: patchesResult.success,
+  }
+}
+
+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(),
+        stdio: "pipe",
+        reject: false,
+      },
+    )
+
+    if (result.exitCode !== 0) {
+      throw new Error(
+        `init failed with exit code ${result.exitCode}, check output above`,
+      )
+    }
+  } catch (err) {
+    error(`Failed to run openspec init: ${err.message}`)
+    return { initialized: false }
+  }
+
+  success("OpenSpec initialized")
+  return { initialized: true }
+}
+
+async function patch() {
+  loading("Patching OpenSpec ensemble implementation...")
+
+  const patched = []
+
+  for (const rel of APPLY_TARGETS) {
+    const abs = path.join(process.cwd(), rel)
+    try {
+      const res = await patchApplyFile(abs)
+      if (res.ok) {
+        patched.push(rel)
+        success(`Patched ensemble implementation section in ${rel}`)
+      } else warn(`Could not patch ${rel} (${res.reason})`)
+    } catch (err) {
+      warn(`Could not patch ${rel}: ${err.message}`)
+    }
+  }
+
+  return { success: patched.length === APPLY_TARGETS.length, patched }
+}

package/src/steps/openspec/index.test.js

@@ -0,0 +1,63 @@
+import { beforeEach, describe, expect, it, vi } from "vitest"
+
+vi.mock("execa")
+vi.mock("../../utils/exec.js")
+vi.mock("./ensemble.js")
+
+import { execa } from "execa"
+import { commandExists } from "../../utils/exec.js"
+import { patchApplyFile } from "./ensemble.js"
+import { initOpenspec } from "./index.js"
+
+const patchSuccess = () => patchApplyFile.mockResolvedValue({ ok: true })
+const installFails = () => execa.mockResolvedValueOnce({ exitCode: 1 })
+const installSuccess = () => execa.mockResolvedValueOnce({ exitCode: 0 })
+const initSuccess = () => execa.mockResolvedValueOnce({ exitCode: 0 })
+const initFails = () => execa.mockResolvedValueOnce({ exitCode: 1 })
+const checkFails = () => commandExists.mockResolvedValueOnce(false)
+const checkSuccess = () => commandExists.mockResolvedValueOnce(true)
+
+describe("initOpenspec()", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it("installs, initializes, and patches when openspec is initially unavailable", async () => {
+    checkFails()
+    checkSuccess()
+    installSuccess()
+    initSuccess()
+    patchSuccess()
+
+    const result = await initOpenspec()
+
+    expect(result.available).toBe(true)
+    expect(result.initialized).toBe(true)
+    expect(result.patched).toBe(true)
+  })
+
+  it("fails if openspec remains unavailable after install", async () => {
+    checkFails()
+    checkFails()
+    installFails()
+
+    const result = await initOpenspec()
+
+    expect(result.available).toBe(false)
+    expect(result.initialized).toBe(false)
+    expect(result.patched).toBe(false)
+  })
+
+  it("fails if openspec init command exits non-zero", async () => {
+    checkFails()
+    checkSuccess()
+    installSuccess()
+    initFails()
+
+    const result = await initOpenspec()
+
+    expect(result.available).toBe(true)
+    expect(result.initialized).toBe(false)
+    expect(result.patched).toBe(false)
+  })
+})

package/src/steps/optimization/caveman.js

@@ -1,29 +1,34 @@
-import { execa } from 'execa'
-import { header, success, warn, error, loading, info } from '../../utils/exec.js'
-
-export async function installCaveman(options = {}) {
-  if (!options.skipHeader) header('Installing caveman')
-
-  loading('installing caveman...')
-
-  try {
-    info('Installing caveman via npx skills')
-    const result = await execa('npx', ['skills', 'add', 'JuliusBrussee/caveman/caveman', '-a', 'opencode', '--yes'], {
-      reject: false,
-      timeout: 600000,
-      stdio: 'pipe',
-    })
-
-    if (result.exitCode === 0) {
-      success('caveman installed')
-      return { optedIn: true, installed: true }
-    }
-
-    if (result.stderr?.trim()) warn(result.stderr.trim().split('\n').slice(-3).join('\n'))
-    warn('caveman install exited with non-zero code')
-    return { optedIn: true, installed: false }
-  } catch (err) {
-    error(`Failed to install caveman: ${err.message}`)
-    return { optedIn: true, installed: false }
-  }
-}
+import { execa } from 'execa'
+import { header, success, warn, error, loading, info } from '../../utils/exec.js'
+
+export async function installCaveman(options = {}) {
+  if (!options.skipHeader) header('Installing caveman')
+
+  loading('installing caveman...')
+
+  const isGlobal = options.installScope === 'global'
+  const skillsArgs = isGlobal
+    ? ['skills', 'add', 'JuliusBrussee/caveman/caveman', '-a', 'opencode', '--yes', '-g']
+    : ['skills', 'add', 'JuliusBrussee/caveman/caveman', '-a', 'opencode', '--yes']
+
+  try {
+    info('Installing caveman via npx skills')
+    const result = await execa('npx', skillsArgs, {
+      reject: false,
+      timeout: 600000,
+      stdio: 'pipe',
+    })
+
+    if (result.exitCode === 0) {
+      success('caveman installed')
+      return { optedIn: true, installed: true }
+    }
+
+    if (result.stderr?.trim()) warn(result.stderr.trim().split('\n').slice(-3).join('\n'))
+    warn('caveman install exited with non-zero code')
+    return { optedIn: true, installed: false }
+  } catch (err) {
+    error(`Failed to install caveman: ${err.message}`)
+    return { optedIn: true, installed: false }
+  }
+}

package/src/steps/optimization/codegraph.js

@@ -0,0 +1,52 @@
+import { execa } from 'execa'
+import { header, success, warn, error, loading } from '../../utils/exec.js'
+
+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',
+      ['@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 }
+    }
+    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('codegraph', ['init'], {
+      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/src/steps/optimization/global.js

@@ -1,64 +1,88 @@
-import fse from 'fs-extra'
-import path from 'node:path'
-import { info, success, warn } from '../../utils/exec.js'
-
-const SOURCE_START = '<!-- OB-SOURCE-ROOTS-START -->'
-const SOURCE_END = '<!-- OB-SOURCE-ROOTS-END -->'
-const RTK_START = '<!-- OB-RTK-START -->'
-const RTK_END = '<!-- OB-RTK-END -->'
-const CAVEMAN_START = '<!-- OB-CAVEMAN-START -->'
-const CAVEMAN_END = '<!-- OB-CAVEMAN-END -->'
-
-function relRoot(cwd, abs) {
-  const rel = path.relative(cwd, abs).replace(/\\/g, '/')
-  return rel || '.'
-}
-
-function buildSourceRootsSection(sourceRoots, cwd) {
-  const roots = Array.isArray(sourceRoots) && sourceRoots.length > 0 ? sourceRoots : [cwd]
-  const bullets = roots.map(r => `- \`${relRoot(cwd, r)}\``).join('\n')
-  const multiRepo = roots.length > 1
-    ? '\nEach root is an independent git repository. For branch/commit/push workflows, run git operations per repository. There is no single shared git history across all roots.\n'
-    : ''
-
-  return `Read and analyze code ONLY from these roots:\n\n${bullets}\n${multiRepo}`
-}
-
-function buildRtkSection(rtkEnabled) {
-  if (!rtkEnabled) return 'RTK was not selected during onboarding. Do not assume `rtk` exists.'
-  return `## RTK, MANDATORY\n\nUse \`rtk\` for ALL CLI commands. Never run commands directly.\n\n- \`rtk git\` NOT \`git\`\n- \`rtk gh\` NOT \`gh\`\n- \`rtk az\` NOT \`az\`\n- \`rtk openspec\` NOT \`openspec\`\n\nIf \`rtk\` is not available, report blocker and stop CLI execution.`
-}
-
-function buildCavemanSection(cavemanEnabled) {
-  if (!cavemanEnabled) return 'Caveman was not selected during onboarding. Use normal concise style.'
-  return `## Caveman\n\ncaveman mode. Active now. Every response. No revert unless user asks \"stop caveman\" or \"normal mode\".`
-}
-
-function replaceBetween(content, start, end, replacement) {
-  if (!content.includes(start) || !content.includes(end)) return content
-  const pattern = new RegExp(`${start}[\\s\\S]*?${end}`)
-  return content.replace(pattern, `${start}\n${replacement.trim()}\n${end}`)
-}
-
-export async function configureObGlobal(ctx = {}, tokenOpt = {}) {
-  const cwd = process.cwd()
-  const skillPath = path.join(cwd, '.agents', 'skills', 'ob-global', 'SKILL.md')
-
-  if (!await fse.pathExists(skillPath)) {
-    warn('ob-global skill not found, skipping dynamic configuration')
-    return { configured: false }
-  }
-
-  const sourceRootsSection = buildSourceRootsSection(ctx.sourceRoots, cwd)
-  const rtkSection = buildRtkSection(!!tokenOpt?.rtk?.optedIn)
-  const cavemanSection = buildCavemanSection(!!tokenOpt?.caveman?.optedIn)
-
-  let content = await fse.readFile(skillPath, 'utf-8')
-  content = replaceBetween(content, SOURCE_START, SOURCE_END, sourceRootsSection)
-  content = replaceBetween(content, RTK_START, RTK_END, rtkSection)
-  content = replaceBetween(content, CAVEMAN_START, CAVEMAN_END, cavemanSection)
-  await fse.writeFile(skillPath, `${content.replace(/\s*$/, '')}\n`, 'utf-8')
-  info('Configured ob-global from onboarding selections')
-  success('ob-global skill updated')
-  return { configured: true, path: skillPath }
-}
+import fse from 'fs-extra'
+import path from 'node:path'
+import { info, success, warn } from '../../utils/exec.js'
+
+const SOURCE_START = '<!-- OB-SOURCE-ROOTS-START -->'
+const SOURCE_END = '<!-- OB-SOURCE-ROOTS-END -->'
+const RTK_START = '<!-- OB-RTK-START -->'
+const RTK_END = '<!-- OB-RTK-END -->'
+const CAVEMAN_START = '<!-- OB-CAVEMAN-START -->'
+const CAVEMAN_END = '<!-- OB-CAVEMAN-END -->'
+
+const CODEGRAPH_START = '<!-- OB-CODEGRAPH-START -->'
+const CODEGRAPH_END = '<!-- OB-CODEGRAPH-END -->'
+
+function relRoot(cwd, abs) {
+  const rel = path.relative(cwd, abs).replace(/\\/g, '/')
+  return rel || '.'
+}
+
+function buildSourceRootsSection(sourceRoots, cwd) {
+  const roots = Array.isArray(sourceRoots) && sourceRoots.length > 0 ? sourceRoots : [cwd]
+  const bullets = roots.map(r => `- \`${relRoot(cwd, r)}\``).join('\n')
+  const multiRepo = roots.length > 1
+    ? '\nEach root is an independent git repository. For branch/commit/push workflows, run git operations per repository. There is no single shared git history across all roots.\n'
+    : ''
+
+  return `Read and analyze code ONLY from these roots:\n\n${bullets}\n${multiRepo}`
+}
+
+function buildRtkSection(rtkEnabled) {
+  if (!rtkEnabled) return 'RTK was not selected during onboarding. Do not assume `rtk` exists.'
+  return `## RTK, MANDATORY\n\nUse \`rtk\` for ALL CLI commands. Never run commands directly.\n\n- \`rtk git\` NOT \`git\`\n- \`rtk gh\` NOT \`gh\`\n- \`rtk az\` NOT \`az\`\n- \`rtk openspec\` NOT \`openspec\`\n\nIf \`rtk\` is not available, report blocker and stop CLI execution.`
+}
+
+function buildCavemanSection(cavemanEnabled) {
+  if (!cavemanEnabled) return 'Caveman was not selected during onboarding. Use normal concise style.'
+  return `## Caveman\n\ncaveman mode. Active now. Every response. No revert unless user asks "stop caveman" or "normal mode".`
+}
+
+function buildCodegraphSection(codegraphEnabled) {
+  if (!codegraphEnabled) return 'Codegraph was not selected during onboarding. Use standard grep/glob/read for code exploration.'
+  return `## CodeGraph
+
+This project has CodeGraph initialized (\`.codegraph/\` exists). Use it for all code exploration.
+
+**NEVER call \`codegraph_explore\` or \`codegraph_context\` directly in the main session** — these return large source payloads that fill context. Instead, ALWAYS spawn an Explore sub-agent for exploration questions ("how does X work?", "where is Y implemented?").
+
+When spawning Explore agents, include in the prompt:
+> This project has CodeGraph initialized. Use \`codegraph_explore\` as your PRIMARY tool. Do NOT re-read files that codegraph_explore already returned. Only fall back to grep/glob/read for files listed under "Additional relevant files".
+
+**The main session may only use these lightweight tools directly** (targeted lookups before edits):
+- \`codegraph_search\` — find symbols by name
+- \`codegraph_callers\` / \`codegraph_callees\` — trace call flow
+- \`codegraph_impact\` — check what's affected before editing
+- \`codegraph_node\` — get a single symbol's details`
+}
+
+
+function replaceBetween(content, start, end, replacement) {
+  if (!content.includes(start) || !content.includes(end)) return content
+  const pattern = new RegExp(`${start}[\\s\\S]*?${end}`)
+  return content.replace(pattern, `${start}\n${replacement.trim()}\n${end}`)
+}
+
+export async function configureObGlobal(ctx = {}, tokenOpt = {}) {
+  const cwd = process.cwd()
+  const skillPath = path.join(cwd, '.agents', 'skills', 'ob-global', 'SKILL.md')
+
+  if (!await fse.pathExists(skillPath)) {
+    warn('ob-global skill not found, skipping dynamic configuration')
+    return { configured: false }
+  }
+
+  const sourceRootsSection = buildSourceRootsSection(ctx.sourceRoots, cwd)
+  const rtkSection = buildRtkSection(!!tokenOpt?.rtk?.optedIn)
+  const cavemanSection = buildCavemanSection(!!tokenOpt?.caveman?.optedIn)
+  const codegraphSection = buildCodegraphSection(!!tokenOpt?.codegraph?.optedIn)
+
+  let content = await fse.readFile(skillPath, 'utf-8')
+  content = replaceBetween(content, SOURCE_START, SOURCE_END, sourceRootsSection)
+  content = replaceBetween(content, RTK_START, RTK_END, rtkSection)
+  content = replaceBetween(content, CAVEMAN_START, CAVEMAN_END, cavemanSection)
+  content = replaceBetween(content, CODEGRAPH_START, CODEGRAPH_END, codegraphSection)
+  await fse.writeFile(skillPath, `${content.replace(/\s*$/, '')}\n`, 'utf-8')
+  info('Configured ob-global from onboarding selections')
+  success('ob-global skill updated')
+  return { configured: true, path: skillPath }
+}