pushary 1.9.57 → 1.9.58

package/dist/bin/pushary-suggestions.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   exitOnFailedSettingsRequest
-} from "../chunk-K45CFSYV.js";
+} from "../chunk-VLJ5C6IT.js";
 import "../chunk-4YNNAF53.js";
 import {
   createIo
@@ -13,9 +13,9 @@ import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
 import "../chunk-IRZ5FVWG.js";
-import "../chunk-FBKVCODG.js";
-import "../chunk-HCIB4YNB.js";
-import "../chunk-SQ5G6A6K.js";
+import "../chunk-S54YLXWW.js";
+import "../chunk-5DZHKNBU.js";
+import "../chunk-IJ6XKKQW.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
@@ -23,8 +23,8 @@ import {
   EXIT
 } from "../chunk-KZERVKTD.js";
 import "../chunk-7RZO6VWD.js";
-import "../chunk-TWLWDIFB.js";
-import "../chunk-AEXACKDR.js";
+import "../chunk-MYBCXDIL.js";
+import "../chunk-WVP6UQG3.js";
 import "../chunk-QENTGE75.js";
 import {
   getApiKey,

package/dist/bin/pushary-transcript-register.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import {
   registerTranscript
-} from "../chunk-W6363YYZ.js";
+} from "../chunk-TN74MUMB.js";
 import "../chunk-QW3FRUFB.js";
-import "../chunk-Z7Q36I4K.js";
-import "../chunk-CUEUANIU.js";
-import "../chunk-QQYUWTYS.js";
+import "../chunk-QP3XPS5U.js";
+import "../chunk-KSVCCSAO.js";
+import "../chunk-ATUZX4K7.js";
 import "../chunk-ECJJKDP7.js";
-import "../chunk-YKYVDHIY.js";
+import "../chunk-QDFLBTUP.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-JSQOHMNJ.js";
 import "../chunk-N3NSWWNU.js";
@@ -16,12 +16,12 @@ import "../chunk-XHKBHWLX.js";
 import "../chunk-6ICPEJY5.js";
 import "../chunk-IRZ5FVWG.js";
 import "../chunk-QTCFEKLJ.js";
-import "../chunk-SQ5G6A6K.js";
+import "../chunk-IJ6XKKQW.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
 import "../chunk-7RZO6VWD.js";
-import "../chunk-TWLWDIFB.js";
-import "../chunk-AEXACKDR.js";
+import "../chunk-MYBCXDIL.js";
+import "../chunk-WVP6UQG3.js";
 import "../chunk-QENTGE75.js";
 import "../chunk-LVDC3RUE.js";
 import "../chunk-5SFM6XB4.js";

package/dist/bin/pushary-upgrade.js

@@ -1,42 +1,52 @@
 #!/usr/bin/env node
 import {
   FINISH_UPGRADE_FLAG,
+  describeUnreadyService,
   finishGlobalUpgrade,
   finishUpgradeWithLock,
+  forgetUnfinishedUpgrade,
   instructionsLeftNoteOf,
+  phoneStartFellShortWithoutFailing,
+  phoneStartServiceAfter,
   readGlobalUpgradeSubject,
+  recordUnfinishedUpgrade,
   refreshedPartsOf,
   runAutoUpdate,
+  serviceStaysOwedBack,
   upgradeFinishExitCode,
   upgradeFinishOutcome,
   upgradeInstalledPackage,
   wasRefreshed,
   withUpgradeLock
-} from "../chunk-RFAF3TOX.js";
+} from "../chunk-4JJ3T7IE.js";
 import {
   installWithUpgradeLock
-} from "../chunk-7OQ4AJC7.js";
+} from "../chunk-KIH5BDH5.js";
+import {
+  phoneStartFellShortLine
+} from "../chunk-FAGDOPQI.js";
 import {
   ensureCodexTrustAfterReapply,
   reapplyAllAgents
-} from "../chunk-IBSRULIY.js";
+} from "../chunk-XFUKCBPU.js";
 import {
   describeCodexTrustConfirmation
-} from "../chunk-4QD7VE4E.js";
+} from "../chunk-OHD35NPC.js";
+import "../chunk-CZULJ647.js";
 import {
   waitForMachineReadiness
-} from "../chunk-AN6TVB2H.js";
-import "../chunk-2NIRYGTK.js";
+} from "../chunk-CSQJCXPX.js";
+import "../chunk-UMVVQXAC.js";
 import {
   readMacAppAgentKey
-} from "../chunk-OLNBYAPI.js";
+} from "../chunk-T2BEIPK2.js";
 import {
   fxServerHolder,
   macAppFxBridge,
   retryAgentCommand
-} from "../chunk-NQDEMRAS.js";
-import "../chunk-JCMSISCC.js";
-import "../chunk-PZDMZ7LM.js";
+} from "../chunk-HUWLEVL2.js";
+import "../chunk-4LUPZ347.js";
+import "../chunk-T2AC5VFQ.js";
 import {
   exitOnHelpFlag
 } from "../chunk-M7NX25ZA.js";
@@ -45,7 +55,7 @@ import {
   expectedLaunchCapabilities,
   hasSpawnProvider,
   resolveControlPolicy
-} from "../chunk-DDQRYX2L.js";
+} from "../chunk-3KOPY2UQ.js";
 import "../chunk-LVWXRXT7.js";
 import "../chunk-VUFHYMSP.js";
 import {
@@ -57,11 +67,12 @@ import {
   parseAutoUpdateFlag,
   readAutoUpdateState,
   updateAutoUpdateState
-} from "../chunk-BAJ3A3BU.js";
-import "../chunk-UPFFO4F6.js";
+} from "../chunk-JZKEC4XJ.js";
+import "../chunk-XWY4UW62.js";
 import {
   DAEMON_COLD_START_TIMEOUT_MS,
   daemonHasRemoteProof,
+  daemonProcessIsThere,
   daemonServiceManagerAvailable,
   disableDaemonService,
   ensureDaemonRunning,
@@ -70,11 +81,11 @@ import {
   replaceDaemonService,
   stopDaemonService,
   waitForDaemonRemoteProof
-} from "../chunk-Z7Q36I4K.js";
-import "../chunk-CUEUANIU.js";
-import "../chunk-QQYUWTYS.js";
+} from "../chunk-QP3XPS5U.js";
+import "../chunk-KSVCCSAO.js";
+import "../chunk-ATUZX4K7.js";
 import "../chunk-ECJJKDP7.js";
-import "../chunk-YKYVDHIY.js";
+import "../chunk-QDFLBTUP.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-XHKBHWLX.js";
 import "../chunk-6ICPEJY5.js";
@@ -82,15 +93,15 @@ import {
   readControlMode,
   recordMacAppKeyPrefix
 } from "../chunk-IRZ5FVWG.js";
-import "../chunk-4YTFYILS.js";
+import "../chunk-RF74KBF5.js";
 import "../chunk-QTCFEKLJ.js";
 import "../chunk-XXNT4FGA.js";
-import "../chunk-6QM54CSJ.js";
-import "../chunk-A54W5A74.js";
+import "../chunk-DQ565WFA.js";
+import "../chunk-ZL3UR6M5.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-FBKVCODG.js";
-import "../chunk-HCIB4YNB.js";
-import "../chunk-SQ5G6A6K.js";
+import "../chunk-S54YLXWW.js";
+import "../chunk-5DZHKNBU.js";
+import "../chunk-IJ6XKKQW.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
@@ -104,13 +115,16 @@ import {
   fxMcpProfile,
   geminiSettings,
   pusharyDir,
+  serviceOwedBackMark,
   vscodePluginDir
-} from "../chunk-TWLWDIFB.js";
+} from "../chunk-MYBCXDIL.js";
 import {
   LATEST_TAG,
   fetchLatestPublishedVersion
-} from "../chunk-AEXACKDR.js";
-import "../chunk-QENTGE75.js";
+} from "../chunk-WVP6UQG3.js";
+import {
+  writeFileAtomic
+} from "../chunk-QENTGE75.js";
 import {
   getApiKey
 } from "../chunk-LVDC3RUE.js";
@@ -125,9 +139,26 @@ import {
 import "../chunk-GZL3KEPC.js";
 
 // bin/pushary-upgrade.ts
-import { existsSync } from "fs";
+import { existsSync as existsSync2 } from "fs";
 import { homedir } from "os";
 import { join } from "path";
+
+// src/service-owed-back.ts
+import { existsSync, mkdirSync, rmSync } from "fs";
+import { dirname } from "path";
+var MARK_MODE = 384;
+var serviceIsOwedBack = (markPath) => existsSync(markPath);
+var recordWhetherTheServiceIsOwedBack = (markPath, owed) => {
+  if (owed === serviceIsOwedBack(markPath)) return;
+  if (!owed) {
+    rmSync(markPath, { force: true });
+    return;
+  }
+  mkdirSync(dirname(markPath), { recursive: true });
+  writeFileAtomic(markPath, "", MARK_MODE);
+};
+
+// bin/pushary-upgrade.ts
 exitOnHelpFlag("upgrade");
 var fxWiredByCli = () => fxServerHolder(fxMcpProfile(), macAppFxBridge(pusharyDir())) === "cli";
 var detectInstallModes = () => {
@@ -135,32 +166,32 @@ var detectInstallModes = () => {
     {
       label: "Cursor plugin",
       upgrade: "updates itself through Cursor",
-      present: existsSync(cursorPluginDir())
+      present: existsSync2(cursorPluginDir())
     },
     {
       label: "VS Code plugin",
       upgrade: `${NPX_LATEST_COMMAND} setup --agents vscode`,
-      present: existsSync(vscodePluginDir())
+      present: existsSync2(vscodePluginDir())
     },
     {
       label: "Codex config",
       upgrade: `${NPX_LATEST_COMMAND} setup --agents codex`,
-      present: existsSync(codexConfigToml())
+      present: existsSync2(codexConfigToml())
     },
     {
       label: "Claude Code config",
       upgrade: `${NPX_LATEST_COMMAND} setup --agents claude_code`,
-      present: existsSync(claudeJson())
+      present: existsSync2(claudeJson())
     },
     {
       label: "Gemini config",
       upgrade: `${NPX_LATEST_COMMAND} setup --agents gemini_cli`,
-      present: existsSync(geminiSettings())
+      present: existsSync2(geminiSettings())
     },
     {
       label: "Hermes plugin (pip)",
       upgrade: `${NPX_LATEST_COMMAND} setup --agents hermes`,
-      present: existsSync(join(homedir(), ".hermes"))
+      present: existsSync2(join(homedir(), ".hermes"))
     },
     {
       label: "fx config",
@@ -191,6 +222,7 @@ var finishUpgrade = async () => {
   const configuredControlProviders = inspectedAgents.filter((agent) => agent.result.configured && (agent.id === "claude" || agent.id === "codex" || agent.id === "gemini")).map((agent) => agent.id);
   const controlMode = readControlMode();
   const daemonStatus = readDaemonStatus();
+  const serviceWasOwedBack = serviceIsOwedBack(serviceOwedBackMark());
   const serviceWasPresent = daemonStatus.kind !== "absent" || hasDaemonServiceDefinition();
   const controlCapabilities = detectProviderLiveCapabilities(configuredControlProviders);
   const controlPolicy = resolveControlPolicy({
@@ -199,6 +231,8 @@ var finishUpgrade = async () => {
     managerAvailable: daemonServiceManagerAvailable(),
     servicePresent: serviceWasPresent
   });
+  const serviceWasRunning = daemonProcessIsThere(daemonStatus) || serviceWasOwedBack;
+  const serviceStart = controlPolicy === "enabled" && apiKey ? await replaceBackgroundService(apiKey, configuredControlProviders, serviceWasRunning) : "not_tried";
   let daemonReady = true;
   let legacyStopFailure = null;
   if (controlPolicy === "disabled" && serviceWasPresent) {
@@ -208,20 +242,14 @@ var finishUpgrade = async () => {
     legacyStopFailure = stopped.kind === "ok" ? null : stopped.detail;
     daemonReady = false;
   } else if (controlPolicy === "enabled") {
-    if (!apiKey) {
-      daemonReady = false;
-    } else {
-      const service = await replaceDaemonService();
-      const daemon = service.kind === "ok" ? await ensureDaemonRunning({ spawnDaemon: () => {
-      }, waitTimeoutMs: DAEMON_COLD_START_TIMEOUT_MS }) : null;
-      const localProof = daemon?.kind === "running" || daemon?.kind === "started" ? await waitForDaemonRemoteProof() : null;
-      const serverProof = localProof && daemonHasRemoteProof(localProof) ? await waitForMachineReadiness(apiKey, expectedLaunchCapabilities(configuredControlProviders)) : null;
-      daemonReady = service.kind === "ok" && localProof !== null && daemonHasRemoteProof(localProof) && (serverProof?.kind === "ready" || serverProof?.kind === "unsupported");
-    }
+    daemonReady = serviceStart === "verified";
   } else if (controlMode === "on" && controlPolicy === "unsupported") {
     daemonReady = false;
   }
-  const finishOutcome = upgradeFinishOutcome({ controlMode, controlPolicy, daemonReady, failedRefreshCount: failedRefreshes.length });
+  const finishReadings = { controlMode, controlPolicy, daemonReady, serviceStart, serviceWasRunning, failedRefreshCount: failedRefreshes.length };
+  const finishOutcome = upgradeFinishOutcome(finishReadings);
+  recordWhetherTheServiceIsOwedBack(serviceOwedBackMark(), serviceStaysOwedBack(finishReadings, serviceWasOwedBack));
+  const phoneStartNote = phoneStartFellShortWithoutFailing(finishReadings) ? phoneStartFellShortLine(phoneStartServiceAfter(serviceStart)) : null;
   console.log();
   if (refreshed.length > 0) {
     console.log("Refreshed so this version is active now:");
@@ -250,20 +278,38 @@ var finishUpgrade = async () => {
     console.log(describeCodexTrustConfirmation(codexTrust));
   }
   console.log();
-  if (!daemonReady) {
-    console.error(controlPolicy === "disabled" ? "Upgrade installed, but the disabled background service could not be fully removed. Re-run setup with --control off." : controlPolicy === "legacy" ? legacyStopFailure ? `Upgrade installed, but the legacy background service could not be stopped: ${legacyStopFailure}. Run setup with --control off.` : "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." : controlPolicy === "enabled" && !apiKey ? "Upgrade installed, but phone-start could not be reconciled because no API key was readable. Re-run setup." : "Upgrade installed, but the background service did not start. Run: pushary daemon install");
+  if (!daemonReady && phoneStartNote === null) {
+    console.error(describeUnreadyService({ controlPolicy, legacyStopFailure, keyReadable: Boolean(apiKey), serviceStart }));
     process.exitCode = upgradeFinishExitCode(finishOutcome);
     return;
   }
   if (failedRefreshes.length > 0) {
+    if (phoneStartNote !== null) console.log(phoneStartNote);
     console.error(`Upgrade installed, but refreshing agent configuration failed for: ${failedRefreshes.map((agent) => agent.label).join(", ")}. Check the config files and run pushary upgrade again.`);
     process.exitCode = upgradeFinishExitCode(finishOutcome);
     return;
   }
-  console.log(controlPolicy === "disabled" ? "Done. Your hooks use the new global install; phone-start remains disabled." : controlPolicy === "unsupported" || controlPolicy === "preserve-absent" ? "Done. Your hooks use the new global install; no background service was added." : "Done. Your hooks and background service use the new global install.");
+  console.log(controlPolicy === "disabled" ? "Done. Your hooks use the new global install; phone-start remains disabled." : controlPolicy === "unsupported" || controlPolicy === "preserve-absent" ? "Done. Your hooks use the new global install; no background service was added." : phoneStartNote === null ? "Done. Your hooks and background service use the new global install." : "Done. Your hooks use the new global install.");
+  if (phoneStartNote !== null) console.log(phoneStartNote);
   console.log("Verify with: pushary doctor");
 };
-var INSTRUCTIONS_LEFT_HEADING = "Pushary instructions left as they were. Fix the file, then run pushary upgrade again:";
+var startBackgroundService = async (apiKey, providers) => {
+  const service = await replaceDaemonService();
+  if (service.kind !== "ok") return "did_not_start";
+  const daemon = await ensureDaemonRunning({ spawnDaemon: () => {
+  }, waitTimeoutMs: DAEMON_COLD_START_TIMEOUT_MS });
+  if (daemon.kind !== "running" && daemon.kind !== "started") return "did_not_start";
+  const localProof = await waitForDaemonRemoteProof();
+  if (localProof.kind !== "running") return "did_not_start";
+  if (!daemonHasRemoteProof(localProof)) return "started_unverified";
+  const serverProof = await waitForMachineReadiness(apiKey, expectedLaunchCapabilities(providers));
+  return serverProof.kind === "ready" || serverProof.kind === "unsupported" ? "verified" : "started_unverified";
+};
+var replaceBackgroundService = async (apiKey, providers, serviceWasRunning) => {
+  if (serviceWasRunning) recordWhetherTheServiceIsOwedBack(serviceOwedBackMark(), true);
+  return startBackgroundService(apiKey, providers);
+};
+var INSTRUCTIONS_LEFT_HEADING = "Pushary instructions left as they were. Fix the file and the next update refreshes them:";
 var KEPT_FOR_APP_HEADING = "Kept for the Pushary Mac app, which owns these agents. Nothing in their config was changed:";
 var AUTO_UPDATE_ON_MESSAGE = "Automatic updates are on. Pushary checks for a new version once a day, when an agent session starts.";
 var AUTO_UPDATE_OFF_MESSAGE = "Automatic updates are off. Turn them back on with: pushary upgrade --auto=on";
@@ -326,6 +372,7 @@ var reportNoGlobalInstall = () => {
   console.log();
   console.log("Check the result with: pushary doctor");
 };
+var upgradeRecordNow = () => ({ statePath: autoUpdateState(), installed: readGlobalUpgradeSubject(), at: (/* @__PURE__ */ new Date()).toISOString() });
 var upgradeSubject = async (subject) => {
   const outcome = await upgradeInstalledPackage(subject, {
     fetchLatest: (packageName) => fetchLatestPublishedVersion({ packageName }),
@@ -333,6 +380,8 @@ var upgradeSubject = async (subject) => {
     recordFinished: () => {
       updateAutoUpdateState(autoUpdateState(), { lastResult: "updated", detail: void 0, announced: false, finishAttempts: void 0 });
     },
+    recordUnfinished: (unfinished) => recordUnfinishedUpgrade(upgradeRecordNow(), unfinished),
+    forgetUnfinished: () => forgetUnfinishedUpgrade(upgradeRecordNow(), subject.version),
     announce: (line) => console.log(line),
     install: (packageName) => installWithUpgradeLock({ packageName, version: LATEST_TAG, timeoutMs: 12e4 }),
     finish: (installedSubject) => finishGlobalUpgrade(installedSubject)

package/dist/bin/pushary-wait.js

@@ -4,7 +4,7 @@ import {
 } from "../chunk-CVWG2N3Y.js";
 import {
   exitOnFailedSettingsRequest
-} from "../chunk-K45CFSYV.js";
+} from "../chunk-VLJ5C6IT.js";
 import "../chunk-4YNNAF53.js";
 import {
   createIo
@@ -16,9 +16,9 @@ import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
 import "../chunk-IRZ5FVWG.js";
-import "../chunk-FBKVCODG.js";
-import "../chunk-HCIB4YNB.js";
-import "../chunk-SQ5G6A6K.js";
+import "../chunk-S54YLXWW.js";
+import "../chunk-5DZHKNBU.js";
+import "../chunk-IJ6XKKQW.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
@@ -26,8 +26,8 @@ import {
   EXIT
 } from "../chunk-KZERVKTD.js";
 import "../chunk-7RZO6VWD.js";
-import "../chunk-TWLWDIFB.js";
-import "../chunk-AEXACKDR.js";
+import "../chunk-MYBCXDIL.js";
+import "../chunk-WVP6UQG3.js";
 import "../chunk-QENTGE75.js";
 import {
   getApiKey,

package/dist/bin/pushary.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import {
   installNetworkDefaults
-} from "../chunk-HCIB4YNB.js";
-import "../chunk-SQ5G6A6K.js";
+} from "../chunk-5DZHKNBU.js";
+import "../chunk-IJ6XKKQW.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-TWLWDIFB.js";
-import "../chunk-AEXACKDR.js";
+import "../chunk-MYBCXDIL.js";
+import "../chunk-WVP6UQG3.js";
 import "../chunk-QENTGE75.js";
 import "../chunk-LVDC3RUE.js";
 import {

package/dist/{chunk-DDQRYX2L.js → chunk-3KOPY2UQ.js}

@@ -13,7 +13,7 @@ import {
   resolvePackageVersionFromBinary,
   resolvePathBinary,
   resolvePathBinaryAsync
-} from "./chunk-AEXACKDR.js";
+} from "./chunk-WVP6UQG3.js";
 import {
   MANAGED_PROVIDERS
 } from "./chunk-GZL3KEPC.js";

package/dist/{chunk-ZU6L34DQ.js → chunk-3WNOO7BM.js}

@@ -1,14 +1,14 @@
 import {
   compatibleConfigFile,
   hasCompatibleHooks
-} from "./chunk-UPFFO4F6.js";
+} from "./chunk-XWY4UW62.js";
 import {
   pusharyHookExecutable
-} from "./chunk-CUEUANIU.js";
+} from "./chunk-KSVCCSAO.js";
 import {
   isProtectedByScope,
   registerHookEntry
-} from "./chunk-TWLWDIFB.js";
+} from "./chunk-MYBCXDIL.js";
 import {
   isRecord
 } from "./chunk-GZL3KEPC.js";

package/dist/{chunk-RFAF3TOX.js → chunk-4JJ3T7IE.js}

@@ -1,20 +1,24 @@
 import {
   claimUpgradeLock,
-  finishWithUpgradeLock,
   forkFinishWithUpgradeLock,
   installWithUpgradeLock,
   releaseAutoUpdateLock
-} from "./chunk-7OQ4AJC7.js";
+} from "./chunk-KIH5BDH5.js";
+import {
+  phoneStartIsRequired
+} from "./chunk-3KOPY2UQ.js";
 import {
   describeAutoUpdateCheck,
   globalInstallLocation,
   hasRetryableUpgradeFinish,
   hasSettledUpgradeFinish,
+  holdsUnfinishedFinish,
   nextFinishAttempt,
+  pendingAutoUpdateAnnouncement,
   readAutoUpdateState,
   updateAutoUpdateState,
   upgradeEntryFor
-} from "./chunk-BAJ3A3BU.js";
+} from "./chunk-JZKEC4XJ.js";
 import {
   EXIT
 } from "./chunk-KZERVKTD.js";
@@ -22,14 +26,14 @@ import {
   autoUpdateLock,
   autoUpdateLog,
   autoUpdateState
-} from "./chunk-TWLWDIFB.js";
+} from "./chunk-MYBCXDIL.js";
 import {
   execNpm,
   fetchLatestPublishedVersion,
   npmErrorMessage,
   readGlobalCliInstallAt,
   readGlobalPrefix
-} from "./chunk-AEXACKDR.js";
+} from "./chunk-WVP6UQG3.js";
 import {
   NPX_LATEST_COMMAND
 } from "./chunk-5SFM6XB4.js";
@@ -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-JCMSISCC.js → chunk-4LUPZ347.js}

@@ -1,6 +1,6 @@
 import {
   parseSseMessages
-} from "./chunk-A54W5A74.js";
+} from "./chunk-ZL3UR6M5.js";
 import {
   NPX_LATEST_COMMAND
 } from "./chunk-5SFM6XB4.js";