@pushary/agent-hooks 0.67.1 → 0.69.0

package/dist/{chunk-V6OA4VPU.js → chunk-P7VBAYQO.js}

@@ -266,6 +266,29 @@ var writeStatusLine = (text) => {
 ` : `  ${text}
 `);
 };
+var visibleLength = (text) => text.replace(/\x1b\[[0-9;]*m/g, "").length;
+var clipToRow = (text, columns) => {
+  const budget = columns - 4;
+  if (budget <= 1 || visibleLength(text) <= budget) return text;
+  let visible = 0;
+  let out = "";
+  for (let i = 0; i < text.length; i += 1) {
+    const escape = /^\x1b\[[0-9;]*m/.exec(text.slice(i));
+    if (escape) {
+      out += escape[0];
+      i += escape[0].length - 1;
+      continue;
+    }
+    if (visible >= budget - 1) break;
+    out += text[i];
+    visible += 1;
+  }
+  return `${out}\u2026`;
+};
+var terminalColumns = () => {
+  const columns = process.stdout.columns;
+  return typeof columns === "number" && columns > 0 ? columns : 80;
+};
 var startSpinner = (getLabel) => {
   if (!humanIsTty()) {
     writeHuman(`  ${getLabel()}
@@ -283,7 +306,8 @@ var startSpinner = (getLabel) => {
   const frames = ["   ", ".  ", ".. ", "..."];
   let i = 0;
   const interval = setInterval(() => {
-    writeHuman(`\r  ${dim(frames[i++ % frames.length])} ${getLabel()}`);
+    const line = `${dim(frames[i++ % frames.length])} ${getLabel()}`;
+    writeHuman(`\r  ${clipToRow(line, terminalColumns())}\x1B[K`);
   }, SPINNER_FRAME_MS);
   return (finalGlyph, finalLabel) => {
     clearInterval(interval);
@@ -338,6 +362,8 @@ var waitForDevice = async (apiKey, baseline) => {
       await sleep(CONNECT_POLL_INTERVAL_MS);
     }
     stop(yellow("!"), "Didn't detect a connection yet");
+    console.log(`  ${dim("Signed in on the app already? Open it and allow notifications.")}`);
+    console.log(`  ${dim("Signing in alone does not connect the phone. Then run")} ${cyan("pushary doctor")}${dim(".")}`);
     return { kind: "timeout" };
   } catch (err) {
     stop(yellow("!"), `Couldn't check connection ${dim(`(${err instanceof Error ? err.message : "network error"})`)}`);
@@ -484,6 +510,18 @@ var startPairing = async (cliPublicKey) => {
     return null;
   }
 };
+var describePairFailure = (reason) => {
+  switch (reason) {
+    case "no_site":
+      return "Couldn't set up your workspace. Try again, or finish setup at pushary.com/dashboard";
+    case "blocked":
+      return "Finish setting up in the Pushary app, then run setup again";
+    case "authorize_failed":
+      return "The app could not authorize this terminal. Re-run setup to try again";
+    default:
+      return "Pairing failed. Re-run setup to try again";
+  }
+};
 var cancelPairing = async (pairId) => {
   try {
     await fetch(`${apiBase()}/api/mobile/pair/start`, {
@@ -495,6 +533,7 @@ var cancelPairing = async (pairId) => {
   } catch {
   }
 };
+var PAIR_MAX_CONSECUTIVE_FAILURES = 8;
 var claimPairing = async (pairId) => {
   try {
     const res = await fetch(`${apiBase()}/api/mobile/pair/claim?id=${encodeURIComponent(pairId)}`, {
@@ -506,6 +545,17 @@ var claimPairing = async (pairId) => {
     return null;
   }
 };
+var ackPairing = async (pairId) => {
+  try {
+    await fetch(`${apiBase()}/api/mobile/pair/ack`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ pairId }),
+      signal: AbortSignal.timeout(5e3)
+    });
+  } catch {
+  }
+};
 var buildPairLinks = (pairId, publicKeyB64, baseUrl = apiBase()) => {
   const id = encodeURIComponent(pairId);
   const pk = encodeURIComponent(publicKeyB64);
@@ -533,12 +583,19 @@ var connectViaAppPairing = async (options = {}) => {
   console.log();
   const startedAt = Date.now();
   const deadline = startedAt + PAIR_TIMEOUT_MS;
+  let hintShown = false;
   const stop = startSpinner(() => {
     const left = Math.max(0, Math.ceil((deadline - Date.now()) / 6e4));
     if (Date.now() - startedAt < PAIR_HINT_AFTER_MS) {
       return "Waiting for the app to authorize";
     }
-    return `Waiting for the app ${dim(`(${left}m left. No app yet? Install it, sign in with this account, then scan. Ctrl-C to stop)`)}`;
+    if (!hintShown) {
+      hintShown = true;
+      writeStatusLine(
+        `${dim("No app yet? Install it, sign in with this account, then scan. Ctrl-C to stop.")}`
+      );
+    }
+    return `Waiting for the app ${dim(`(${left}m left)`)}`;
   });
   let cancelled = false;
   const onInterrupt = () => {
@@ -548,10 +605,22 @@ var connectViaAppPairing = async (options = {}) => {
     void Promise.allSettled([Promise.resolve(flushed), cancelPairing(pairId)]).finally(() => process.exit(EXIT_ABORTED));
   };
   process.once("SIGINT", onInterrupt);
+  let consecutiveFailures = 0;
   try {
     while (Date.now() < deadline) {
       if (cancelled) return null;
       const claim = await claimPairing(pairId);
+      if (claim === null) {
+        consecutiveFailures += 1;
+        if (consecutiveFailures >= PAIR_MAX_CONSECUTIVE_FAILURES) {
+          stop(yellow("!"), "Can't reach pushary.com to finish pairing. Check your connection, then re-run setup.");
+          await cancelPairing(pairId);
+          return null;
+        }
+        await sleep(PAIR_POLL_INTERVAL_MS);
+        continue;
+      }
+      consecutiveFailures = 0;
       if (claim?.status === "authorized") {
         let apiKey;
         try {
@@ -561,6 +630,7 @@ var connectViaAppPairing = async (options = {}) => {
           await cancelPairing(pairId);
           return null;
         }
+        await ackPairing(pairId);
         stop(check, "App connected");
         return { apiKey, handle: claim.siteSlug };
       }
@@ -568,6 +638,10 @@ var connectViaAppPairing = async (options = {}) => {
         stop(yellow("!"), "Pairing expired \u2014 re-run setup to try again");
         return null;
       }
+      if (claim?.status === "failed") {
+        stop(yellow("!"), describePairFailure(claim.reason));
+        return null;
+      }
       await sleep(PAIR_POLL_INTERVAL_MS);
     }
     stop(yellow("!"), "Timed out waiting for the app");

package/dist/src/index.d.ts

@@ -36,6 +36,7 @@ interface ModeState {
     readonly relayUrl: string | null;
     readonly trainingConsent?: boolean;
     readonly scope?: ScopeContract | null;
+    readonly degraded?: boolean;
 }
 declare const fetchModeState: (apiKey: string, sessionId?: string) => Promise<ModeState>;
 declare const fetchModeOverride: (apiKey: string) => Promise<ApprovalMode | null>;

package/dist/src/index.js

@@ -1,8 +1,8 @@
 import {
   handlePreToolUse
-} from "../chunk-SONXGCZY.js";
+} from "../chunk-C5I2RAMT.js";
 import "../chunk-CAJZAFVS.js";
-import "../chunk-YHG74UFF.js";
+import "../chunk-3USMXNVB.js";
 import {
   askUser,
   cancelQuestion,
@@ -15,7 +15,7 @@ import {
   reportEvent,
   resolvePolicy,
   waitForAnswer
-} from "../chunk-XOUYM27W.js";
+} from "../chunk-H46LSQRT.js";
 import "../chunk-WLGEY4UX.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushary/agent-hooks",
-  "version": "0.67.1",
+  "version": "0.69.0",
   "description": "Permission hooks for AI coding agents: route tool approvals through Pushary push notifications",
   "keywords": [
     "pushary",

package/dist/chunk-YHG74UFF.js

@@ -1,12 +0,0 @@
-// src/answer.ts
-var denyReasonFrom = (value, note) => {
-  const trimmed = note?.trim();
-  if (trimmed) return `Denied from your phone: ${trimmed}`;
-  return value && value !== "no" && value !== "yes" ? `Denied from your phone: ${value}` : "Denied via push notification";
-};
-var isDeferAnswer = (value) => value === "defer";
-
-export {
-  denyReasonFrom,
-  isDeferAnswer
-};