@pushary/agent-hooks 1.9.53 → 1.9.55

package/dist/bin/pushary-doctor.js

@@ -15,13 +15,15 @@ import {
   writeStdoutFully
 } from "../chunk-EO23EUOK.js";
 import {
+  describeAnswerTestPrompt,
   describeReach,
   describeRoundTrip,
   fetchChannels,
+  ownAppPlatforms,
   reachVerdict,
   roundTripEvidence,
   verifyRoundTrip
-} from "../chunk-XZRLFBEA.js";
+} from "../chunk-LGTF7AZX.js";
 import "../chunk-3EGEA4KH.js";
 import {
   readMachineReadiness,
@@ -1373,6 +1375,7 @@ var main = async () => {
     console.log();
     console.log(`  ${dim("Notification Delivery")}`);
     const probe = await fetchChannels(apiKey);
+    const appPlatforms = probe.kind === "ok" ? ownAppPlatforms(probe.status) : [];
     if (probe.kind !== "ok") {
       check(
         false,
@@ -1420,9 +1423,11 @@ var main = async () => {
       console.log();
       console.log(`  ${dim("Question Roundtrip")}`);
       console.log(`  ${dim("\u2192")} Question sent, waiting for your answer...`);
+      const answerStep = describeAnswerTestPrompt(appPlatforms).step;
+      if (answerStep !== null) console.log(`    ${dim(answerStep)}`);
       const outcome = await verifyRoundTrip(apiKey, "Pushary Doctor");
       roundTrip = outcome;
-      const report = describeRoundTrip(outcome);
+      const report = describeRoundTrip(outcome, appPlatforms);
       check(report.ok, "Synthetic answer test", report.message);
       for (const line of report.next) console.log(`    ${dim(line)}`);
     }

package/dist/bin/pushary-setup.js

@@ -30,16 +30,19 @@ import {
 } from "../chunk-EO23EUOK.js";
 import {
   BROWSER_CONNECT_COMMAND,
+  SETUP_AGENT_NAME,
   confirmAppConnection,
   connectDevice,
   connectViaAppPairing,
+  describeAnswerTestPrompt,
   describeRoundTripOutcome,
+  notificationAnswerStep,
   pairingEscapeApplies,
   printConnectInstructions,
   roundTripEvidence,
   verifyRoundTrip,
   waitForYourPhone
-} from "../chunk-XZRLFBEA.js";
+} from "../chunk-LGTF7AZX.js";
 import "../chunk-3EGEA4KH.js";
 import {
   readManagedControlEvidence,
@@ -55,7 +58,7 @@ import {
 } from "../chunk-EUW7JL2K.js";
 import {
   codexEngineBehindLauncher
-} from "../chunk-ABGN5RN2.js";
+} from "../chunk-T5L5NWT3.js";
 import "../chunk-XCEN33UP.js";
 import {
   CURSOR_PLUGIN_BACKUP_INFIX,
@@ -244,7 +247,7 @@ import {
   CODEX_ENGINE_ENTRYPOINT,
   CODEX_ENGINE_MANIFEST,
   codexEngineInside
-} from "../chunk-36NGFHE4.js";
+} from "../chunk-E46NE7FB.js";
 import {
   reportEvent
 } from "../chunk-U2L42GVI.js";
@@ -707,6 +710,12 @@ var fetchSetupWaitGuidance = async (apiKey) => {
 
 // src/setup/closing.ts
 var ACTIVITY_URL = "pushary.com/dashboard/agent/activity";
+var CHECK_THE_NOTIFICATION_OPENED = "Check the notification opened something you could tap, then:";
+var SEND_ANOTHER_TEST = "pushary doctor --roundtrip   send another one";
+var sendAnotherTestLines = (appPlatforms) => {
+  const step = notificationAnswerStep(appPlatforms);
+  return step === null ? [CHECK_THE_NOTIFICATION_OPENED, SEND_ANOTHER_TEST] : [SEND_ANOTHER_TEST, step];
+};
 var TRANSCRIPT_SYNC_NOTICE = `Transcripts sync redacted and encrypted. Your phone can decrypt them; authorized Pushary compliance admins can recover them for documented legal obligations. Turn off: ${NPX_LATEST_COMMAND} setup --transcripts off`;
 var PAIR_PHONE_APP_HINT = `${NPX_LATEST_COMMAND} setup --connect app   pair the Pushary app on your phone`;
 var RESTART_AGENTS_LINE = "Restart any open agent sessions so they pick up Pushary.";
@@ -856,8 +865,7 @@ var describeClosing = (facts) => {
       next: [
         "No answer returned from the synthetic test. Delivery acceptance does not prove a visible notification.",
         "",
-        "Check the notification opened something you could tap, then:",
-        "pushary doctor --roundtrip   send another one",
+        ...sendAnotherTestLines(facts.appPlatforms ?? []),
         "",
         "If you simply were not looking, re-run setup or pass --verify push to skip this check."
       ],
@@ -1019,6 +1027,12 @@ var roundTripOutcome = (outcome) => {
       return null;
   }
 };
+var connectOutcomeOf = (roundTrip, phone) => {
+  const fromRoundTrip = roundTripOutcome(roundTrip);
+  if (fromRoundTrip !== null) return fromRoundTrip;
+  if (phone === null) return "skipped";
+  return phone.reachesYou ? "delivered" : "unreachable";
+};
 var currentStep = "start";
 var markStep = (step) => {
   currentStep = step;
@@ -1086,23 +1100,24 @@ var reportSetupOutcomeWith = async (deps, outcome) => emit(deps, {
   abortReason: null
 });
 var reportSetupOutcome = (outcome) => reportSetupOutcomeWith(defaultDeps, outcome);
-var reportSetupAbortWith = async (deps, reason, exitCode, keyCheck = "unknown") => emit(deps, {
-  agents: [],
+var NOTHING_CONFIGURED = { completed: [], skipped: [], failures: [], connectOutcome: "skipped" };
+var reportSetupAbortWith = async (deps, reason, exitCode, keyCheck = "unknown", progress = NOTHING_CONFIGURED) => emit(deps, {
+  agents: progress.completed,
   connectMode: recordedOptions?.connectMode ?? null,
-  connectOutcome: "skipped",
-  failedAgents: 0,
-  agentFailures: [],
+  connectOutcome: progress.connectOutcome,
+  failedAgents: progress.failures.length,
+  agentFailures: agentFailureWire(progress.failures),
   closingReason: null,
   controlFailureStage: null,
   controlMissingPrerequisite: null,
-  skippedAgents: [],
+  skippedAgents: progress.skipped,
   nonInteractive: recordedOptions?.nonInteractive ?? null,
   keyCheck,
   exitCode,
   abandonedAt: currentStep,
   abortReason: reason
 });
-var reportSetupAbort = (reason, exitCode, keyCheck) => reportSetupAbortWith(defaultDeps, reason, exitCode, keyCheck);
+var reportSetupAbort = (reason, exitCode, keyCheck, progress) => reportSetupAbortWith(defaultDeps, reason, exitCode, keyCheck, progress);
 
 // src/setup/app-key.ts
 var pickAppKey = (candidates) => candidates.fromAgents.find(
@@ -1167,8 +1182,8 @@ var green = paint("\x1B[32m");
 var cyan = paint("\x1B[36m");
 var yellow = paint("\x1B[33m");
 var check = green("\u2713");
-var abortWith = async (reason, code, keyCheck) => {
-  await reportSetupAbort(reason, code, keyCheck);
+var abortWith = async (reason, code, keyCheck, progress) => {
+  await reportSetupAbort(reason, code, keyCheck, progress);
   if (jsonMode) {
     await writeStdoutFully(`${JSON.stringify({ ok: false, reason, exitCode: code, ...keyCheck ? { keyCheck } : {} }, null, 2)}
 `);
@@ -2474,6 +2489,8 @@ var AGENT_CAPABILITIES = {
 var failedAgentNames = (failures) => failures.map((failure) => AGENT_NAMES[failure.agent]);
 var agentFailureNextLine = (next) => next.kind === "retry-agent" ? `${dim(RETRY_AGENT_LABEL)} ${cyan(next.command)}` : next.instruction;
 var NO_ANSWER_YET = "No answer yet";
+var CONNECT_PHONE_STEP = "connect-phone";
+var ANSWER_TEST_STEP = "answer-test";
 var roundTripAnswerOf = (outcome) => outcome?.kind === "answered" ? { latencyMs: outcome.latencyMs, answerSource: outcome.answerSource } : null;
 var roundTripSpinnerEnd = (outcome) => {
   const report = describeRoundTripOutcome(outcome);
@@ -2914,7 +2931,7 @@ var main = async () => {
       console.log(`  ${check} Phone-start background service disabled.`);
     }
   }
-  markStep("connect-phone");
+  markStep(CONNECT_PHONE_STEP);
   if (keyCheck.kind === "ok") console.log(`  ${dim(await fetchSetupWaitGuidance(trimmedKey))}`);
   const skipPhone = options.skipPhone;
   let phone = null;
@@ -2977,11 +2994,20 @@ var main = async () => {
   // being a thing they have to know to run.
   (phone?.reachesYou || phone?.outcome?.kind === "unattributable")) {
     console.log();
+    const appPlatforms = phone?.appPlatforms ?? [];
+    const prompt = describeAnswerTestPrompt(appPlatforms);
     console.log(`  ${dim("Answer the test question on your phone.")}`);
-    const answer = verifyRoundTrip(trimmedKey);
-    await spinner("Waiting for you to tap the notification", async () => roundTripSpinnerEnd(await answer));
+    if (prompt.step !== null) console.log(`  ${dim(prompt.step)}`);
+    markStep(ANSWER_TEST_STEP);
+    const answer = verifyRoundTrip(trimmedKey, SETUP_AGENT_NAME, {
+      interrupted: async (exitCode2) => {
+        await abortWith("interrupted", exitCode2, keyCheck.kind, { completed, skipped, failures, connectOutcome: connectOutcomeOf(null, phone) });
+      }
+    });
+    await spinner(prompt.waiting, async () => roundTripSpinnerEnd(await answer));
     roundTrip = await answer;
-    const report = describeRoundTripOutcome(roundTrip);
+    markStep(CONNECT_PHONE_STEP);
+    const report = describeRoundTripOutcome(roundTrip, appPlatforms);
     if (!report.ok) console.log(`  ${yellow("!")} ${report.message}`);
     for (const line of report.next) console.log(`  ${dim(line)}`);
   } else if (verifyMode === "roundtrip" && keyCheck.kind === "ok") {
@@ -3157,7 +3183,8 @@ var main = async () => {
     // null when the check did not run, so it changes nothing. Only an outright
     // `false` is allowed to hold back "Setup complete.".
     roundTripAnswered: roundTrip === null ? null : roundTrip.kind === "answered" ? true : roundTrip.kind === "unanswered" ? false : null,
-    roundTripAnswer: roundTripAnswerOf(roundTrip)
+    roundTripAnswer: roundTripAnswerOf(roundTrip),
+    appPlatforms: phone?.appPlatforms
   });
   console.log(`  ${closing.ok ? green(bold(closing.headline)) : yellow(bold(closing.headline))}`);
   if (failures.length > 0) {
@@ -3186,7 +3213,7 @@ var main = async () => {
     // nothing produced it, because setup stopped at a delivered notification, so
     // the one value meaning "a human tapped" was never emitted by the command
     // whose job is to prove a human can.
-    connectOutcome: roundTripOutcome(roundTrip) ?? (phone === null ? "skipped" : phone.reachesYou ? "delivered" : "unreachable"),
+    connectOutcome: connectOutcomeOf(roundTrip, phone),
     keyCheck: keyCheck?.kind ?? "skipped",
     exitCode
   });

package/dist/bin/pushary-status.js

@@ -3,7 +3,7 @@ import {
   describeReach,
   fetchChannels,
   reachVerdict
-} from "../chunk-XZRLFBEA.js";
+} from "../chunk-LGTF7AZX.js";
 import "../chunk-3EGEA4KH.js";
 import {
   describeLastSeen,

package/dist/{chunk-36NGFHE4.js → chunk-E46NE7FB.js}

@@ -4,6 +4,7 @@ import { rmSync } from "fs";
 import { join } from "path";
 var CODEX_APP_LAUNCH_VARIABLE = "CODEX_CLI_PATH";
 var CODEX_ENGINE_PENDING_VARIABLE = "PUSHARY_CODEX_ENGINE_PENDING";
+var CODEX_APP_LAUNCH_AT_LOGIN_VERB = "codex-app-launch-at-login";
 var CODEX_ENGINE_DIRECTORY = "Contents/Resources/codex-cli";
 var CODEX_ENGINE_ENTRYPOINT = "bin/codex";
 var CODEX_ENGINE_MANIFEST = "codex-package.json";
@@ -60,6 +61,7 @@ var letCodexRunWithoutPushary = (app, engineArgs) => {
 export {
   CODEX_APP_LAUNCH_VARIABLE,
   CODEX_ENGINE_PENDING_VARIABLE,
+  CODEX_APP_LAUNCH_AT_LOGIN_VERB,
   CODEX_ENGINE_DIRECTORY,
   CODEX_ENGINE_ENTRYPOINT,
   CODEX_ENGINE_MANIFEST,

package/dist/{chunk-XZRLFBEA.js → chunk-LGTF7AZX.js}

@@ -99,10 +99,12 @@ var describeJustPairedRepair = (verdict) => {
 
 // src/setup/verify.ts
 var plural2 = (count, one) => `${count} ${one}${count === 1 ? "" : "s"}`;
+var SETUP_AGENT_NAME = "Pushary setup";
+var ownAppPlatforms = (channels) => channels.yours?.appPlatforms ?? channels.appPlatforms;
 var describeRecipients = (push, channels) => {
   const parts = [];
   if (push.app > 0) {
-    const platforms = channels.yours?.appPlatforms ?? channels.appPlatforms;
+    const platforms = ownAppPlatforms(channels);
     const suffix = platforms.length > 0 ? ` (${platforms.join(", ")})` : "";
     parts.push(`${plural2(push.app, "app device")}${suffix}`);
   }
@@ -131,7 +133,7 @@ var sendTestNotification = async (apiKey) => {
   const result = await callMcpTool(apiKey, "send_notification", {
     title: "Pushary is connected",
     body: "This setup notification reached you. Agent hooks still need a real-agent check.",
-    agentName: "Pushary setup"
+    agentName: SETUP_AGENT_NAME
   }, { timeoutMs: 2e4 });
   const toCount = (value) => typeof value === "number" && Number.isFinite(value) ? value : 0;
   const app = toCount(result.delivery?.mobile?.recipients);
@@ -185,8 +187,10 @@ var describeVerifyOutcome = (outcome) => {
       };
   }
 };
-var ROUND_TRIP_QUESTION = "Pushary delivery test. Tap Yes or No to test returning an answer. This does not test your agent hooks.";
+var ROUND_TRIP_QUESTION = "Pushary delivery test. Answer either way to test returning an answer. This does not test your agent hooks.";
 var ROUND_TRIP_TIMEOUT_MS = 55e3;
+var reportNoInterrupt = async () => {
+};
 var defaultAsk = (apiKey, agentName) => (
   // wait:false so the poll is ours: the blocking form returns on the SITE's
   // policy timeout, which a user may have set to seconds, and a setup check
@@ -218,10 +222,11 @@ var answeredRoundTrip = (answer, correlationId, latencyMs) => {
     ...isAnswerSource(answer.answerSource) ? { answerSource: answer.answerSource } : {}
   };
 };
-var verifyRoundTrip = async (apiKey, agentName = "Pushary setup", deps = {}) => {
+var verifyRoundTrip = async (apiKey, agentName = SETUP_AGENT_NAME, deps = {}) => {
   const ask = deps.ask ?? defaultAsk;
   const wait = deps.wait ?? defaultWait;
   const cancel = deps.cancel ?? defaultCancel;
+  const interrupted = deps.interrupted ?? reportNoInterrupt;
   const now = deps.now ?? Date.now;
   const started = now();
   let asked;
@@ -237,8 +242,12 @@ var verifyRoundTrip = async (apiKey, agentName = "Pushary setup", deps = {}) =>
       let timer;
       try {
         await Promise.race([
-          cancel(apiKey, asked.correlationId).catch(() => {
-          }),
+          Promise.all([
+            cancel(apiKey, asked.correlationId).catch(() => {
+            }),
+            interrupted(code).catch(() => {
+            })
+          ]),
           new Promise((resolve) => {
             timer = setTimeout(resolve, 4e3);
           })
@@ -291,7 +300,30 @@ var describeAnswerSource = (source) => {
       return source ? `Answer source: ${source}. This was a synthetic test.` : "The answering surface was not reported. This was a synthetic test.";
   }
 };
-var describeRoundTripOutcome = (outcome) => {
+var NOTIFICATION_ANSWER_STEPS = /* @__PURE__ */ new Map([
+  ["ios", "Press and hold the notification, then tap Approve."],
+  ["android", "Expand the notification, then tap Approve."]
+]);
+var EITHER_PHONE_ANSWER_STEP = "Press and hold the notification on iPhone, or expand it on Android, then tap Approve.";
+var notificationAnswerStep = (appPlatforms) => {
+  const platforms = [...new Set(appPlatforms)];
+  const [onlyPlatform] = platforms;
+  if (onlyPlatform === void 0) return null;
+  if (platforms.length > 1) return EITHER_PHONE_ANSWER_STEP;
+  return NOTIFICATION_ANSWER_STEPS.get(onlyPlatform) ?? EITHER_PHONE_ANSWER_STEP;
+};
+var WAITING_FOR_TAP = "Waiting for you to tap the notification";
+var WAITING_FOR_ANSWER = "Waiting for your answer";
+var describeAnswerTestPrompt = (appPlatforms) => {
+  const step = notificationAnswerStep(appPlatforms);
+  return { step, waiting: step === null ? WAITING_FOR_TAP : WAITING_FOR_ANSWER };
+};
+var CHECK_THE_NOTIFICATION_OPENED = "Check the notification actually opened something you could tap, then run pushary doctor --roundtrip.";
+var unansweredNextStep = (appPlatforms) => {
+  const step = notificationAnswerStep(appPlatforms);
+  return step === null ? CHECK_THE_NOTIFICATION_OPENED : `To send another one, run pushary doctor --roundtrip. ${step}`;
+};
+var describeRoundTripOutcome = (outcome, appPlatforms = []) => {
   switch (outcome.kind) {
     case "answered":
       return {
@@ -305,7 +337,7 @@ var describeRoundTripOutcome = (outcome) => {
         message: "The question was sent and nothing came back.",
         next: [
           "A push that arrives and cannot be answered is the most common way this breaks, so this is worth resolving now.",
-          "Check the notification actually opened something you could tap, then run pushary doctor --roundtrip."
+          unansweredNextStep(appPlatforms)
         ]
       };
     case "notify-only":
@@ -331,8 +363,8 @@ var describeRoundTripOutcome = (outcome) => {
       };
   }
 };
-var describeRoundTrip = (outcome) => {
-  const report = describeRoundTripOutcome(outcome);
+var describeRoundTrip = (outcome, appPlatforms = []) => {
+  const report = describeRoundTripOutcome(outcome, appPlatforms);
   return { ...report, next: [...report.next, "Agent hook activation remains unverified. Restart your agent and check one real approval."] };
 };
 var roundTripEvidence = (outcome) => ({
@@ -560,7 +592,7 @@ var sendAndConfirm = async (apiKey, channels) => {
   const report = describeVerifyOutcome(outcome);
   stopSend(report.ok ? check : yellow("!"), report.message);
   for (const line of report.next) console.log(`  ${dim(line)}`);
-  return { reachesYou: report.ok, outcome, detail: null };
+  return { reachesYou: report.ok, outcome, detail: null, appPlatforms: ownAppPlatforms(channels) };
 };
 var printCapabilityDelta = () => {
   console.log(`  ${dim("Two ways to get approvals on your phone:")}`);
@@ -1028,7 +1060,11 @@ var waitForYourPhone = async (apiKey, options = {}) => {
 export {
   reachVerdict,
   describeReach,
+  SETUP_AGENT_NAME,
+  ownAppPlatforms,
   verifyRoundTrip,
+  notificationAnswerStep,
+  describeAnswerTestPrompt,
   describeRoundTripOutcome,
   describeRoundTrip,
   roundTripEvidence,

package/dist/{chunk-ABGN5RN2.js → chunk-T5L5NWT3.js}

@@ -12,7 +12,7 @@ import {
   launcherIsGone,
   launcherWaitingOnThisProcess,
   tellTheLauncherTheEngineStarted
-} from "./chunk-36NGFHE4.js";
+} from "./chunk-E46NE7FB.js";
 
 // src/codex-desktop-launch.ts
 import { spawn as spawn2, execFileSync } from "child_process";
@@ -695,7 +695,7 @@ var codexDesktopCommand = async (args, entry, readAccount) => {
     return runCodexDesktopProxy(engine2, args.slice(3), readAccount, { watchesForCards: layoutIsKnown });
   }
   if (args[0] === APP_CARDS_FLAG) {
-    const { codexAppCardsCommandOnThisMac } = await import("./codex-app-cards-switch-RENOSSDD.js");
+    const { codexAppCardsCommandOnThisMac } = await import("./codex-app-cards-switch-P4RVJNRV.js");
     return codexAppCardsCommandOnThisMac(args.slice(1), entry, readAccount);
   }
   if (args.length > 2) throw new Error("Usage: pushary codex --desktop [path/to/Codex.app]");