theslopmachine 0.7.0 → 0.7.2

package/src/install.js

@@ -11,7 +11,6 @@ import {
   OPCODE_VERSION,
   PACKAGE_ROOT,
   REQUIRED_SKILL_DIRS,
-  REQUIRED_SLOPMACHINE_ROOT_FILES,
   REQUIRED_SLOPMACHINE_FILES,
 } from './constants.js'
 import {
@@ -63,6 +62,41 @@ function getUnixBeadsBinDirs() {
   ]
 }
 
+function getUnixCommonBinDirs() {
+  const home = getHomeDir()
+  return [
+    path.join(home, '.local', 'bin'),
+    path.join(home, '.cargo', 'bin'),
+    '/opt/homebrew/bin',
+    '/usr/local/bin',
+  ]
+}
+
+function getWindowsCommonBinDirs() {
+  if (process.platform !== 'win32') {
+    return []
+  }
+
+  const home = getHomeDir()
+  return [
+    process.env.LOCALAPPDATA ? path.join(process.env.LOCALAPPDATA, 'Programs') : null,
+    path.join(home, '.local', 'bin'),
+    path.join(home, '.cargo', 'bin'),
+  ].filter(Boolean)
+}
+
+function getCommonCommandCandidates(command) {
+  if (process.platform === 'win32') {
+    return getWindowsCommonBinDirs().flatMap((dir) => [
+      path.join(dir, `${command}.exe`),
+      path.join(dir, `${command}.cmd`),
+      path.join(dir, command),
+    ])
+  }
+
+  return getUnixCommonBinDirs().map((dir) => path.join(dir, command))
+}
+
 function getWindowsBeadsBinDirs() {
   if (process.platform !== 'win32') {
     return []
@@ -309,14 +343,57 @@ async function installBeadsOnUnix() {
   return result
 }
 
+function getVersionArgs(command) {
+  if (command === 'tmux') {
+    return ['-V']
+  }
+
+  if (command === 'zip') {
+    return ['-v']
+  }
+
+  return ['--version']
+}
+
 async function getCommandVersion(command, args = ['--version']) {
-  const exists = await commandExists(command)
-  if (!exists) return null
-  const result = await runCommand(command, args)
+  const resolved = await resolveCommand(command, {
+    additionalCandidates: getCommonCommandCandidates(command),
+    preferCandidates: true,
+  })
+  if (!resolved) return null
+  const versionArgs = args.length === 1 && args[0] === '--version' ? getVersionArgs(command) : args
+  const result = await runCommand(resolved, versionArgs)
   if (result.code !== 0) return null
   return (result.stdout || result.stderr).trim()
 }
 
+function extractSemver(value) {
+  const match = String(value || '').match(/\d+\.\d+\.\d+/)
+  return match ? match[0] : null
+}
+
+function compareSemver(left, right) {
+  const leftParts = left.split('.').map((part) => Number.parseInt(part, 10))
+  const rightParts = right.split('.').map((part) => Number.parseInt(part, 10))
+  const length = Math.max(leftParts.length, rightParts.length)
+  for (let index = 0; index < length; index += 1) {
+    const a = leftParts[index] || 0
+    const b = rightParts[index] || 0
+    if (a > b) return 1
+    if (a < b) return -1
+  }
+  return 0
+}
+
+function isVersionAtLeast(currentVersion, minimumVersion) {
+  const current = extractSemver(currentVersion)
+  const minimum = extractSemver(minimumVersion)
+  if (!current || !minimum) {
+    return false
+  }
+  return compareSemver(current, minimum) >= 0
+}
+
 async function getPythonVersion() {
   const python3Version = await getCommandVersion('python3')
   if (python3Version) {
@@ -430,19 +507,27 @@ async function tryInstallCoreDependency(name) {
 async function ensureLatestOpencode(requiredVersion) {
   const npmVersion = await getGlobalNpmPackageVersion('opencode-ai')
   const commandPath = await resolveCommand('opencode')
+  const commandVersion = await getCommandVersion('opencode')
 
   if (npmVersion) {
     log(`opencode detected via global npm package: opencode-ai@${npmVersion}`)
-    if (requiredVersion && !npmVersion.includes(requiredVersion)) {
-      warn(`opencode version differs from tested reference ${requiredVersion}`)
+    if (!requiredVersion || isVersionAtLeast(npmVersion, requiredVersion)) {
+      log(`Using existing opencode-ai@${npmVersion}`)
+      return
     }
-    log('Refreshing opencode-ai to latest via npm')
+    warn(`opencode version ${npmVersion} is below minimum supported version ${requiredVersion}`)
+    log('Updating opencode-ai via npm to reach the minimum supported version')
   } else if (commandPath) {
     log(`opencode command detected at ${commandPath}`)
-    log('Installing opencode-ai@latest globally via npm so theslopmachine can manage the current opencode install')
+    if (!requiredVersion || (commandVersion && isVersionAtLeast(commandVersion, requiredVersion))) {
+      log(`Using existing opencode command${commandVersion ? `: ${commandVersion}` : ''}`)
+      return
+    }
+    warn(`opencode command version${commandVersion ? ` ${commandVersion}` : ''} is below minimum supported version ${requiredVersion}`)
+    log('Installing opencode-ai globally via npm so theslopmachine can manage a supported opencode install')
   } else {
     warn('opencode is not installed or not available in PATH')
-    log('Installing opencode-ai@latest globally via npm')
+    log('Installing opencode-ai via npm')
   }
 
   const result = await tryInstallCoreDependency('opencode')
@@ -794,18 +879,6 @@ async function installSlopmachineAssets(paths) {
     }
   }
 
-  for (const relativePath of REQUIRED_SLOPMACHINE_ROOT_FILES) {
-    const targetPath = path.join(paths.slopmachineDir, relativePath)
-    const result = await copyFileReplacing(path.join(PACKAGE_ROOT, relativePath), targetPath)
-    if (result.replaced) {
-      log(`Refreshed asset: ${relativePath}`)
-      summary.refreshed.push(relativePath)
-    } else {
-      log(`Installed asset: ${relativePath}`)
-      summary.installed.push(relativePath)
-    }
-  }
-
   return summary
 }