@keeperhub/wallet 0.1.8 → 0.1.9

package/dist/index.js

@@ -147,15 +147,69 @@ function fund(walletAddress) {
 }
 
 // src/skill-install.ts
+import { execFileSync } from "child_process";
 import { chmod, copyFile, mkdir, readFile, writeFile } from "fs/promises";
+import { readFileSync } from "fs";
 import { dirname as dirname2, join as join2 } from "path";
 import { fileURLToPath } from "url";
-var HOOK_COMMAND = "keeperhub-wallet-hook";
-var KEEPERHUB_HOOK_MARKER = "keeperhub-wallet-hook";
-function buildKeeperhubEntry() {
+var HOOK_BIN = "keeperhub-wallet-hook";
+var HOOK_COMMAND_BARE = HOOK_BIN;
+var PACKAGE_NAME = "@keeperhub/wallet";
+function readPackageVersion() {
+  try {
+    const here = dirname2(fileURLToPath(import.meta.url));
+    const pkgPath = join2(here, "..", "package.json");
+    const raw = readFileSync(pkgPath, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed.version === "string" && parsed.version.length > 0) {
+      return parsed.version;
+    }
+  } catch {
+  }
+  return "latest";
+}
+function buildNpxCommand(version) {
+  return `npx -y -p ${PACKAGE_NAME}@${version} ${HOOK_BIN}`;
+}
+var KEEPERHUB_HOOK_MARKER = HOOK_BIN;
+function filterKeeperhubHooksFromEntry(entry) {
+  if (typeof entry !== "object" || entry === null) {
+    return entry;
+  }
+  const candidate = entry;
+  if (!Array.isArray(candidate.hooks)) {
+    return entry;
+  }
+  const survivors = candidate.hooks.filter((h) => {
+    const cmd = h?.command;
+    return !(typeof cmd === "string" && cmd.includes(KEEPERHUB_HOOK_MARKER));
+  });
+  if (survivors.length === candidate.hooks.length) {
+    return entry;
+  }
+  if (survivors.length === 0) {
+    return null;
+  }
+  return { ...candidate, hooks: survivors };
+}
+function resolveHookCommand() {
+  const envOverride = process.env.KEEPERHUB_WALLET_HOOK_COMMAND;
+  if (envOverride && envOverride.length > 0) {
+    return envOverride;
+  }
+  try {
+    execFileSync("/bin/sh", ["-c", `command -v ${HOOK_BIN}`], {
+      stdio: "ignore"
+    });
+    return HOOK_COMMAND_BARE;
+  } catch {
+    return buildNpxCommand(readPackageVersion());
+  }
+}
+function buildKeeperhubEntry(command) {
   return {
     matcher: "*",
-    hooks: [{ type: "command", command: HOOK_COMMAND }]
+    hooks: [{ type: "command", command }]
   };
 }
 function resolveDefaultSkillSource() {
@@ -166,7 +220,8 @@ function defaultNotice(msg) {
   process.stderr.write(`${msg}
 `);
 }
-async function registerClaudeCodeHook(settingsPath) {
+async function registerClaudeCodeHook(settingsPath, options = {}) {
+  const command = options.hookCommand ?? resolveHookCommand();
   let raw = null;
   try {
     raw = await readFile(settingsPath, "utf-8");
@@ -189,12 +244,12 @@ async function registerClaudeCodeHook(settingsPath) {
   const existingPreToolUse = Array.isArray(hooks.PreToolUse) ? hooks.PreToolUse : [];
   const filtered = [];
   for (const entry of existingPreToolUse) {
-    const serialised = JSON.stringify(entry);
-    if (!serialised.includes(KEEPERHUB_HOOK_MARKER)) {
-      filtered.push(entry);
+    const survivor = filterKeeperhubHooksFromEntry(entry);
+    if (survivor !== null) {
+      filtered.push(survivor);
     }
   }
-  filtered.push(buildKeeperhubEntry());
+  filtered.push(buildKeeperhubEntry(command));
   hooks.PreToolUse = filtered;
   config.hooks = hooks;
   await mkdir(dirname2(settingsPath), { recursive: true, mode: 448 });
@@ -210,26 +265,27 @@ async function writeSkillToAgent(agent, skillSource) {
   await chmod(target, 420);
   return { agent: agent.agent, path: target, status: "written" };
 }
-function buildNoticeMessage(agent) {
-  return `${agent.agent} does not support auto-registered PreToolUse hooks; run \`${HOOK_COMMAND}\` on every tool use via ${agent.agent}'s settings file at ${agent.settingsFile}`;
+function buildNoticeMessage(agent, command) {
+  return `${agent.agent} does not support auto-registered PreToolUse hooks; run \`${command}\` on every tool use via ${agent.agent}'s settings file at ${agent.settingsFile}`;
 }
 async function installSkill(options = {}) {
   const agents = detectAgents(options.homeOverride);
   const skillSource = options.skillSourcePath ?? resolveDefaultSkillSource();
   const onNotice = options.onNotice ?? defaultNotice;
+  const hookCommand = options.hookCommand ?? resolveHookCommand();
   const skillWrites = [];
   const hookRegistrations = [];
   for (const agent of agents) {
     const write = await writeSkillToAgent(agent, skillSource);
     skillWrites.push(write);
     if (agent.hookSupport === "claude-code") {
-      await registerClaudeCodeHook(agent.settingsFile);
+      await registerClaudeCodeHook(agent.settingsFile, { hookCommand });
       hookRegistrations.push({
         agent: agent.agent,
         status: "registered"
       });
     } else {
-      const message = buildNoticeMessage(agent);
+      const message = buildNoticeMessage(agent, hookCommand);
       hookRegistrations.push({
         agent: agent.agent,
         status: "notice",
@@ -637,6 +693,26 @@ var DEFAULT_TOOL_RE = /keeperhub|wallet|sign/i;
 function defaultToolMatcher(name) {
   return DEFAULT_TOOL_RE.test(name);
 }
+function hasPaymentShape(input) {
+  const ti = input.tool_input ?? {};
+  const challenge = ti.paymentChallenge;
+  if (challenge !== void 0 && challenge !== null) {
+    return true;
+  }
+  if (ti.amount !== void 0 && ti.amount !== null) {
+    return true;
+  }
+  if (ti.unit !== void 0 && ti.unit !== null) {
+    return true;
+  }
+  for (const field of ["to", "contract", "assetAddress"]) {
+    const v = ti[field];
+    if (typeof v === "string" && ADDRESS_RE.test(v)) {
+      return true;
+    }
+  }
+  return false;
+}
 function extractAmountMicroUsdc(input) {
   const ti = input.tool_input ?? {};
   const challenge = ti.paymentChallenge ?? {};
@@ -686,6 +762,9 @@ async function createPreToolUseHook(options = {}) {
     if (!(typeof hookInput.tool_name === "string" && toolMatcher(hookInput.tool_name))) {
       return { decision: "allow" };
     }
+    if (!hasPaymentShape(hookInput)) {
+      return { decision: "allow" };
+    }
     const contractAddr = extractContractAddress(hookInput);
     const amountMicro = extractAmountMicroUsdc(hookInput);
     if (contractAddr && !safety.allowlisted_contracts.includes(contractAddr)) {
@@ -1034,6 +1113,7 @@ export {
   paymentSigner,
   readWalletConfig,
   registerClaudeCodeHook,
+  resolveHookCommand,
   runCli,
   runHookCli,
   selectProtocol,