aish-cli 1.1.0 → 1.1.1

package/aish.plugin.zsh

@@ -327,13 +327,19 @@ Respond with only the updated command."
     wait $pid 2>/dev/null
     local exit_code=$?
     cmd=$(<"$tmpfile")
-    local errmsg=$(<"$errfile")
+    local stats=$(<"$errfile")
     rm -f "$tmpfile" "$errfile"
 
+    # Strip ANSI codes from stats for clean display
+    stats="${stats//$'\e[2m'/}"
+    stats="${stats//$'\e[0m'/}"
+    stats="${stats## }"  # trim leading space
+    stats="${stats%%$'\n'}"  # trim trailing newline
+
     if [[ $exit_code -ne 0 ]]; then
       # Show error briefly
       BUFFER=""
-      POSTDISPLAY=$'\n  '"Error: ${errmsg:-aish command failed}"
+      POSTDISPLAY=$'\n  '"Error: ${stats:-aish command failed}"
       region_highlight=()
       zle -R
       sleep 2
@@ -369,10 +375,11 @@ Command: ${cmd}"
 Command: ${cmd}"
       fi
 
-      # Show result with hints
+      # Show result with hints and stats
       BUFFER="$cmd"
       CURSOR=${#BUFFER}
       local hints=$'\n  tab: refine  │  enter: accept  │  esc: cancel'
+      [[ -n "$stats" ]] && hints+="  │  ${stats}"
       POSTDISPLAY="$hints"
       # Highlight POSTDISPLAY area (starts after BUFFER)
       local hint_start=${#BUFFER}

package/dist/index.js

@@ -8,56 +8,59 @@ import { tmpdir, homedir } from "os";
 import { join } from "path";
 var SYSTEM_PROMPT = `You are a CLI assistant that converts natural language into the exact shell commands to run.
 
-Some project files are provided below for reference so you don't need to read them yourself.
-
 GUIDELINES:
-1. Review the project files provided below to understand available scripts and commands.
-2. If you need more context, use the Read tool to look at relevant files (scripts, configs, docs).
-3. Prefer existing scripts/targets from package.json, Makefile, etc. over raw commands.
-4. If unsure about exact flags, use common/standard ones or provide multiple options.
+1. For standard commands (git, ls, curl, etc.), respond immediately without reading files.
+2. For project-specific commands (build, test, run scripts, etc.), ALWAYS read README.md first (if it exists), then the relevant config file:
+   - Node.js: package.json
+   - Python: pyproject.toml, setup.py, or Pipfile
+   - Rust: Cargo.toml
+   - Go: go.mod
+   - Ruby: Gemfile
+   - Make: Makefile
+   - Other: Justfile, Taskfile.yml
+3. ALWAYS prefer project scripts over direct tool invocation:
+   - Use "npm run build" not "tsup" or "tsc"
+   - Use "make test" not the underlying test command
+   - Use "cargo build" not "rustc" directly
+   This ensures correct flags, environment, and project configuration.
+4. If unsure about exact flags, provide multiple options.
 
 RESPONSE FORMAT \u2014 THIS IS CRITICAL:
 Your final message MUST be ONLY a JSON object. No prose, no explanation, no "Based on...", no markdown.
 Exactly this format: {"commands": ["command1"]}
 If you are unsure which command the user wants, return multiple options and the user will pick: {"commands": ["option1", "option2"]}
-Prefer existing scripts/targets with correct flags over raw commands.
 For values the user hasn't specified, use <placeholders> like: git commit -m "<message>" or curl <url>. Use descriptive names inside the angle brackets.`;
-var PROJECT_FILES = [
-  "Makefile",
-  "package.json",
-  "README.md",
-  "Justfile",
-  "Taskfile.yml",
-  "docker-compose.yml",
-  "Cargo.toml",
-  "pyproject.toml",
-  "Gemfile"
+var TOOL_HINTS = [
+  { files: ["bun.lockb", "bun.lock"], hint: "Use bun (not npm/yarn/pnpm)" },
+  { files: ["pnpm-lock.yaml"], hint: "Use pnpm (not npm/yarn)" },
+  { files: ["yarn.lock"], hint: "Use yarn (not npm/pnpm)" },
+  { files: ["package-lock.json"], hint: "Use npm (not yarn/pnpm)" },
+  { files: ["Cargo.lock"], hint: "Use cargo for Rust commands" },
+  { files: ["poetry.lock"], hint: "Use poetry (not pip)" },
+  { files: ["Pipfile.lock"], hint: "Use pipenv (not pip)" },
+  { files: ["uv.lock"], hint: "Use uv (not pip/poetry)" },
+  { files: ["Gemfile.lock"], hint: "Use bundle exec for Ruby commands" },
+  { files: ["go.sum"], hint: "Use go modules" },
+  { files: ["flake.lock"], hint: "Nix flake project - use nix commands" }
 ];
-var MAX_FILE_SIZE = 4e3;
 async function gatherProjectContext(cwd) {
-  const sections = [];
-  const found = [];
-  for (const file of PROJECT_FILES) {
-    const filePath = join(cwd, file);
-    try {
-      await access(filePath);
-      let content = await readFile(filePath, "utf-8");
-      if (content.length > MAX_FILE_SIZE) {
-        content = content.slice(0, MAX_FILE_SIZE) + "\n...(truncated)";
+  const hints = [];
+  for (const { files, hint } of TOOL_HINTS) {
+    for (const file of files) {
+      try {
+        await access(join(cwd, file));
+        hints.push(hint);
+        break;
+      } catch {
       }
-      sections.push(`--- ${file} ---
-${content}`);
-      found.push(file);
-    } catch {
     }
   }
-  if (found.length > 0) logVerbose(`  context: ${found.join(", ")}`);
-  if (sections.length === 0) return "";
+  if (hints.length > 0) logVerbose(`  hints: ${hints.join(", ")}`);
+  if (hints.length === 0) return "";
   return `
 
-Project files:
-
-${sections.join("\n\n")}`;
+Tool hints:
+- ${hints.join("\n- ")}`;
 }
 var verbose = false;
 function setVerbose(v) {
@@ -176,7 +179,7 @@ async function queryClaude(query, cwd, model) {
   const cached = await cacheGet(key);
   if (cached) {
     logVerbose("  cache: hit");
-    return cached;
+    return { ...cached, stats: { cached: true } };
   }
   const prompt = `${SYSTEM_PROMPT}${context}
 
@@ -192,12 +195,19 @@ User request: ${query}`;
   ];
   const { stdout } = await spawnWithStdin("claude", args, prompt, cwd);
   let text = stdout.trim();
+  let stats = {};
   try {
     const wrapper = JSON.parse(text);
     if (verbose) {
       logVerbose(formatStats(wrapper));
       if (wrapper.result) logVerbose(`  result: ${wrapper.result}`);
     }
+    stats.durationMs = wrapper.duration_ms;
+    stats.cost = wrapper.total_cost_usd;
+    if (wrapper.usage) {
+      stats.inputTokens = (wrapper.usage.input_tokens || 0) + (wrapper.usage.cache_creation_input_tokens || 0) + (wrapper.usage.cache_read_input_tokens || 0);
+      stats.outputTokens = wrapper.usage.output_tokens || 0;
+    }
     if (wrapper.result) {
       text = wrapper.result;
     }
@@ -206,9 +216,11 @@ User request: ${query}`;
   }
   const result = parseResponse(text);
   result.cacheKey = key;
+  result.stats = stats;
   return result;
 }
 async function queryCodex(query, cwd, model) {
+  const startTime = Date.now();
   const context = await gatherProjectContext(cwd);
   const resultFile = join(tmpdir(), `aish-codex-${Date.now()}.txt`);
   const prompt = `${SYSTEM_PROMPT}${context}
@@ -218,6 +230,8 @@ User request: ${query}`;
     "exec",
     "--sandbox",
     "read-only",
+    "-c",
+    'model_reasoning_effort="low"',
     "-o",
     resultFile,
     "-"
@@ -230,7 +244,9 @@ User request: ${query}`;
   const text = await readFile(resultFile, "utf-8");
   await unlink(resultFile).catch(() => {
   });
-  return parseResponse(text);
+  const result = parseResponse(text);
+  result.stats = { durationMs: Date.now() - startTime };
+  return result;
 }
 async function queryAi(provider, query, cwd, model) {
   if (provider === "codex") {
@@ -410,10 +426,12 @@ async function main() {
   } : startSpinner("Thinking...");
   let commands;
   let resultCacheKey;
+  let stats;
   try {
     const result = await queryAi(provider, query, cwd, model);
     commands = result.commands;
     resultCacheKey = result.cacheKey;
+    stats = result.stats;
   } catch (err) {
     stopSpinner();
     if (print) {
@@ -423,6 +441,23 @@ async function main() {
     process.exit(1);
   }
   stopSpinner();
+  if (stats) {
+    const parts = [];
+    if (stats.cached) {
+      parts.push("cached");
+    } else {
+      if (stats.durationMs) parts.push(`${(stats.durationMs / 1e3).toFixed(1)}s`);
+      if (stats.inputTokens || stats.outputTokens) {
+        parts.push(`${stats.inputTokens || 0}\u2192${stats.outputTokens || 0} tok`);
+      }
+      if (stats.cost) parts.push(`$${stats.cost.toFixed(4)}`);
+    }
+    if (parts.length > 0) {
+      const output = print ? process.stderr : process.stdout;
+      output.write(`${DIM3}  ${parts.join(" \xB7 ")}${RESET2}
+`);
+    }
+  }
   if (commands.length === 0) {
     if (print) {
       process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aish-cli",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "AI Shell - convert natural language to bash commands using Claude or Codex",
   "type": "module",
   "license": "MIT",