pushary 1.9.43 → 1.9.44

package/dist/bin/pushary-setup.js

@@ -1,36 +1,56 @@
 #!/usr/bin/env node
 import {
   runBrowserLogin
-} from "../chunk-F5ALKPNS.js";
+} from "../chunk-ALY7ZBNB.js";
 import {
   coworkOutput,
   coworkSelection
-} from "../chunk-JJWG7CBT.js";
+} from "../chunk-GBCR2FH2.js";
 import "../chunk-PUZZELE6.js";
 import {
   clearDeclinedAgent,
   declinedAgentForSetupChoice
-} from "../chunk-VIVLJK3T.js";
+} from "../chunk-7UM4NCUI.js";
 import {
   CURSOR_GATE_SCRIPT,
   describeVersionManagerPin,
+  saveSetupFailure,
   versionManagerOf
-} from "../chunk-EA5NWDK7.js";
+} from "../chunk-FYNMFSIZ.js";
 import {
   codexTrustOutcome,
   describeCodexTrustConfirmation,
   needsCodexTrustStep
-} from "../chunk-HC4DQXAT.js";
+} from "../chunk-MIBCRQWK.js";
+import {
+  describeWaitLadder
+} from "../chunk-CVWG2N3Y.js";
 import {
   writeStdoutFully
 } from "../chunk-EO23EUOK.js";
 import {
-  ensureCodexTrustsPusharyHooks
-} from "../chunk-TH74SUVV.js";
+  BROWSER_CONNECT_COMMAND,
+  confirmAppConnection,
+  connectDevice,
+  connectViaAppPairing,
+  describeRoundTripOutcome,
+  pairingEscapeApplies,
+  printConnectInstructions,
+  roundTripEvidence,
+  verifyRoundTrip,
+  waitForYourPhone
+} from "../chunk-KILK6SWZ.js";
+import "../chunk-3EGEA4KH.js";
 import {
   readManagedControlEvidence,
   waitForMachineReadiness
-} from "../chunk-LE2YVPAT.js";
+} from "../chunk-4WBAHVBK.js";
+import {
+  ensureCodexTrustsPusharyHooks
+} from "../chunk-E76QCZIA.js";
+import {
+  setHumanStream
+} from "../chunk-QCGNGEGE.js";
 import {
   describeSetupSideEffects,
   installAgentSkill,
@@ -44,7 +64,7 @@ import {
   soleGateFile,
   soleGateReceipt,
   soleGateReceiptFile
-} from "../chunk-ENGASUEL.js";
+} from "../chunk-FI2F5KZJ.js";
 import {
   HERMES_PIP_PACKAGE,
   describeDetection,
@@ -57,7 +77,11 @@ import {
   runHermesConfigScript,
   shortenHome,
   vscodeSettingsTargets
-} from "../chunk-ZORCUL3Z.js";
+} from "../chunk-HV4TEKNP.js";
+import {
+  mcpServerBearer,
+  readMacAppAgentKey
+} from "../chunk-LEHBWBCG.js";
 import {
   AgentConfigError,
   FX_PUSHARY_TOOLS_RULE,
@@ -82,64 +106,13 @@ import {
   retryAgentCommand,
   withFxPusharyServer,
   writeFxProfile,
-  writeInstructionBlock
-} from "../chunk-VGPEXMYM.js";
+  writeInstructionBlock,
+  writeSetupConfigFile,
+  writeSetupConfigJson
+} from "../chunk-RGBTKOCC.js";
 import {
   MCP_BRIDGE_BINARY
-} from "../chunk-LOUZNXTJ.js";
-import {
-  checkCodexInstall,
-  detectProviderLiveCapabilities,
-  expectedLaunchCapabilities,
-  hasSpawnProvider,
-  nodeCodexInstallProbe,
-  resolveControlPolicy
-} from "../chunk-NV2LARV4.js";
-import {
-  detectClaudeVersion
-} from "../chunk-RIVNNBEK.js";
-import {
-  describeAutoUpdateAnnouncement,
-  takeAutoUpdateAnnouncement
-} from "../chunk-H64CU2VB.js";
-import {
-  DAEMON_COLD_START_TIMEOUT_MS,
-  clearDaemonNeedsLogin,
-  daemonHasRemoteProof,
-  daemonServiceDefinitionPath,
-  daemonServiceManagerAvailable,
-  disableDaemonService,
-  ensureDaemonRunning,
-  hasDaemonServiceDefinition,
-  readDaemonStatus,
-  replaceDaemonService,
-  stopDaemonService,
-  waitForDaemonRemoteProof
-} from "../chunk-SCYAXV7U.js";
-import {
-  transcriptPreferenceForSetup
-} from "../chunk-VQL62ECJ.js";
-import "../chunk-XHKBHWLX.js";
-import {
-  BROWSER_CONNECT_COMMAND,
-  confirmAppConnection,
-  connectDevice,
-  connectViaAppPairing,
-  describeRoundTripOutcome,
-  pairingEscapeApplies,
-  printConnectInstructions,
-  roundTripEvidence,
-  verifyRoundTrip,
-  waitForYourPhone
-} from "../chunk-C6QBNBL4.js";
-import "../chunk-3EGEA4KH.js";
-import {
-  setHumanStream
-} from "../chunk-QCGNGEGE.js";
-import {
-  mcpServerBearer,
-  readMacAppAgentKey
-} from "../chunk-F7SZ2RCK.js";
+} from "../chunk-TWATOPHK.js";
 import {
   OPENCODE_HOOK_BINARY,
   addOpenCodeMcpServer,
@@ -155,12 +128,16 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   openCodeWired
-} from "../chunk-O4SYJVAF.js";
+} from "../chunk-UZVF6MP2.js";
 import {
   ansiPainter,
   createIo,
   useColor
 } from "../chunk-FO3MDD26.js";
+import {
+  describeAutoUpdateAnnouncement,
+  takeAutoUpdateAnnouncement
+} from "../chunk-3IRC3XFG.js";
 import {
   addClaudeMcpServer,
   addCompatibleHooks,
@@ -179,7 +156,21 @@ import {
   hasCompatibleHooks,
   isClaudeMcpSnapshot,
   updateClaudeMcpSnapshot
-} from "../chunk-V5SUKRRI.js";
+} from "../chunk-FKDZU6YX.js";
+import {
+  DAEMON_COLD_START_TIMEOUT_MS,
+  clearDaemonNeedsLogin,
+  daemonHasRemoteProof,
+  daemonServiceDefinitionPath,
+  daemonServiceManagerAvailable,
+  disableDaemonService,
+  ensureDaemonRunning,
+  hasDaemonServiceDefinition,
+  readDaemonStatus,
+  replaceDaemonService,
+  stopDaemonService,
+  waitForDaemonRemoteProof
+} from "../chunk-W2TA4EVZ.js";
 import {
   KEEP_HINT,
   captureHookTakeover,
@@ -191,25 +182,25 @@ import {
   geminiWired,
   planHooks,
   pusharyHookExecutable
-} from "../chunk-PIZ65U3D.js";
+} from "../chunk-T4CKP47U.js";
 import {
   GEMINI_HOOK_BINARY,
   GEMINI_HOOK_EVENTS,
   addGeminiHooks,
   addGeminiMcpServer
-} from "../chunk-IMD5FN6Y.js";
+} from "../chunk-SI2NC6UU.js";
 import {
   AGENT_CHOICES,
   effectiveControlMode,
   effectiveVerify,
   parseSetupOptions
-} from "../chunk-Q7CUTGT4.js";
-import "../chunk-55FB6OSG.js";
+} from "../chunk-6EV3B5CD.js";
+import "../chunk-OSMNLNPF.js";
 import "../chunk-GMXKITVA.js";
 import {
-  compareVersion,
-  parseVersion
-} from "../chunk-6ICPEJY5.js";
+  transcriptPreferenceForSetup
+} from "../chunk-WBD7HZEZ.js";
+import "../chunk-XHKBHWLX.js";
 import {
   KEY_FILE_MODE,
   exportLine,
@@ -222,28 +213,44 @@ import {
   recordMacAppKeyPrefix,
   resolveShellRc,
   writeKey
-} from "../chunk-C3RVRTHS.js";
+} from "../chunk-TJZUQRMH.js";
+import {
+  checkCodexInstall,
+  detectProviderLiveCapabilities,
+  expectedLaunchCapabilities,
+  hasSpawnProvider,
+  nodeCodexInstallProbe,
+  resolveControlPolicy
+} from "../chunk-L2ZM7LXN.js";
+import {
+  detectClaudeVersion
+} from "../chunk-RIVNNBEK.js";
+import {
+  compareVersion,
+  parseVersion
+} from "../chunk-6ICPEJY5.js";
 import {
   reportEvent
-} from "../chunk-YRE6GUFZ.js";
-import "../chunk-O7ADPLBF.js";
-import "../chunk-4T2TGP4T.js";
+} from "../chunk-BKK3JCTD.js";
+import "../chunk-CAJCCQ7N.js";
+import "../chunk-5ZSBQHCM.js";
+import "../chunk-M2L7625S.js";
+import "../chunk-GOEIW2VH.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-53KLSE2F.js";
+import "../chunk-53UZN7JW.js";
 import {
   checkApiKey,
   describeKeyCheck,
   samePusharyAccount
-} from "../chunk-C54VJJ37.js";
-import "../chunk-H6V5S52A.js";
-import "../chunk-W3BO56VE.js";
+} from "../chunk-TKTS3SIM.js";
+import "../chunk-S2ALW446.js";
+import "../chunk-WMO2XVG4.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-LAAOHBLO.js";
 import {
   NpmMissingError,
   addCodexHookTrust,
@@ -288,18 +295,18 @@ import {
   resolveGlobalBinary,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-S3OWTQ6Z.js";
+} from "../chunk-4JHEZ2PV.js";
 import {
   backupFile,
-  readJsonSafe,
-  writeFileAtomic,
-  writeJsonAtomic
+  readJsonSafe
 } from "../chunk-AQFEP65J.js";
-import "../chunk-GTOBOC6M.js";
+import {
+  getBaseUrl
+} from "../chunk-OWQOMGBF.js";
 import {
   NPX_LATEST_COMMAND,
   renderCommandHelp
-} from "../chunk-LDCRV6HG.js";
+} from "../chunk-T3KMJI4W.js";
 import {
   HOOK_COMPATIBLE_PROFILES,
   PRETOOLUSE_GATED_TOOLS,
@@ -307,13 +314,15 @@ import {
   computerOsOfPlatform,
   getPackageVersion,
   hookCompatibleProfile,
+  isApprovalMode,
   isComputerAgent,
   isNewerVersion,
   isRecord,
+  isTimeoutAction,
   isValidApiKey,
   launchedPackage,
   ownPackageName
-} from "../chunk-RXXKFM22.js";
+} from "../chunk-JNU3LV47.js";
 
 // bin/pushary-setup.ts
 import { existsSync, readFileSync, writeFileSync, mkdirSync, cpSync, rmSync, renameSync, realpathSync, statSync, openSync, readSync, closeSync } from "fs";
@@ -622,6 +631,39 @@ var planPhoneCheck = (context) => {
   return "connect";
 };
 
+// src/setup/wait-guidance.ts
+var UNAVAILABLE = "Approval settings unavailable. Run pushary wait before stepping away.";
+var isPolicyRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var isWaitSeconds = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0;
+var setupWaitGuidance = (value) => {
+  if (!isPolicyRecord(value) || !Array.isArray(value.policies)) return UNAVAILABLE;
+  if (value.modeOverride != null && !isApprovalMode(value.modeOverride)) return UNAVAILABLE;
+  const rule = value.policies.find((row) => isPolicyRecord(row) && row.tool === "*") ?? {
+    mode: value.defaultMode,
+    pushFirstSeconds: value.defaultPushFirstSeconds,
+    timeoutSeconds: value.defaultTimeoutSeconds,
+    timeoutAction: value.defaultTimeoutAction
+  };
+  if (!isPolicyRecord(rule) || !isApprovalMode(rule.mode) || !isTimeoutAction(rule.timeoutAction) || !isWaitSeconds(rule.pushFirstSeconds) || !isWaitSeconds(rule.timeoutSeconds)) return UNAVAILABLE;
+  const mode = value.modeOverride ?? rule.mode;
+  if (!isApprovalMode(mode)) return UNAVAILABLE;
+  let behavior = describeWaitLadder({ tool: "*", mode, pushFirstSeconds: rule.pushFirstSeconds, timeoutSeconds: rule.timeoutSeconds, timeoutAction: rule.timeoutAction });
+  if (rule.timeoutSeconds === 0 && rule.timeoutAction === "approve") behavior = "auto-approve";
+  if (rule.timeoutSeconds === 0 && rule.timeoutAction === "deny") behavior = "auto-deny";
+  return `Workspace default: ${behavior}. Agent, repository and tool rules can differ. Run pushary wait to inspect the rules.`;
+};
+var fetchSetupWaitGuidance = async (apiKey) => {
+  try {
+    const response = await fetch(`${getBaseUrl()}/api/mcp/policy`, {
+      headers: { Authorization: `Bearer ${apiKey}` },
+      signal: AbortSignal.timeout(5e3)
+    });
+    return response.ok ? setupWaitGuidance(await response.json()) : UNAVAILABLE;
+  } catch {
+    return UNAVAILABLE;
+  }
+};
+
 // src/setup/closing.ts
 var ACTIVITY_URL = "pushary.com/dashboard/agent/activity";
 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`;
@@ -653,6 +695,7 @@ var SURFACE_COLUMN = Math.max(...COMMAND_SURFACE.map((entry) => entry.command.le
 var renderCommandSurface = () => COMMAND_SURFACE.map((entry) => `${entry.command.padEnd(SURFACE_COLUMN)}${entry.summary}`);
 var nextSteps = (facts, reachable) => {
   const lines = ["Delivery follows the current approval mode, recipient rules and presence. pushary mode status shows the workspace setting.", facts.managedControlReady === true ? "Phone-start and steering: local and server checks passed just now. Recheck after sleep or network changes." : "Phone-start and steering: unverified. Run pushary doctor to check the provider, background service and server route."];
+  lines.push("Before stepping away, run pushary wait to see how long phone approvals wait and what happens if you do not answer.");
   if (facts.staleEnvironmentKey) {
     lines.push("Open a new terminal or unset PUSHARY_API_KEY, then run pushary doctor before starting an agent.");
   }
@@ -689,6 +732,7 @@ var describeClosing = (facts) => {
       headline: `Setup finished with ${count} problem${count === 1 ? "" : "s"}.`,
       next: [
         ...nextSteps(facts, reachable),
+        "For support: pushary doctor --bundle creates a redacted diagnostic with the last setup failure. Review it before sharing.",
         "",
         `Approvals: ${ACTIVITY_URL}`
       ],
@@ -732,6 +776,7 @@ var describeClosing = (facts) => {
       ok: false,
       headline: "Agents configured. Phone delivery is unverified.",
       next: [
+        "Your agent configuration is saved. Once your phone is connected, run pushary doctor --roundtrip to finish verification without reinstalling.",
         "Approval routing depends on your mode, presence and recipients. Check the phone and its notification settings.",
         "",
         ...nextSteps(facts, false)
@@ -911,7 +956,16 @@ var recordCodexTrust = (outcome) => {
 var emitted = false;
 var SETUP_COMPLETED_EVENT = "agent_setup_completed";
 var SETUP_AGENT_TYPE = "setup";
-var defaultDeps = { report: reportEvent };
+var defaultDeps = {
+  report: async (event, options) => {
+    try {
+      saveSetupFailure({ ...event });
+    } catch {
+      process.stderr.write("[pushary] Could not save the local setup diagnostic. Keep the setup output for support.\n");
+    }
+    return reportEvent(event, options);
+  }
+};
 var completeBeacon = (run) => ({
   ...run,
   codexTrust: recordedCodexTrust,
@@ -1090,9 +1144,7 @@ var readAgentJson = (filePath) => {
   );
 };
 var writeJson = (filePath, data) => {
-  const dir = dirname2(filePath);
-  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-  writeFileSync(filePath, JSON.stringify(data, null, 2) + "\n", "utf-8");
+  writeSetupConfigJson(filePath, data);
 };
 var readAgentToml = (filePath) => {
   let raw;
@@ -1202,7 +1254,7 @@ var setupClaudeCode = async (apiKey) => {
     }
     mcpSnapshot = updateClaudeMcpSnapshot(mcpReceipt.value, apiKey);
   }
-  writeJsonAtomic(CLAUDE_MCP_RECEIPT, mcpSnapshot, 384);
+  writeSetupConfigJson(CLAUDE_MCP_RECEIPT, mcpSnapshot, 384);
   await spinner("Adding MCP server (type: http)", async () => {
     addClaudeMcpServer(claudeJson2, apiKey);
   });
@@ -1213,10 +1265,10 @@ var setupClaudeCode = async (apiKey) => {
     addPusharyHooks(settings, resolveGlobalBinDir("pushary-hook"), detectClaudeVersion());
   });
   await spinner(`Writing ${CLAUDE_JSON}`, async () => {
-    writeJsonAtomic(CLAUDE_JSON, claudeJson2, 384);
+    writeSetupConfigJson(CLAUDE_JSON, claudeJson2, 384);
   });
   await spinner(`Writing ${CLAUDE_SETTINGS}`, async () => {
-    writeJsonAtomic(CLAUDE_SETTINGS, settings);
+    writeSetupConfigJson(CLAUDE_SETTINGS, settings);
   });
   await installSkill("claude-code", CLAUDE_SKILL_DIR);
   console.log();
@@ -1388,7 +1440,7 @@ var removeCodexNotifyEntry = (codexConfig) => {
   } else {
     config.notify = filtered;
   }
-  writeFileSync(codexConfig, stringifyTOML(config), "utf-8");
+  writeSetupConfigFile(codexConfig, stringifyTOML(config), KEY_FILE_MODE);
 };
 var addCodexNotifyEntry = (codexConfig) => {
   const pusharyCodexPath = resolveGlobalBinary("pushary-codex") ?? "pushary-codex";
@@ -1402,7 +1454,7 @@ var addCodexNotifyEntry = (codexConfig) => {
   if (!notify.some((n) => typeof n === "string" && n.includes("pushary-codex"))) {
     notify.push(pusharyCodexPath);
     config.notify = notify;
-    writeFileSync(codexConfig, stringifyTOML(config), "utf-8");
+    writeSetupConfigFile(codexConfig, stringifyTOML(config), KEY_FILE_MODE);
   }
 };
 var confirmCodexTrust = async () => {
@@ -1443,7 +1495,7 @@ var setupCodex = async (apiKey) => {
   await spinner("Adding Pushary MCP server (key embedded, auto-allowed)", async () => {
     const config = readAgentToml(codexConfig);
     addCodexMcpServer(config, apiKey);
-    writeFileAtomic(codexConfig, stringifyTOML(config), KEY_FILE_MODE);
+    writeSetupConfigFile(codexConfig, stringifyTOML(config), KEY_FILE_MODE);
   });
   const codexVersion = detectCodexVersion();
   const hooksSupported = codexSupportsHooks(codexVersion);
@@ -1468,7 +1520,7 @@ var setupCodex = async (apiKey) => {
       const config = raw ? parseTOML(raw) : {};
       dropVacatedCodexHookTrust(config, CODEX_HOOKS_JSON, vacated);
       addCodexHookTrust(config, CODEX_HOOKS_JSON, hookCommand, hookPositions);
-      writeFileSync(codexConfig, stringifyTOML(config), "utf-8");
+      writeSetupConfigFile(codexConfig, stringifyTOML(config), KEY_FILE_MODE);
       portedTrustWritten = true;
     }, { optional: true });
     await spinner("Removing legacy notify handler", async () => {
@@ -1632,7 +1684,7 @@ var setupCursor = async (apiKey) => {
     if (servers.pushary) {
       servers.pushary.headers = { ...servers.pushary.headers, Authorization: `Bearer ${apiKey}` };
       mcp.mcpServers = servers;
-      writeJsonAtomic(mcpPath, mcp, KEY_FILE_MODE);
+      writeSetupConfigJson(mcpPath, mcp, KEY_FILE_MODE);
     }
   });
   await spinner("Registering permission gate (~/.cursor/hooks.json)", async () => {
@@ -1676,7 +1728,7 @@ var registerVsCodePlugin = (pluginDir) => {
     }
     if (current !== null) backupFile(settingsPath);
     mkdirSync(dirname2(settingsPath), { recursive: true });
-    writeFileAtomic(settingsPath, result.content);
+    writeSetupConfigFile(settingsPath, result.content);
     written.push(settingsPath);
   }
   return { written, manual };
@@ -1721,7 +1773,7 @@ var setupVsCode = async (apiKey) => {
     if (servers.pushary) {
       servers.pushary.headers = { ...servers.pushary.headers, Authorization: `Bearer ${apiKey}` };
       mcp.mcpServers = servers;
-      writeJsonAtomic(mcpPath, mcp, KEY_FILE_MODE);
+      writeSetupConfigJson(mcpPath, mcp, KEY_FILE_MODE);
     }
     pinGuardedVsCodeGate(VSCODE_PLUGIN_DIR);
   });
@@ -1921,7 +1973,7 @@ var setupGemini = async (apiKey) => {
     addGeminiHooks(settings, guardBinary(resolveGlobalBinary(GEMINI_HOOK_BINARY) ?? GEMINI_HOOK_BINARY));
   });
   await spinner(`Writing ${GEMINI_SETTINGS}`, async () => {
-    writeJsonAtomic(GEMINI_SETTINGS, settings, KEY_FILE_MODE);
+    writeSetupConfigJson(GEMINI_SETTINGS, settings, KEY_FILE_MODE);
   });
   await spinner("Teaching Gemini to ask via push (~/.gemini/GEMINI.md)", async () => {
     writeInstructionBlock(GEMINI_MD, renderAgentInstructions("Gemini"));
@@ -1953,7 +2005,7 @@ var setupOpenCode = async (apiKey) => {
   await spinner(`Adding MCP server (${openCodeConfigFile()})`, async () => {
     const config = readAgentJson(openCodeConfigFile());
     addOpenCodeMcpServer(config, apiKey);
-    writeJsonAtomic(openCodeConfigFile(), config, KEY_FILE_MODE);
+    writeSetupConfigJson(openCodeConfigFile(), config, KEY_FILE_MODE);
   });
   await spinner("Teaching OpenCode to ask via push", async () => {
     writeInstructionBlock(OPENCODE_INSTRUCTIONS(), renderAgentInstructions("OpenCode"));
@@ -2027,7 +2079,7 @@ var captureTakeoverReceipt = (agent) => {
     } : {},
     ...mcp ? { mcpServer: captureMcpServer(mcp[0], mcp[1]) } : {}
   };
-  writeJsonAtomic(hookTakeoverReceipt(agent), receipt, 384);
+  writeSetupConfigJson(hookTakeoverReceipt(agent), receipt, 384);
 };
 var agentIsWired = (agent) => {
   const readJson2 = (path) => {
@@ -2149,8 +2201,8 @@ var setupCompatibleAgent = (profile) => async (apiKey) => {
   }
   for (const [path, document] of documents) {
     await spinner(`Writing ${shortenHome(path)}`, async () => {
-      if (document.format === "toml") writeFileAtomic(path, stringifyTOML(document.value), KEY_FILE_MODE);
-      else writeJsonAtomic(path, document.value, KEY_FILE_MODE);
+      if (document.format === "toml") writeSetupConfigFile(path, stringifyTOML(document.value), KEY_FILE_MODE);
+      else writeSetupConfigJson(path, document.value, KEY_FILE_MODE);
     });
   }
   if (instructionsFile && profile.instructions) {
@@ -2164,8 +2216,8 @@ var setupCompatibleAgent = (profile) => async (apiKey) => {
   const soleGateClaim = gate && settings ? claimSoleGate(settings, gate) : null;
   if (gate && settingsPath && settings && soleGateClaim?.kind === "claimed") {
     await spinner(`Making Pushary the only gate (${shortenHome(settingsPath)})`, async () => {
-      writeJsonAtomic(soleGateReceiptFile(gate), soleGateReceipt(gate), KEY_FILE_MODE);
-      writeJsonAtomic(settingsPath, settings);
+      writeSetupConfigJson(soleGateReceiptFile(gate), soleGateReceipt(gate), KEY_FILE_MODE);
+      writeSetupConfigJson(settingsPath, settings);
     });
   }
   console.log();
@@ -2780,6 +2832,7 @@ var main = async () => {
     }
   }
   markStep("connect-phone");
+  if (keyCheck.kind === "ok") console.log(`  ${dim(await fetchSetupWaitGuidance(trimmedKey))}`);
   const skipPhone = options.skipPhone;
   let phone = null;
   const verifyMode = effectiveVerify(options, { paired: keyFromPairing });

package/dist/bin/pushary-stats.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import {
   readLedgerSummary
-} from "../chunk-Y3N3SYBX.js";
+} from "../chunk-GRAPJKDK.js";
 import {
   exitOnHelpFlag
-} from "../chunk-XLHFWG2E.js";
+} from "../chunk-OR6KJOHE.js";
 import "../chunk-KZERVKTD.js";
 import {
   getApiKey
-} from "../chunk-GTOBOC6M.js";
-import "../chunk-LDCRV6HG.js";
-import "../chunk-RXXKFM22.js";
+} from "../chunk-OWQOMGBF.js";
+import "../chunk-T3KMJI4W.js";
+import "../chunk-JNU3LV47.js";
 
 // bin/pushary-stats.ts
 exitOnHelpFlag("stats");

package/dist/bin/pushary-status.js

@@ -1,71 +1,72 @@
 #!/usr/bin/env node
-import {
-  describeLastSeen,
-  listMachines
-} from "../chunk-LE2YVPAT.js";
-import "../chunk-NV2LARV4.js";
-import "../chunk-RIVNNBEK.js";
-import "../chunk-SCYAXV7U.js";
-import "../chunk-XHKBHWLX.js";
 import {
   describeReach,
   fetchChannels,
   reachVerdict
-} from "../chunk-C6QBNBL4.js";
+} from "../chunk-KILK6SWZ.js";
 import "../chunk-3EGEA4KH.js";
+import {
+  describeLastSeen,
+  listMachines
+} from "../chunk-4WBAHVBK.js";
 import "../chunk-QCGNGEGE.js";
 import {
   CONNECTED_THROUGH_MAC_APP,
   readMacAppConnectionWhenKeyless
-} from "../chunk-F7SZ2RCK.js";
+} from "../chunk-LEHBWBCG.js";
 import {
   SIGNED_OUT_ON_MAC_MESSAGE,
   activeKeyVerdictOf,
   describeSignedOutKey,
   readSignedOutDiagnosis
-} from "../chunk-JB4JCGRW.js";
-import "../chunk-O4SYJVAF.js";
+} from "../chunk-42CVAOC5.js";
+import "../chunk-UZVF6MP2.js";
 import {
   createIo
 } from "../chunk-FO3MDD26.js";
-import {
-  exitOnHelpFlag
-} from "../chunk-XLHFWG2E.js";
-import "../chunk-V5SUKRRI.js";
-import "../chunk-PIZ65U3D.js";
-import "../chunk-IMD5FN6Y.js";
-import "../chunk-Q7CUTGT4.js";
-import "../chunk-55FB6OSG.js";
+import "../chunk-FKDZU6YX.js";
+import "../chunk-W2TA4EVZ.js";
+import "../chunk-T4CKP47U.js";
+import "../chunk-SI2NC6UU.js";
+import "../chunk-6EV3B5CD.js";
+import "../chunk-OSMNLNPF.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
-import "../chunk-6ICPEJY5.js";
+import "../chunk-XHKBHWLX.js";
 import {
   readKeySource
-} from "../chunk-C3RVRTHS.js";
-import "../chunk-YRE6GUFZ.js";
-import "../chunk-O7ADPLBF.js";
-import "../chunk-4T2TGP4T.js";
+} from "../chunk-TJZUQRMH.js";
+import {
+  exitOnHelpFlag
+} from "../chunk-OR6KJOHE.js";
+import "../chunk-L2ZM7LXN.js";
+import "../chunk-RIVNNBEK.js";
+import "../chunk-6ICPEJY5.js";
+import "../chunk-BKK3JCTD.js";
+import "../chunk-CAJCCQ7N.js";
+import "../chunk-5ZSBQHCM.js";
+import "../chunk-M2L7625S.js";
+import "../chunk-GOEIW2VH.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-53KLSE2F.js";
+import "../chunk-53UZN7JW.js";
 import {
   checkApiKey,
   describeKeyCheck
-} from "../chunk-C54VJJ37.js";
-import "../chunk-H6V5S52A.js";
-import "../chunk-W3BO56VE.js";
+} from "../chunk-TKTS3SIM.js";
+import "../chunk-S2ALW446.js";
+import "../chunk-WMO2XVG4.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-LAAOHBLO.js";
-import "../chunk-S3OWTQ6Z.js";
+import "../chunk-4JHEZ2PV.js";
 import "../chunk-AQFEP65J.js";
-import "../chunk-GTOBOC6M.js";
-import "../chunk-LDCRV6HG.js";
-import "../chunk-RXXKFM22.js";
+import "../chunk-OWQOMGBF.js";
+import "../chunk-T3KMJI4W.js";
+import "../chunk-JNU3LV47.js";
 
 // src/status.ts
 var SIGNED_OUT_LINE = { label: "Server", value: "key signed out on this Mac", ok: false };