shellwise 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shellwise",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Smart command history with inline auto-suggest and fuzzy search for your terminal",
   "type": "module",
   "bin": {

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];
@@ -86,7 +85,9 @@ async function main(): Promise<void> {
         }
 
         // 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

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"]);