@pushary/agent-hooks 0.38.0 → 0.39.0

package/dist/bin/pushary-doctor.js

@@ -148,14 +148,22 @@ var main = async () => {
   const settings = readJson(CLAUDE_SETTINGS);
   if (settings) {
     const hooks = settings.hooks;
-    const hasPreHook = JSON.stringify(hooks?.PreToolUse ?? []).includes("pushary-hook");
-    const hasPostHook = JSON.stringify(hooks?.PostToolUse ?? []).includes("pushary-post-hook");
-    const hasStopHook = JSON.stringify(hooks?.Stop ?? []).includes("pushary-stop-hook");
-    const hasPromptHook = JSON.stringify(hooks?.UserPromptSubmit ?? []).includes("pushary-prompt-hook");
-    check(hasPreHook, "Claude Code: PreToolUse hook");
-    check(hasPostHook, "Claude Code: PostToolUse hook");
-    check(hasStopHook, "Claude Code: Stop hook");
-    check(hasPromptHook, "Claude Code: UserPromptSubmit hook", hasPromptHook ? void 0 : "missing, re-run setup to register it");
+    const CLAUDE_HOOK_CHECKS = [
+      { event: "PreToolUse", needle: "pushary-hook", label: "PreToolUse hook" },
+      { event: "PostToolUse", needle: "pushary-post-hook", label: "PostToolUse hook" },
+      { event: "UserPromptSubmit", needle: "pushary-prompt-hook", label: "UserPromptSubmit hook" },
+      { event: "Stop", needle: "pushary-stop-hook", label: "Stop hook" },
+      { event: "StopFailure", needle: "pushary-stopfailure-hook", label: "StopFailure hook" },
+      { event: "Notification", needle: "pushary-notification-hook", label: "Notification hook" },
+      { event: "SessionStart", needle: "pushary-session-start-hook", label: "SessionStart hook" },
+      { event: "SessionEnd", needle: "pushary-session-end-hook", label: "SessionEnd hook" },
+      { event: "PermissionRequest", needle: "pushary-permission-hook", label: "PermissionRequest hook" },
+      { event: "PermissionDenied", needle: "pushary-permission-denied-hook", label: "PermissionDenied hook" }
+    ];
+    for (const { event, needle, label } of CLAUDE_HOOK_CHECKS) {
+      const present = JSON.stringify(hooks?.[event] ?? []).includes(needle);
+      check(present, `Claude Code: ${label}`, present ? void 0 : "missing \u2014 run npx @pushary/agent-hooks@latest upgrade");
+    }
     const preHookCommand = extractHookCommand(hooks?.PreToolUse, "pushary-hook");
     if (preHookCommand) {
       const resolves = commandResolves(preHookCommand);

package/dist/bin/pushary-setup.js

@@ -481,7 +481,7 @@ var setupClaudeCode = async (apiKey) => {
     addPusharyToolPermissions(settings);
   });
   await installGlobally();
-  await spinner("Adding hooks (PreToolUse, PostToolUse, UserPromptSubmit, Stop)", async () => {
+  await spinner("Adding hooks (approvals, activity, presence, and lifecycle events)", async () => {
     addPusharyHooks(settings, resolveGlobalBinDir("pushary-hook"));
   });
   await spinner(`Writing ${CLAUDE_SETTINGS}`, async () => {

package/dist/bin/pushary-upgrade.js

@@ -1,8 +1,67 @@
 #!/usr/bin/env node
 import {
   execNpm,
-  npmErrorMessage
+  npmErrorMessage,
+  resolveGlobalBinDir
 } from "../chunk-J7JWI3KU.js";
+import {
+  addClaudeMcpServer,
+  addPusharyHooks,
+  addPusharyToolPermissions
+} from "../chunk-7EW3USQF.js";
+import "../chunk-Z5PL3K7C.js";
+import {
+  getApiKey
+} from "../chunk-NKXSILEW.js";
+
+// src/reapply.ts
+import { join, dirname } from "path";
+import { homedir } from "os";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+var CLAUDE_SETTINGS = join(homedir(), ".claude", "settings.json");
+var CLAUDE_JSON = join(homedir(), ".claude.json");
+var readJson = (filePath) => {
+  try {
+    return JSON.parse(readFileSync(filePath, "utf-8"));
+  } catch {
+    return null;
+  }
+};
+var writeJson = (filePath, data) => {
+  const dir = dirname(filePath);
+  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+  writeFileSync(filePath, JSON.stringify(data, null, 2) + "\n", "utf-8");
+};
+var hasPusharyClaudeHooks = (settings) => JSON.stringify(settings.hooks ?? {}).includes("pushary-hook");
+var hasPusharyMcp = (claudeJson) => !!claudeJson.mcpServers?.pushary;
+var reapplyClaudeSettings = (apiKey, paths = {}) => {
+  const settingsPath = paths.settingsPath ?? CLAUDE_SETTINGS;
+  const claudeJsonPath = paths.claudeJsonPath ?? CLAUDE_JSON;
+  const settings = readJson(settingsPath);
+  const claudeJson = readJson(claudeJsonPath);
+  const configured = settings != null && hasPusharyClaudeHooks(settings) || claudeJson != null && hasPusharyMcp(claudeJson);
+  if (!configured) return { reapplied: false, hooks: false, mcp: false };
+  let hooks = false;
+  let mcp = false;
+  try {
+    const s = settings ?? {};
+    addPusharyToolPermissions(s);
+    addPusharyHooks(s, resolveGlobalBinDir("pushary-hook"));
+    writeJson(settingsPath, s);
+    hooks = true;
+  } catch {
+  }
+  if (apiKey) {
+    try {
+      const cj = claudeJson ?? {};
+      addClaudeMcpServer(cj, apiKey);
+      writeJson(claudeJsonPath, cj);
+      mcp = true;
+    } catch {
+    }
+  }
+  return { reapplied: hooks || mcp, hooks, mcp };
+};
 
 // bin/pushary-upgrade.ts
 var getInstalledVersion = () => {
@@ -52,7 +111,20 @@ var main = async () => {
     console.error(`Upgrade failed: ${npmErrorMessage(err)}`);
     process.exit(1);
   }
-  console.log("Done. Your hooks point at the global install, so agents pick this up on their next tool call.");
+  let apiKey;
+  try {
+    apiKey = getApiKey();
+  } catch {
+    apiKey = void 0;
+  }
+  try {
+    const result = reapplyClaudeSettings(apiKey);
+    if (result.reapplied) {
+      console.log("Refreshed Claude Code hooks and settings so the new hook set is active now.");
+    }
+  } catch {
+  }
+  console.log("Done. Your hooks point at the global install and settings were refreshed.");
   console.log("Verify with: pushary doctor");
 };
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushary/agent-hooks",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "description": "Permission hooks for AI coding agents: route tool approvals through Pushary push notifications",
   "keywords": [
     "pushary",
@@ -72,7 +72,7 @@
   "scripts": {
     "build": "node scripts/bundle-plugin.mjs && tsup",
     "dev": "tsup --watch",
-    "test": "bun test src/api.test.ts && bun test src/claude-config.test.ts && bun test src/config.test.ts && bun test src/mcp-http.test.ts && bun test src/retry.test.ts && bun test src/usage.test.ts && bun test src/validate.test.ts && bun test src/policy.test.ts && bun test src/npm.test.ts && bun test src/identity.test.ts && bun test src/pending.test.ts && bun test src/events.test.ts && bun test src/describe.test.ts && bun test src/suggestions.test.ts && bun test src/safe-commands.test.ts && bun test src/hook.test.ts && bun test src/codex-adapter.test.ts && bun test src/codex-config.test.ts && bun test src/gemini-adapter.test.ts && bun test src/gemini-config.test.ts && bun test src/instruction-file.test.ts && bun test src/pairing.test.ts && bun test src/wait-ladder.test.ts && bun test src/ledger.test.ts && bun test src/wrapper/wrapper.test.ts"
+    "test": "bun test src/api.test.ts && bun test src/claude-config.test.ts && bun test src/config.test.ts && bun test src/mcp-http.test.ts && bun test src/retry.test.ts && bun test src/usage.test.ts && bun test src/validate.test.ts && bun test src/policy.test.ts && bun test src/npm.test.ts && bun test src/identity.test.ts && bun test src/pending.test.ts && bun test src/events.test.ts && bun test src/describe.test.ts && bun test src/reapply.test.ts && bun test src/suggestions.test.ts && bun test src/safe-commands.test.ts && bun test src/hook.test.ts && bun test src/codex-adapter.test.ts && bun test src/codex-config.test.ts && bun test src/gemini-adapter.test.ts && bun test src/gemini-config.test.ts && bun test src/instruction-file.test.ts && bun test src/pairing.test.ts && bun test src/wait-ladder.test.ts && bun test src/ledger.test.ts && bun test src/wrapper/wrapper.test.ts"
   },
   "dependencies": {
     "@inquirer/prompts": "^8.4.2",