agentapprove 0.1.11 → 0.1.12

package/dist/cli.js

@@ -2505,7 +2505,7 @@ function shouldDeleteCryptoMaterial(purgeConfirmed, firstKeyConfirmation, second
 }
 
 // src/cli.ts
-var VERSION = "0.1.11";
+var VERSION = "0.1.12";
 function getApiUrl() {
   return process.env.AGENTAPPROVE_API || "https://api.agentapprove.com";
 }
@@ -2553,8 +2553,8 @@ function getCommand() {
   }
   return filtered[0] || "install";
 }
-var OPENCODE_PLUGIN_VERSION = "0.1.7";
-var OPENCLAW_PLUGIN_VERSION = "0.2.5";
+var OPENCODE_PLUGIN_VERSION = "0.1.8";
+var OPENCLAW_PLUGIN_VERSION = "0.2.7";
 var OPENCLAW_PLUGIN_SPEC = `@agentapprove/openclaw@${OPENCLAW_PLUGIN_VERSION}`;
 var AGENTS = {
   "claude-code": {
@@ -2667,6 +2667,53 @@ var AGENTS = {
     ]
   }
 };
+var SHARED_HOOK_FILES = ["common.sh"];
+var STATUS_FIELD_LABELS = {
+  AGENTAPPROVE_API: "API URL",
+  AGENTAPPROVE_TOKEN: "Token",
+  AGENTAPPROVE_PRIVACY: "Privacy",
+  AGENTAPPROVE_RETENTION_DAYS: "Retention",
+  AGENTAPPROVE_CONFIG_SET_AT: "Configured at",
+  AGENTAPPROVE_DEBUG_LOG: "Debug logging",
+  AGENTAPPROVE_E2E_MODE: "Security mode",
+  AGENTAPPROVE_E2E_ENABLED: "E2E encryption",
+  AGENTAPPROVE_FAIL_BEHAVIOR: "If unreachable"
+};
+var HOOK_STATUS_LABELS = {
+  PreToolUse: "Tool approval",
+  PostToolUse: "Tool completed",
+  PostToolUseFailure: "Tool failed",
+  PermissionRequest: "Permission request",
+  UserPromptSubmit: "Prompt submitted",
+  SessionStart: "Session start",
+  SessionEnd: "Session end",
+  Stop: "Stop",
+  sessionStart: "Session start",
+  sessionEnd: "Session end",
+  beforeShellExecution: "Shell approval",
+  beforeMCPExecution: "MCP approval",
+  preToolUse: "Tool approval",
+  afterShellExecution: "Shell completed",
+  afterMCPExecution: "MCP completed",
+  postToolUse: "Tool completed",
+  beforeSubmitPrompt: "Prompt submitted",
+  subagentStart: "Subagent start",
+  subagentStop: "Subagent stop",
+  preCompact: "Pre-compact",
+  afterAgentThought: "Agent thinking",
+  afterAgentResponse: "Agent response",
+  BeforeTool: "Tool approval",
+  AfterTool: "Tool completed",
+  BeforeAgent: "Prompt submitted",
+  AfterAgent: "Stop",
+  BeforeModel: "Model request",
+  AfterModel: "Model response",
+  Notification: "Notification",
+  userPromptSubmitted: "Prompt submitted",
+  errorOccurred: "Error",
+  SubagentStart: "Subagent start",
+  SubagentStop: "Subagent stop"
+};
 function findGitBash() {
   if (!isWindows())
     return null;
@@ -2864,6 +2911,93 @@ function detectInstalledAgents() {
   }
   return installed;
 }
+function getDownloadableHookFilesForAgent(agentId) {
+  const agent = AGENTS[agentId];
+  if (!agent)
+    return [];
+  return agent.hooks.filter((hook) => !hook.isPlugin).map((hook) => hook.file);
+}
+function buildHookDownloadPlan(agentIds) {
+  const files = new Set;
+  const perAgent = [];
+  for (const agentId of agentIds) {
+    const agent = AGENTS[agentId];
+    if (!agent)
+      continue;
+    const agentFiles = [...new Set(getDownloadableHookFilesForAgent(agentId))];
+    if (agentFiles.length === 0) {
+      continue;
+    }
+    perAgent.push({
+      agentId,
+      agentName: agent.name,
+      count: agentFiles.length
+    });
+    for (const file of agentFiles) {
+      files.add(file);
+    }
+  }
+  const sharedCount = perAgent.length > 0 ? SHARED_HOOK_FILES.length : 0;
+  if (sharedCount > 0) {
+    for (const file of SHARED_HOOK_FILES) {
+      files.add(file);
+    }
+  }
+  return {
+    files: [...files],
+    perAgent,
+    sharedCount
+  };
+}
+function formatHookDownloadSummary(plan) {
+  const parts = plan.perAgent.map((entry) => `${entry.agentName}: ${entry.count}`);
+  if (plan.sharedCount > 0) {
+    parts.push(`shared: ${plan.sharedCount}`);
+  }
+  return parts.join(", ");
+}
+function parseEnvAssignment(line) {
+  if (!line.includes("=")) {
+    return null;
+  }
+  const [key, ...valueParts] = line.split("=");
+  return {
+    key: key.trim(),
+    value: valueParts.join("=").trim()
+  };
+}
+function formatStatusValue(key, value) {
+  switch (key) {
+    case "AGENTAPPROVE_TOKEN":
+      return value.slice(0, 15) + "...";
+    case "AGENTAPPROVE_RETENTION_DAYS":
+      return `${value} days`;
+    case "AGENTAPPROVE_CONFIG_SET_AT": {
+      const timestamp = Number.parseInt(value, 10);
+      if (Number.isFinite(timestamp)) {
+        return new Date(timestamp * 1000).toLocaleString();
+      }
+      return value;
+    }
+    case "AGENTAPPROVE_DEBUG_LOG":
+    case "AGENTAPPROVE_E2E_ENABLED":
+      return value === "true" ? "Enabled" : "Disabled";
+    case "AGENTAPPROVE_E2E_MODE":
+      return value.charAt(0).toUpperCase() + value.slice(1);
+    case "AGENTAPPROVE_FAIL_BEHAVIOR":
+    case "AGENTAPPROVE_PRIVACY":
+      return value.charAt(0).toUpperCase() + value.slice(1);
+    default:
+      return value;
+  }
+}
+function formatHookStatusLabel(name) {
+  const explicitLabel = HOOK_STATUS_LABELS[name];
+  if (explicitLabel) {
+    return explicitLabel;
+  }
+  return name.replace(/\*/g, "events").replace(/([a-z])([A-Z])/g, "$1 $2").replace(/[-_]/g, " ").replace(/\s+/g, " ").trim().replace(/^./, (letter) => letter.toUpperCase());
+}
 function getAgentApproveDir() {
   return join(homedir(), ".agentapprove");
 }
@@ -2992,10 +3126,12 @@ function readExistingConfig() {
     const config = {};
     for (const line of content.split(`
 `)) {
-      if (line.startsWith("#") || !line.includes("="))
+      if (line.startsWith("#"))
         continue;
-      const [key, ...valueParts] = line.split("=");
-      const value = valueParts.join("=").trim();
+      const assignment = parseEnvAssignment(line);
+      if (!assignment)
+        continue;
+      const { key, value } = assignment;
       switch (key.trim()) {
         case "AGENTAPPROVE_API":
           config.apiUrl = value;
@@ -3488,7 +3624,7 @@ async function installHooksForAgent(agentId, hooksDir, mode = "approval") {
     }
     hooks.internal.enabled = true;
     writeJsonConfig(agent.configPath, config);
-    installedHooks.push("openclaw");
+    installedHooks.push(installResult.label);
     return { success: true, backupPath, hooks: installedHooks };
   }
   if (agentId === "opencode") {
@@ -3517,7 +3653,7 @@ async function installHooksForAgent(agentId, hooksDir, mode = "approval") {
         console.warn(`Warning: Could not update package.json: ${err.message}`);
       }
     }
-    installedHooks.push("agentapprove");
+    installedHooks.push("Agent Approve plugin");
     return { success: true, backupPath, hooks: installedHooks };
   }
   const hooksToInstall = mode === "observe" ? agent.hooks.filter((h2) => !h2.isApprovalHook) : agent.hooks;
@@ -3944,64 +4080,10 @@ codex_hooks = true`;
   }
   return "";
 }
-var HOOK_FILES = [
-  "common.sh",
-  "claude-pre-tool.sh",
-  "claude-post-tool.sh",
-  "claude-post-tool-failure.sh",
-  "claude-notification.sh",
-  "claude-user-prompt.sh",
-  "claude-prompt.sh",
-  "claude-session-start.sh",
-  "claude-session-end.sh",
-  "claude-stop.sh",
-  "notify-hook.sh",
-  "completion-hook.sh",
-  "cursor-session-start.sh",
-  "cursor-session-end.sh",
-  "cursor-approval.sh",
-  "cursor-mcp-approval.sh",
-  "cursor-pre-tool.sh",
-  "cursor-shell-complete.sh",
-  "cursor-mcp-complete.sh",
-  "cursor-post-tool.sh",
-  "cursor-start.sh",
-  "cursor-subagent-start.sh",
-  "cursor-subagent-stop.sh",
-  "cursor-precompact.sh",
-  "cursor-stop.sh",
-  "cursor-thought.sh",
-  "cursor-response.sh",
-  "gemini-before-tool.sh",
-  "gemini-after-tool.sh",
-  "gemini-before-agent.sh",
-  "gemini-after-agent.sh",
-  "gemini-before-model.sh",
-  "gemini-after-model.sh",
-  "gemini-notification.sh",
-  "gemini-session-start.sh",
-  "gemini-session-end.sh",
-  "gemini-stop.sh",
-  "codex-session-start.sh",
-  "codex-pre-tool.sh",
-  "codex-post-tool.sh",
-  "codex-user-prompt.sh",
-  "codex-stop.sh",
-  "github-session-start.sh",
-  "github-session-end.sh",
-  "github-user-prompt.sh",
-  "github-pre-tool.sh",
-  "github-post-tool.sh",
-  "github-error.sh",
-  "github-stop.sh",
-  "github-subagent-start.sh",
-  "github-subagent-stop.sh",
-  "github-precompact.sh"
-];
-async function copyHookScripts(hooksDir, token) {
+async function copyHookScripts(hooksDir, token, files) {
   let downloaded = 0;
   const failed = [];
-  for (const file of HOOK_FILES) {
+  for (const file of files) {
     try {
       const response = await fetch(`${API_URL}/${API_VERSION}/hooks/${file}?format=raw`, {
         headers: {
@@ -4028,13 +4110,43 @@ async function copyHookScripts(hooksDir, token) {
   }
   return { downloaded, failed };
 }
+function readOpenClawInstalledVersion() {
+  const packagePath = join(homedir(), ".openclaw", "extensions", "openclaw", "package.json");
+  if (!existsSync2(packagePath)) {
+    return null;
+  }
+  try {
+    const pkg = JSON.parse(readFileSync(packagePath, "utf-8"));
+    return typeof pkg.version === "string" ? pkg.version : null;
+  } catch {
+    return null;
+  }
+}
 function installOpenClawPluginViaCli() {
   try {
     execSync(`openclaw plugins install ${OPENCLAW_PLUGIN_SPEC}`, { stdio: "pipe" });
-    return { success: true };
+    const installedVersion = readOpenClawInstalledVersion();
+    if (!installedVersion) {
+      return {
+        success: true,
+        label: "Agent Approve plugin (version not verified)"
+      };
+    }
+    if (installedVersion !== OPENCLAW_PLUGIN_VERSION) {
+      return {
+        success: false,
+        error: `OpenClaw installed ${installedVersion}, expected ${OPENCLAW_PLUGIN_VERSION}. Re-run after updating the published installer package.`,
+        label: "Agent Approve plugin"
+      };
+    }
+    return {
+      success: true,
+      version: installedVersion,
+      label: `Agent Approve plugin v${installedVersion}`
+    };
   } catch (err) {
     const message = err instanceof Error ? err.message : "unknown error";
-    return { success: false, error: message };
+    return { success: false, error: message, label: "Agent Approve plugin" };
   }
 }
 var SYSTEM_DEPS = [
@@ -4269,7 +4381,7 @@ E2E Key: ${keyId}`;
 Privacy: ${existingConfig.privacy || "unknown"}${e2eLine}`, "Existing configuration found");
   } else {
     me(`Approve AI agent actions from your iPhone or Apple Watch.
-Installs hooks for Claude Code, Cursor, Gemini CLI, VS Code GitHub Copilot, and GitHub Copilot CLI.`, "About");
+Installs hooks and plugins for OpenClaw, OpenAI Codex, Claude Code, Cursor, Gemini CLI, and more.`, "About");
   }
   const installedAgents = detectInstalledAgents();
   const agentOptions = Object.entries(AGENTS).map(([id, agent]) => ({
@@ -4348,7 +4460,7 @@ Installs hooks for Claude Code, Cursor, Gemini CLI, VS Code GitHub Copilot, and
   }
   connectionOptions.push({ value: "qr", label: "Scan QR code", hint: hasExistingToken ? undefined : "Recommended" });
   const connectionMethod = await le({
-    message: "Connect to iOS app (required for hook download)",
+    message: "Connect to iOS app (required for setup and any hook downloads)",
     options: connectionOptions
   });
   if (lD(connectionMethod)) {
@@ -4441,7 +4553,7 @@ Installs hooks for Claude Code, Cursor, Gemini CLI, VS Code GitHub Copilot, and
       });
       await new Promise((resolve) => setTimeout(resolve, 10));
       me(qrDisplay + `
-Session: ${session.sessionCode}`, "Scan with Agent Approve iOS app");
+Session: ${session.sessionCode}`, "Scan in Agent Approve iOS app (Settings > Scan QR Code)");
       const pairingSpinner = _2();
       pairingSpinner.start("Waiting for iOS app...");
       const result = await waitForPairing(session.sessionCode, (expiresIn) => {
@@ -4511,14 +4623,20 @@ Session: ${session.sessionCode}`, "Scan with Agent Approve iOS app");
     failBehavior,
     configSetAt
   }).catch(() => {});
-  const downloadSpinner = _2();
-  downloadSpinner.start("Downloading hook scripts");
-  const downloadResult = await copyHookScripts(hooksDir, token);
-  if (downloadResult.failed.length > 0) {
-    downloadSpinner.stop(`Downloaded ${downloadResult.downloaded} hooks, ${downloadResult.failed.length} failed`);
-    v2.warn(`Failed to download: ${downloadResult.failed.join(", ")}`);
+  const hookDownloadPlan = buildHookDownloadPlan(selectedAgents);
+  if (hookDownloadPlan.files.length > 0) {
+    const downloadSpinner = _2();
+    downloadSpinner.start("Downloading hook scripts");
+    const downloadResult = await copyHookScripts(hooksDir, token, hookDownloadPlan.files);
+    const summary = formatHookDownloadSummary(hookDownloadPlan);
+    if (downloadResult.failed.length > 0) {
+      downloadSpinner.stop(`Downloaded ${downloadResult.downloaded} of ${hookDownloadPlan.files.length} hook files (${summary})`);
+      v2.warn(`Failed to download: ${downloadResult.failed.join(", ")}`);
+    } else {
+      downloadSpinner.stop(`Hook scripts downloaded (${downloadResult.downloaded} files: ${summary})`);
+    }
   } else {
-    downloadSpinner.stop(`Hook scripts downloaded (${downloadResult.downloaded} files)`);
+    v2.success("No hook scripts needed for the selected agents");
   }
   const e2eKeyPath = join(homedir(), ".agentapprove", "e2e-key");
   const hasE2EKey = existsSync2(e2eKeyPath);
@@ -4670,9 +4788,13 @@ async function statusCommand() {
 `);
   for (const line of lines) {
     if (line.startsWith("AGENTAPPROVE_")) {
-      const [key, value] = line.split("=");
-      const displayKey = key.replace("AGENTAPPROVE_", "").toLowerCase();
-      const displayValue = key.includes("TOKEN") ? value.slice(0, 15) + "..." : value;
+      const assignment = parseEnvAssignment(line);
+      if (!assignment) {
+        continue;
+      }
+      const { key, value } = assignment;
+      const displayKey = STATUS_FIELD_LABELS[key] || key.replace("AGENTAPPROVE_", "");
+      const displayValue = formatStatusValue(key, value);
       console.log(`  ${source_default.dim(displayKey + ":")} ${displayValue}`);
     }
   }
@@ -4694,14 +4816,14 @@ async function statusCommand() {
       if (agentId === "opencode") {
         const pluginConfig = config.plugin;
         if (Array.isArray(pluginConfig) && pluginConfig.some((entry) => typeof entry === "string" && entry.includes("@agentapprove/opencode"))) {
-          console.log(`  ${source_default.green("✓")} ${agent.name}: agentapprove plugin`);
+          console.log(`  ${source_default.green("✓")} ${agent.name}: Agent Approve plugin`);
         }
         continue;
       }
       if (agentId === "openclaw") {
         const entries = config.plugins?.entries;
         if (entries?.openclaw) {
-          console.log(`  ${source_default.green("✓")} ${agent.name}: openclaw plugin`);
+          console.log(`  ${source_default.green("✓")} ${agent.name}: Agent Approve plugin`);
         }
         continue;
       }
@@ -4715,7 +4837,7 @@ async function statusCommand() {
           return str.includes("agentapprove");
         });
         if (installedHooks.length > 0) {
-          console.log(`  ${source_default.green("✓")} ${agent.name}: ${installedHooks.map((h2) => h2.name).join(", ")}`);
+          console.log(`  ${source_default.green("✓")} ${agent.name}: ${installedHooks.map((h2) => formatHookStatusLabel(h2.name)).join(", ")}`);
         }
       }
     }
@@ -5059,7 +5181,7 @@ but if unused for 30 days they expire. Get a new one below.`, "Token Expired");
   });
   await new Promise((resolve) => setTimeout(resolve, 10));
   me(qrDisplay + `
-Session: ${session.sessionCode}`, "Scan with Agent Approve iOS app");
+Session: ${session.sessionCode}`, "Scan in Agent Approve iOS app (Settings > Scan QR Code)");
   const pairingSpinner = _2();
   pairingSpinner.start("Waiting for iOS app...");
   const result = await waitForPairing(session.sessionCode, (expiresIn) => {
@@ -5223,7 +5345,7 @@ async function pairCommand() {
   const noteLabel = e2eKeyId ? `Session: ${session.sessionCode}
 Key ID: ${e2eKeyId}` : `Session: ${session.sessionCode}`;
   me(qrDisplay + `
-${noteLabel}`, "Scan with Agent Approve iOS app");
+${noteLabel}`, "Scan in Agent Approve iOS app (Settings > Scan QR Code)");
   const pairingSpinner = _2();
   pairingSpinner.start("Waiting for iOS app...");
   const result = await waitForPairing(session.sessionCode, (expiresIn) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentapprove",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "Approve AI agent actions from your iPhone or Apple Watch",
   "type": "module",
   "bin": {