pushary 1.9.57 → 1.9.59

package/dist/{chunk-UPFFO4F6.js → chunk-KQWN7C5C.js}

@@ -3,18 +3,18 @@ import {
   addGeminiMcpServer,
   removeGeminiMcpServer,
   supportedClaudeEvents
-} from "./chunk-QQYUWTYS.js";
+} from "./chunk-TDOKDCFH.js";
 import {
   CLAUDE_CODE_AGENT,
   compatibleToolLookup
-} from "./chunk-4YTFYILS.js";
+} from "./chunk-5JWCWALO.js";
 import {
   guardBinary,
   guardBinaryRefusing,
   holdBudgetOf,
   isProtectedByScope,
   registerHookEntry
-} from "./chunk-TWLWDIFB.js";
+} from "./chunk-KZCYHWDF.js";
 import {
   HOOK_COMPATIBLE_PROFILES,
   HOOK_LOCATOR_BINARY,
@@ -26,7 +26,7 @@ import {
   pusharyMissingReason,
   refusalOutput,
   withHookHoldBudget
-} from "./chunk-GZL3KEPC.js";
+} from "./chunk-762CDAJJ.js";
 
 // src/claude-config.ts
 import { join } from "path";

package/dist/{chunk-D2EETYAL.js → chunk-KW3DED2A.js}

@@ -1,3 +1,13 @@
+import {
+  describeAppRepair,
+  describeJustPairedRepair,
+  describeReach,
+  describeVerifyOutcome,
+  ownAppPlatforms,
+  reachVerdict,
+  reachesYou,
+  verifyDelivery
+} from "./chunk-2FVP7WRP.js";
 import {
   generateKeypair,
   openSealedKey,
@@ -12,371 +22,16 @@ import {
   terminalColumns,
   useColor
 } from "./chunk-FO3MDD26.js";
-import {
-  callMcpTool
-} from "./chunk-A54W5A74.js";
 import {
   reportedInstallSource
-} from "./chunk-7RZO6VWD.js";
+} from "./chunk-3RKIJM26.js";
 import {
   NPX_LATEST_COMMAND
-} from "./chunk-5SFM6XB4.js";
+} from "./chunk-BMPZ5HVJ.js";
 import {
   NO_PAIRING_COMPUTER,
-  PAIR_TTL_SECONDS,
-  classifyConfirmResponse,
-  isAnswerSource
-} from "./chunk-GZL3KEPC.js";
-
-// src/reach.ts
-var reachVerdict = (channels) => {
-  const { yours, site } = channels;
-  if (yours === null || site === null) {
-    return channels.phoneReachable || channels.webActive > 0 ? { kind: "yours" } : { kind: "nobody" };
-  }
-  if (yours.phoneReachable) return { kind: "yours" };
-  const solo = site.otherMembers === 0;
-  if (solo) {
-    return site.phoneReachable || site.webActive > 0 ? { kind: "yours" } : { kind: "nobody" };
-  }
-  if (site.appDevices === 0 && site.webActive === 0) return { kind: "nobody" };
-  if (site.webActive > 0 && !yours.webAttributable) {
-    return { kind: "unattributable", otherMembers: site.otherMembers };
-  }
-  return { kind: "others", otherMembers: site.otherMembers };
-};
-var reachesYou = (channels) => reachVerdict(channels).kind === "yours";
-var plural = (count, one, many = `${one}s`) => `${count} ${count === 1 ? one : many}`;
-var describeReach = (channels) => {
-  const verdict = reachVerdict(channels);
-  if (verdict.kind === "nobody") return "nothing can receive an approval";
-  const parts = [];
-  const own = channels.yours;
-  if (verdict.kind === "yours" && own !== null && own.appDevices > 0) {
-    const platforms = own.appPlatforms.length > 0 ? ` (${own.appPlatforms.join(", ")})` : "";
-    parts.push(`${plural(own.appDevices, "app device")}${platforms}`);
-  } else if (channels.appDevices > 0) {
-    const platforms = channels.appPlatforms.length > 0 ? ` (${channels.appPlatforms.join(", ")})` : "";
-    parts.push(`${plural(channels.appDevices, "app device")}${platforms}`);
-  }
-  if (channels.webPhone > 0) parts.push(`${plural(channels.webPhone, "browser")} on a phone`);
-  if (channels.webDesktop > 0) parts.push(`${plural(channels.webDesktop, "browser")} on a desktop`);
-  const summary = parts.length > 0 ? parts.join(", ") : "a device";
-  if (verdict.kind === "others") return `${summary}, none of them yours`;
-  if (verdict.kind === "unattributable") return `${summary}, and no way to tell whose`;
-  return summary;
-};
-var describeAppRepair = (verdict) => {
-  switch (verdict.kind) {
-    case "yours":
-      return null;
-    case "nobody":
-      return [
-        "Open the Pushary app, sign in, and allow notifications.",
-        `If this terminal was never paired with your phone, run: ${NPX_LATEST_COMMAND} setup --connect app`
-      ];
-    case "others":
-      return [
-        `Reachable devices belong to other members of this workspace (${verdict.otherMembers}).`,
-        "Sign in on the Pushary app with your own account so approvals can reach you."
-      ];
-    case "unattributable":
-      return [
-        "Something is reachable here, but not identifiably yours.",
-        "Sign in on the Pushary app so your approvals are routed to your device."
-      ];
-  }
-};
-var describeJustPairedRepair = (verdict) => {
-  if (verdict.kind === "nobody") {
-    return [
-      "The app asks for the notification permission after it grants the pairing.",
-      "Open the Pushary app and allow notifications. That is the whole remaining step."
-    ];
-  }
-  return describeAppRepair(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 = ownAppPlatforms(channels);
-    const suffix = platforms.length > 0 ? ` (${platforms.join(", ")})` : "";
-    parts.push(`${plural2(push.app, "app device")}${suffix}`);
-  }
-  if (push.web > 0) parts.push(plural2(push.web, "browser"));
-  return parts.length > 0 ? parts.join(" and ") : plural2(push.total, "device");
-};
-var classifyDelivery = (channels, push) => {
-  if (push.total <= 0) return { kind: "no-recipients" };
-  const verdict = reachVerdict(channels);
-  if (verdict.kind === "yours" && (push.app > 0 || channels.yours === null || channels.site?.otherMembers === 0)) {
-    return { kind: "delivered", recipients: push.total, deviceLabel: describeRecipients(push, channels) };
-  }
-  if (verdict.kind === "unattributable") {
-    return { kind: "unattributable", recipients: push.total, otherMembers: verdict.otherMembers };
-  }
-  if (verdict.kind === "others") {
-    return { kind: "others-only", recipients: push.total, otherMembers: verdict.otherMembers };
-  }
-  if (verdict.kind === "yours") {
-    const otherMembers = channels.site?.otherMembers ?? 0;
-    return { kind: "unattributable", recipients: push.total, otherMembers };
-  }
-  return { kind: "delivered", recipients: push.total, deviceLabel: describeRecipients(push, channels) };
-};
-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: SETUP_AGENT_NAME
-  }, { timeoutMs: 2e4 });
-  const toCount = (value) => typeof value === "number" && Number.isFinite(value) ? value : 0;
-  const app = toCount(result.delivery?.mobile?.recipients);
-  const web = toCount(result.delivery?.web?.recipients);
-  return { app, web, total: typeof result.sent === "number" ? result.sent : app + web };
-};
-var verifyDelivery = async (apiKey, channels, deps = {}) => {
-  const send = deps.send ?? sendTestNotification;
-  try {
-    return classifyDelivery(channels, await send(apiKey));
-  } catch (err) {
-    return { kind: "error", detail: err instanceof Error ? err.message : "send failed" };
-  }
-};
-var describeVerifyOutcome = (outcome) => {
-  switch (outcome.kind) {
-    case "delivered":
-      return { ok: true, message: `Delivered to ${outcome.deviceLabel}. Push works.`, next: [] };
-    case "no-recipients":
-      return {
-        ok: false,
-        message: "Nothing to deliver to. Agents are configured; approvals will fall back to the terminal.",
-        next: [
-          "Run pushary pair to pair your phone.",
-          "Then pushary doctor --roundtrip to test a synthetic question and answer."
-        ]
-      };
-    case "others-only":
-      return {
-        ok: false,
-        message: `Delivered to ${plural2(outcome.recipients, "device")} on this site, none of them yours.`,
-        next: [
-          `Approvals for your agent would wake one of your ${plural2(outcome.otherMembers, "teammate")}.`,
-          "Run pushary pair to pair your own phone."
-        ]
-      };
-    case "unattributable":
-      return {
-        ok: false,
-        message: `Delivered to ${plural2(outcome.recipients, "device")} on this site, and no way to tell whose.`,
-        next: [
-          "Browser subscriptions carry no owner, and this site has other members.",
-          "Install the Pushary app and pair it with pushary pair, or run pushary doctor --roundtrip to prove it reaches you."
-        ]
-      };
-    case "error":
-      return {
-        ok: false,
-        message: `Could not send the test notification (${outcome.detail}).`,
-        next: ["Agents are configured. Run pushary doctor once the connection is back."]
-      };
-  }
-};
-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
-  // reporting "unanswered" after three seconds would be a lie about the product.
-  callMcpTool(apiKey, "ask_user", {
-    question: ROUND_TRIP_QUESTION,
-    type: "confirm",
-    agentName,
-    wait: false
-  }, { timeoutMs: 15e3 })
-);
-var defaultWait = (apiKey, correlationId) => callMcpTool(apiKey, "wait_for_answer", {
-  correlationId,
-  timeoutMs: ROUND_TRIP_TIMEOUT_MS
-}, { timeoutMs: ROUND_TRIP_TIMEOUT_MS + 5e3 });
-var defaultCancel = async (apiKey, correlationId) => {
-  await callMcpTool(apiKey, "cancel_question", { correlationId }, { timeoutMs: 1e4 }).catch(() => {
-  });
-};
-var answeredRoundTrip = (answer, correlationId, latencyMs) => {
-  if (answer.value === void 0 || classifyConfirmResponse(answer.value) === null) {
-    return { kind: "error", detail: "the server reported an answer without a valid Yes, No or defer value" };
-  }
-  return {
-    kind: "answered",
-    value: answer.value,
-    latencyMs,
-    correlationId,
-    ...isAnswerSource(answer.answerSource) ? { answerSource: answer.answerSource } : {}
-  };
-};
-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;
-  try {
-    asked = await ask(apiKey, agentName);
-  } catch (err) {
-    return { kind: "error", detail: err instanceof Error ? err.message : "ask failed" };
-  }
-  let shutdown;
-  const stop = (code) => {
-    if (shutdown) return;
-    shutdown = (async () => {
-      let timer;
-      try {
-        await Promise.race([
-          Promise.all([
-            cancel(apiKey, asked.correlationId).catch(() => {
-            }),
-            interrupted(code).catch(() => {
-            })
-          ]),
-          new Promise((resolve) => {
-            timer = setTimeout(resolve, 4e3);
-          })
-        ]);
-      } finally {
-        clearTimeout(timer);
-        process.stderr.write("Delivery test interrupted. Cleanup was attempted; an unresolved question expires automatically.\n");
-        process.exit(code);
-      }
-    })();
-  };
-  const onInterrupt = () => stop(130);
-  const onTerminate = () => stop(143);
-  if (asked.correlationId) {
-    process.on("SIGINT", onInterrupt);
-    process.on("SIGTERM", onTerminate);
-  }
-  let answerObserved = false;
-  try {
-    if (asked.noDevices || asked.warning) return { kind: "no-recipients" };
-    if (asked.mode === "notify_only" || asked.status === "notified") return { kind: "notify-only" };
-    if (!asked.correlationId) return { kind: "error", detail: "no correlationId returned" };
-    const answer = asked.answered === true ? asked : await wait(apiKey, asked.correlationId);
-    if (answer.answered === true) {
-      const outcome = answeredRoundTrip(answer, asked.correlationId, now() - started);
-      answerObserved = outcome.kind === "answered";
-      return outcome;
-    }
-    return { kind: "unanswered" };
-  } catch (err) {
-    return { kind: "error", detail: err instanceof Error ? err.message : "wait failed" };
-  } finally {
-    if (shutdown) await shutdown;
-    process.off("SIGINT", onInterrupt);
-    process.off("SIGTERM", onTerminate);
-    if (!answerObserved && asked.correlationId) await cancel(apiKey, asked.correlationId).catch(() => {
-    });
-  }
-};
-var describeAnswerSource = (source) => {
-  switch (source) {
-    case "mobile_app":
-    case "mobile_background":
-      return "Answered on your phone.";
-    case "mac_app":
-      return "Answered on your Mac.";
-    case "sandbox":
-      return "This was a simulated sandbox answer.";
-    default:
-      return source ? `Answer source: ${source}. This was a synthetic test.` : "The answering surface was not reported. This was a synthetic test.";
-  }
-};
-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 {
-        ok: true,
-        message: `Answered "${outcome.value}" in ${(outcome.latencyMs / 1e3).toFixed(1)}s. ${describeAnswerSource(outcome.answerSource)}`,
-        next: []
-      };
-    case "unanswered":
-      return {
-        ok: false,
-        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.",
-          unansweredNextStep(appPlatforms)
-        ]
-      };
-    case "notify-only":
-      return {
-        ok: true,
-        message: "Sent. This site is in notify-only mode, so questions never wait for an answer.",
-        next: ["Switch with pushary mode push_first if you want approvals to hold for your phone."]
-      };
-    case "no-recipients":
-      return {
-        ok: false,
-        message: "Nothing to ask. No phone or browser is connected to this site.",
-        next: [
-          "Run pushary pair to pair your phone.",
-          "Or pushary pair --app if you already have the Pushary app."
-        ]
-      };
-    case "error":
-      return {
-        ok: false,
-        message: `Could not complete the round trip (${outcome.detail}).`,
-        next: ["Agents are configured. Run pushary doctor --roundtrip once the connection is back."]
-      };
-  }
-};
-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) => ({
-  kind: outcome?.kind ?? "skipped",
-  ...outcome?.kind === "answered" ? {
-    correlationId: outcome.correlationId ?? null,
-    answerSource: outcome.answerSource ?? null,
-    value: outcome.value,
-    latencyMs: outcome.latencyMs
-  } : {},
-  hookActivation: "unverified"
-});
+  PAIR_TTL_SECONDS
+} from "./chunk-762CDAJJ.js";
 
 // src/onboarding.ts
 import qrcodeTerminal from "qrcode-terminal";
@@ -1058,16 +713,6 @@ var waitForYourPhone = async (apiKey, options = {}) => {
 };
 
 export {
-  reachVerdict,
-  describeReach,
-  SETUP_AGENT_NAME,
-  ownAppPlatforms,
-  verifyRoundTrip,
-  notificationAnswerStep,
-  describeAnswerTestPrompt,
-  describeRoundTripOutcome,
-  describeRoundTrip,
-  roundTripEvidence,
   fetchChannels,
   connectDevice,
   confirmAppConnection,

package/dist/{chunk-TWLWDIFB.js → chunk-KZCYHWDF.js}

@@ -1,12 +1,12 @@
 import {
   quoteIfNeeded
-} from "./chunk-AEXACKDR.js";
+} from "./chunk-US3IT6ZC.js";
 import {
   CODEX_QUESTION_TOOLS,
   HOOK_BUDGETS,
   HOOK_LOCATOR_BINARY,
   withHookHoldBudget
-} from "./chunk-GZL3KEPC.js";
+} from "./chunk-762CDAJJ.js";
 
 // src/setup/paths.ts
 import { homedir as homedir2 } from "os";
@@ -463,6 +463,7 @@ var claudeMcpReceipt = () => join2(pusharyDir(), "setup", "claude-mcp.json");
 var bridgeAgentKey = () => join2(pusharyDir(), "bridge-auth", "agent-key.json");
 var autoUpdateState = () => join2(pusharyDir(), "auto-update.json");
 var autoUpdateLock = () => join2(pusharyDir(), "auto-update.lock");
+var serviceOwedBackMark = () => join2(pusharyDir(), "service-owed-back");
 var autoUpdateLog = () => join2(pusharyDir(), "logs", "auto-update.log");
 var clientReportClaims = () => join2(pusharyDir(), "client-reports");
 var claudeRegistrationReceipt = () => join2(pusharyDir(), "setup", "claude-registration.json");
@@ -537,6 +538,7 @@ export {
   bridgeAgentKey,
   autoUpdateState,
   autoUpdateLock,
+  serviceOwedBackMark,
   autoUpdateLog,
   clientReportClaims,
   claudeRegistrationReceipt,

package/dist/{chunk-RFAF3TOX.js → chunk-L3NVHPBU.js}

@@ -1,20 +1,24 @@
 import {
   claimUpgradeLock,
-  finishWithUpgradeLock,
   forkFinishWithUpgradeLock,
   installWithUpgradeLock,
   releaseAutoUpdateLock
-} from "./chunk-7OQ4AJC7.js";
+} from "./chunk-BRUHVTFB.js";
+import {
+  phoneStartIsRequired
+} from "./chunk-5PP4455M.js";
 import {
   describeAutoUpdateCheck,
   globalInstallLocation,
   hasRetryableUpgradeFinish,
   hasSettledUpgradeFinish,
+  holdsUnfinishedFinish,
   nextFinishAttempt,
+  pendingAutoUpdateAnnouncement,
   readAutoUpdateState,
   updateAutoUpdateState,
   upgradeEntryFor
-} from "./chunk-BAJ3A3BU.js";
+} from "./chunk-5BNXJTOZ.js";
 import {
   EXIT
 } from "./chunk-KZERVKTD.js";
@@ -22,17 +26,17 @@ import {
   autoUpdateLock,
   autoUpdateLog,
   autoUpdateState
-} from "./chunk-TWLWDIFB.js";
+} from "./chunk-KZCYHWDF.js";
 import {
   execNpm,
   fetchLatestPublishedVersion,
   npmErrorMessage,
   readGlobalCliInstallAt,
   readGlobalPrefix
-} from "./chunk-AEXACKDR.js";
+} from "./chunk-US3IT6ZC.js";
 import {
   NPX_LATEST_COMMAND
-} from "./chunk-5SFM6XB4.js";
+} from "./chunk-BMPZ5HVJ.js";
 import {
   commandsPackage,
   globalUpgradeEntry,
@@ -75,8 +79,29 @@ var instructionsLeftNoteOf = (agent) => {
 var RETRYABLE_UPGRADE_FINISH = { kind: "retryable" };
 var SETTLED_UPGRADE_FINISH = { kind: "settled" };
 var controlWaitsOnThePerson = (readings) => readings.controlPolicy === "legacy" || readings.controlMode === "on" && readings.controlPolicy === "unsupported";
+var serviceStartFellShort = (start) => start === "did_not_start" || start === "started_unverified";
+var aRunningServiceDidNotComeBack = (readings) => readings.serviceWasRunning && readings.serviceStart === "did_not_start";
+var phoneStartFellShortWithoutFailing = (readings) => serviceStartFellShort(readings.serviceStart) && !aRunningServiceDidNotComeBack(readings) && !phoneStartIsRequired({ mode: readings.controlMode, policy: readings.controlPolicy, lifecycleFailed: false });
+var serviceCameBack = (start) => start === "verified" || start === "started_unverified";
+var serviceStaysOwedBack = (readings, owedBefore) => readings.controlPolicy !== "disabled" && !serviceCameBack(readings.serviceStart) && (owedBefore || aRunningServiceDidNotComeBack(readings));
+var phoneStartServiceAfter = (start) => start === "started_unverified" ? "running_unverified" : "not_running";
+var DISABLED_SERVICE_NOT_REMOVED = "Upgrade installed, but the disabled background service could not be fully removed. Re-run setup with --control off.";
+var LEGACY_SERVICE_NOT_ADOPTED = "Upgrade installed and the legacy background service was stopped, but it cannot be safely adopted. Run setup with --control off, or restore its provider and native service manager.";
+var NO_KEY_FOR_PHONE_START = "Upgrade installed, but phone-start could not be reconciled because no API key was readable. Re-run setup.";
+var PHONE_START_CANNOT_RUN_HERE = "Upgrade installed, but phone-start is required on this computer and cannot run here yet. Run pushary doctor to see what it needs.";
+var SERVICE_STARTED_UNVERIFIED = "Upgrade installed, and the background service started, but it was not verified in time. Check it with: pushary doctor";
+var SERVICE_DID_NOT_START = "Upgrade installed, but the background service did not start. Run: pushary daemon install";
+var describeLegacyService = (stopFailure) => stopFailure ? `Upgrade installed, but the legacy background service could not be stopped: ${stopFailure}. Run setup with --control off.` : LEGACY_SERVICE_NOT_ADOPTED;
+var describeUnreadyService = (service) => {
+  if (service.controlPolicy === "disabled") return DISABLED_SERVICE_NOT_REMOVED;
+  if (service.controlPolicy === "legacy") return describeLegacyService(service.legacyStopFailure);
+  if (service.controlPolicy === "enabled" && !service.keyReadable) return NO_KEY_FOR_PHONE_START;
+  if (service.controlPolicy === "unsupported") return PHONE_START_CANNOT_RUN_HERE;
+  return service.serviceStart === "started_unverified" ? SERVICE_STARTED_UNVERIFIED : SERVICE_DID_NOT_START;
+};
+var serviceFailedTheFinish = (readings) => !readings.daemonReady && !phoneStartFellShortWithoutFailing(readings);
 var upgradeFinishOutcome = (readings) => {
-  if (!readings.daemonReady) return controlWaitsOnThePerson(readings) ? SETTLED_UPGRADE_FINISH : RETRYABLE_UPGRADE_FINISH;
+  if (serviceFailedTheFinish(readings)) return controlWaitsOnThePerson(readings) ? SETTLED_UPGRADE_FINISH : RETRYABLE_UPGRADE_FINISH;
   return readings.failedRefreshCount > 0 ? SETTLED_UPGRADE_FINISH : FINISHED_UPGRADE;
 };
 var UPGRADE_FINISH_EXIT_CODES = {
@@ -244,15 +269,19 @@ var readGlobalUpgradeSubject = (platform = process.platform) => {
   const prefix = readGlobalPrefix();
   return globalUpgradeSubject(prefix, prefix === void 0 ? { kind: "unavailable" } : readGlobalCliInstallAt(prefix, platform));
 };
-var finishWithThisNode = (entry) => finishWithUpgradeLock({ entry, args: [FINISH_UPGRADE_FLAG] });
+var finishWithThisNode = async (entry) => (await forkFinishWithUpgradeLock({ entry, args: [FINISH_UPGRADE_FLAG] })).code;
+var NEVER_RAN = { kind: "failed", waitsOnThePerson: false };
+var finishOutcomeOfExit = (code) => {
+  const outcome = upgradeFinishOutcomeOfExit(code);
+  return outcome.kind === "finished" ? { kind: "finished" } : { kind: "failed", waitsOnThePerson: outcome.kind === "settled" };
+};
 var finishGlobalUpgrade = async (subject, platform = process.platform, runFinish = finishWithThisNode) => {
   const entry = globalUpgradeEntry(subject.prefix, subject.name, platform);
   if (!existsSync(entry)) return { kind: "entry_missing", entry };
   try {
-    await runFinish(entry);
-    return { kind: "finished" };
+    return finishOutcomeOfExit(await runFinish(entry));
   } catch {
-    return { kind: "failed" };
+    return NEVER_RAN;
   }
 };
 var describeHeldUpgradeLock = (holderPid) => `Another Pushary upgrade is already running${holderPid === void 0 ? "" : ` (pid ${holderPid})`}. Try again when it has finished.`;
@@ -267,21 +296,62 @@ var withUpgradeLock = async (run, request = {}) => {
   }
   return { kind: "ran" };
 };
+var upgradeOnRecordIsStillThisOne = (earlier, installedVersion) => earlier.to === installedVersion && (holdsUnfinishedFinish(earlier) || pendingAutoUpdateAnnouncement(earlier) !== null);
+var startOfTheUpgradeOnRecord = (statePath, installedVersion) => {
+  const earlier = readAutoUpdateState(statePath);
+  return upgradeOnRecordIsStillThisOne(earlier, installedVersion) ? earlier.from : void 0;
+};
 var finishUpgradeWithLock = async (run, request) => {
   const outcome = await withUpgradeLock(run, request);
   if (outcome.kind === "refused") {
-    updateAutoUpdateState(request.statePath, { lastResult: "finish_pending", to: request.installedVersion, detail: outcome.message });
+    updateAutoUpdateState(request.statePath, {
+      lastResult: "finish_pending",
+      from: startOfTheUpgradeOnRecord(request.statePath, request.installedVersion),
+      to: request.installedVersion,
+      detail: outcome.message
+    });
   }
   return outcome;
 };
+var FINISH_DID_NOT_FINISH_DETAIL = "installed, but refreshing the agent configs did not finish; run pushary upgrade again";
+var FINISH_WAITS_ON_THE_PERSON_DETAIL = "installed, but refreshing the agent configs needs a change only you can make; make it, then run pushary upgrade again";
+var waitsOnThePerson = (unfinished) => unfinished.kind === "failed" && unfinished.waitsOnThePerson;
+var recordUnfinishedUpgrade = (record, unfinished) => {
+  if (record.installed.kind !== "installed") return;
+  const settled = waitsOnThePerson(unfinished);
+  updateAutoUpdateState(record.statePath, {
+    lastCheckAt: record.at,
+    lastResult: settled ? "finish_blocked" : "finish_pending",
+    from: startOfTheUpgradeOnRecord(record.statePath, record.installed.version),
+    to: record.installed.version,
+    at: record.at,
+    detail: settled ? FINISH_WAITS_ON_THE_PERSON_DETAIL : FINISH_DID_NOT_FINISH_DETAIL,
+    finishAttempts: void 0
+  });
+};
+var forgetUnfinishedUpgrade = (record, upgradedFrom) => {
+  if (record.installed.kind !== "installed" || !holdsUnfinishedFinish(readAutoUpdateState(record.statePath))) return;
+  updateAutoUpdateState(record.statePath, {
+    lastResult: "updated",
+    from: upgradedFrom,
+    to: record.installed.version,
+    at: record.at,
+    detail: void 0,
+    announced: true,
+    finishAttempts: void 0
+  });
+};
 var describeUpgradeStart = (subject, latest) => `Upgrading ${subject.name} ${subject.version} -> ${latest ?? "latest"}`;
 var upgradeInstalledPackage = async (subject, effects) => {
   const pendingFinish = effects.hasPendingFinish(subject.version);
   const latest = await effects.fetchLatest(subject.name);
   const newerPublished = latest !== void 0 && isNewerVersion(latest, subject.version);
   if (pendingFinish && !newerPublished) {
-    const finish = await effects.finish(subject);
-    if (finish.kind !== "finished") return { kind: "pending_finish_failed", finish };
+    const finish2 = await effects.finish(subject);
+    if (finish2.kind !== "finished") {
+      effects.recordUnfinished(finish2);
+      return { kind: "pending_finish_failed", finish: finish2 };
+    }
     effects.recordFinished();
   }
   if (latest !== void 0 && !newerPublished) return { kind: "current", version: subject.version };
@@ -291,13 +361,20 @@ var upgradeInstalledPackage = async (subject, effects) => {
   } catch (error) {
     return { kind: "install_failed", detail: npmErrorMessage(error) };
   }
-  return { kind: "installed", finish: await effects.finish(subject) };
+  const finish = await effects.finish(subject);
+  if (finish.kind === "finished") effects.forgetUnfinished();
+  else effects.recordUnfinished(finish);
+  return { kind: "installed", finish };
 };
 
 export {
   refreshedPartsOf,
   wasRefreshed,
   instructionsLeftNoteOf,
+  phoneStartFellShortWithoutFailing,
+  serviceStaysOwedBack,
+  phoneStartServiceAfter,
+  describeUnreadyService,
   upgradeFinishOutcome,
   upgradeFinishExitCode,
   FINISH_UPGRADE_FLAG,
@@ -307,5 +384,7 @@ export {
   finishGlobalUpgrade,
   withUpgradeLock,
   finishUpgradeWithLock,
+  recordUnfinishedUpgrade,
+  forgetUnfinishedUpgrade,
   upgradeInstalledPackage
 };

package/dist/{chunk-LVZYIUSR.js → chunk-LAEW5QQD.js}

@@ -1,6 +1,6 @@
 import {
   DEFAULT_SESSION
-} from "./chunk-4YTFYILS.js";
+} from "./chunk-5JWCWALO.js";
 
 // src/answer.ts
 var isDeferAnswer = (value) => value === "defer";

package/dist/{chunk-SQ5G6A6K.js → chunk-M46WDK64.js}

@@ -1,6 +1,6 @@
 import {
   pusharyDir
-} from "./chunk-TWLWDIFB.js";
+} from "./chunk-KZCYHWDF.js";
 import {
   writeFileAtomic
 } from "./chunk-QENTGE75.js";