@abitat_reece/cli 0.1.1 → 0.1.3

package/dist/auth.js

@@ -1,6 +1,8 @@
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { setTimeout as delay } from "node:timers/promises";
+const DEFAULT_START_ATTEMPTS = 4;
+const DEFAULT_START_RETRY_DELAY_MS = 1000;
 export function defaultApiUrl(env) {
     return env.ABITAT_API_URL ?? "https://workspace.abitat.io";
 }
@@ -38,7 +40,10 @@ export async function deleteCliSession(configPath) {
 }
 export async function runLoginCommand(input) {
     const fetchFn = input.fetchFn ?? fetch;
-    const start = await startDeviceLogin(input.apiUrl, fetchFn);
+    const start = await startDeviceLogin(input.apiUrl, fetchFn, {
+        maxAttempts: input.maxStartAttempts ?? DEFAULT_START_ATTEMPTS,
+        retryDelayMs: input.startRetryDelayMs ?? DEFAULT_START_RETRY_DELAY_MS
+    });
     input.openUrl(new URL(start.verificationPath, input.apiUrl).toString());
     const maxPolls = input.maxPolls ?? 120;
     const pollIntervalMs = input.pollIntervalMs ?? 1000;
@@ -59,14 +64,34 @@ export async function runLoginCommand(input) {
     }
     throw new Error("Timed out waiting for browser login approval");
 }
-async function startDeviceLogin(apiUrl, fetchFn) {
-    const response = await fetchFn(`${trimTrailingSlash(apiUrl)}/api/cli/device-login/start`, {
-        method: "POST"
-    });
-    if (!response.ok) {
-        throw new Error(`Unable to start CLI login (${response.status})`);
+async function startDeviceLogin(apiUrl, fetchFn, options) {
+    let lastError;
+    const maxAttempts = Math.max(1, options.maxAttempts);
+    for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+        try {
+            const response = await fetchFn(`${trimTrailingSlash(apiUrl)}/api/cli/device-login/start`, {
+                method: "POST"
+            });
+            if (response.ok) {
+                return parseStartResponse(await response.json());
+            }
+            const error = new Error(`Unable to start CLI login (${response.status})`);
+            if (!isTransientHostedStatus(response.status) || attempt >= maxAttempts) {
+                throw error;
+            }
+            lastError = error;
+        }
+        catch (error) {
+            if (!isTransientFetchError(error) || attempt >= maxAttempts) {
+                throw error;
+            }
+            lastError = error;
+        }
+        if (options.retryDelayMs > 0) {
+            await delay(options.retryDelayMs);
+        }
     }
-    return parseStartResponse(await response.json());
+    throw lastError instanceof Error ? lastError : new Error("Unable to start CLI login");
 }
 async function pollDeviceLogin(apiUrl, deviceLoginId, fetchFn) {
     const response = await fetchFn(`${trimTrailingSlash(apiUrl)}/api/cli/device-login/poll`, {
@@ -78,16 +103,19 @@ async function pollDeviceLogin(apiUrl, deviceLoginId, fetchFn) {
         return { status: "pending" };
     }
     if (!response.ok) {
-        if (isTransientPollStatus(response.status)) {
+        if (isTransientHostedStatus(response.status)) {
             return { status: "pending" };
         }
         throw new Error(`Unable to poll CLI login (${response.status})`);
     }
     return parsePollResponse(await response.json());
 }
-function isTransientPollStatus(status) {
+function isTransientHostedStatus(status) {
     return status === 429 || status === 502 || status === 503 || status === 504;
 }
+function isTransientFetchError(error) {
+    return error instanceof TypeError;
+}
 function parseStartResponse(value) {
     const candidate = value;
     if (typeof candidate.code !== "string" ||

package/dist/iphone.js

@@ -1,3 +1,6 @@
+import { setTimeout as delay } from "node:timers/promises";
+const DEFAULT_HOST_REGISTER_ATTEMPTS = 4;
+const DEFAULT_HOST_REGISTER_RETRY_DELAY_MS = 1000;
 export function createIphoneStartupPlan(input) {
     return [
         {
@@ -12,28 +15,53 @@ export function createIphoneStartupPlan(input) {
             env: {
                 ABITAT_API_URL: input.apiUrl,
                 ABITAT_HOST_TOKEN: input.hostToken,
-                ABITAT_MACHINE_ID: input.machineId
+                ABITAT_MACHINE_ID: input.machineId,
+                CODEX_APP_SERVER_URL: input.codexServerUrl
             }
         }
     ];
 }
 export async function registerHost(input) {
     const fetchFn = input.fetchFn ?? fetch;
-    const response = await fetchFn(`${trimTrailingSlash(input.apiUrl)}/api/hosts/register`, {
-        method: "POST",
-        headers: {
-            authorization: `Bearer ${input.cliToken}`,
-            "content-type": "application/json"
-        },
-        body: JSON.stringify({
-            machineName: input.machineName,
-            platform: input.platform
-        })
-    });
-    if (!response.ok) {
-        throw new Error(`Unable to register host (${response.status})`);
+    let lastError;
+    const maxAttempts = Math.max(1, input.maxAttempts ?? DEFAULT_HOST_REGISTER_ATTEMPTS);
+    const retryDelayMs = input.retryDelayMs ?? DEFAULT_HOST_REGISTER_RETRY_DELAY_MS;
+    for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+        try {
+            const response = await fetchFn(`${trimTrailingSlash(input.apiUrl)}/api/hosts/register`, {
+                method: "POST",
+                headers: {
+                    authorization: `Bearer ${input.cliToken}`,
+                    "content-type": "application/json"
+                },
+                body: JSON.stringify({
+                    machineName: input.machineName,
+                    platform: input.platform
+                })
+            });
+            if (response.ok) {
+                return parseHostRegistration(await response.json());
+            }
+            const error = new Error(`Unable to register host (${response.status})`);
+            if (!isTransientHostedStatus(response.status) || attempt >= maxAttempts) {
+                throw error;
+            }
+            lastError = error;
+        }
+        catch (error) {
+            if (!isTransientFetchError(error) || attempt >= maxAttempts) {
+                throw error;
+            }
+            lastError = error;
+        }
+        if (retryDelayMs > 0) {
+            await delay(retryDelayMs);
+        }
     }
-    const body = (await response.json());
+    throw lastError instanceof Error ? lastError : new Error("Unable to register host");
+}
+function parseHostRegistration(value) {
+    const body = value;
     if (typeof body.machineId !== "string" ||
         typeof body.workspaceId !== "string" ||
         typeof body.hostToken !== "string") {
@@ -66,3 +94,9 @@ export async function prepareIphoneCommand(input) {
 function trimTrailingSlash(value) {
     return value.replace(/\/+$/u, "");
 }
+function isTransientHostedStatus(status) {
+    return status === 429 || status === 502 || status === 503 || status === 504;
+}
+function isTransientFetchError(error) {
+    return error instanceof TypeError;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@abitat_reece/cli",
   "private": false,
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Remote Codex control from Mac and iPhone",
   "type": "module",
   "bin": {
@@ -15,7 +15,7 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@abitat_reece/host-daemon": "0.1.1"
+    "@abitat_reece/host-daemon": "0.1.3"
   },
   "devDependencies": {
     "@types/node": "25.6.0",