shellwise 0.2.3 → 0.2.5

package/package.json

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

package/src/cli/import.ts

@@ -1,34 +1,65 @@
 import { existsSync, readFileSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
-import { insertCommand } from "../db/queries";
+import { insertCommand, getExistingHashes, hashCommand } from "../db/queries";
 import { getHostname } from "../utils/platform";
 
 export function runImport(shell?: string): void {
   const home = homedir();
+  const existing = getExistingHashes();
+  const seen = new Set<string>();
   let imported = 0;
+  let skipped = 0;
 
   if (!shell || shell === "zsh") {
     const zshPath = join(home, ".zsh_history");
     if (existsSync(zshPath)) {
-      imported += importZshHistory(zshPath);
+      const result = importZshHistory(zshPath, existing, seen);
+      imported += result.imported;
+      skipped += result.skipped;
     }
   }
 
   if (!shell || shell === "bash") {
     const bashPath = join(home, ".bash_history");
     if (existsSync(bashPath)) {
-      imported += importBashHistory(bashPath);
+      const result = importBashHistory(bashPath, existing, seen);
+      imported += result.imported;
+      skipped += result.skipped;
     }
   }
 
-  console.log(`Imported ${imported} commands.`);
+  console.log(`Imported ${imported} commands. Skipped ${skipped} duplicates.`);
 }
 
-function importZshHistory(path: string): number {
+interface ImportResult {
+  imported: number;
+  skipped: number;
+}
+
+function tryInsert(
+  cmd: string,
+  shell: string,
+  hostname: string,
+  existing: Set<string>,
+  seen: Set<string>
+): boolean {
+  const hash = hashCommand(cmd);
+  if (existing.has(hash) || seen.has(hash)) return false;
+  seen.add(hash);
+  insertCommand({ command: cmd, hostname, shell });
+  return true;
+}
+
+function importZshHistory(
+  path: string,
+  existing: Set<string>,
+  seen: Set<string>
+): ImportResult {
   const content = readFileSync(path, "utf-8");
   const lines = content.split("\n");
-  let count = 0;
+  let imported = 0;
+  let skipped = 0;
   const hostname = getHostname();
 
   for (const line of lines) {
@@ -37,12 +68,11 @@ function importZshHistory(path: string): number {
     if (extMatch) {
       const cmd = extMatch[2].trim();
       if (cmd && cmd.length >= 2) {
-        insertCommand({
-          command: cmd,
-          hostname,
-          shell: "zsh",
-        });
-        count++;
+        if (tryInsert(cmd, "zsh", hostname, existing, seen)) {
+          imported++;
+        } else {
+          skipped++;
+        }
       }
       continue;
     }
@@ -50,27 +80,38 @@ function importZshHistory(path: string): number {
     // Plain format
     const cmd = line.trim();
     if (cmd && cmd.length >= 2 && !cmd.startsWith("#")) {
-      insertCommand({ command: cmd, hostname, shell: "zsh" });
-      count++;
+      if (tryInsert(cmd, "zsh", hostname, existing, seen)) {
+        imported++;
+      } else {
+        skipped++;
+      }
     }
   }
 
-  return count;
+  return { imported, skipped };
 }
 
-function importBashHistory(path: string): number {
+function importBashHistory(
+  path: string,
+  existing: Set<string>,
+  seen: Set<string>
+): ImportResult {
   const content = readFileSync(path, "utf-8");
   const lines = content.split("\n");
-  let count = 0;
+  let imported = 0;
+  let skipped = 0;
   const hostname = getHostname();
 
   for (const line of lines) {
     const cmd = line.trim();
     if (cmd && cmd.length >= 2 && !cmd.startsWith("#")) {
-      insertCommand({ command: cmd, hostname, shell: "bash" });
-      count++;
+      if (tryInsert(cmd, "bash", hostname, existing, seen)) {
+        imported++;
+      } else {
+        skipped++;
+      }
     }
   }
 
-  return count;
+  return { imported, skipped };
 }

package/src/db/queries.ts

@@ -151,7 +151,12 @@ export function pruneOlderThan(days: number): number {
   const db = getDb();
   const cutoff = Date.now() - days * 24 * 3600_000;
 
-  const result = db.run("DELETE FROM commands WHERE created_at < ?", [cutoff]);
+  const result = db.run(
+    `DELETE FROM commands WHERE command_hash IN (
+       SELECT command_hash FROM command_stats WHERE last_used_at < ?
+     )`,
+    [cutoff]
+  );
 
   // Cleanup orphaned stats
   db.run(
@@ -161,6 +166,16 @@ export function pruneOlderThan(days: number): number {
   return result.changes;
 }
 
+export function getExistingHashes(): Set<string> {
+  const db = getDb();
+  const rows = db
+    .query<{ command_hash: string }, []>(
+      "SELECT command_hash FROM command_stats"
+    )
+    .all();
+  return new Set(rows.map((r) => r.command_hash));
+}
+
 export function refreshAllFrecency(): void {
   const db = getDb();
   const now = Date.now();