agentapprove 0.1.22 → 0.1.24

package/dist/cli.js

@@ -2827,7 +2827,7 @@ function resolvePairingApiBaseUrl(options) {
 }
 
 // src/cli.ts
-var VERSION = "0.1.22";
+var VERSION = "0.1.24";
 function getApiUrl() {
   return process.env.AGENTAPPROVE_API || "https://api.agentapprove.com";
 }
@@ -2906,7 +2906,7 @@ var OPENCLAW_PLUGIN_SPEC = `@agentapprove/openclaw@${OPENCLAW_PLUGIN_VERSION}`;
 var PI_PLUGIN_VERSION = "0.1.7";
 var PI_PLUGIN_SPEC = `npm:@agentapprove/pi@${PI_PLUGIN_VERSION}`;
 var PI_STATUS_TIMEOUT_MS = 5000;
-var HERMES_PLUGIN_VERSION = "0.1.0";
+var HERMES_PLUGIN_VERSION = "0.1.1";
 var HERMES_PIP_DEPS = ["cryptography>=44.0,<46", "httpx>=0.27,<0.29"];
 var AGENTS = {
   "claude-code": {
@@ -4812,6 +4812,8 @@ codex_hooks = true`;
       "in that directory, then:",
       "",
       "  pip install --user cryptography httpx",
+      "  # On uv-managed Python (PEP 668 EXTERNALLY-MANAGED): instead run",
+      "  #   uv pip install --system --break-system-packages --python $(which python3.12) cryptography httpx",
       "  hermes plugins enable agentapprove",
       "",
       "The plugin reads your existing Agent Approve config from ~/.agentapprove/env.",
@@ -4856,9 +4858,50 @@ function readOpenClawInstalledVersion() {
     return null;
   }
 }
+function isOpenClawAlreadyExistsError(err) {
+  if (!err || typeof err !== "object")
+    return false;
+  const e2 = err;
+  const blob = [
+    Buffer.isBuffer(e2.stderr) ? e2.stderr.toString() : String(e2.stderr || ""),
+    Buffer.isBuffer(e2.stdout) ? e2.stdout.toString() : String(e2.stdout || ""),
+    String(e2.message || "")
+  ].join(`
+`);
+  return /plugin already exists|delete it first|use .*plugins update/i.test(blob);
+}
 function installOpenClawPluginViaCli() {
+  const installCmd = (force) => `openclaw plugins install ${OPENCLAW_PLUGIN_SPEC}${force ? " --force" : ""}`;
+  const tryInstall = (force) => {
+    try {
+      execSync(installCmd(force), { stdio: "pipe" });
+      return { ok: true };
+    } catch (err) {
+      return { ok: false, err };
+    }
+  };
+  let firstAttempt = tryInstall(false);
+  if (!firstAttempt.ok && isOpenClawAlreadyExistsError(firstAttempt.err)) {
+    const existingVersion = readOpenClawInstalledVersion();
+    if (existingVersion === OPENCLAW_PLUGIN_VERSION) {
+      return {
+        success: true,
+        version: existingVersion,
+        label: `Agent Approve plugin v${existingVersion} (already installed)`
+      };
+    }
+    const forceAttempt = tryInstall(true);
+    if (!forceAttempt.ok) {
+      const message = forceAttempt.err instanceof Error ? forceAttempt.err.message : "unknown error";
+      return { success: false, error: message, label: "Agent Approve plugin" };
+    }
+    firstAttempt = { ok: true };
+  }
+  if (!firstAttempt.ok) {
+    const message = firstAttempt.err instanceof Error ? firstAttempt.err.message : "unknown error";
+    return { success: false, error: message, label: "Agent Approve plugin" };
+  }
   try {
-    execSync(`openclaw plugins install ${OPENCLAW_PLUGIN_SPEC}`, { stdio: "pipe" });
     const installedVersion = readOpenClawInstalledVersion();
     if (!installedVersion) {
       return {
@@ -4989,7 +5032,7 @@ function removePiPluginViaCli() {
     };
   }
 }
-var HERMES_BUNDLE_SHA256 = "2572cec0a2d8467e9ffc2000e5c52cf652265d20638244a8a70e2e3a6c9d2734";
+var HERMES_BUNDLE_SHA256 = "2631f8b287f05a02fb73b40e9e0dd38321a605e0d39d2ed13ac296a68d9044e6";
 var HERMES_BUNDLE_FILENAME = `agentapprove-hermes-${HERMES_PLUGIN_VERSION}.tar.gz`;
 var HERMES_PLUGIN_DIR = join(homedir(), ".hermes", "plugins", "agentapprove");
 function findPython() {
@@ -5142,6 +5185,56 @@ function hermesDepsAlreadyInstalled(pythonCommand) {
     return false;
   }
 }
+function uvAvailable() {
+  try {
+    execSync("uv --version", { stdio: "pipe", timeout: 5000 });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isExternallyManagedError(err) {
+  if (!err || typeof err !== "object")
+    return false;
+  const e2 = err;
+  const stderr = Buffer.isBuffer(e2.stderr) ? e2.stderr.toString() : String(e2.stderr || "");
+  const stdout = Buffer.isBuffer(e2.stdout) ? e2.stdout.toString() : String(e2.stdout || "");
+  const message = String(e2.message || "");
+  const blob = `${stderr}
+${stdout}
+${message}`;
+  return /externally-managed-environment|PEP 668|managed by uv/i.test(blob);
+}
+function installHermesDepsAdaptive(pythonCommand, deps) {
+  const depsArg = deps.map((d2) => `"${d2}"`).join(" ");
+  try {
+    execSync(`${pythonCommand} -m pip install --user --quiet ${depsArg}`, { stdio: "pipe" });
+    return { ok: true };
+  } catch (pipErr) {
+    if (!isExternallyManagedError(pipErr)) {
+      return {
+        ok: false,
+        error: `pip install failed: ${pipErr instanceof Error ? pipErr.message : String(pipErr)}. ` + `Try manually: ${pythonCommand} -m pip install --user ${depsArg}`
+      };
+    }
+    if (!uvAvailable()) {
+      return {
+        ok: false,
+        error: "Python is externally managed (PEP 668) and `uv` is not installed. " + `Install uv (https://docs.astral.sh/uv/) and re-run, or run manually: uv pip install --system --python ${pythonCommand} ${depsArg}`
+      };
+    }
+    const uvCmd = `uv pip install --system --break-system-packages --python ${pythonCommand} --quiet ${depsArg}`;
+    try {
+      execSync(uvCmd, { stdio: "pipe" });
+      return { ok: true };
+    } catch (uvErr) {
+      return {
+        ok: false,
+        error: `uv pip install failed: ${uvErr instanceof Error ? uvErr.message : String(uvErr)}. ` + `Try manually: ${uvCmd}`
+      };
+    }
+  }
+}
 async function installHermesPluginViaCli() {
   try {
     execSync("hermes --version", { stdio: "pipe" });
@@ -5270,14 +5363,12 @@ async function installHermesPluginViaCli() {
     }
   }
   if (!hermesDepsAlreadyInstalled(python.command)) {
-    const depsArg = HERMES_PIP_DEPS.map((d2) => `"${d2}"`).join(" ");
-    try {
-      execSync(`${python.command} -m pip install --user --quiet ${depsArg}`, { stdio: "pipe" });
-    } catch (err) {
+    const depsResult = installHermesDepsAdaptive(python.command, HERMES_PIP_DEPS);
+    if (!depsResult.ok) {
       return {
         success: false,
         label: "Agent Approve plugin",
-        error: `Installed bundle but could not install Python runtime deps: ${err instanceof Error ? err.message : String(err)}. ` + `Try manually: ${python.command} -m pip install --user ${HERMES_PIP_DEPS.join(" ")}`
+        error: `Installed bundle but could not install Python runtime deps: ${depsResult.error}`
       };
     }
   }
@@ -6144,6 +6235,7 @@ Backups will be created with timestamp`, "Files to be modified");
 ` + `    3. Extract into ~/.hermes/plugins/agentapprove/
 ` + `    4. Write the SHA-256 to ~/.hermes/plugins/agentapprove/.bundle-hash
 ` + `    5. pip install --user cryptography httpx
+` + `       (uv-managed Python: uv pip install --system --break-system-packages --python $(which python3.12) cryptography httpx)
 ` + `    6. hermes plugins enable agentapprove
 ` + `  Then re-run: npx agentapprove`);
         }

package/package.json

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