shellwise 0.1.0 → 0.1.2

package/README.md

@@ -31,11 +31,17 @@ Tab/Shift+Tab to navigate, Enter to select, Esc to dismiss
 
 ## Install
 
+> **Important:** This is a CLI tool — install it **globally**.
+
 ```bash
+# Recommended
 bun install -g shellwise
+
+# Or with npm
+npm install -g shellwise
 ```
 
-That's it. Shell integration is auto-injected into your `~/.zshrc` or `~/.bashrc` on install. Restart your terminal to activate.
+Shell integration is auto-injected into your `~/.zshrc` or `~/.bashrc` on install. Restart your terminal to activate.
 
 ### Manual setup
 
@@ -43,10 +49,10 @@ If auto-setup didn't work, add to your shell config:
 
 ```bash
 # ~/.zshrc
-eval "$(sw init zsh)"
+eval "$(shellwise init zsh)"
 
 # ~/.bashrc
-eval "$(sw init bash)"
+eval "$(shellwise init bash)"
 ```
 
 ## Usage
@@ -76,29 +82,31 @@ Press `Ctrl+R` to open full fuzzy search:
 
 ### Commands
 
+Both `shellwise` and `sw` work as the command name:
+
 ```bash
-sw search [--query <text>]     # Interactive fuzzy search (Ctrl+R)
-sw suggest --query <text>      # Get top suggestion (used by shell hook)
-sw add --command <cmd>         # Save a command to history
-sw init <zsh|bash>             # Output shell integration script
-sw import [zsh|bash]           # Import existing shell history
-sw stats                       # Show usage statistics
-sw prune --days <n>            # Remove entries older than n days
-sw daemon start|stop|status    # Manage background daemon
+shellwise search [--query <text>]     # Interactive fuzzy search (Ctrl+R)
+shellwise suggest --query <text>      # Get top suggestion (used by shell hook)
+shellwise add --command <cmd>         # Save a command to history
+shellwise init <zsh|bash>             # Output shell integration script
+shellwise import [zsh|bash]           # Import existing shell history
+shellwise stats                       # Show usage statistics
+shellwise prune --days <n>            # Remove entries older than n days
+shellwise daemon start|stop|status    # Manage background daemon
 ```
 
 ### Import existing history
 
 ```bash
-sw import zsh    # Import from ~/.zsh_history
-sw import bash   # Import from ~/.bash_history
+shellwise import zsh    # Import from ~/.zsh_history
+shellwise import bash   # Import from ~/.bash_history
 ```
 
 ## Architecture
 
 ```
 ┌──────────────┐     TCP (persistent)     ┌──────────────────┐
-│   Zsh/Bash   │◄────────────────────────►│   sw daemon      │
+│   Zsh/Bash   │◄────────────────────────►│ shellwise daemon │
 │   (shell)    │     ~1-3ms round-trip    │   (Bun process)  │
 └──────────────┘                          └────────┬─────────┘
                                                    │
@@ -132,6 +140,7 @@ sw import bash   # Import from ~/.bash_history
 
 ```bash
 bun remove -g shellwise
+# or: npm uninstall -g shellwise
 ```
 
 Shell integration is automatically removed from your config on uninstall.

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "shellwise",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Smart command history with inline auto-suggest and fuzzy search for your terminal",
   "type": "module",
   "bin": {
+    "shellwise": "./bin/sw.js",
     "sw": "./bin/sw.js"
   },
   "files": [

package/scripts/setup.sh

@@ -10,15 +10,33 @@ DIM='\033[2m'
 BOLD='\033[1m'
 RESET='\033[0m'
 
+# Detect if this is a local (not global) install
+if [[ -z "$(command -v shellwise 2>/dev/null)" && -z "$(command -v sw 2>/dev/null)" ]]; then
+  # Check if we're inside node_modules (local install)
+  if [[ "$PWD" == *"node_modules"* ]] || [[ "${INIT_CWD:-}" == *"node_modules"* ]]; then
+    echo -e "${YELLOW}${BOLD}[shellwise]${RESET} This is a CLI tool — install it globally:"
+    echo -e "  ${BOLD}bun install -g shellwise${RESET}"
+    echo -e "  ${DIM}or: npm install -g shellwise${RESET}"
+    exit 0
+  fi
+fi
+
 MARKER="# shellwise shell integration"
 
-# Detect sw binary path
+# Detect shellwise binary path (prefer 'shellwise' over 'sw' to avoid conflicts)
 SW_BIN=""
-if command -v sw &>/dev/null; then
-  SW_BIN="sw"
-else
-  # Try common global bin paths
-  for p in "$HOME/.bun/bin/sw" "$HOME/.local/bin/sw" "$(npm prefix -g 2>/dev/null)/bin/sw"; do
+if command -v shellwise &>/dev/null; then
+  SW_BIN="shellwise"
+elif command -v sw &>/dev/null; then
+  # Verify it's actually shellwise, not another tool
+  if sw --help 2>&1 | grep -q "shellwise" 2>/dev/null; then
+    SW_BIN="sw"
+  fi
+fi
+
+# Try common global bin paths
+if [[ -z "$SW_BIN" ]]; then
+  for p in "$HOME/.bun/bin/shellwise" "$HOME/.local/bin/shellwise" "$(npm prefix -g 2>/dev/null)/bin/shellwise"; do
     if [[ -x "$p" ]]; then
       SW_BIN="$p"
       break
@@ -27,8 +45,8 @@ else
 fi
 
 if [[ -z "$SW_BIN" ]]; then
-  echo -e "${YELLOW}[shellwise]${RESET} Could not find sw binary. Add manually:"
-  echo '  eval "$(sw init zsh)"   # add to ~/.zshrc'
+  echo -e "${YELLOW}[shellwise]${RESET} Could not find shellwise binary. Add manually:"
+  echo '  eval "$(shellwise init zsh)"   # add to ~/.zshrc'
   exit 0
 fi
 
@@ -75,14 +93,16 @@ case "$SHELL_NAME" in
   *)
     echo -e "${YELLOW}[shellwise]${RESET} Unsupported shell: $SHELL_NAME"
     echo '  Supported: zsh, bash'
-    echo '  Add manually: eval "$(sw init zsh)"'
+    echo '  Add manually: eval "$(shellwise init zsh)"'
     exit 0
     ;;
 esac
 
 # Start daemon for fast suggest
-if command -v sw &>/dev/null; then
-  sw daemon start &>/dev/null || true
+if command -v shellwise &>/dev/null; then
+  shellwise daemon start &>/dev/null || true
+elif [[ -n "$SW_BIN" ]]; then
+  $SW_BIN daemon start &>/dev/null || true
 fi
 
 echo -e "${GREEN}${BOLD}[shellwise]${RESET} Restart your terminal or run: ${BOLD}source ~/.${SHELL_NAME}rc${RESET}"

package/src/cli/add.ts

@@ -1,5 +1,6 @@
 import { insertCommand } from "../db/queries";
 import { getHostname } from "../utils/platform";
+import { IGNORED_COMMANDS } from "../utils/constants";
 
 interface AddOptions {
   command: string;
@@ -10,8 +11,6 @@ interface AddOptions {
   shell?: string;
 }
 
-const IGNORED_COMMANDS = new Set(["ls", "cd", "pwd", "exit", "clear", "sw"]);
-
 export function runAdd(opts: AddOptions): void {
   const cmd = opts.command.trim();
 

package/src/cli/suggest.ts

@@ -10,15 +10,18 @@ export function runSuggest(query: string, limit: number = 5): void {
   const db = getDb();
   const historyResults: string[] = [];
 
+  // Escape LIKE wildcards in user input
+  const escapedQuery = query.replace(/[%_\\]/g, "\\$&");
+
   // History: prefix matches
   const prefixes = db
     .query<{ command: string }, [string, number]>(
       `SELECT command FROM command_stats
-       WHERE command LIKE ? || '%'
+       WHERE command LIKE ? || '%' ESCAPE '\\'
        ORDER BY frecency_score DESC
        LIMIT ?`
     )
-    .all(query, limit);
+    .all(escapedQuery, limit);
 
   for (const r of prefixes) {
     if (r.command !== query) historyResults.push(r.command);
@@ -32,11 +35,11 @@ export function runSuggest(query: string, limit: number = 5): void {
     const contains = db
       .query<{ command: string }, [string, string, number]>(
         `SELECT command FROM command_stats
-         WHERE command LIKE '%' || ? || '%' AND command != ?
+         WHERE command LIKE '%' || ? || '%' ESCAPE '\\' AND command != ?
          ORDER BY frecency_score DESC
          LIMIT ?`
       )
-      .all(query, query, remaining + historyResults.length);
+      .all(escapedQuery, query, remaining + historyResults.length);
 
     for (const r of contains) {
       if (!resultSet.has(r.command) && r.command !== query) {

package/src/daemon/server.ts

@@ -2,15 +2,15 @@ import { getDb, closeDb } from "../db/connection";
 import { insertCommand } from "../db/queries";
 import { getHostname } from "../utils/platform";
 import { getCommonSuggestions } from "../data/common-commands";
+import { IGNORED_COMMANDS } from "../utils/constants";
 import { parseRequest, getSocketPath, getPidPath, getDaemonPort } from "./protocol";
 import { unlinkSync, writeFileSync, existsSync } from "fs";
 import type { Socket } from "bun";
-
-const IGNORED_COMMANDS = new Set(["ls", "cd", "pwd", "exit", "clear", "sw"]);
 const IDLE_TIMEOUT = 30 * 60_000; // 30 min
 
 let idleTimer: ReturnType<typeof setTimeout> | null = null;
 let server: ReturnType<typeof Bun.listen> | null = null;
+let tcpServer: ReturnType<typeof Bun.listen> | null = null;
 
 // Pre-warm DB + prepared statements on start
 let suggestPrefix: ReturnType<ReturnType<typeof getDb>["prepare"]>;
@@ -20,13 +20,13 @@ function initPreparedStatements() {
   const db = getDb();
   suggestPrefix = db.prepare(
     `SELECT command FROM command_stats
-     WHERE command LIKE ?1 || '%'
+     WHERE command LIKE ?1 || '%' ESCAPE '\\'
      ORDER BY frecency_score DESC
      LIMIT ?2`
   );
   suggestContains = db.prepare(
     `SELECT command FROM command_stats
-     WHERE command LIKE '%' || ?1 || '%' AND command != ?1
+     WHERE command LIKE '%' || ?1 || '%' ESCAPE '\\' AND command != ?1
      ORDER BY frecency_score DESC
      LIMIT ?2`
   );
@@ -55,8 +55,11 @@ function handleRequest(raw: string): string {
       const historyResults: string[] = [];
       const historyLimit = 5;
 
+      // Escape LIKE wildcards in user input
+      const escapedQuery = req.query.replace(/[%_\\]/g, "\\$&");
+
       // History: prefix matches
-      const prefixes = suggestPrefix.all(req.query, historyLimit) as { command: string }[];
+      const prefixes = suggestPrefix.all(escapedQuery, historyLimit) as { command: string }[];
       for (const r of prefixes) {
         if (r.command !== req.query) historyResults.push(r.command);
       }
@@ -65,7 +68,7 @@ function handleRequest(raw: string): string {
       if (historyResults.length < historyLimit) {
         const remaining = historyLimit - historyResults.length;
         const resultSet = new Set(historyResults);
-        const contains = suggestContains.all(req.query, remaining + historyResults.length) as {
+        const contains = suggestContains.all(escapedQuery, remaining + historyResults.length) as {
           command: string;
         }[];
         for (const r of contains) {
@@ -151,7 +154,7 @@ export function startServer(): void {
   });
 
   const port = getDaemonPort();
-  Bun.listen({
+  tcpServer = Bun.listen({
     hostname: "127.0.0.1",
     port,
     socket: socketHandlers,
@@ -177,6 +180,10 @@ export function stopServer(): void {
     server.stop(true);
     server = null;
   }
+  if (tcpServer) {
+    tcpServer.stop(true);
+    tcpServer = null;
+  }
   closeDb();
 
   const socketPath = getSocketPath();

package/src/db/queries.ts

@@ -95,8 +95,10 @@ export function searchCommands(opts: SearchOptions): CommandStats[] {
   const params: (string | number)[] = [];
 
   if (opts.query) {
-    conditions.push("cs.command LIKE ?");
-    params.push(`%${opts.query}%`);
+    conditions.push("cs.command LIKE ? ESCAPE '\\'");
+    // Escape LIKE wildcards in user input
+    const escaped = opts.query.replace(/[%_\\]/g, "\\$&");
+    params.push(`%${escaped}%`);
   }
 
   if (opts.cwd) {

package/src/index.ts

@@ -10,7 +10,6 @@ import { runPrune } from "./cli/prune";
 import { closeDb } from "./db/connection";
 import { startServer, isDaemonRunning, getDaemonInfo } from "./daemon/server";
 import { daemonRequest } from "./daemon/client";
-import { getSocketPath, getPidPath, getDaemonPort } from "./daemon/protocol";
 
 const args = process.argv.slice(2);
 const command = args[0];
@@ -30,7 +29,7 @@ function parseFlags(args: string[]): Record<string, string> {
 function printHelp(): void {
   console.log(`shellwise - Smart command history with fuzzy search
 
-Usage: sw <command> [options]
+Usage: shellwise <command> [options]  (or: sw <command>)
 
 Commands:
   search [--query <text>]     Interactive fuzzy search (Ctrl+R)
@@ -43,8 +42,8 @@ Commands:
   daemon start|stop|status    Manage background daemon (faster suggest)
 
 Setup:
-  Add to ~/.zshrc:   eval "$(sw init zsh)"
-  Add to ~/.bashrc:  eval "$(sw init bash)"
+  Add to ~/.zshrc:   eval "$(shellwise init zsh)"
+  Add to ~/.bashrc:  eval "$(shellwise init bash)"
 
 Features:
   - Auto-save: commands are recorded automatically
@@ -81,12 +80,14 @@ async function main(): Promise<void> {
       case "add": {
         const flags = parseFlags(args.slice(1));
         if (!flags.command) {
-          console.error("Usage: sw add --command <cmd>");
+          console.error("Usage: shellwise add --command <cmd>");
           process.exit(1);
         }
 
         // Try daemon first
-        const addMsg = `ADD\t${flags.command}\t${flags.cwd || ""}\t${flags["exit-code"] || "0"}\t${flags.duration || "0"}\t${flags.session || ""}\t${flags.shell || ""}\n`;
+        // Strip tabs from command to avoid breaking protocol delimiter
+        const safeCommand = flags.command.replace(/\t/g, " ");
+        const addMsg = `ADD\t${safeCommand}\t${flags.cwd || ""}\t${flags["exit-code"] || "0"}\t${flags.duration || "0"}\t${flags.session || ""}\t${flags.shell || ""}\n`;
         const addResult = await daemonRequest(addMsg);
         if (!addResult) {
           // Fallback: direct
@@ -105,10 +106,10 @@ async function main(): Promise<void> {
       case "init": {
         const shell = args[1];
         if (!shell) {
-          console.error("Usage: sw init <zsh|bash>");
+          console.error("Usage: shellwise init <zsh|bash>");
           process.exit(1);
         }
-        runInit(shell, "sw");
+        runInit(shell, "shellwise");
         break;
       }
 
@@ -138,7 +139,7 @@ async function main(): Promise<void> {
               return;
             }
             // Fork to background
-            const proc = Bun.spawn(["sw", "daemon", "_run"], {
+            const proc = Bun.spawn(["shellwise", "daemon", "_run"], {
               stdio: ["ignore", "ignore", "ignore"],
               // @ts-ignore - Bun supports detached
               detached: true,
@@ -178,7 +179,7 @@ async function main(): Promise<void> {
             break;
           }
           default:
-            console.error("Usage: sw daemon start|stop|status");
+            console.error("Usage: shellwise daemon start|stop|status");
             process.exit(1);
         }
         break;

package/src/search/scorer.ts

@@ -37,13 +37,12 @@ export function rankResults(
   }
 
   const results: ScoredResult[] = [];
+  const maxFrecency = stats.reduce((max, s) => Math.max(max, s.frecency_score), 1);
 
   for (const match of matches) {
     const stat = statsMap.get(match.text);
     if (!stat) continue;
 
-    // Normalize frecency to 0-1 range
-    const maxFrecency = stats.reduce((max, s) => Math.max(max, s.frecency_score), 1);
     const normalizedFrecency = stat.frecency_score / maxFrecency;
 
     // CWD bonus

package/src/utils/constants.ts

@@ -0,0 +1 @@
+export const IGNORED_COMMANDS = new Set(["ls", "cd", "pwd", "exit", "clear", "sw"]);