alvin-bot 4.23.0 → 4.23.1

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to Alvin Bot are documented here.
 
+## [4.23.1] — 2026-05-12
+
+### Fixed: install.sh now installs via npm (no more git clone collision)
+
+The `install.sh` one-line installer was broken on two counts, both pre-existing and surfaced when end-to-end testing the 4.23.0 install path on a fresh machine:
+
+1. **Data-dir collision with `~/.alvin-bot/`.** The installer cloned the alvin-bot source into `~/.alvin-bot/`, but that path is the per-user **data directory** in 4.x (env, memory, logs, cron-jobs.json), created and owned by the bot itself. On any second run, `git pull` in the data dir failed (`fatal: not a git repository`).
+
+2. **`npm install --omit=dev` + `npm run build` doesn't work.** TypeScript needs `@types/better-sqlite3` (a `devDependency`), so building from source with prod-only deps fails with 6 `TS7016` errors.
+
+Both bugs only mattered on the `install.sh` path; the canonical `npm install -g alvin-bot` was unaffected.
+
+**Fix:** `install.sh` now does exactly what the README's Quick Start documents — bootstraps Node (the new code from 4.23.0) and then `npm install -g alvin-bot`. Dropped: `git clone`, `npm run build`, the symlink dance into `/usr/local/bin`, and the `INSTALL_DIR`/`REPO_URL`/`BIN_LINK` machinery. The canonical install lives at `/opt/homebrew/lib/node_modules/alvin-bot/` (Apple Silicon) or `/usr/local/lib/node_modules/alvin-bot/` (Intel/Linux); `~/.alvin-bot/` is reserved exclusively for the bot's own data files.
+
+The new flow also:
+- Retries with `sudo` if a non-sudo `npm install -g` fails with EACCES (common on Linux where node lives in `/usr/lib`).
+- Skips the auto-launch of `alvin-bot setup` in non-interactive shells (i.e. raw `curl … | bash`) so we don't dump an interactive wizard into a pipe.
+- Adds a `BASH_SOURCE` guard so the file can be `source`d for unit-testing helpers without firing `main`.
+
+End-to-end verified on a fresh Apple Silicon Mac (macOS 26.4.1) with node and brew uninstalled: `curl … | bash` bootstraps Node via brew prompt, installs alvin-bot via npm, lands the binary in `/opt/homebrew/bin/alvin-bot` v4.23.0 — without ever touching `~/.alvin-bot/`.
+
 ## [4.23.0] — 2026-05-12
 
 ### Installer: bootstrap Node automatically + optional capability tools

package/install.sh

@@ -1,7 +1,18 @@
 #!/usr/bin/env bash
 # ─────────────────────────────────────────────────────────────
 # Alvin Bot — One-Line Installer
-# Usage: curl -fsSL https://install.alvin-bot.dev | bash
+# Usage: curl -fsSL https://raw.githubusercontent.com/alvbln/Alvin-Bot/main/install.sh | bash
+#
+# This script bootstraps anything missing (Homebrew on macOS, Node.js)
+# and then installs alvin-bot from npm — the same path documented in the
+# README's Quick Start. It does NOT clone the git repo. The canonical
+# install lives at:
+#     /opt/homebrew/lib/node_modules/alvin-bot/   (Apple Silicon)
+#     /usr/local/lib/node_modules/alvin-bot/      (Intel macOS / Linux)
+#
+# `~/.alvin-bot/` is the per-user data directory (env, memory, logs,
+# cron-jobs.json) and is created/managed by the bot itself — never
+# touched by this installer.
 # ─────────────────────────────────────────────────────────────
 set -euo pipefail
 
@@ -13,9 +24,6 @@ BLUE='\033[0;34m'
 BOLD='\033[1m'
 NC='\033[0m' # No Color
 
-INSTALL_DIR="$HOME/.alvin-bot"
-REPO_URL="https://github.com/alvbln/alvin-bot.git"
-BIN_LINK="/usr/local/bin/alvin-bot"
 MIN_NODE_VERSION=18
 
 # ─── Helpers ────────────────────────────────────────────────
@@ -25,6 +33,11 @@ ok()    { echo -e "${GREEN}✔${NC}  $*"; }
 warn()  { echo -e "${YELLOW}⚠${NC}  $*"; }
 fail()  { echo -e "${RED}✘${NC}  $*"; exit 1; }
 
+# Is this shell interactive enough to prompt the user?
+is_interactive() {
+  [ -t 0 ] && [ -t 1 ]
+}
+
 # ─── OS Detection ──────────────────────────────────────────
 
 detect_os() {
@@ -42,22 +55,7 @@ detect_os() {
   ok "Detected OS: ${BOLD}$OS${NC}"
 }
 
-# ─── Dependency Checks ─────────────────────────────────────
-
-check_git() {
-  if ! command -v git &>/dev/null; then
-    fail "Git is not installed. Please install git first:
-    macOS:  xcode-select --install
-    Linux:  sudo apt install git  (or yum/pacman equivalent)
-    WSL:    sudo apt install git"
-  fi
-  ok "Git found: $(git --version)"
-}
-
-# Is this shell interactive enough to prompt the user?
-is_interactive() {
-  [ -t 0 ] && [ -t 1 ]
-}
+# ─── Prereqs ────────────────────────────────────────────────
 
 # Ensure Homebrew is available on macOS. Offers to auto-install via the
 # official curl|bash sequence. A no-op on non-macOS systems.
@@ -95,8 +93,7 @@ ensure_brew() {
 }
 
 # Ensure Node.js >= MIN_NODE_VERSION. Offers to install via brew (macOS) or
-# NodeSource (Debian/Ubuntu) if missing or too old. Falls back to a clear
-# manual-install message on unsupported platforms.
+# NodeSource (Debian/Ubuntu) if missing or too old.
 ensure_node() {
   if command -v node &>/dev/null; then
     local node_ver
@@ -169,50 +166,28 @@ check_npm() {
 # ─── Installation ──────────────────────────────────────────
 
 install_bot() {
-  if [ -d "$INSTALL_DIR" ]; then
-    warn "Existing installation found at $INSTALL_DIR"
-    info "Updating..."
-    cd "$INSTALL_DIR"
-    git pull --ff-only || fail "Git pull failed. Resolve conflicts manually in $INSTALL_DIR"
+  info "Installing alvin-bot from the npm registry..."
+  # Try a regular global install first. If that fails with EACCES because
+  # the user's npm prefix isn't writable (common on Linux where node was
+  # installed via apt to /usr/lib), retry with sudo if available.
+  if npm install -g alvin-bot 2>&1; then
+    :
+  elif command -v sudo &>/dev/null; then
+    warn "npm install failed without sudo — retrying with sudo (you may be prompted)..."
+    sudo npm install -g alvin-bot || fail "npm install -g alvin-bot failed even with sudo."
   else
-    info "Cloning alvin-bot to $INSTALL_DIR..."
-    git clone --depth 1 "$REPO_URL" "$INSTALL_DIR" || fail "Git clone failed. Check your network."
-    cd "$INSTALL_DIR"
+    fail "npm install -g alvin-bot failed. Re-run with sudo, or fix your npm prefix permissions."
   fi
 
-  info "Installing production dependencies..."
-  npm install --omit=dev || fail "npm install failed."
-
-  info "Building TypeScript..."
-  npm run build || fail "Build failed."
-
-  ok "Installation complete!"
-}
-
-create_symlink() {
-  local bin_dir
-  bin_dir=$(dirname "$BIN_LINK")
-
-  # Make CLI executable
-  chmod +x "$INSTALL_DIR/bin/cli.js"
-
-  # Try /usr/local/bin first, fall back to ~/.local/bin
-  if [ -w "$bin_dir" ] || [ -w "$BIN_LINK" ] 2>/dev/null; then
-    ln -sf "$INSTALL_DIR/bin/cli.js" "$BIN_LINK"
-    ok "Symlinked: alvin-bot → $BIN_LINK"
-  elif command -v sudo &>/dev/null; then
-    info "Creating symlink (requires sudo)..."
-    sudo ln -sf "$INSTALL_DIR/bin/cli.js" "$BIN_LINK"
-    ok "Symlinked: alvin-bot → $BIN_LINK"
-  else
-    # Fallback: ~/.local/bin
-    local fallback="$HOME/.local/bin"
-    mkdir -p "$fallback"
-    ln -sf "$INSTALL_DIR/bin/cli.js" "$fallback/alvin-bot"
-    warn "Symlinked to $fallback/alvin-bot (add to PATH if not already)"
-    warn "  export PATH=\"$fallback:\$PATH\""
-    BIN_LINK="$fallback/alvin-bot"
+  # Verify the binary is reachable. On Apple Silicon with Homebrew, the
+  # global bin is /opt/homebrew/bin — we already PATH-loaded brew above
+  # via ensure_brew, so this should just work.
+  if ! command -v alvin-bot &>/dev/null; then
+    warn "alvin-bot installed, but not on PATH yet. Run 'npm prefix -g' to find the bin dir,"
+    warn "and add it to your shell PATH. Then re-open this terminal."
+    return 0
   fi
+  ok "alvin-bot installed: $(alvin-bot version 2>/dev/null | head -1)"
 }
 
 # ─── Main ──────────────────────────────────────────────────
@@ -224,13 +199,11 @@ main() {
   echo ""
 
   detect_os
-  check_git
   ensure_node
   check_npm
 
   echo ""
   install_bot
-  create_symlink
 
   echo ""
   echo -e "─────────────────────────────────────"
@@ -241,14 +214,22 @@ main() {
   echo -e "    ${BOLD}alvin-bot start${NC}    — Start the bot"
   echo -e "    ${BOLD}alvin-bot --help${NC}   — Show all commands"
   echo ""
-  echo -e "  Installed to: ${BLUE}$INSTALL_DIR${NC}"
-  echo -e "  Command:      ${BLUE}$BIN_LINK${NC}"
-  echo ""
 
-  # Run interactive setup
-  info "Starting setup wizard..."
-  echo ""
-  alvin-bot setup || warn "Setup skipped. Run 'alvin-bot setup' later to configure."
+  # Run interactive setup right away when we have a TTY. In piped/non-
+  # interactive mode (`curl ... | bash`) skip — the user can run setup
+  # themselves whenever they're ready.
+  if is_interactive; then
+    info "Starting setup wizard..."
+    echo ""
+    alvin-bot setup || warn "Setup skipped. Run 'alvin-bot setup' later to configure."
+  else
+    info "Non-interactive install detected — skipping the setup wizard."
+    info "Open a fresh terminal and run:  alvin-bot setup"
+  fi
 }
 
-main "$@"
+# Allow this file to be sourced (e.g. for testing helpers) without
+# triggering main(). When executed directly, BASH_SOURCE[0] equals $0.
+if [[ "${BASH_SOURCE[0]:-$0}" == "${0}" ]]; then
+  main "$@"
+fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alvin-bot",
-  "version": "4.23.0",
+  "version": "4.23.1",
   "description": "Alvin Bot — Your personal AI agent on Telegram, WhatsApp, Discord, Signal, and Web.",
   "type": "module",
   "main": "dist/index.js",