@nomac/cli 0.13.0 → 0.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomac/cli",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "Cloud Mac sessions over SSH and HTTPS, plus iOS builds and publishing — built for agents.",
   "license": "UNLICENSED",
   "type": "module",

package/src/mac-transport.mjs

@@ -28,19 +28,26 @@ export function transportOptions(options = {}) {
   return { url, token, agent: proxy ? new HttpsProxyAgent(proxy) : undefined, ca: options.ca };
 }
 
-/** How long a busy guest is retried before guest_busy reaches the caller. */
-export const GUEST_BUSY_RETRY = { budgetMs: 75_000, pauseMs: 3_000 };
+/** How long a busy or briefly unreachable Mac is retried before the error reaches the caller. */
+export const GUEST_BUSY_RETRY = { budgetMs: 120_000, pauseMs: 3_000 };
+/**
+ * Passing failures: a saturated guest (a first Simulator boot answers slowly for a minute or
+ * two), a Mac whose network dropped for a moment (most nights at its provider, October 2026),
+ * an answer lost on the way, or the same request still starting (copies of it that waited out
+ * an outage reach the Mac together).
+ */
+const PASSING = new Set(["guest_busy", "host_unavailable", "outcome_unknown", "operation_pending"]);
 
 /**
- * A saturated guest (e.g. a first Simulator boot) answers slowly for a minute or
- * two. Guest operations are idempotent by job ID, request key and blob offset, so
- * only guest_busy is retried; every other failure is returned for reconciliation.
+ * Guest operations are idempotent by job ID, request key and blob offset (a job start always
+ * carries its request key), so passing failures are retried with the same request; every other
+ * failure is returned for reconciliation.
  */
 export function macRequest(method, path, options = {}) {
   const started = Date.now();
   // The first attempt runs synchronously, so invalid input still throws immediately.
   const attempt = () => macRequestOnce(method, path, options).catch(async error => {
-    if (error?.code !== "guest_busy" || Date.now() - started + GUEST_BUSY_RETRY.pauseMs + 15_000 > GUEST_BUSY_RETRY.budgetMs) throw error;
+    if (!PASSING.has(error?.code) || Date.now() - started + GUEST_BUSY_RETRY.pauseMs + 15_000 > GUEST_BUSY_RETRY.budgetMs) throw error;
     await new Promise(resolve => setTimeout(resolve, GUEST_BUSY_RETRY.pauseMs));
     return attempt();
   });

package/src/session-ssh.mjs

@@ -53,7 +53,8 @@ export function sshArgs(session, { batch = true } = {}) {
     ...(session.mode === "hosted" ? ["-F", "/dev/null", "-o", `UserKnownHostsFile=${session.knownHosts}`, "-o", "GlobalKnownHostsFile=/dev/null",
       "-o", `HostKeyAlias=nomac-${session.id}`, "-o", `ProxyCommand=${[process.execPath, cliEntry(), "tunnel", session.id].map(shellQuote).join(" ")}`] : []),
     "-o", "StrictHostKeyChecking=yes", "-o", "ForwardAgent=no",
-    "-o", "ConnectTimeout=15", "-o", "ServerAliveInterval=15", "-o", "ServerAliveCountMax=3",
+    // Two minutes of silence: a network drop at the Macs' provider pauses the stream until it resumes.
+    "-o", "ConnectTimeout=15", "-o", "ServerAliveInterval=15", "-o", "ServerAliveCountMax=8",
     ...multiplexArgs(session),
     ...(batch ? ["-o", "BatchMode=yes", "-o", "ClearAllForwardings=yes"] : []),
     ...(session.port ? ["-p", String(session.port)] : []),

package/src/ssh-config.mjs

@@ -52,7 +52,7 @@ export function sshConfigBlock(local, alias, project, { platform = process.platf
     `  ProxyCommand ${quoted(node)} ${quoted(bin)} tunnel ${local.id}`,
     "  ForwardAgent no",
     "  ServerAliveInterval 15",
-    "  ServerAliveCountMax 3",
+    "  ServerAliveCountMax 8",
     `${END} ${alias}`,
   ].join("\n");
 }