@firstpick/pi-extension-bang-command-autocomplete 0.1.3 → 0.1.5

package/README.md

@@ -2,10 +2,18 @@
 
 Autocomplete for `!<command>` in Pi.
 
+![Bang command autocomplete with common commands](images/Common_commands_v0.1.4.png)
+
+Built-in suggestions for common shell commands appear as soon as you type `!`.
+
+![Learned full-line and current-session suggestions](images/Learned_Lines_v0.1.4.png)
+
+Learned full command lines and commands from the current session surface next to each other while you refine a bang.
+
 ## What it does
 
 - Suggests command names while typing `!<command>`.
-- Uses a built-in common-command index out of the box.
+- Uses a built-in common-command index out of the box (with platform-aware defaults).
 - Learns commands you run via `!`/`!!` and persists them across Pi sessions.
 - Learns full bang command lines (e.g. `!git add .`) and suggests them directly.
 - Learns flags used with those commands (e.g. `!rg -n`) and suggests them when you type `!<command> ` or `!<command> -...`.
@@ -22,7 +30,10 @@ pi install npm:@firstpick/pi-extension-bang-command-autocomplete
 ## Configuration
 
 - `PI_BANG_AUTOCOMPLETE_INCLUDE_HISTORY`
-  - `1|true|yes|on`: include commands from `~/.bash_history` and fish history.
+  - `1|true|yes|on`: include commands from shell history.
+    - Bash: `~/.bash_history`
+    - Zsh: `~/.zsh_history`
+    - Fish: `$XDG_DATA_HOME/fish/fish_history` (fallback: `~/.local/share/fish/fish_history`)
   - unset/other: use built-in command list only (default).
 - `PI_BANG_AUTOCOMPLETE_RUNTIME_STORE_PATH`
   - optional absolute/relative file path for persisted learned commands.

package/index.ts

@@ -1,25 +1,18 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { envFlag, getAgentDir } from "@firstpick/pi-utils";
 
 type CommandSource = "common" | "history" | "runtime";
 
 const DEFAULT_RUNTIME_STORE_PATH = path.join(
-  os.homedir(),
-  ".pi",
-  "agent",
+  getAgentDir(),
   "state",
   "bang-command-autocomplete-runtime.json",
 );
 
-function envFlag(name: string, fallback: boolean): boolean {
-  const raw = process.env[name]?.trim().toLowerCase();
-  if (!raw) return fallback;
-  return raw === "1" || raw === "true" || raw === "yes" || raw === "on";
-}
-
-const COMMON_COMMANDS = [
+const COMMON_COMMANDS_BASE = [
   "ls",
   "la",
   "ll",
@@ -51,10 +44,6 @@ const COMMON_COMMANDS = [
   "just",
   "docker",
   "docker-compose",
-  "systemctl",
-  "journalctl",
-  "pacman",
-  "yay",
   "curl",
   "wget",
   "ssh",
@@ -65,6 +54,17 @@ const COMMON_COMMANDS = [
   "btop",
 ] as const;
 
+const COMMON_COMMANDS_UNIX = ["systemctl", "journalctl"] as const;
+const COMMON_COMMANDS_LINUX = ["pacman", "yay"] as const;
+
+function getCommonCommands(): string[] {
+  const platform = os.platform();
+  const commands = [...COMMON_COMMANDS_BASE];
+  if (platform !== "win32") commands.push(...COMMON_COMMANDS_UNIX);
+  if (platform === "linux") commands.push(...COMMON_COMMANDS_LINUX);
+  return commands;
+}
+
 function parseCommandLine(commandLine: string): { executable?: string; flags: string[] } {
   const trimmed = commandLine.trim();
   if (!trimmed || trimmed.startsWith("#")) return { flags: [] };
@@ -95,7 +95,8 @@ function extractExecutable(commandLine: string): string | undefined {
 }
 
 function readFishHistoryExecutables(): string[] {
-  const historyPath = path.join(os.homedir(), ".local", "share", "fish", "fish_history");
+  const fishDataHome = process.env.XDG_DATA_HOME?.trim() || path.join(os.homedir(), ".local", "share");
+  const historyPath = path.join(fishDataHome, "fish", "fish_history");
   if (!fs.existsSync(historyPath)) return [];
 
   const content = fs.readFileSync(historyPath, "utf8");
@@ -124,6 +125,20 @@ function readBashHistoryExecutables(): string[] {
     .filter((v): v is string => Boolean(v));
 }
 
+function readZshHistoryExecutables(): string[] {
+  const historyPath = path.join(os.homedir(), ".zsh_history");
+  if (!fs.existsSync(historyPath)) return [];
+
+  const content = fs.readFileSync(historyPath, "utf8");
+  return content
+    .split(/\r?\n/)
+    .map((line) => {
+      const cleaned = line.includes(";") ? line.slice(line.indexOf(";") + 1) : line;
+      return extractExecutable(cleaned);
+    })
+    .filter((v): v is string => Boolean(v));
+}
+
 function getRuntimeStorePath(): string {
   const configured = process.env.PI_BANG_AUTOCOMPLETE_RUNTIME_STORE_PATH?.trim();
   return configured ? path.resolve(configured) : DEFAULT_RUNTIME_STORE_PATH;
@@ -218,12 +233,12 @@ function writeRuntimeData(storePath: string, data: RuntimeStoreData): void {
 function buildCommandIndex(includeHistory: boolean): Array<{ command: string; source: CommandSource }> {
   const merged = new Map<string, CommandSource>();
 
-  for (const command of COMMON_COMMANDS) {
+  for (const command of getCommonCommands()) {
     merged.set(command, "common");
   }
 
   if (includeHistory) {
-    const historyExecutables = [...readFishHistoryExecutables(), ...readBashHistoryExecutables()];
+    const historyExecutables = [...readFishHistoryExecutables(), ...readBashHistoryExecutables(), ...readZshHistoryExecutables()];
     for (let i = historyExecutables.length - 1; i >= 0; i--) {
       const command = historyExecutables[i];
       if (!command) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firstpick/pi-extension-bang-command-autocomplete",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Autocomplete for !<command> in Pi, with optional shell-history indexing.",
   "license": "MIT",
   "keywords": [
@@ -15,11 +15,14 @@
     ]
   },
   "peerDependencies": {
-    "@mariozechner/pi-coding-agent": "*"
+    "@earendil-works/pi-coding-agent": "*"
   },
   "files": [
     "index.ts",
     "README.md",
     "LICENSE"
-  ]
+  ],
+  "dependencies": {
+    "@firstpick/pi-utils": "^0.1.0"
+  }
 }