claude-remote-approver 0.4.1 → 0.5.1

package/README.md

@@ -169,6 +169,7 @@ Config file location: `~/.claude-remote-approver.json`
   "topic": "cra-a1b2c3d4e5f67890abcdef1234567890",
   "ntfyServer": "https://ntfy.sh",
   "timeout": 120,
+  "planTimeout": 300,
   "autoApprove": [],
   "autoDeny": []
 }
@@ -179,6 +180,7 @@ Config file location: `~/.claude-remote-approver.json`
 | `topic` | `string` | `""` | Your unique ntfy topic. Generated by `setup`. |
 | `ntfyServer` | `string` | `"https://ntfy.sh"` | The ntfy server URL. Change this if you self-host. |
 | `timeout` | `number` | `120` | Seconds to wait for a response before auto-denying. |
+| `planTimeout` | `number` | `300` | Seconds to wait for ExitPlanMode (plan approval) responses. Plan reviews need more reading time. |
 | `autoApprove` | `string[]` | `[]` | Reserved for future use. |
 | `autoDeny` | `string[]` | `[]` | Reserved for future use. |
 

package/bin/cli.mjs

@@ -12,6 +12,7 @@ import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
 import qrcode from "qrcode-terminal";
+import { ASK } from "../src/hook.mjs";
 
 // ---------------------------------------------------------------------------
 // main
@@ -87,8 +88,8 @@ export async function main(args, deps) {
       try {
         input = JSON.parse(deps.stdin);
       } catch {
-        const deny = { hookSpecificOutput: { hookEventName: "PermissionRequest", decision: { behavior: "deny" } } };
-        deps.stdout.write(JSON.stringify(deny) + "\n");
+        deps.stderr.write("[claude-remote-approver] Invalid hook input. Falling back to CLI.\n");
+        deps.stdout.write(JSON.stringify(ASK) + "\n");
         break;
       }
 
@@ -96,8 +97,8 @@ export async function main(args, deps) {
       try {
         result = await deps.processHook(input, deps);
       } catch {
-        const deny = { hookSpecificOutput: { hookEventName: "PermissionRequest", decision: { behavior: "deny" } } };
-        deps.stdout.write(JSON.stringify(deny) + "\n");
+        deps.stderr.write("[claude-remote-approver] Hook processing failed. Falling back to CLI.\n");
+        deps.stdout.write(JSON.stringify(ASK) + "\n");
         break;
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-remote-approver",
-  "version": "0.4.1",
+  "version": "0.5.1",
   "description": "Approve or deny Claude Code permission prompts remotely from your phone via ntfy.sh",
   "type": "module",
   "bin": {

package/src/config.mjs

@@ -9,6 +9,7 @@ export const DEFAULT_CONFIG = {
   topic: "",
   ntfyServer: "https://ntfy.sh",
   timeout: 120,
+  planTimeout: 300,
   // autoApprove/autoDeny are reserved for future use and not yet implemented
   autoApprove: [],
   autoDeny: [],
@@ -21,7 +22,8 @@ export function loadConfig(configPath = CONFIG_PATH) {
     const config = { ...DEFAULT_CONFIG, ...fileConfig };
     if (typeof config.topic !== "string") config.topic = DEFAULT_CONFIG.topic;
     if (typeof config.ntfyServer !== "string") config.ntfyServer = DEFAULT_CONFIG.ntfyServer;
-    if (typeof config.timeout !== "number" || config.timeout <= 0) config.timeout = DEFAULT_CONFIG.timeout;
+    if (!Number.isFinite(config.timeout) || config.timeout <= 0) config.timeout = DEFAULT_CONFIG.timeout;
+    if (!Number.isFinite(config.planTimeout) || config.planTimeout <= 0) config.planTimeout = DEFAULT_CONFIG.planTimeout;
     if (!Array.isArray(config.autoApprove)) config.autoApprove = DEFAULT_CONFIG.autoApprove;
     if (!Array.isArray(config.autoDeny)) config.autoDeny = DEFAULT_CONFIG.autoDeny;
     return config;

package/src/hook.mjs

@@ -1,6 +1,11 @@
 // src/hook.mjs
 
 import crypto from "node:crypto";
+import { DEFAULT_CONFIG } from "./config.mjs";
+
+export const ASK = Object.freeze({ hookSpecificOutput: Object.freeze({ hookEventName: "PermissionRequest", decision: Object.freeze({ behavior: "ask" }) }) });
+const DENY = Object.freeze({ hookSpecificOutput: Object.freeze({ hookEventName: "PermissionRequest", decision: Object.freeze({ behavior: "deny" }) }) });
+const MAX_RETRIES = 3;
 
 /**
  * Build ntfy action buttons for Approve / Deny.
@@ -30,6 +35,136 @@ export function buildActions(server, topic, requestId) {
   ];
 }
 
+/**
+ * Send with retry, returning null on exhausted retries.
+ */
+export async function sendWithRetry(sendFn, params) {
+  for (let i = 0; i < MAX_RETRIES; i++) {
+    try {
+      return await sendFn(params);
+    } catch (err) {
+      if (i === MAX_RETRIES - 1) {
+        console.error(`[claude-remote-approver] Notification failed after ${MAX_RETRIES} attempts:`, err.message, "— Falling back to CLI.");
+        return null;
+      }
+    }
+  }
+  return null;
+}
+
+/**
+ * Check if the input is an AskUserQuestion tool call with questions.
+ */
+export function isAskUserQuestion(input) {
+  return (
+    input?.tool_name === "AskUserQuestion" &&
+    Array.isArray(input?.tool_input?.questions) &&
+    input.tool_input.questions.length > 0
+  );
+}
+
+/**
+ * Build ntfy action buttons for question options.
+ */
+export function buildQuestionActions(server, topic, requestId, options) {
+  const url = `${server}/${topic}-response`;
+  return options.map((opt) => ({
+    action: "http",
+    label: opt.label,
+    url,
+    body: JSON.stringify({ requestId, answer: opt.label }),
+    method: "POST",
+  }));
+}
+
+/**
+ * Build a human-readable message for a question with options.
+ */
+export function buildQuestionMessage(question, options, opts = {}) {
+  const { multiSelect, batchInfo } = opts;
+  let msg = question;
+  if (batchInfo) msg += ` ${batchInfo}`;
+  if (multiSelect) msg += "\n(multiple selections allowed)";
+  msg += "\n\n";
+  for (const opt of options) {
+    msg += `• ${opt.label}: ${opt.description}\n`;
+  }
+  return msg.trimEnd();
+}
+
+/**
+ * Process an AskUserQuestion hook request.
+ */
+export async function processAskUserQuestion(input, deps) {
+  const config = deps.loadConfig();
+  if (!config.topic) return ASK;
+
+  const questions = input.tool_input.questions;
+  const answers = {};
+
+  for (const q of questions) {
+    const requestId = crypto.randomUUID();
+    const options = q.options;
+
+    const MAX_BUTTONS = 3;
+    const batches = [];
+    for (let j = 0; j < options.length; j += MAX_BUTTONS) {
+      batches.push(options.slice(j, j + MAX_BUTTONS));
+    }
+
+    for (let i = 0; i < batches.length; i++) {
+      const batch = batches[i];
+      const batchInfo = batches.length > 1 ? `(${i + 1}/${batches.length})` : undefined;
+      const actions = buildQuestionActions(config.ntfyServer, config.topic, requestId, batch);
+      const message = buildQuestionMessage(q.question, batch, { multiSelect: q.multiSelect, batchInfo });
+
+      const sent = await sendWithRetry(deps.sendNotification, {
+        server: config.ntfyServer,
+        topic: config.topic,
+        title: `Claude Code: ${q.header || "Question"}`,
+        message,
+        actions,
+        requestId,
+      });
+      if (!sent) return ASK;
+    }
+
+    // AskUserQuestion uses standard timeout (not planTimeout)
+    let response;
+    try {
+      response = await deps.waitForResponse({
+        server: config.ntfyServer,
+        topic: config.topic,
+        requestId,
+        timeout: config.timeout * 1000,
+      });
+    } catch (err) {
+      console.error("[claude-remote-approver] Response listener failed:", err.message, "— Falling back to CLI.");
+      return ASK;
+    }
+
+    if (response.answer) {
+      answers[q.question] = response.answer;
+    } else {
+      console.error("[claude-remote-approver] No answer received. Falling back to CLI.");
+      return ASK;
+    }
+  }
+
+  return {
+    hookSpecificOutput: {
+      hookEventName: "PermissionRequest",
+      decision: {
+        behavior: "allow",
+        updatedInput: {
+          questions: input.tool_input.questions,
+          answers,
+        },
+      },
+    },
+  };
+}
+
 /**
  * Process a Claude Code hook request.
  *
@@ -45,38 +180,50 @@ export async function processHook(input, { loadConfig, sendNotification, waitFor
   const config = loadConfig();
 
   if (!config.topic) {
-    return { hookSpecificOutput: { hookEventName: "PermissionRequest", decision: { behavior: "deny" } } };
+    return ASK;
+  }
+
+  if (isAskUserQuestion(input)) {
+    return processAskUserQuestion(input, { loadConfig, sendNotification, waitForResponse });
   }
 
   const requestId = crypto.randomUUID();
   const { title, message } = formatToolInfo(input);
   const actions = buildActions(config.ntfyServer, config.topic, requestId);
 
-  try {
-    await sendNotification({
-      server: config.ntfyServer,
-      topic: config.topic,
-      title,
-      message,
-      actions,
-      requestId,
-    });
-  } catch (err) {
-    return { hookSpecificOutput: { hookEventName: "PermissionRequest", decision: { behavior: "deny" } } };
-  }
+  const sent = await sendWithRetry(sendNotification, {
+    server: config.ntfyServer,
+    topic: config.topic,
+    title,
+    message,
+    actions,
+    requestId,
+  });
+  if (!sent) return ASK;
 
   let response;
   try {
+    const isPlanReview = input.tool_name === "ExitPlanMode";
+    const timeout = (isPlanReview ? (config.planTimeout ?? DEFAULT_CONFIG.planTimeout) : config.timeout) * 1000;
     response = await waitForResponse({
       server: config.ntfyServer,
       topic: config.topic,
       requestId,
-      timeout: config.timeout * 1000,
+      timeout,
     });
   } catch (err) {
-    return { hookSpecificOutput: { hookEventName: "PermissionRequest", decision: { behavior: "deny" } } };
+    console.error("[claude-remote-approver] Response listener failed:", err.message, "— Falling back to CLI.");
+    return ASK;
   }
 
-  const behavior = response.approved ? "allow" : "deny";
-  return { hookSpecificOutput: { hookEventName: "PermissionRequest", decision: { behavior } } };
+  if (response.timeout) {
+    console.error("[claude-remote-approver] Timed out waiting for response. Falling back to CLI.");
+    return ASK;
+  }
+  if (response.error) {
+    console.error("[claude-remote-approver] Response error:", response.error.message, "— Falling back to CLI.");
+    return ASK;
+  }
+  if (response.approved === false) return DENY;
+  return { hookSpecificOutput: { hookEventName: "PermissionRequest", decision: { behavior: "allow" } } };
 }

package/src/ntfy.mjs

@@ -27,7 +27,7 @@ export async function sendNotification({ server, topic, title, message, actions,
  * Subscribe to the response topic via SSE and wait for a matching requestId.
  *
  * @param {{ server: string, topic: string, requestId: string, timeout: number }} params
- * @returns {Promise<{ approved: boolean }>}
+ * @returns {Promise<{ approved: boolean } | { timeout: true } | { error: Error } | { answer: string }>}
  */
 export async function waitForResponse({ server, topic, requestId, timeout }) {
   const baseUrl = server.replace(/\/+$/, '');
@@ -70,6 +70,9 @@ export async function waitForResponse({ server, topic, requestId, timeout }) {
               clearTimeout(timer);
               controller.signal.removeEventListener('abort', onAbort);
               controller.abort();
+              if (typeof parsed.answer === 'string') {
+                return { answer: parsed.answer };
+              }
               return { approved: parsed.approved };
             }
           } catch {
@@ -82,13 +85,14 @@ export async function waitForResponse({ server, topic, requestId, timeout }) {
     }
 
     clearTimeout(timer);
-    return { approved: false };
+    return { timeout: true };
   } catch (err) {
     if (timer !== undefined) clearTimeout(timer);
-    if (err?.name !== "AbortError") {
-      console.error("[claude-remote-approver] waitForResponse error:", err);
+    if (err?.name === "AbortError") {
+      return { timeout: true };
     }
-    return { approved: false };
+    console.error("[claude-remote-approver] waitForResponse error:", err.message ?? err);
+    return { error: err };
   }
 }