fluxy-bot 0.2.16 → 0.2.18

package/bin/cli.js

@@ -8,8 +8,10 @@ import { fileURLToPath } from 'url';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-const ROOT = path.resolve(__dirname, '..');
+const REPO_ROOT = path.resolve(__dirname, '..');
 const DATA_DIR = path.join(os.homedir(), '.fluxy');
+const IS_DEV = fs.existsSync(path.join(REPO_ROOT, '.git'));
+const ROOT = IS_DEV ? REPO_ROOT : DATA_DIR;
 const CONFIG_PATH = path.join(DATA_DIR, 'config.json');
 const BIN_DIR = path.join(DATA_DIR, 'bin');
 const CF_PATH = path.join(BIN_DIR, 'cloudflared');

package/install.ps1

@@ -0,0 +1,91 @@
+# ── Fluxy Installer for Windows ──
+# Downloads the latest fluxy-bot from npm and installs to ~/.fluxy/
+
+$ErrorActionPreference = "Stop"
+
+$FLUXY_HOME = Join-Path $env:USERPROFILE ".fluxy"
+
+function Write-Info($msg)  { Write-Host "  ▸ $msg" -ForegroundColor Cyan }
+function Write-Ok($msg)    { Write-Host "  ✔ $msg" -ForegroundColor Green }
+function Write-Err($msg)   { Write-Host "  ✘ $msg" -ForegroundColor Red }
+
+Write-Host ""
+Write-Host "  Fluxy Installer" -ForegroundColor Cyan
+Write-Host ""
+
+# ── Check dependencies ──
+foreach ($cmd in @("node", "npm")) {
+    if (-not (Get-Command $cmd -ErrorAction SilentlyContinue)) {
+        Write-Err "$cmd is required but not installed."
+        exit 1
+    }
+}
+
+# ── Get tarball URL ──
+Write-Info "Fetching latest version..."
+$TARBALL_URL = (npm view fluxy-bot dist.tarball 2>$null).Trim()
+if (-not $TARBALL_URL) {
+    Write-Err "Failed to fetch tarball URL from npm."
+    exit 1
+}
+$VERSION = (npm view fluxy-bot version 2>$null).Trim()
+Write-Ok "Found fluxy-bot@$VERSION"
+
+# ── Download and extract ──
+$TMPDIR = Join-Path ([System.IO.Path]::GetTempPath()) ("fluxy-install-" + [guid]::NewGuid().ToString("N").Substring(0,8))
+New-Item -ItemType Directory -Path $TMPDIR -Force | Out-Null
+
+try {
+    Write-Info "Downloading..."
+    $tarball = Join-Path $TMPDIR "fluxy.tgz"
+    Invoke-WebRequest -Uri $TARBALL_URL -OutFile $tarball -UseBasicParsing
+    Write-Ok "Downloaded"
+
+    Write-Info "Extracting..."
+    tar xzf $tarball -C $TMPDIR
+    Write-Ok "Extracted"
+
+    $EXTRACTED = Join-Path $TMPDIR "package"
+    if (-not (Test-Path $EXTRACTED)) {
+        Write-Err "Unexpected tarball structure."
+        exit 1
+    }
+
+    # ── Copy to ~/.fluxy/ ──
+    Write-Info "Installing to $FLUXY_HOME..."
+    New-Item -ItemType Directory -Path $FLUXY_HOME -Force | Out-Null
+
+    # Copy-Item -Recurse -Force overwrites existing files but does NOT delete extras
+    Get-ChildItem -Path $EXTRACTED -Force | ForEach-Object {
+        Copy-Item -Path $_.FullName -Destination $FLUXY_HOME -Recurse -Force
+    }
+    Write-Ok "Files copied"
+
+    # ── Install dependencies ──
+    Write-Info "Installing dependencies (this may take a moment)..."
+    Push-Location $FLUXY_HOME
+    npm install --omit=dev --ignore-scripts 2>$null
+    Pop-Location
+    Write-Ok "Dependencies installed"
+
+    # ── Add to PATH ──
+    Write-Info "Configuring PATH..."
+    $binDir = Join-Path $FLUXY_HOME "bin"
+    $userPath = [Environment]::GetEnvironmentVariable("Path", "User")
+    if ($userPath -notlike "*$binDir*") {
+        [Environment]::SetEnvironmentVariable("Path", "$binDir;$userPath", "User")
+        $env:Path = "$binDir;$env:Path"
+        Write-Ok "Added $binDir to user PATH"
+    } else {
+        Write-Ok "PATH already configured"
+    }
+
+    Write-Host ""
+    Write-Host "  Fluxy v$VERSION installed successfully!" -ForegroundColor Green
+    Write-Host "  Run 'fluxy' to start your bot." -ForegroundColor DarkGray
+    Write-Host ""
+}
+finally {
+    # Clean up temp directory
+    Remove-Item -Path $TMPDIR -Recurse -Force -ErrorAction SilentlyContinue
+}

package/install.sh

@@ -0,0 +1,109 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# ── Fluxy Installer ──
+# Downloads the latest fluxy-bot from npm and installs to ~/.fluxy/
+
+FLUXY_HOME="$HOME/.fluxy"
+
+c_reset='\033[0m'
+c_cyan='\033[36m'
+c_green='\033[32m'
+c_red='\033[31m'
+c_dim='\033[2m'
+c_bold='\033[1m'
+
+info()  { echo -e "  ${c_cyan}▸${c_reset} $1"; }
+ok()    { echo -e "  ${c_green}✔${c_reset} $1"; }
+err()   { echo -e "  ${c_red}✘${c_reset} $1" >&2; }
+
+echo -e "\n  ${c_cyan}${c_bold}Fluxy Installer${c_reset}\n"
+
+# ── Check dependencies ──
+for cmd in node npm curl tar; do
+  if ! command -v "$cmd" &>/dev/null; then
+    err "$cmd is required but not installed."
+    exit 1
+  fi
+done
+
+# ── Get tarball URL ──
+info "Fetching latest version..."
+TARBALL_URL=$(npm view fluxy-bot dist.tarball 2>/dev/null)
+if [ -z "$TARBALL_URL" ]; then
+  err "Failed to fetch tarball URL from npm."
+  exit 1
+fi
+VERSION=$(npm view fluxy-bot version 2>/dev/null)
+ok "Found fluxy-bot@${VERSION}"
+
+# ── Download and extract ──
+TMPDIR=$(mktemp -d)
+trap 'rm -rf "$TMPDIR"' EXIT
+
+info "Downloading..."
+curl -fsSL "$TARBALL_URL" -o "$TMPDIR/fluxy.tgz"
+ok "Downloaded"
+
+info "Extracting..."
+tar xzf "$TMPDIR/fluxy.tgz" -C "$TMPDIR"
+ok "Extracted"
+
+# npm pack tarballs extract into a 'package/' directory
+EXTRACTED="$TMPDIR/package"
+if [ ! -d "$EXTRACTED" ]; then
+  err "Unexpected tarball structure."
+  exit 1
+fi
+
+# ── Copy to ~/.fluxy/ ──
+info "Installing to $FLUXY_HOME..."
+mkdir -p "$FLUXY_HOME"
+
+# cp -r overwrites existing files but does NOT delete extras (config.json, memory.db, etc.)
+cp -r "$EXTRACTED"/* "$FLUXY_HOME"/
+# Also copy hidden files if any
+cp -r "$EXTRACTED"/.[!.]* "$FLUXY_HOME"/ 2>/dev/null || true
+ok "Files copied"
+
+# ── Install dependencies ──
+info "Installing dependencies (this may take a moment)..."
+cd "$FLUXY_HOME"
+npm install --omit=dev --ignore-scripts 2>/dev/null
+ok "Dependencies installed"
+
+# ── Create symlink ──
+info "Creating fluxy command..."
+chmod +x "$FLUXY_HOME/bin/cli.js"
+
+SYMLINK_TARGET="$FLUXY_HOME/bin/cli.js"
+SYMLINK_CREATED=false
+
+# Try /usr/local/bin first
+if [ -d "/usr/local/bin" ] && [ -w "/usr/local/bin" ]; then
+  ln -sf "$SYMLINK_TARGET" /usr/local/bin/fluxy
+  SYMLINK_CREATED=true
+  ok "Created /usr/local/bin/fluxy"
+elif [ -d "/usr/local/bin" ]; then
+  # Try with sudo
+  if sudo ln -sf "$SYMLINK_TARGET" /usr/local/bin/fluxy 2>/dev/null; then
+    SYMLINK_CREATED=true
+    ok "Created /usr/local/bin/fluxy (sudo)"
+  fi
+fi
+
+# Fallback to ~/.local/bin
+if [ "$SYMLINK_CREATED" = false ]; then
+  mkdir -p "$HOME/.local/bin"
+  ln -sf "$SYMLINK_TARGET" "$HOME/.local/bin/fluxy"
+  ok "Created ~/.local/bin/fluxy"
+
+  # Check if ~/.local/bin is in PATH
+  if ! echo "$PATH" | tr ':' '\n' | grep -q "$HOME/.local/bin"; then
+    echo -e "\n  ${c_dim}Add ~/.local/bin to your PATH:${c_reset}"
+    echo -e "  ${c_dim}  export PATH=\"\$HOME/.local/bin:\$PATH\"${c_reset}"
+  fi
+fi
+
+echo -e "\n  ${c_green}${c_bold}Fluxy v${VERSION} installed successfully!${c_reset}"
+echo -e "  ${c_dim}Run 'fluxy' to start your bot.${c_reset}\n"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluxy-bot",
-  "version": "0.2.16",
+  "version": "0.2.18",
   "description": "Self-hosted AI bot — run your own AI assistant from anywhere",
   "type": "module",
   "license": "MIT",
@@ -20,7 +20,9 @@
     "vite.fluxy.config.ts",
     "tsconfig.json",
     "postcss.config.js",
-    "components.json"
+    "components.json",
+    "install.sh",
+    "install.ps1"
   ],
   "keywords": [
     "ai",

package/scripts/postinstall.js

@@ -1,30 +1,92 @@
 #!/usr/bin/env node
 
-// Links the npm-installed package to ~/.fluxy/app/ so everything
-// lives in one predictable location for the Claude Agent SDK.
+// Copies source files to ~/.fluxy/ so everything lives in one
+// predictable location. Backward compat for `npm install -g fluxy-bot`.
 
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
+import { execSync } from 'child_process';
 import { fileURLToPath } from 'url';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const PKG_ROOT = path.resolve(__dirname, '..');
 const FLUXY_HOME = path.join(os.homedir(), '.fluxy');
-const APP_DIR = path.join(FLUXY_HOME, 'app');
 
-// Skip if already at the target location
-if (path.resolve(PKG_ROOT) === path.resolve(APP_DIR)) {
+// Loop guard: if we're already running inside ~/.fluxy/, exit
+// (prevents infinite loop when npm install triggers postinstall again)
+if (path.resolve(PKG_ROOT) === path.resolve(FLUXY_HOME)) {
   process.exit(0);
 }
 
-// Create ~/.fluxy/ if needed
+// Dev guard: don't interfere with development
+if (fs.existsSync(path.join(PKG_ROOT, '.git'))) {
+  process.exit(0);
+}
+
+// ── Copy source files to ~/.fluxy/ ──
+
 fs.mkdirSync(FLUXY_HOME, { recursive: true });
 
-// Remove existing app link/dir
+const DIRS_TO_COPY = [
+  'bin', 'supervisor', 'worker', 'shared', 'client',
+  'dist', 'dist-fluxy', 'scripts',
+];
+
+const FILES_TO_COPY = [
+  'package.json', 'vite.config.ts', 'vite.fluxy.config.ts',
+  'tsconfig.json', 'postcss.config.js', 'components.json',
+];
+
+for (const dir of DIRS_TO_COPY) {
+  const src = path.join(PKG_ROOT, dir);
+  if (!fs.existsSync(src)) continue;
+  const dst = path.join(FLUXY_HOME, dir);
+  fs.cpSync(src, dst, { recursive: true, force: true });
+}
+
+for (const file of FILES_TO_COPY) {
+  const src = path.join(PKG_ROOT, file);
+  if (!fs.existsSync(src)) continue;
+  fs.copyFileSync(src, path.join(FLUXY_HOME, file));
+}
+
+// ── Install dependencies in ~/.fluxy/ ──
+
 try {
-  fs.rmSync(APP_DIR, { recursive: true, force: true });
-} catch {}
+  execSync('npm install --omit=dev --ignore-scripts', {
+    cwd: FLUXY_HOME,
+    stdio: 'ignore',
+  });
+} catch {
+  // Non-fatal: deps may already exist from a previous install
+}
+
+// ── Create fluxy symlink ──
 
-// Create symlink: ~/.fluxy/app → npm install location
-fs.symlinkSync(PKG_ROOT, APP_DIR, 'junction');
+const cliPath = path.join(FLUXY_HOME, 'bin', 'cli.js');
+fs.chmodSync(cliPath, 0o755);
+
+if (process.platform === 'win32') {
+  // On Windows, npm handles the bin linking via package.json "bin" field
+  // Just ensure the files are in place
+} else {
+  const targets = ['/usr/local/bin/fluxy', path.join(os.homedir(), '.local', 'bin', 'fluxy')];
+  let linked = false;
+
+  for (const target of targets) {
+    try {
+      fs.mkdirSync(path.dirname(target), { recursive: true });
+      try { fs.unlinkSync(target); } catch {}
+      fs.symlinkSync(cliPath, target);
+      linked = true;
+      break;
+    } catch {
+      // No permission, try next
+    }
+  }
+
+  if (!linked) {
+    console.log(`Note: Could not create fluxy symlink. You can run it directly: node ${cliPath}`);
+  }
+}

package/supervisor/fluxy-agent.ts

@@ -119,7 +119,7 @@ export async function startFluxyAgentQuery(
       prompt: sdkPrompt,
       options: {
         model,
-        cwd: DATA_DIR,
+        cwd: PKG_DIR,
         permissionMode: 'bypassPermissions',
         allowDangerouslySkipPermissions: true,
         maxTurns: 50,