opencode-starterkit 1.0.5 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-starterkit",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "private": false,
   "type": "module",
   "description": "Global baseline + thin project overlay installer for OpenCode.",

package/src/install-global.mjs

@@ -1,5 +1,6 @@
 import fs from 'node:fs'
 import path from 'node:path'
+import os from 'node:os'
 import { spawnSync } from 'node:child_process'
 import readline from 'node:readline'
 import {
@@ -75,32 +76,51 @@ function mergeGlobalOpencodeJson() {
   return { merged: true, globalPath }
 }
 
+function runCommandCapture(cmd) {
+  return spawnSync('bash', ['-lc', cmd], { encoding: 'utf8' })
+}
+
 function checkBeadsCli() {
-  const whichResult = spawnSync('bash', ['-lc', 'command -v br'], { encoding: 'utf8' })
-  const found = whichResult.status === 0 && whichResult.stdout.trim().length > 0
-  if (!found) {
-    return { ok: false, path: null, version: null }
+  const candidates = [
+    'command -v br',
+    `${os.homedir()}/.local/bin/br`,
+    `${os.homedir()}/.cargo/bin/br`,
+  ]
+
+  for (const candidate of candidates) {
+    const whichResult = candidate.startsWith('command -v')
+      ? runCommandCapture(candidate)
+      : { status: fs.existsSync(candidate) ? 0 : 1, stdout: candidate }
+
+    const found = whichResult.status === 0 && String(whichResult.stdout || '').trim().length > 0
+    if (!found) continue
+
+    const resolvedPath = String(whichResult.stdout || '').trim()
+    const versionResult = runCommandCapture(`"${resolvedPath}" --version || "${resolvedPath}" version`)
+    const version = `${versionResult.stdout || ''}${versionResult.stderr || ''}`.trim() || null
+    return { ok: true, path: resolvedPath, version }
   }
-  const versionResult = spawnSync('bash', ['-lc', 'br --version || br version'], { encoding: 'utf8' })
-  const version = `${versionResult.stdout || ''}${versionResult.stderr || ''}`.trim() || null
-  return { ok: true, path: whichResult.stdout.trim(), version }
+
+  return { ok: false, path: null, version: null }
 }
 
-function getSuggestedBeadsInstall() {
+function detectPlatformArch() {
   const platform = process.platform
-  const primary = 'curl -fsSL https://raw.githubusercontent.com/Dicklesworthstone/beads_rust/main/install.sh | bash'
-  const fallback = 'cargo install beads-rs'
+  const arch = process.arch
+
+  if (platform === 'darwin' && arch === 'arm64') return { osLabel: 'macOS Apple Silicon', platform, arch }
+  if (platform === 'darwin' && (arch === 'x64' || arch === 'amd64')) return { osLabel: 'macOS Intel', platform, arch }
+  if (platform === 'linux' && (arch === 'x64' || arch === 'amd64')) return { osLabel: 'Linux x64', platform, arch }
+  if (platform === 'linux' && arch === 'arm64') return { osLabel: 'Linux arm64', platform, arch }
+  if (platform === 'win32') return { osLabel: `Windows ${arch}`, platform, arch }
+  return { osLabel: `${platform} ${arch}`, platform, arch }
+}
 
-  if (platform === 'darwin') {
-    return { osLabel: 'macOS', primary, fallback }
-  }
-  if (platform === 'linux') {
-    return { osLabel: 'Linux', primary, fallback }
-  }
-  if (platform === 'win32') {
-    return { osLabel: 'Windows', primary: 'Use WSL and run: ' + primary, fallback: 'Use a supported Rust/cargo install path inside WSL' }
-  }
-  return { osLabel: platform, primary, fallback }
+function getInstallPlan() {
+  const detected = detectPlatformArch()
+  const primary = 'curl -fsSL https://raw.githubusercontent.com/Dicklesworthstone/beads_rust/main/install.sh | bash'
+  const fallback = 'curl -fsSL https://raw.githubusercontent.com/Dicklesworthstone/beads_rust/main/install.sh | bash -s -- --from-source'
+  return { ...detected, primary, fallback }
 }
 
 async function askYesNo(question) {
@@ -118,6 +138,13 @@ function runShellCommand(command) {
   return spawnSync('bash', ['-lc', command], { stdio: 'inherit', encoding: 'utf8' })
 }
 
+function ensureBrOnPathHints(brPath) {
+  const dir = path.dirname(brPath)
+  if (process.env.PATH && process.env.PATH.split(':').includes(dir)) return
+  process.env.PATH = `${dir}:${process.env.PATH || ''}`
+  console.warn(`[opencode-starterkit] Added ${dir} to current process PATH for verification.`)
+}
+
 async function ensureBeadsCliInteractive() {
   const check = checkBeadsCli()
   if (check.ok) {
@@ -126,14 +153,14 @@ async function ensureBeadsCliInteractive() {
     return
   }
 
-  const install = getSuggestedBeadsInstall()
+  const install = getInstallPlan()
   console.warn('[opencode-starterkit] beads CLI (br) is required by the baseline but was not found.')
-  console.warn(`[opencode-starterkit] Detected OS: ${install.osLabel}`)
-  console.warn(`[opencode-starterkit] Recommended install command:\n  ${install.primary}`)
-  console.warn(`[opencode-starterkit] Fallback command:\n  ${install.fallback}`)
+  console.warn(`[opencode-starterkit] Detected platform: ${install.osLabel}`)
+  console.warn(`[opencode-starterkit] Primary install command:\n  ${install.primary}`)
+  console.warn(`[opencode-starterkit] Fallback install command:\n  ${install.fallback}`)
 
   if (!process.stdin.isTTY) {
-    throw new Error('Missing beads CLI (br). Non-interactive mode cannot auto-install; run the suggested install command and retry.')
+    throw new Error(`Missing beads CLI (br). Non-interactive mode cannot auto-install. Try: ${install.primary}`)
   }
 
   const approved = await askYesNo('Install beads CLI now? [y/N] ')
@@ -141,18 +168,29 @@ async function ensureBeadsCliInteractive() {
     throw new Error('User declined beads CLI installation. Beads-based workflows will not function until br is installed.')
   }
 
-  const result = runShellCommand(install.primary)
-  if (result.status !== 0) {
-    throw new Error(`Automatic beads install failed. Try manually: ${install.primary}`)
+  console.log('[opencode-starterkit] Running primary beads install...')
+  let result = runShellCommand(install.primary)
+  let verify = checkBeadsCli()
+  if (!verify.ok) {
+    console.warn(`[opencode-starterkit] Primary install did not yield br. Exit code=${result.status}. Trying fallback...`)
+    result = runShellCommand(install.fallback)
+    verify = checkBeadsCli()
   }
 
-  const verify = checkBeadsCli()
   if (!verify.ok) {
-    throw new Error('beads install command completed but br is still not available on PATH.')
+    throw new Error(
+      `Automatic beads install failed. Tried:\n1) ${install.primary}\n2) ${install.fallback}\nPlease install br manually and retry.`
+    )
+  }
+
+  ensureBrOnPathHints(verify.path)
+  const finalCheck = checkBeadsCli()
+  if (!finalCheck.ok) {
+    throw new Error(`beads install appears to have succeeded, but br is still not executable from PATH candidates. Found path=${verify.path}`)
   }
 
-  console.log(`[opencode-starterkit] beads CLI installed: ${verify.path}`)
-  if (verify.version) console.log(`[opencode-starterkit] beads CLI version: ${verify.version}`)
+  console.log(`[opencode-starterkit] beads CLI installed: ${finalCheck.path}`)
+  if (finalCheck.version) console.log(`[opencode-starterkit] beads CLI version: ${finalCheck.version}`)
 }
 
 export async function installGlobal({ cwd }) {