lash-cli 1.0.7 → 1.1.27

package/bin/lash

@@ -1,57 +1,84 @@
-#!/bin/sh
-set -e
-
-if [ -n "$LASH_BIN_PATH" ]; then
-    resolved="$LASH_BIN_PATH"
-else
-    # Get the real path of this script
-    script_path="$0"
-    while [ -L "$script_path" ]; do
-        link_target="$(readlink "$script_path")"
-        case "$link_target" in
-            /*) script_path="$link_target" ;;
-            *) script_path="$(dirname "$script_path")/$link_target" ;;
-        esac
-    done
-    script_dir="$(dirname "$script_path")"
-    script_dir="$(cd "$script_dir" && pwd)"
-    
-    # Map platform
-    case "$(uname -s)" in
-        Darwin) platform="darwin" ;;
-        Linux) platform="linux" ;;
-        MINGW*|CYGWIN*|MSYS*) platform="win32" ;;
-        *) platform="$(uname -s | tr '[:upper:]' '[:lower:]')" ;;
-    esac
-    
-    # Map arch
-    case "$(uname -m)" in
-        x86_64|amd64) arch="x64" ;;
-        aarch64) arch="arm64" ;;
-        armv7l) arch="arm" ;;
-        *) arch="$(uname -m)" ;;
-    esac
-    
-    name="lash-cli-${platform}-${arch}"
-    binary="lash"
-    [ "$platform" = "win32" ] && binary="lash.exe"
-    
-    resolved=""
-    current_dir="$script_dir"
-    while [ "$current_dir" != "/" ]; do
-        candidate="$current_dir/node_modules/$name/bin/$binary"
-        if [ -f "$candidate" ]; then
-            resolved="$candidate"
-            break
-        fi
-        current_dir="$(dirname "$current_dir")"
-    done
-    
-    if [ -z "$resolved" ]; then
-        printf "It seems that your package manager failed to install the right version of the lash CLI for your platform. You can try manually installing the \"%s\" package\n" "$name" >&2
-        exit 1
-    fi
-fi
-
-trap '' INT
-exec "$resolved" "$@"
+#!/usr/bin/env node
+
+const childProcess = require("child_process")
+const fs = require("fs")
+const path = require("path")
+const os = require("os")
+
+function run(target) {
+  const result = childProcess.spawnSync(target, process.argv.slice(2), {
+    stdio: "inherit",
+  })
+  if (result.error) {
+    console.error(result.error.message)
+    process.exit(1)
+  }
+  const code = typeof result.status === "number" ? result.status : 0
+  process.exit(code)
+}
+
+const envPath = process.env.LASH_BIN_PATH
+if (envPath) {
+  run(envPath)
+}
+
+const scriptPath = fs.realpathSync(__filename)
+const scriptDir = path.dirname(scriptPath)
+
+const platformMap = {
+  darwin: "darwin",
+  linux: "linux",
+  win32: "windows",
+}
+const archMap = {
+  x64: "x64",
+  arm64: "arm64",
+  arm: "arm",
+}
+
+let platform = platformMap[os.platform()]
+if (!platform) {
+  platform = os.platform()
+}
+let arch = archMap[os.arch()]
+if (!arch) {
+  arch = os.arch()
+}
+const base = "lash-cli-" + platform + "-" + arch
+const binary = platform === "windows" ? "lash.exe" : "lash"
+
+function findBinary(startDir) {
+  let current = startDir
+  for (;;) {
+    const modules = path.join(current, "node_modules")
+    if (fs.existsSync(modules)) {
+      const entries = fs.readdirSync(modules)
+      for (const entry of entries) {
+        if (!entry.startsWith(base)) {
+          continue
+        }
+        const candidate = path.join(modules, entry, "bin", binary)
+        if (fs.existsSync(candidate)) {
+          return candidate
+        }
+      }
+    }
+    const parent = path.dirname(current)
+    if (parent === current) {
+      return
+    }
+    current = parent
+  }
+}
+
+const resolved = findBinary(scriptDir)
+if (!resolved) {
+  console.error(
+    'It seems that your package manager failed to install the right version of the opencode CLI for your platform. You can try manually installing the "' +
+      base +
+      '" package',
+  )
+  process.exit(1)
+}
+
+run(resolved)

package/package.json

@@ -1,37 +1,23 @@
 {
   "name": "lash-cli",
-  "version": "1.0.7",
-  "description": "lash - The AI coding agent built for the terminal",
   "bin": {
     "lash": "./bin/lash"
   },
   "scripts": {
-    "postinstall": "node ./postinstall.mjs"
-  },
-  "keywords": [
-    "ai",
-    "cli",
-    "coding",
-    "assistant",
-    "terminal",
-    "lash"
-  ],
-  "author": "",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/lacymorrow/lash"
+    "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
   },
+  "version": "1.1.27",
   "optionalDependencies": {
-    "lash-cli-windows-x64": "1.0.7",
-    "lash-cli-linux-arm64": "1.0.7",
-    "lash-cli-linux-x64": "1.0.7",
-    "lash-cli-linux-x64-baseline": "1.0.7",
-    "lash-cli-darwin-x64": "1.0.7",
-    "lash-cli-darwin-x64-baseline": "1.0.7",
-    "lash-cli-darwin-arm64": "1.0.7"
-  },
-  "engines": {
-    "node": ">=18.0.0"
+    "lash-cli-linux-arm64": "1.1.27",
+    "lash-cli-linux-x64": "1.1.27",
+    "lash-cli-linux-x64-baseline": "1.1.27",
+    "lash-cli-linux-arm64-musl": "1.1.27",
+    "lash-cli-linux-x64-musl": "1.1.27",
+    "lash-cli-linux-x64-baseline-musl": "1.1.27",
+    "lash-cli-darwin-arm64": "1.1.27",
+    "lash-cli-darwin-x64": "1.1.27",
+    "lash-cli-darwin-x64-baseline": "1.1.27",
+    "lash-cli-windows-x64": "1.1.27",
+    "lash-cli-windows-x64-baseline": "1.1.27"
   }
 }

package/postinstall.mjs

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+
 import fs from "fs"
 import path from "path"
 import os from "os"
@@ -9,49 +10,124 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const require = createRequire(import.meta.url)
 
 function detectPlatformAndArch() {
+  // Map platform names
   let platform
   switch (os.platform()) {
-    case "darwin": platform = "darwin"; break;
-    case "linux": platform = "linux"; break;
-    case "win32": platform = "windows"; break;
-    default: platform = os.platform(); break;
+    case "darwin":
+      platform = "darwin"
+      break
+    case "linux":
+      platform = "linux"
+      break
+    case "win32":
+      platform = "windows"
+      break
+    default:
+      platform = os.platform()
+      break
   }
+
+  // Map architecture names
   let arch
   switch (os.arch()) {
-    case "x64": arch = "x64"; break;
-    case "arm64": arch = "arm64"; break;
-    case "arm": arch = "arm"; break;
-    default: arch = os.arch(); break;
+    case "x64":
+      arch = "x64"
+      break
+    case "arm64":
+      arch = "arm64"
+      break
+    case "arm":
+      arch = "arm"
+      break
+    default:
+      arch = os.arch()
+      break
   }
+
   return { platform, arch }
 }
 
 function findBinary() {
   const { platform, arch } = detectPlatformAndArch()
-  const packageName = `lash-cli-${platform}-${arch}`
-  const binary = platform === "windows" ? "lash.exe" : "lash"
+
+  // Read package.json to determine naming
+  const pkg = require("./package.json")
+  const baseName = pkg.name
+  const binaryKeys = Object.keys(pkg.bin || {})
+  const binName = binaryKeys[0] || (platform === "windows" ? `${baseName}.exe` : baseName)
+
+  // Determine actual binary naming inside the package
+  const packageName = `${baseName}-${platform}-${arch}`
+  const binaryName = platform === "windows" ? `${binName}.exe` : binName
 
   try {
+    // Use require.resolve to find the package
     const packageJsonPath = require.resolve(`${packageName}/package.json`)
     const packageDir = path.dirname(packageJsonPath)
-    const binaryPath = path.join(packageDir, "bin", binary)
-    if (!fs.existsSync(binaryPath)) throw new Error(`Binary not found`)
-    return binaryPath
+    const binaryPath = path.join(packageDir, "bin", binaryName)
+
+    if (!fs.existsSync(binaryPath)) {
+      throw new Error(`Binary not found at ${binaryPath}`)
+    }
+
+    return { binaryPath, binaryName }
   } catch (error) {
     throw new Error(`Could not find package ${packageName}: ${error.message}`)
   }
 }
 
-function main() {
+function prepareBinDirectory(binaryName) {
+  const binDir = path.join(__dirname, "bin")
+  const targetPath = path.join(binDir, binaryName)
+
+  // Ensure bin directory exists
+  if (!fs.existsSync(binDir)) {
+    fs.mkdirSync(binDir, { recursive: true })
+  }
+
+  // Remove existing binary/symlink if it exists
+  if (fs.existsSync(targetPath)) {
+    fs.unlinkSync(targetPath)
+  }
+
+  return { binDir, targetPath }
+}
+
+function symlinkBinary(sourcePath, binaryName) {
+  const { targetPath } = prepareBinDirectory(binaryName)
+
+  fs.symlinkSync(sourcePath, targetPath)
+  console.log(`opencode binary symlinked: ${targetPath} -> ${sourcePath}`)
+
+  // Verify the file exists after operation
+  if (!fs.existsSync(targetPath)) {
+    throw new Error(`Failed to symlink binary to ${targetPath}`)
+  }
+}
+
+async function main() {
   try {
-    const binaryPath = findBinary()
-    const binScript = path.join(__dirname, "bin", "lash")
-    if (fs.existsSync(binScript)) fs.unlinkSync(binScript)
-    fs.symlinkSync(binaryPath, binScript, 'file')
-    fs.chmodSync(binScript, '755')
+    if (os.platform() === "win32") {
+      // On Windows, the .exe is already included in the package and bin field points to it
+      // No postinstall setup needed
+      console.log("Windows detected: binary setup not needed (using packaged .exe)")
+      return
+    }
+
+    // On non-Windows platforms, just verify the binary package exists
+    // Don't replace the wrapper script - it handles binary execution
+    const { binaryPath } = findBinary()
+    console.log(`Platform binary verified at: ${binaryPath}`)
+    console.log("Wrapper script will handle binary execution")
   } catch (error) {
-    console.error("Failed to create symlink:", error.message)
-    // Don't exit 1, let it fail silently as wrapper script exists
+    console.error("Failed to setup opencode binary:", error.message)
+    process.exit(1)
   }
 }
-main()
+
+try {
+  main()
+} catch (error) {
+  console.error("Postinstall script error:", error.message)
+  process.exit(0)
+}

package/bin/lash.cmd

@@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe" "%~dp0\..\node_modules\lash-cli-windows-x64\bin\lash.exe" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node "%~dp0\..\node_modules\lash-cli-windows-x64\bin\lash.exe" %*
-)