opencode-onboard 0.4.1 → 0.4.2

package/README.md

@@ -90,6 +90,18 @@ OpenCode generates `ARCHITECTURE.md` and `DESIGN.md` from your actual codebase,
 
 ---
 
+## Commands
+
+Custom slash commands are installed into `.opencode/commands/` and are available directly in OpenCode.
+
+| Command | Description |
+|---------|-------------|
+| `/init` | Initialize the project: generate `ARCHITECTURE.md`, `DESIGN.md`, archive history, activate agent team |
+| `/plan <url>` | Parse a user story URL and produce a plan — proposal, specs, and tasks. Stops before implementation. |
+| `/main <task>` | Quick direct implementation — no OpenSpec, no ensemble, no PRs. Just do it. |
+
+---
+
 ## Agents and Skills
 
 opencode-onboard draws a hard line between two concepts:

package/content/.opencode/commands/init.md

@@ -0,0 +1,8 @@
+---
+description: Initialize the project — runs the bootstrap sequence defined in AGENTS.md if not yet initialized.
+---
+
+Check if `AGENTS.md` is in bootstrap mode (contains `<!-- AGENTS-TEMPLATE-START -->`).
+
+- If yes: run the full initialization sequence defined in `AGENTS.md` now.
+- If no: tell the user the project is already initialized.

package/content/.opencode/commands/main.md

@@ -0,0 +1,17 @@
+---
+description: Quick direct implementation — no OpenSpec, no ensemble, no PRs. Just do it.
+---
+
+Implement the task described after `/main` directly and immediately.
+
+**Rules:**
+- No OpenSpec artifacts (no proposal, no specs, no tasks.md)
+- No ensemble team (no team_create, no team_spawn)
+- No branches, no PRs
+- Work directly in the current branch
+- Keep changes minimal and focused on exactly what was asked
+- Use Read/Glob/Grep to locate relevant files before editing
+- After editing, run `pnpm run typecheck` to catch type errors; fix any that are caused by your changes
+- Do NOT run lint or tests unless the user asks
+
+**Input**: Everything after `/main` is the task. Execute it now. 

package/content/.opencode/commands/plan.md

@@ -0,0 +1,37 @@
+---
+description: Parse a user story URL and produce a plan — proposal, specs, and tasks. Stops before implementation.
+---
+
+Parse the work item at the URL provided after `/plan` and produce a full implementation plan.
+
+**Input**: A GitHub Issue URL or Azure DevOps work item URL. Example: `/plan https://github.com/org/repo/issues/42`
+
+**Steps:**
+
+1. **Load baseline**
+
+   Load `@ob-global` first.
+
+2. **Detect URL type and load matching skill**
+
+   - GitHub Issue URL → load `ob-userstory-gh` skill
+   - Azure DevOps URL → load `ob-userstory-az` skill
+
+   Follow the skill steps exactly: fetch the issue/work item via CLI and create an OpenSpec change.
+
+3. **Propose**
+
+   Run `/opsx-propose` to generate `proposal.md`, specs, and `tasks.md`.
+
+4. **Show the plan**
+
+   Display:
+   - Change name
+   - Total number of tasks
+   - Full task list summary
+
+5. **Stop**
+
+   Ask the user: "Ready to implement? Type `/opsx-apply` to start."
+
+   Do NOT proceed to implementation. Do NOT run `/opsx-apply` automatically.

package/package.json

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

package/src/commands/join.js

@@ -0,0 +1,43 @@
+import chalk from 'chalk'
+import { header, info } from '../utils/exec.js'
+import { installBrowser } from '../steps/browser/index.js'
+import { checkRtk } from '../steps/optimization/index.js'
+import { choosePlatform, checkPlatform } from '../steps/platform/index.js'
+import { readOnboardConfig } from './shared.js'
+
+export async function runJoin() {
+  const logo = chalk.hex('#fe3d57')
+  console.log()
+  console.log(logo('  🤝 opencode-onboard join'))
+  console.log(chalk.dim('  New team member setup — checks & local installs only'))
+  console.log(chalk.dim('  This will NOT modify any project files.'))
+  console.log()
+
+  // Step 1: Platform CLI check
+  header('Step 1, Platform CLI check')
+  const saved = await readOnboardConfig()
+  const savedPlatform = saved?.wizard?.platform
+  if (savedPlatform) {
+    info(`Detected project platform: ${savedPlatform === 'github' ? 'GitHub' : 'Azure DevOps'}`)
+    await checkPlatform(savedPlatform)
+  } else {
+    const platform = await choosePlatform()
+    void platform // result not persisted in join mode
+  }
+
+  // Step 2: rtk check
+  header('Step 2, Checking rtk')
+  await checkRtk({ skipHeader: true })
+
+  // Step 3: Browser extension
+  await installBrowser()
+
+  console.log()
+  console.log(chalk.bold.green('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'))
+  console.log(chalk.bold.green('  Join setup complete!'))
+  console.log(chalk.bold.green('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'))
+  console.log()
+  console.log('  Your local environment is ready.')
+  console.log('  Open the project in OpenCode and start coding!')
+  console.log()
+}

package/src/commands/shared.js

@@ -0,0 +1,12 @@
+import fse from 'fs-extra'
+import path from 'node:path'
+
+export async function readOnboardConfig() {
+  const cfgPath = path.join(process.cwd(), '.opencode', 'opencode-onboard.json')
+  if (!await fse.pathExists(cfgPath)) return null
+  try {
+    return await fse.readJson(cfgPath)
+  } catch {
+    return null
+  }
+}

package/src/commands/shared.test.js

@@ -0,0 +1,56 @@
+import { describe, it, expect, beforeEach, afterEach } from 'vitest'
+import fs from 'node:fs'
+import path from 'node:path'
+import os from 'node:os'
+import { readOnboardConfig } from './shared.js'
+
+describe('readOnboardConfig()', () => {
+  let tmpDir, originalCwd
+
+  beforeEach(() => {
+    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'shared-test-'))
+    originalCwd = process.cwd()
+    process.chdir(tmpDir)
+  })
+
+  afterEach(() => {
+    process.chdir(originalCwd)
+    fs.rmSync(tmpDir, { recursive: true, force: true })
+  })
+
+  it('returns null when config file does not exist', async () => {
+    const result = await readOnboardConfig()
+
+    expect(result).toBeNull()
+  })
+
+  it('returns parsed config when file exists', async () => {
+    const configDir = path.join(tmpDir, '.opencode')
+    fs.mkdirSync(configDir)
+    fs.writeFileSync(
+      path.join(configDir, 'opencode-onboard.json'),
+      JSON.stringify({ schema: 1, wizard: { platform: 'github' } }),
+      'utf-8'
+    )
+
+    const result = await readOnboardConfig()
+
+    expect(result).not.toBeNull()
+    expect(result.schema).toBe(1)
+    expect(result.wizard.platform).toBe('github')
+  })
+
+  it('returns null when file contains invalid JSON', async () => {
+    const configDir = path.join(tmpDir, '.opencode')
+    fs.mkdirSync(configDir)
+    fs.writeFileSync(
+      path.join(configDir, 'opencode-onboard.json'),
+      'not valid json',
+      'utf-8'
+    )
+
+    const result = await readOnboardConfig()
+
+    expect(result).toBeNull()
+  })
+})

package/src/commands/single.js

@@ -0,0 +1,64 @@
+import { cleanAiFiles } from '../steps/clean/index.js'
+import { copyContentStep } from '../steps/copy/index.js'
+import { chooseModels } from '../steps/models/index.js'
+import { initOpenspec } from '../steps/openspec/index.js'
+import { tokenOptimizationStep } from '../steps/optimization/index.js'
+import { choosePlatform } from '../steps/platform/index.js'
+import { installBrowser } from '../steps/browser/index.js'
+import { writeOnboardConfig } from '../steps/metadata/index.js'
+import { readOnboardConfig } from './shared.js'
+
+export async function runSingleCommand(command) {
+  const saved = await readOnboardConfig()
+  const savedWizard = saved?.wizard ?? {}
+  const ctx = {
+    hasDesign: !!savedWizard?.preserved?.design,
+    hasArchitecture: !!savedWizard?.preserved?.architecture,
+    hasOpenspec: !!savedWizard?.preserved?.openspec,
+    sourceMode: savedWizard?.sourceMode ?? 'current',
+    sourceRoots: Array.isArray(savedWizard?.sourceRoots) ? savedWizard.sourceRoots : [],
+  }
+  const platform = savedWizard?.platform
+  const resolvedPlatform = platform === 'azure' || platform === 'github' ? platform : 'github'
+
+  const handlers = {
+    clean: async () => {
+      await cleanAiFiles()
+    },
+    platform: async () => {
+      await choosePlatform()
+    },
+    copy: async () => {
+      await copyContentStep(resolvedPlatform, ctx)
+    },
+    openspec: async () => {
+      await initOpenspec()
+    },
+    models: async () => {
+      await chooseModels()
+    },
+    optimization: async () => {
+      await tokenOptimizationStep({ ctx })
+    },
+    browser: async () => {
+      await installBrowser()
+    },
+    metadata: async () => {
+      await writeOnboardConfig({
+        ...ctx,
+        platform: resolvedPlatform,
+        additionalSkillsProvider: 'npx-skills',
+        planModel: savedWizard?.models?.plan ?? null,
+        buildModel: savedWizard?.models?.build ?? null,
+        fastModel: savedWizard?.models?.fast ?? null,
+        optionalTools: savedWizard?.optionalTools ?? null,
+        cavemanGuidance: savedWizard?.cavemanGuidance ?? null,
+      })
+    },
+  }
+
+  const handler = handlers[command]
+  if (!handler) return false
+  await handler()
+  return true
+}

package/src/commands/wizard.js

@@ -0,0 +1,99 @@
+import chalk from 'chalk'
+import { chooseSourceScope } from '../steps/source/index.js'
+import { cleanAiFiles } from '../steps/clean/index.js'
+import { choosePlatform } from '../steps/platform/index.js'
+import { copyContentStep } from '../steps/copy/index.js'
+import { initOpenspec } from '../steps/openspec/index.js'
+import { chooseModels } from '../steps/models/index.js'
+import { tokenOptimizationStep } from '../steps/optimization/index.js'
+import { installBrowser } from '../steps/browser/index.js'
+import { writeOnboardConfig } from '../steps/metadata/index.js'
+
+export async function runWizard(version) {
+  const logo = chalk.hex('#fe3d57')
+  const bannerLines = [
+    logo('                             '),
+    logo('        ▒▒▒▒▒▒▒▒▒▒▒▒▒        '),
+    logo('        ▒▒▓       ▓▒▓        '),
+    logo('   ▒▒▒▒▒▒▓▒▒▒▒▒▒▒▒▒▓▓▒▒▒▒▒   '),
+    logo('  ▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓  '),
+    logo(' ▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓ '),
+    logo(' ▓▒▒▒▒░░░▒▒▒▒▒▒▒▒▒▒▒░░░▒▒▒▓▓ '),
+    logo('  ▓▓▓▓▒▒▒▓▓▓▓▓▓▓▓▓▓▓▒▒▒▓▓▓▓  '),
+    logo('  ▓▓▒▒▒▒▒▒░▒▒▒▒▒▒▒░▒▒▒▒▒▒▓▓  '),
+    logo('  ▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓   '),
+    logo('  ▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓   '),
+    logo('   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓    '),
+    '',
+    chalk.bold('        🧰 opencode-onboard') + chalk.dim(` v${version}`),
+    chalk.dim('        Prepare your codebase for AI agents'),
+  ]
+
+  for (const line of bannerLines) console.log(line)
+  console.log()
+  console.log('  This tool will set up your project with a team of AI agents,')
+  console.log('  install skills, select models, and configure OpenCode.')
+  console.log()
+
+  // Only wait for Enter in a real interactive TTY
+  if (process.stdin.isTTY) {
+    console.log(chalk.bold('  Press Enter to begin...'))
+    console.log()
+    await new Promise(resolve => {
+      process.stdin.resume()
+      process.stdin.once('data', () => {
+        process.stdin.pause()
+        resolve()
+      })
+    })
+  }
+
+  const scope = await chooseSourceScope()
+
+  const preserve = await cleanAiFiles()
+  const ctx = { ...preserve, ...scope }
+
+  const platform = await choosePlatform()
+
+  await copyContentStep(platform, ctx)
+
+  await initOpenspec()
+
+  const selectedModels = await chooseModels()
+
+  const tokenOpt = await tokenOptimizationStep({ ctx })
+  const { rtk, quota, caveman, cavemanGuidance } = tokenOpt
+
+  await installBrowser()
+
+  await writeOnboardConfig({
+    ...ctx,
+    platform,
+    additionalSkillsProvider: 'npx-skills',
+    ...selectedModels,
+    optionalTools: { rtk, quota, caveman },
+    cavemanGuidance,
+  })
+
+  const toGenerate = [
+    !ctx.hasDesign && 'DESIGN.md',
+    !ctx.hasArchitecture && 'ARCHITECTURE.md',
+  ].filter(Boolean)
+
+  console.log()
+  console.log(chalk.bold.green('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'))
+  console.log(chalk.bold.green('  Onboarding complete!'))
+  console.log(chalk.bold.green('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'))
+  console.log()
+  console.log('  Open this project in OpenCode and type:')
+  console.log(chalk.bold('  "init"'))
+  console.log()
+  if (toGenerate.length > 0) {
+    console.log(`  OpenCode will generate ${toGenerate.join(' and ')}`)
+    console.log('  from your actual codebase, then activate the agent team.')
+  } else {
+    console.log('  OpenCode will activate the agent team.')
+  }
+  console.log(`  Source scope: ${ctx.sourceMode === 'parent-selected' ? ctx.sourceRoots.map(p => `../${p.split(/[/\\]/).pop()}`).join(', ') : 'current folder'}`)
+  console.log()
+}

package/src/index.js

@@ -1,17 +1,9 @@
 #!/usr/bin/env node
 import chalk from 'chalk'
-import fse from 'fs-extra'
 import { createRequire } from 'node:module'
-import path from 'node:path'
-import { installBrowser } from './steps/browser/index.js'
-import { cleanAiFiles } from './steps/clean/index.js'
-import { copyContentStep } from './steps/copy/index.js'
-import { chooseModels } from './steps/models/index.js'
-import { initOpenspec } from './steps/openspec/index.js'
-import { tokenOptimizationStep } from './steps/optimization/index.js'
-import { choosePlatform } from './steps/platform/index.js'
-import { chooseSourceScope } from './steps/source/index.js'
-import { writeOnboardConfig } from './steps/metadata/index.js'
+import { runJoin } from './commands/join.js'
+import { runSingleCommand } from './commands/single.js'
+import { runWizard } from './commands/wizard.js'
 
 function printHelp(version) {
   console.log(`opencode-onboard v${version}`)
@@ -21,6 +13,7 @@ function printHelp(version) {
   console.log('  npx opencode-onboard <command>      Run a single step command')
   console.log()
   console.log('Commands:')
+  console.log('  join            New team member setup (checks & local installs only)')
   console.log('  clean           Run AI files cleanup step')
   console.log('  platform        Run platform selection step')
   console.log('  copy            Run content copy step')
@@ -34,71 +27,6 @@ function printHelp(version) {
   console.log('  -h, --help      Show this help message')
 }
 
-async function readOnboardConfig() {
-  const cfgPath = path.join(process.cwd(), '.opencode', 'opencode-onboard.json')
-  if (!await fse.pathExists(cfgPath)) return null
-  try {
-    return await fse.readJson(cfgPath)
-  } catch {
-    return null
-  }
-}
-
-async function runSingleCommand(command) {
-  const saved = await readOnboardConfig()
-  const savedWizard = saved?.wizard ?? {}
-  const ctx = {
-    hasDesign: !!savedWizard?.preserved?.design,
-    hasArchitecture: !!savedWizard?.preserved?.architecture,
-    hasOpenspec: !!savedWizard?.preserved?.openspec,
-    sourceMode: savedWizard?.sourceMode ?? 'current',
-    sourceRoots: Array.isArray(savedWizard?.sourceRoots) ? savedWizard.sourceRoots : [],
-  }
-  const platform = savedWizard?.platform
-  const resolvedPlatform = platform === 'azure' || platform === 'github' ? platform : 'github'
-
-  const handlers = {
-    clean: async () => {
-      await cleanAiFiles()
-    },
-    platform: async () => {
-      await choosePlatform()
-    },
-    copy: async () => {
-      await copyContentStep(resolvedPlatform, ctx)
-    },
-    openspec: async () => {
-      await initOpenspec()
-    },
-    models: async () => {
-      await chooseModels()
-    },
-    optimization: async () => {
-      await tokenOptimizationStep({ ctx })
-    },
-    browser: async () => {
-      await installBrowser()
-    },
-    metadata: async () => {
-      await writeOnboardConfig({
-        ...ctx,
-        platform: resolvedPlatform,
-        additionalSkillsProvider: 'npx-skills',
-        planModel: savedWizard?.models?.plan ?? null,
-        buildModel: savedWizard?.models?.build ?? null,
-        fastModel: savedWizard?.models?.fast ?? null,
-        optionalTools: savedWizard?.optionalTools ?? null,
-        cavemanGuidance: savedWizard?.cavemanGuidance ?? null,
-      })
-    },
-  }
-
-  const handler = handlers[command]
-  if (!handler) return false
-  await handler()
-  return true
-}
-
 if (process.stdout.isTTY) console.clear()
 console.log()
 const require = createRequire(import.meta.url)
@@ -111,103 +39,32 @@ if (args.includes('-h') || args.includes('--help')) {
 }
 
 if (args.length > 0) {
-  const ok = await runSingleCommand(args[0])
-  if (!ok) {
-    console.log(chalk.red(`Unknown command: ${args[0]}`))
-    console.log()
-    printHelp(version)
-    process.exit(1)
+  try {
+    if (args[0] === 'join') {
+      await runJoin()
+    } else {
+      const ok = await runSingleCommand(args[0])
+      if (!ok) {
+        console.log(chalk.red(`Unknown command: ${args[0]}`))
+        console.log()
+        printHelp(version)
+        process.exit(1)
+      }
+    }
+  } catch (err) {
+    if (err.name === 'ExitPromptError') {
+      console.log()
+      console.log(chalk.yellow('Cancelled.'))
+    } else {
+      console.error(chalk.red('\nUnexpected error:'), err.message)
+      process.exit(1)
+    }
   }
   process.exit(0)
 }
 
-const logo = chalk.hex('#fe3d57')
-const bannerLines = [
-  logo('                             '),
-  logo('        ▒▒▒▒▒▒▒▒▒▒▒▒▒        '),
-  logo('        ▒▒▓       ▓▒▓        '),
-  logo('   ▒▒▒▒▒▒▓▒▒▒▒▒▒▒▒▒▓▓▒▒▒▒▒   '),
-  logo('  ▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓  '),
-  logo(' ▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓ '),
-  logo(' ▓▒▒▒▒░░░▒▒▒▒▒▒▒▒▒▒▒░░░▒▒▒▓▓ '),
-  logo('  ▓▓▓▓▒▒▒▓▓▓▓▓▓▓▓▓▓▓▒▒▒▓▓▓▓  '),
-  logo('  ▓▓▒▒▒▒▒▒░▒▒▒▒▒▒▒░▒▒▒▒▒▒▓▓  '),
-  logo('  ▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓   '),
-  logo('  ▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓   '),
-  logo('   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓    '),
-  '',
-  chalk.bold('        🧰 opencode-onboard') + chalk.dim(` v${version}`),
-  chalk.dim('        Prepare your codebase for AI agents'),
-]
-
-for (const line of bannerLines) console.log(line)
-console.log()
-console.log('  This tool will set up your project with a team of AI agents,')
-console.log('  install skills, select models, and configure OpenCode.')
-console.log()
-
-// Only wait for Enter in a real interactive TTY
-if (process.stdin.isTTY) {
-  console.log(chalk.bold('  Press Enter to begin...'))
-  console.log()
-  await new Promise(resolve => {
-    process.stdin.resume()
-    process.stdin.once('data', () => {
-      process.stdin.pause()
-      resolve()
-    })
-  })
-}
-
 try {
-  const scope = await chooseSourceScope()
-
-  const preserve = await cleanAiFiles()
-  const ctx = { ...preserve, ...scope }
-
-  const platform = await choosePlatform()
-
-  await copyContentStep(platform, ctx)
-
-  await initOpenspec()
-
-  const selectedModels = await chooseModels()
-
-  const tokenOpt = await tokenOptimizationStep({ ctx })
-  const { rtk, quota, caveman, cavemanGuidance } = tokenOpt
-
-  await installBrowser()
-
-  await writeOnboardConfig({
-    ...ctx,
-    platform,
-    additionalSkillsProvider: 'npx-skills',
-    ...selectedModels,
-    optionalTools: { rtk, quota, caveman },
-    cavemanGuidance,
-  })
-
-  const toGenerate = [
-    !ctx.hasDesign && 'DESIGN.md',
-    !ctx.hasArchitecture && 'ARCHITECTURE.md',
-  ].filter(Boolean)
-
-  console.log()
-  console.log(chalk.bold.green('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'))
-  console.log(chalk.bold.green('  Onboarding complete!'))
-  console.log(chalk.bold.green('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'))
-  console.log()
-  console.log('  Open this project in OpenCode and type:')
-  console.log(chalk.bold('  "init"'))
-  console.log()
-  if (toGenerate.length > 0) {
-    console.log(`  OpenCode will generate ${toGenerate.join(' and ')}`)
-    console.log('  from your actual codebase, then activate the agent team.')
-  } else {
-    console.log('  OpenCode will activate the agent team.')
-  }
-  console.log(`  Source scope: ${ctx.sourceMode === 'parent-selected' ? ctx.sourceRoots.map(p => `../${p.split(/[/\\]/).pop()}`).join(', ') : 'current folder'}`)
-  console.log()
+  await runWizard(version)
 } catch (err) {
   if (err.name === 'ExitPromptError') {
     console.log()

package/src/steps/browser/browser.test.js

@@ -44,7 +44,7 @@ describe('installBrowser()', () => {
 
     await installBrowser()
 
-    expect(execa).toHaveBeenCalledWith('npx', expect.arrayContaining('@different-ai/opencode-browser'), expect.any(Object))
+    expect(execa).toHaveBeenCalledWith('npx', expect.arrayContaining(['@different-ai/opencode-browser']), expect.any(Object))
   })
 
   it('logs success when exit code is 0', async () => {

package/src/steps/metadata/metadata.test.js

@@ -25,14 +25,17 @@ import fse from 'fs-extra'
 import { writeOnboardConfig } from './index.js'
 
 describe('writeOnboardConfig()', () => {
-  let tmpDir
+  let tmpDir, originalCwd
 
   beforeEach(() => {
+    vi.clearAllMocks()
     tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'metadata-test-'))
+    originalCwd = process.cwd()
     process.chdir(tmpDir)
   })
 
   afterEach(() => {
+    process.chdir(originalCwd)
     fs.rmSync(tmpDir, { recursive: true, force: true })
   })
 
@@ -57,7 +60,7 @@ describe('writeOnboardConfig()', () => {
     expect(fse.ensureDir).toHaveBeenCalled()
     expect(fse.writeJson).toHaveBeenCalled()
     const call = fse.writeJson.mock.calls[0]
-    const payload = call[0]
+    const payload = call[1]
     expect(payload.schema).toBe(1)
     expect(payload.wizard.platform).toBe('github')
     expect(payload.wizard.models.build).toBe('build-model')
@@ -70,7 +73,7 @@ describe('writeOnboardConfig()', () => {
     await writeOnboardConfig({ platform: 'github', sourceMode: 'current', sourceRoots: [] })
 
     const call = fse.writeJson.mock.calls[0]
-    const payload = call[0]
+    const payload = call[1]
     expect(payload.opencodeVersion).toBe('2.0.0')
   })
 
@@ -80,7 +83,7 @@ describe('writeOnboardConfig()', () => {
     await writeOnboardConfig({ platform: 'github', sourceMode: 'current', sourceRoots: [] })
 
     const call = fse.writeJson.mock.calls[0]
-    const payload = call[0]
+    const payload = call[1]
     expect(payload.opencodeVersion).toBe(null)
   })
 
@@ -90,7 +93,7 @@ describe('writeOnboardConfig()', () => {
     await writeOnboardConfig({ platform: 'github', sourceMode: 'current', sourceRoots: [] })
 
     const call = fse.writeJson.mock.calls[0]
-    const payload = call[0]
+    const payload = call[1]
     expect(payload.note).toContain('Informational file only')
   })
 })

package/src/steps/models/format.test.js

@@ -7,7 +7,7 @@ describe('buildDisplayModels()', () => {
 
     const result = buildDisplayModels(raw)
 
-    expect(result[0].label).toContain('[$]')
+    expect(result[0].label).toContain('[$$]')
   })
 
   it('adds cost tier label for mid-range models', () => {
@@ -15,7 +15,7 @@ describe('buildDisplayModels()', () => {
 
     const result = buildDisplayModels(raw)
 
-    expect(result[0].label).toContain('[$$]')
+    expect(result[0].label).toContain('[$$$]')
   })
 
   it('adds cost tier label for expensive models', () => {
@@ -47,7 +47,8 @@ describe('buildDisplayModels()', () => {
 
     const result = buildDisplayModels(raw)
 
-    expect(result[0].description).toContain('cost: ?')
+    expect(result[0].description).toContain('?')
+    expect(result[0].label).not.toContain('[')
   })
 
   it('handles $0 subscription pricing', () => {
@@ -58,7 +59,7 @@ describe('buildDisplayModels()', () => {
     expect(result[0].description).toContain('$0 (subscription)')
   })
 
-  it('sorts models by cost ascending', () => {
+  it('preserves input order (sorting is done upstream by parseModels)', () => {
     const raw = [
       { id: 'expensive/model', name: 'Expensive', cost: 100, context: 1000 },
       { id: 'cheap/model', name: 'Cheap', cost: 1, context: 1000 },
@@ -67,8 +68,8 @@ describe('buildDisplayModels()', () => {
 
     const result = buildDisplayModels(raw)
 
-    expect(result[0].id).toBe('cheap/model')
-    expect(result[1].id).toBe('mid/model')
-    expect(result[2].id).toBe('expensive/model')
+    expect(result[0].id).toBe('expensive/model')
+    expect(result[1].id).toBe('cheap/model')
+    expect(result[2].id).toBe('mid/model')
   })
 })

package/src/steps/models/write.test.js

@@ -7,16 +7,6 @@ vi.mock('../../utils/exec.js', () => ({
   success: vi.fn(),
 }))
 
-vi.mock('fs-extra', () => ({
-  default: {
-    readFile: vi.fn(),
-    writeFile: vi.fn(),
-    writeJson: vi.fn(),
-    pathExists: vi.fn(),
-  },
-}))
-
-import fse from 'fs-extra'
 import { success } from '../../utils/exec.js'
 import { writeModelToAgent, writeModelsToConfigs } from './write.js'
 
@@ -24,6 +14,7 @@ describe('writeModelToAgent()', () => {
   let tmpDir
 
   beforeEach(() => {
+    vi.clearAllMocks()
     tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'models-write-test-'))
   })
 
@@ -69,18 +60,22 @@ custom_field: custom_value
 })
 
 describe('writeModelsToConfigs()', () => {
-  let tmpDir, agentsDir, opencodeJsonPath, ensembleJsonPath
+  let tmpDir, agentsDir, opencodeJsonPath, ensembleJsonPath, originalCwd
 
   beforeEach(() => {
+    vi.clearAllMocks()
+    originalCwd = process.cwd()
     tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'models-config-test-'))
     agentsDir = path.join(tmpDir, '.agents', 'agents')
     fs.mkdirSync(agentsDir, { recursive: true })
     opencodeJsonPath = path.join(tmpDir, '.opencode', 'opencode.json')
     ensembleJsonPath = path.join(tmpDir, '.opencode', 'ensemble.json')
     fs.mkdirSync(path.dirname(opencodeJsonPath), { recursive: true })
+    process.chdir(tmpDir)
   })
 
   afterEach(() => {
+    process.chdir(originalCwd)
     fs.rmSync(tmpDir, { recursive: true, force: true })
   })
 
@@ -106,12 +101,15 @@ describe('writeModelsToConfigs()', () => {
   })
 
   it('reports success when writing configs', async () => {
+    const agentFile = path.join(agentsDir, 'back-engineer.md')
+    fs.writeFileSync(agentFile, '---\nname: Back\n---', 'utf-8')
+
     await writeModelsToConfigs({
       planModel: 'plan-model',
       buildModel: 'build-model',
       fastModel: 'fast-model',
-      agentsDir: '/nonexistent',
-      preset: { roles: { build: { agents: [] }, fast: { agents: [] } } },
+      agentsDir,
+      preset: { roles: { build: { agents: ['back-engineer'] }, fast: { agents: [] } } },
     })
 
     expect(success).toHaveBeenCalled()

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

@@ -20,6 +20,21 @@ vi.mock('./caveman.js', () => ({ installCaveman: vi.fn() }))
 vi.mock('./caveman-guidance.js', () => ({ enableCavemanGuidance: vi.fn() }))
 vi.mock('./global.js', () => ({ configureObGlobal: vi.fn() }))
 
+vi.mock('fs-extra', () => ({
+  default: {
+    readJson: vi.fn().mockResolvedValue({
+      info: 'Token optimization info',
+      message: 'Select tools',
+      timeoutMs: 5000,
+      choices: [
+        { value: 'rtk', checked: false },
+        { value: 'quota', checked: false },
+        { value: 'caveman', checked: false },
+      ],
+    }),
+  },
+}))
+
 import { checkbox } from '@inquirer/prompts'
 import { commandExists, warn } from '../../utils/exec.js'
 import { installQuota } from './quota.js'
@@ -34,6 +49,9 @@ describe('tokenOptimizationStep()', () => {
   })
 
   it('runs all optimizations by default selection', async () => {
+    const originalIsTTY = process.stdin.isTTY
+    Object.defineProperty(process.stdin, 'isTTY', { value: true, configurable: true })
+
     checkbox.mockResolvedValue(['rtk', 'quota', 'caveman'])
     commandExists.mockResolvedValue(true)
     installQuota.mockResolvedValue({ optedIn: true, installed: true })
@@ -43,6 +61,8 @@ describe('tokenOptimizationStep()', () => {
 
     const result = await tokenOptimizationStep()
 
+    Object.defineProperty(process.stdin, 'isTTY', { value: originalIsTTY, configurable: true })
+
     expect(commandExists).toHaveBeenCalledWith('rtk')
     expect(installQuota).toHaveBeenCalledWith({ skipHeader: true, skipPrompt: true })
     expect(installCaveman).toHaveBeenCalledWith({ skipHeader: true, skipPrompt: true })

package/src/steps/platform/platform.test.js

@@ -54,7 +54,7 @@ describe('choosePlatform()', () => {
         await checkPlatform('github')
 
         expect(success).toHaveBeenCalledWith('GitHub CLI (gh) available')
-        expect(success).toHaveBeenCalledWith('GitHub CLI authenticated')
+        expect(success).toHaveBeenCalledWith('GitHub CLI (gh) authenticated')
       })
 
       it('warns when gh is installed but not authenticated', async () => {

package/src/steps/source/source.test.js

@@ -27,7 +27,7 @@ vi.mock('fs-extra', () => ({
       parentSelectionMessage: 'Select sibling folders',
     }),
     readdir: vi.fn(),
-    stat: vi.fn(),
+    stat: vi.fn().mockResolvedValue({ isDirectory: () => true }),
   },
 }))
 
@@ -36,15 +36,17 @@ import fse from 'fs-extra'
 import { chooseSourceScope } from './index.js'
 
 describe('chooseSourceScope()', () => {
-  let tmpDir
+  let tmpDir, originalCwd
 
   beforeEach(() => {
     tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'source-test-'))
+    originalCwd = process.cwd()
     process.chdir(tmpDir)
     vi.clearAllMocks()
   })
 
   afterEach(() => {
+    process.chdir(originalCwd)
     fs.rmSync(tmpDir, { recursive: true, force: true })
   })
 
@@ -61,7 +63,7 @@ describe('chooseSourceScope()', () => {
     select.mockResolvedValue('parent')
     const parentDir = path.dirname(tmpDir)
     const siblingDir = path.join(parentDir, 'sibling-project')
-    fs.mkdirSync(siblingDir)
+    fs.mkdirSync(siblingDir, { recursive: true })
     fse.readdir.mockResolvedValue(['sibling-project'])
 
     await chooseSourceScope()

package/src/utils/models-pricing.test.js

@@ -75,7 +75,6 @@ describe('parseModels()', () => {
     const result = parseModels(data)
 
     expect(result[0].cost).toBeUndefined()
-    expect(result[0].description).toContain('cost: ?')
   })
 
   it('extracts context limit', () => {