@getverbal/cli 0.4.2 → 0.5.0

package/dist/cli.js

@@ -113,7 +113,7 @@ function compareSemver(a, b) {
   }
   return 0;
 }
-var VERSION = "0.4.2";
+var VERSION = "0.5.0";
 
 // src/auth/credentials.ts
 import { readFileSync, writeFileSync, rmSync, mkdirSync, chmodSync, renameSync } from "node:fs";
@@ -343,37 +343,71 @@ import os2 from "node:os";
 import path2 from "node:path";
 import { fileURLToPath } from "node:url";
 import { execSync as execSync5 } from "node:child_process";
+function isGetverbalOnPath() {
+  const cmd = process.platform === "win32" ? "where getverbal" : "which getverbal";
+  try {
+    execSync5(cmd, { stdio: "pipe" });
+    return true;
+  } catch {
+    return false;
+  }
+}
 function installClaudeHooks(useGlobal = false) {
   const settingsPath = path2.join(os2.homedir(), ".claude", "settings.json");
   const hooksRoot = path2.resolve(__dirname2, "..", "..", "hooks");
-  const stopHook = path2.join(hooksRoot, "ingest-stop-hook.sh");
-  const endHook = path2.join(hooksRoot, "ingest-session-end-hook.sh");
   const configPath = findMcpConfigPath();
+  const configEnv = configPath ? { VERBAL_CONFIG_PATH: configPath } : undefined;
+  const useCliCommands = useGlobal || isGetverbalOnPath();
   const settings = readJson(settingsPath) ?? {};
   settings.hooks = settings.hooks ?? {};
-  upsertHook(settings, "Stop", stopHook, {
-    timeout: 30,
-    statusMessage: "Tracking usage in Verbal",
-    async: true,
-    env: configPath ? { VERBAL_CONFIG_PATH: configPath } : undefined
-  });
-  upsertHook(settings, "SessionEnd", endHook, {
-    timeout: 30,
-    statusMessage: "Finalizing usage data",
-    env: configPath ? { VERBAL_CONFIG_PATH: configPath } : undefined
-  });
-  const reviewPromptHook = path2.join(hooksRoot, "session-review-prompt.js");
-  upsertHook(settings, "Stop", `node ${reviewPromptHook}`, {
-    timeout: 5,
-    statusMessage: "Checking session review timer"
-  });
-  const preflightHook = path2.join(hooksRoot, "preflight-hook.sh");
-  if (fs2.existsSync(preflightHook)) {
-    upsertHook(settings, "UserPromptSubmit", preflightHook, {
+  if (useCliCommands) {
+    upsertHook(settings, "Stop", "getverbal ingest-claude-hook", {
+      timeout: 30,
+      statusMessage: "Tracking usage in Verbal",
+      async: true,
+      env: { HOOK_EVENT: "Stop", ...configEnv }
+    });
+    upsertHook(settings, "SessionEnd", "getverbal ingest-claude-hook", {
+      timeout: 30,
+      statusMessage: "Finalizing usage data",
+      env: { HOOK_EVENT: "SessionEnd", ...configEnv }
+    });
+    upsertHook(settings, "Stop", "getverbal session-review", {
+      timeout: 5,
+      statusMessage: "Checking session review timer"
+    });
+    upsertHook(settings, "UserPromptSubmit", "getverbal preflight", {
       timeout: 10,
       statusMessage: "Coaching prompt",
-      env: configPath ? { VERBAL_CONFIG_PATH: configPath } : undefined
+      env: configEnv
     });
+  } else {
+    const stopHook = path2.join(hooksRoot, "ingest-stop-hook.sh");
+    const endHook = path2.join(hooksRoot, "ingest-session-end-hook.sh");
+    upsertHook(settings, "Stop", stopHook, {
+      timeout: 30,
+      statusMessage: "Tracking usage in Verbal",
+      async: true,
+      env: configEnv ? { HOOK_EVENT: "Stop", ...configEnv } : { HOOK_EVENT: "Stop" }
+    });
+    upsertHook(settings, "SessionEnd", endHook, {
+      timeout: 30,
+      statusMessage: "Finalizing usage data",
+      env: configEnv ? { HOOK_EVENT: "SessionEnd", ...configEnv } : { HOOK_EVENT: "SessionEnd" }
+    });
+    const reviewPromptHook = path2.join(hooksRoot, "session-review-prompt.js");
+    upsertHook(settings, "Stop", `node ${reviewPromptHook}`, {
+      timeout: 5,
+      statusMessage: "Checking session review timer"
+    });
+    const preflightHook = path2.join(hooksRoot, "preflight-hook.sh");
+    if (fs2.existsSync(preflightHook)) {
+      upsertHook(settings, "UserPromptSubmit", preflightHook, {
+        timeout: 10,
+        statusMessage: "Coaching prompt",
+        env: configEnv
+      });
+    }
   }
   fs2.mkdirSync(path2.dirname(settingsPath), { recursive: true });
   fs2.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
@@ -402,6 +436,13 @@ function tryUnloadPlist(plistPath) {
     execSync5(`launchctl unload "${plistPath}"`, { stdio: "pipe" });
   } catch {}
 }
+function hookIdentityKey(command) {
+  for (const keyword of HOOK_IDENTITY_KEYWORDS) {
+    if (command.includes(keyword))
+      return keyword;
+  }
+  return null;
+}
 function upsertHook(settings, hookName, command, options) {
   const hookEntry = {
     matcher: "",
@@ -409,7 +450,12 @@ function upsertHook(settings, hookName, command, options) {
   };
   settings.hooks = settings.hooks ?? {};
   settings.hooks[hookName] = settings.hooks[hookName] ?? [];
-  const existingIndex = settings.hooks[hookName].findIndex((entry) => entry.hooks?.some((hook) => hook.command.includes(path2.basename(command))));
+  const newKey = hookIdentityKey(command);
+  const existingIndex = settings.hooks[hookName].findIndex((entry) => entry.hooks?.some((hook) => {
+    if (newKey !== null && hookIdentityKey(hook.command) === newKey)
+      return true;
+    return hook.command.includes(path2.basename(command));
+  }));
   if (existingIndex >= 0) {
     settings.hooks[hookName][existingIndex] = hookEntry;
   } else {
@@ -437,10 +483,19 @@ function findMcpConfigPath() {
     current = parent;
   }
 }
-var __filename2, __dirname2;
+var __filename2, __dirname2, HOOK_IDENTITY_KEYWORDS;
 var init_hooks_installer = __esm(() => {
   __filename2 = fileURLToPath(import.meta.url);
   __dirname2 = path2.dirname(__filename2);
+  HOOK_IDENTITY_KEYWORDS = [
+    "ingest-claude-hook",
+    "ingest-stop-hook",
+    "ingest-session-end-hook",
+    "session-review-prompt",
+    "session-review",
+    "preflight-hook",
+    "preflight"
+  ];
 });
 
 // src/import/index.ts
@@ -17750,6 +17805,58 @@ async function main(args = process.argv) {
       }
       savePreflightState2(stateDir, updatedState);
       process.stdout.write(JSON.stringify(result) + `
+`);
+      return;
+    }
+    case "session-review": {
+      const STATE_FILE = "/tmp/verbal-session-prompts.json";
+      const THRESHOLD_MS = 1500000;
+      const PRUNE_MS = 86400000;
+      let input = {};
+      try {
+        const text = await readStdinText();
+        if (text.trim().length > 0) {
+          input = JSON.parse(text);
+        }
+      } catch {
+        process.exit(0);
+      }
+      if (input.stop_hook_active)
+        process.exit(0);
+      const sessionId = input.session_id;
+      if (!sessionId)
+        process.exit(0);
+      let state = {};
+      try {
+        state = JSON.parse(fs15.readFileSync(STATE_FILE, "utf8"));
+      } catch {
+        state = {};
+      }
+      const now = Date.now();
+      for (const [id, entry2] of Object.entries(state)) {
+        if (now - entry2.start > PRUNE_MS) {
+          delete state[id];
+        }
+      }
+      const entry = state[sessionId];
+      if (!entry) {
+        state[sessionId] = { start: now, prompted: false };
+        try {
+          fs15.writeFileSync(STATE_FILE, JSON.stringify(state));
+        } catch {}
+        process.exit(0);
+      }
+      if (entry.prompted)
+        process.exit(0);
+      const elapsed = now - entry.start;
+      if (elapsed < THRESHOLD_MS)
+        process.exit(0);
+      entry.prompted = true;
+      try {
+        fs15.writeFileSync(STATE_FILE, JSON.stringify(state));
+      } catch {}
+      const elapsedMin = Math.round(elapsed / 60000);
+      process.stdout.write(`You've been working for ~${elapsedMin} minutes. When the user seems ready to wrap up or there is a natural pause, offer a session review: say "Want to quickly rate this session? It helps track your AI ROI." If they say yes, call submit_session_review with session_id="${sessionId}", usefulness_rating (1-5), effectiveness_rating (1-5), and time_saved_bucket.
 `);
       return;
     }
@@ -17997,6 +18104,8 @@ function printHelp() {
                      (no flags = auto-detect, watches all available sources)
   verbal-hooks preflight [--mode silent|notify|blocking] [--threshold 60]
                          (reads prompt from stdin, prints coaching to stderr)
+  verbal-hooks session-review
+                         (Stop hook: prompts for session review after 25 min; reads stdin)
   verbal-hooks status
   verbal-hooks uninstall --claude --codex
 `);

package/package.json

@@ -1,13 +1,17 @@
 {
   "name": "@getverbal/cli",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Set up Verbal AI spend tracking in one command",
   "bin": {
     "getverbal": "dist/cli.js"
   },
   "type": "module",
   "main": "./dist/cli.js",
-  "files": ["dist", "README.md", "LICENSE"],
+  "files": [
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
   "scripts": {
     "build": "bun build src/cli.ts --target=node --outdir=dist --format=esm",
     "build:tsc": "tsc -p tsconfig.json",
@@ -17,14 +21,15 @@
     "prepublishOnly": "npm run typecheck && npm run build"
   },
   "dependencies": {
-    "picocolors": "^1.1.0",
-    "open": "^10.0.0",
+    "@getverbal/cli": "^0.4.2",
     "@modelcontextprotocol/sdk": "^1.27.0",
+    "open": "^10.0.0",
+    "picocolors": "^1.1.0",
     "zod": "^3.25.0"
   },
   "devDependencies": {
-    "typescript": "^5.5.0",
     "@types/node": "^20.0.0",
+    "typescript": "^5.5.0",
     "vitest": "^3.0.0"
   },
   "engines": {