omnara 0.5.0 → 0.5.2

package/dist/cli.js

@@ -158,6 +158,7 @@ import { simpleGit as simpleGit2 } from "simple-git";
 import {
   query as query2
 } from "@anthropic-ai/claude-agent-sdk";
+import { setTimeout as delay } from "node:timers/promises";
 
 // src/utils/logger.ts
 import path from "path";
@@ -442,6 +443,16 @@ function extractErrorMessage(error) {
   return String(error);
 }
 
+// src/utils/backoff.ts
+var INITIAL_RETRY_DELAY_MS = 1e3;
+var MAX_RETRY_DELAY_MS = 3e4;
+function calculateBackoff(currentDelayMs) {
+  let nextDelay = currentDelayMs * 2;
+  const jitterRange = nextDelay * 0.25;
+  nextDelay = nextDelay - jitterRange + Math.random() * jitterRange * 2;
+  return Math.min(nextDelay, MAX_RETRY_DELAY_MS);
+}
+
 // src/orchestrator/utils/envelope-utils.ts
 import { randomUUID } from "crypto";
 function createEnvelope(sessionId, content, senderId, metadata, payloadMetadata) {
@@ -629,6 +640,7 @@ function buildAgentCompletionMessage(resultText, summary, errorText) {
 }
 
 // src/orchestrator/session.ts
+var MAX_GENERATION_RETRIES = 6;
 var Session = class {
   constructor(id, ai, options = {}) {
     this.id = id;
@@ -653,6 +665,8 @@ var Session = class {
   announced = false;
   shouldSummarize = false;
   conversationHistory = [];
+  retryDelayMs = INITIAL_RETRY_DELAY_MS;
+  retryCount = 0;
   sessionInitControl;
   enqueue(message) {
     this.queue.push(message);
@@ -727,6 +741,7 @@ var Session = class {
           await this.dispatchEnvelope(envelope);
         }
       }
+      this.resetRetryState();
       const complete = await this.buildCompletionEnvelope(resultMessage, summaryTextBlocks);
       await Promise.all([
         this.emitProgress("idle", "Ready for next message"),
@@ -738,14 +753,42 @@ var Session = class {
         sessionId: this.id,
         pendingMessages: this.queue.length
       });
-      if (this.queue.length > 0) {
-        this.startGenerate();
-      }
     }
   }
   startGenerate() {
-    void this.generate().catch((error) => {
-      logger.error("[Session] Generation failed", { sessionId: this.id, error });
+    void this.generate().then(() => {
+      if (this.queue.length > 0) {
+        this.startGenerate();
+      }
+    }).catch(async (error) => {
+      this.retryCount++;
+      logger.error("[Session] Generation failed", {
+        sessionId: this.id,
+        error,
+        attempt: this.retryCount,
+        maxRetries: MAX_GENERATION_RETRIES
+      });
+      if (this.retryCount < MAX_GENERATION_RETRIES && this.queue.length > 0) {
+        logger.info(
+          `[Session] Retrying in ${Math.round(this.retryDelayMs / 1e3)}s (attempt ${this.retryCount}/${MAX_GENERATION_RETRIES})`,
+          { sessionId: this.id }
+        );
+        await delay(this.retryDelayMs);
+        this.retryDelayMs = calculateBackoff(this.retryDelayMs);
+        this.startGenerate();
+      } else if (this.queue.length > 0) {
+        logger.error(
+          `[Session] Max retries (${MAX_GENERATION_RETRIES}) reached, sending error to client`,
+          { sessionId: this.id }
+        );
+        const errorEnvelope = this.buildErrorCompletionEnvelope(error);
+        this.queue = [];
+        await Promise.all([
+          this.emitProgress("error", "Generation failed"),
+          this.dispatchEnvelope(errorEnvelope)
+        ]);
+        this.resetRetryState();
+      }
     });
   }
   captureSdkSessionId(message) {
@@ -795,6 +838,26 @@ var Session = class {
     };
     return createEnvelope(this.id, content, this.id);
   }
+  buildErrorCompletionEnvelope(error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    const content = {
+      type: "agent_complete",
+      success: false,
+      duration_ms: null,
+      cost_usd: null,
+      message: `Generation failed after ${this.retryCount} retries: ${errorMessage}`,
+      metadata: {
+        agent_session_id: this.id,
+        error: errorMessage,
+        retries: this.retryCount
+      }
+    };
+    return createEnvelope(this.id, content, this.id);
+  }
+  resetRetryState() {
+    this.retryDelayMs = INITIAL_RETRY_DELAY_MS;
+    this.retryCount = 0;
+  }
   async summarize(summaryTextBlocks) {
     if (summaryTextBlocks.length === 0) {
       return "No assistant output to summarize.";
@@ -1206,7 +1269,7 @@ import * as Sentry3 from "@sentry/node";
 
 // src/auth/credentials-store.ts
 import fs2 from "fs/promises";
-import { setTimeout as delay } from "node:timers/promises";
+import { setTimeout as delay2 } from "node:timers/promises";
 import os2 from "node:os";
 import path3 from "node:path";
 import * as Sentry2 from "@sentry/node";
@@ -1349,7 +1412,7 @@ var CredentialsStore = class {
             `Timed out acquiring credentials lock ${lockPath}${formatLockHolder(holder)}`
           );
         }
-        await delay(LOCK_RETRY_INTERVAL_MS);
+        await delay2(LOCK_RETRY_INTERVAL_MS);
       }
     }
   }
@@ -2398,9 +2461,11 @@ var AgentOrchestrator = class {
     this.started = false;
   }
   async cancel() {
-    await Promise.all(
-      this.workerManager.listWorkers().filter((worker) => worker.status === "running").map((worker) => this.workerManager.cancelWorker(worker.session.id).catch(() => false))
-    );
+    if (this.sessionSettings.type === "orchestrator") {
+      await Promise.all(
+        this.workerManager.listWorkers().filter((worker) => worker.status === "running").map((worker) => this.workerManager.cancelWorker(worker.session.id).catch(() => false))
+      );
+    }
     await this.session?.cancel();
   }
   async getCompletions(request) {
@@ -7717,12 +7782,12 @@ var RelayBridge = class extends EventEmitter {
       }
     });
     this.ensureAgentSessionExists();
-    let backoffMs = 1e3;
+    let backoffMs = INITIAL_RETRY_DELAY_MS;
     while (!this.stopped) {
       try {
         await this.establishConnection();
         this.clearLoginWait();
-        backoffMs = 1e3;
+        backoffMs = INITIAL_RETRY_DELAY_MS;
       } catch (error) {
         if (isLoginRequiredError(error) || isUnauthorizedApiError(error)) {
           if (!this.waitingForLogin) {
@@ -7733,7 +7798,7 @@ var RelayBridge = class extends EventEmitter {
           } else {
             this.logger.debug("Relay bridge still waiting for credentials...");
           }
-          await delay2(LOGIN_WAIT_DELAY_MS);
+          await delay3(LOGIN_WAIT_DELAY_MS);
           continue;
         }
         const aborted = isAbortError(error);
@@ -7747,8 +7812,8 @@ var RelayBridge = class extends EventEmitter {
         this.logger.error(
           `Relay connection failed: ${extractErrorMessage5(error)}. Retrying in ${Math.round(backoffMs / 1e3)}s.`
         );
-        await delay2(backoffMs);
-        backoffMs = Math.min(backoffMs * 2, 3e4);
+        await delay3(backoffMs);
+        backoffMs = calculateBackoff(backoffMs);
       }
     }
   }
@@ -8395,7 +8460,7 @@ function buildRelayWebsocketUrl(baseUrl, path16) {
   }
   return url.toString();
 }
-function delay2(ms) {
+function delay3(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 function extractErrorMessage5(error) {
@@ -8415,22 +8480,41 @@ function isAbortError(error) {
   const message = error.message ? error.message.toLowerCase() : "";
   return message.includes("aborted with ctrl+c");
 }
+var CONNECT_TIMEOUT_MS = 3e4;
 function waitForOpen(ws) {
   return new Promise((resolve, reject) => {
-    const onOpen = () => {
-      cleanup();
-      resolve();
-    };
-    const onError = (error) => {
-      cleanup();
-      reject(error);
-    };
+    let timer = null;
     const cleanup = () => {
+      if (timer) {
+        clearTimeout(timer);
+        timer = null;
+      }
       ws.removeListener("open", onOpen);
       ws.removeListener("error", onError);
     };
+    const settle = (error) => {
+      cleanup();
+      if (error) {
+        try {
+          if (ws.readyState === WebSocket.CONNECTING) {
+            ws.terminate();
+          } else if (ws.readyState === WebSocket.OPEN) {
+            ws.close();
+          }
+        } catch {
+        }
+        reject(error);
+      } else {
+        resolve();
+      }
+    };
+    const onOpen = () => settle();
+    const onError = (error) => settle(error);
     ws.once("open", onOpen);
     ws.once("error", onError);
+    timer = setTimeout(() => {
+      settle(new Error("WebSocket connection timed out"));
+    }, CONNECT_TIMEOUT_MS);
   });
 }
 function isLoginRequiredError(error) {
@@ -8525,63 +8609,7 @@ function buildOrchestratorLogger() {
 
 // src/commands/auth.ts
 import { Command } from "commander";
-import * as Sentry13 from "@sentry/node";
-function buildAuthCommand() {
-  const auth = new Command("auth").description("Authenticate the Omnara CLI.");
-  auth.command("login").description("Authenticate via the browser-based verification flow.").action(async () => {
-    const store = new CredentialsStore();
-    const backendUrl = resolveBackendUrl();
-    try {
-      await performVerificationLogin({
-        backendUrlOption: backendUrl,
-        frontendUrlOption: resolveFrontendUrl(),
-        store
-      });
-    } catch (error) {
-      Sentry13.captureException(error);
-      if (error instanceof ApiError) {
-        console.error(`
-Request failed (HTTP ${error.status}): ${error.message}`);
-      } else {
-        console.error(`
-Login failed: ${extractErrorMessage6(error)}`);
-      }
-      process.exitCode = 1;
-    }
-  });
-  auth.command("logout").description("Remove stored CLI credentials.").action(async () => {
-    const store = new CredentialsStore();
-    await store.clear();
-    console.log("Credentials cleared.");
-  });
-  auth.command("status").description("Show stored CLI credential details.").action(async () => {
-    const store = new CredentialsStore();
-    const credentials = await store.load();
-    if (!credentials) {
-      console.log("No credentials stored.");
-      return;
-    }
-    printStatus(credentials);
-  });
-  return auth;
-}
-function printStatus(credentials) {
-  if (credentials.pat) {
-    console.log("Authentication: PAT stored");
-    return;
-  }
-  console.log("Authentication: Not configured");
-}
-function extractErrorMessage6(error) {
-  if (error instanceof Error) {
-    return error.message;
-  }
-  return String(error);
-}
-
-// src/commands/daemon.ts
-import { Command as Command2 } from "commander";
-import * as Sentry24 from "@sentry/node";
+import * as Sentry18 from "@sentry/node";
 
 // src/daemon/daemon-launcher.ts
 import { spawn as spawn2, exec as execCb } from "node:child_process";
@@ -8591,12 +8619,12 @@ import { promisify as promisify2 } from "node:util";
 
 // src/daemon/daemon-client.ts
 import http2 from "node:http";
-import * as Sentry15 from "@sentry/node";
+import * as Sentry14 from "@sentry/node";
 
 // src/daemon/state-store.ts
 import fs7 from "node:fs/promises";
 import path8 from "node:path";
-import * as Sentry14 from "@sentry/node";
+import * as Sentry13 from "@sentry/node";
 
 // src/daemon/paths.ts
 import fs6 from "node:fs/promises";
@@ -8640,9 +8668,9 @@ var DaemonStateStore = class {
       if (isFileNotFound2(error)) {
         return null;
       }
-      Sentry14.captureException(error);
+      Sentry13.captureException(error);
       throw new Error(
-        `Failed to read daemon state from ${this.filePath}: ${extractErrorMessage7(error)}`
+        `Failed to read daemon state from ${this.filePath}: ${extractErrorMessage6(error)}`
       );
     }
   }
@@ -8661,7 +8689,7 @@ var DaemonStateStore = class {
       await fs7.unlink(this.filePath);
     } catch (error) {
       if (!isFileNotFound2(error)) {
-        Sentry14.captureException(error);
+        Sentry13.captureException(error);
         throw error;
       }
     }
@@ -8672,7 +8700,7 @@ function isFileNotFound2(error) {
     error && typeof error === "object" && "code" in error && error.code === "ENOENT"
   );
 }
-function extractErrorMessage7(error) {
+function extractErrorMessage6(error) {
   if (error instanceof Error && error.message) {
     return error.message;
   }
@@ -8699,7 +8727,7 @@ var DaemonClient = class {
         await this.stateStore.clear();
         return null;
       }
-      Sentry15.captureException(error);
+      Sentry14.captureException(error);
       throw error;
     }
   }
@@ -8719,7 +8747,7 @@ var DaemonClient = class {
         await this.stateStore.clear();
         return null;
       }
-      Sentry15.captureException(error);
+      Sentry14.captureException(error);
       throw error;
     }
   }
@@ -8742,7 +8770,7 @@ var DaemonClient = class {
         await this.stateStore.clear();
         return false;
       }
-      Sentry15.captureException(error);
+      Sentry14.captureException(error);
       throw error;
     }
   }
@@ -8767,7 +8795,7 @@ var DaemonClient = class {
         await this.stateStore.clear();
         return null;
       }
-      Sentry15.captureException(error);
+      Sentry14.captureException(error);
       throw error;
     }
   }
@@ -8841,7 +8869,7 @@ function isProcessAlive2(pid) {
     if (isErrno2(error, "ESRCH")) {
       return false;
     }
-    Sentry15.captureException(error);
+    Sentry14.captureException(error);
     return false;
   }
 }
@@ -8874,13 +8902,13 @@ var HttpError = class extends Error {
 // src/daemon/directory-registry.ts
 import fs9 from "node:fs/promises";
 import path10 from "node:path";
-import * as Sentry17 from "@sentry/node";
+import * as Sentry16 from "@sentry/node";
 
 // src/daemon/config-store.ts
 import fs8 from "node:fs/promises";
 import path9 from "node:path";
 import { randomUUID as randomUUID6 } from "node:crypto";
-import * as Sentry16 from "@sentry/node";
+import * as Sentry15 from "@sentry/node";
 var DEFAULT_CONFIG = {
   directories: [],
   settings: {}
@@ -8898,9 +8926,9 @@ var DaemonConfigStore = class {
       if (isFileNotFound3(error)) {
         return cloneConfig(DEFAULT_CONFIG);
       }
-      Sentry16.captureException(error);
+      Sentry15.captureException(error);
       throw new Error(
-        `Failed to read daemon config from ${this.filePath}: ${extractErrorMessage8(error)}`
+        `Failed to read daemon config from ${this.filePath}: ${extractErrorMessage7(error)}`
       );
     }
   }
@@ -8982,7 +9010,7 @@ function isFileNotFound3(error) {
     error && typeof error === "object" && "code" in error && error.code === "ENOENT"
   );
 }
-function extractErrorMessage8(error) {
+function extractErrorMessage7(error) {
   if (error instanceof Error && error.message) {
     return error.message;
   }
@@ -9020,14 +9048,14 @@ var DirectoryRegistry = class {
         throw new Error("Path is not a directory");
       }
     } catch (error) {
-      Sentry17.captureException(error);
+      Sentry16.captureException(error);
       throw new Error(
-        `Directory ${directoryPath} is not accessible: ${extractErrorMessage9(error)}`
+        `Directory ${directoryPath} is not accessible: ${extractErrorMessage8(error)}`
       );
     }
   }
 };
-function extractErrorMessage9(error) {
+function extractErrorMessage8(error) {
   if (error instanceof Error && error.message) {
     return error.message;
   }
@@ -9043,7 +9071,7 @@ import path11 from "node:path";
 import os3 from "node:os";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
-import * as Sentry18 from "@sentry/node";
+import * as Sentry17 from "@sentry/node";
 var REGISTRY_PATH = path11.join(OMNARA_HOME_DIR, "session-processes.json");
 var LOCK_PATH = `${REGISTRY_PATH}.lock`;
 var execFileAsync = promisify(execFile);
@@ -9055,7 +9083,7 @@ async function acquireLock(retries = 20, delayMs = 50) {
       return handle;
     } catch (error) {
       if (error.code !== "EEXIST") {
-        Sentry18.captureException(error);
+        Sentry17.captureException(error);
         throw error;
       }
       await new Promise((resolve) => setTimeout(resolve, delayMs));
@@ -9092,7 +9120,7 @@ async function readRegistry() {
     if (error.code === "ENOENT") {
       return {};
     }
-    Sentry18.captureException(error);
+    Sentry17.captureException(error);
     throw error;
   }
 }
@@ -9120,7 +9148,7 @@ async function isProcessAlive3(pid) {
     if (error.code === "ESRCH") {
       return false;
     }
-    Sentry18.captureException(error);
+    Sentry17.captureException(error);
     return true;
   }
 }
@@ -9329,13 +9357,13 @@ async function killAllDaemonProcesses(options = {}) {
           process.kill(pid, "SIGKILL");
           logger3.success(`Killed process ${pid}`);
         } catch (error) {
-          logger3.warn(`Failed to kill ${pid}: ${extractErrorMessage10(error)}`);
+          logger3.warn(`Failed to kill ${pid}: ${extractErrorMessage9(error)}`);
         }
       }
       await stateStore.clear();
       logger3.debug(`Cleared ${envLabel} daemon state file`);
     } catch (error) {
-      logger3.error(`Failed to kill ${envLabel} daemon processes: ${extractErrorMessage10(error)}`);
+      logger3.error(`Failed to kill ${envLabel} daemon processes: ${extractErrorMessage9(error)}`);
     }
   }
 }
@@ -9352,7 +9380,7 @@ async function killDaemonByState(options = {}) {
     process.kill(state.pid, "SIGKILL");
     logger3.success(`Killed daemon process ${state.pid}`);
   } catch (error) {
-    logger3.warn(`Failed to kill daemon ${state.pid}: ${extractErrorMessage10(error)}`);
+    logger3.warn(`Failed to kill daemon ${state.pid}: ${extractErrorMessage9(error)}`);
   }
   await stateStore.clear();
 }
@@ -9372,13 +9400,13 @@ async function killSessionsByRegistry(options = {}) {
           process.kill(record.pid, "SIGKILL");
           logger3.success(`Killed session process ${record.pid}`);
         } catch (error) {
-          logger3.warn(`Failed to kill session ${record.pid}: ${extractErrorMessage10(error)}`);
+          logger3.warn(`Failed to kill session ${record.pid}: ${extractErrorMessage9(error)}`);
         }
       }
       return [{}, void 0];
     });
   } catch (error) {
-    logger3.warn(`Failed to kill sessions via registry: ${extractErrorMessage10(error)}`);
+    logger3.warn(`Failed to kill sessions via registry: ${extractErrorMessage9(error)}`);
   }
 }
 async function findDaemonRelatedPids() {
@@ -9415,7 +9443,7 @@ async function registerDirectory(directoryPath, options) {
     options.logger.warn("Daemon was unavailable; storing directory locally.");
   } catch (error) {
     options.logger.warn(
-      `Failed to register ${normalized} with daemon: ${extractErrorMessage10(error)}`
+      `Failed to register ${normalized} with daemon: ${extractErrorMessage9(error)}`
     );
   }
   const registry = new DirectoryRegistry();
@@ -9453,13 +9481,73 @@ async function waitForReady(client, options = {}) {
   logger3.warn("Timed out waiting for daemon readiness.");
   return null;
 }
-function extractErrorMessage10(error) {
+function extractErrorMessage9(error) {
   if (error instanceof Error && error.message) {
     return error.message;
   }
   return String(error);
 }
 
+// src/commands/auth.ts
+function buildAuthCommand() {
+  const auth = new Command("auth").description("Authenticate the Omnara CLI.");
+  auth.command("login").description("Authenticate via the browser-based verification flow.").action(async () => {
+    const store = new CredentialsStore();
+    const backendUrl = resolveBackendUrl();
+    try {
+      const configStore = new DaemonConfigStore();
+      await ensureMachineNameConfigured(configStore, logger);
+      await performVerificationLogin({
+        backendUrlOption: backendUrl,
+        frontendUrlOption: resolveFrontendUrl(),
+        store
+      });
+    } catch (error) {
+      Sentry18.captureException(error);
+      if (error instanceof ApiError) {
+        console.error(`
+Request failed (HTTP ${error.status}): ${error.message}`);
+      } else {
+        console.error(`
+Login failed: ${extractErrorMessage10(error)}`);
+      }
+      process.exitCode = 1;
+    }
+  });
+  auth.command("logout").description("Remove stored CLI credentials.").action(async () => {
+    const store = new CredentialsStore();
+    await store.clear();
+    console.log("Credentials cleared.");
+  });
+  auth.command("status").description("Show stored CLI credential details.").action(async () => {
+    const store = new CredentialsStore();
+    const credentials = await store.load();
+    if (!credentials) {
+      console.log("No credentials stored.");
+      return;
+    }
+    printStatus(credentials);
+  });
+  return auth;
+}
+function printStatus(credentials) {
+  if (credentials.pat) {
+    console.log("Authentication: PAT stored");
+    return;
+  }
+  console.log("Authentication: Not configured");
+}
+function extractErrorMessage10(error) {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  return String(error);
+}
+
+// src/commands/daemon.ts
+import { Command as Command2 } from "commander";
+import * as Sentry24 from "@sentry/node";
+
 // src/daemon/run-daemon.ts
 import * as Sentry23 from "@sentry/node";
 
@@ -9680,7 +9768,7 @@ function extractErrorMessage11(error) {
 // src/daemon/machine-supervisor.ts
 import { randomUUID as randomUUID7 } from "node:crypto";
 import os5 from "node:os";
-import { setTimeout as delay3 } from "node:timers/promises";
+import { setTimeout as delay4 } from "node:timers/promises";
 import WebSocket2 from "ws";
 import * as Sentry21 from "@sentry/node";
 
@@ -17681,14 +17769,13 @@ var FALLBACK_NAME = pkg.name ?? "omnara";
 var FALLBACK_VERSION = pkg.version ?? "0.0.0";
 var FALLBACK_DESCRIPTION = pkg.description ?? "Command-line interface for Omnara.";
 var PACKAGE_NAME = true ? "omnara" : FALLBACK_NAME;
-var PACKAGE_VERSION = true ? "0.5.0" : FALLBACK_VERSION;
+var PACKAGE_VERSION = true ? "0.5.2" : FALLBACK_VERSION;
 var PACKAGE_DESCRIPTION = true ? "Command-line interface for Omnara." : FALLBACK_DESCRIPTION;
 
 // src/daemon/machine-supervisor.ts
 var HEARTBEAT_INTERVAL_MS = 1e4;
-var RECONNECT_DELAY_MS = 2e3;
 var LOGIN_WAIT_DELAY_MS2 = 3e4;
-var CONNECT_TIMEOUT_MS = 3e4;
+var CONNECT_TIMEOUT_MS2 = 3e4;
 var DAEMON_VERSION = PACKAGE_VERSION ?? "0.0.0";
 var MachineSupervisor = class {
   backendUrl;
@@ -17770,11 +17857,13 @@ var MachineSupervisor = class {
     this.running = false;
   }
   async runLoop() {
+    let retryDelayMs = INITIAL_RETRY_DELAY_MS;
     while (!this.stopRequested) {
       try {
         const identity = await this.registerMachine();
         this.clearLoginWait();
         await this.runWebsocket(identity);
+        retryDelayMs = INITIAL_RETRY_DELAY_MS;
       } catch (error) {
         if (this.stopRequested) {
           break;
@@ -17789,11 +17878,14 @@ var MachineSupervisor = class {
           } else {
             this.logger.debug("Machine supervisor still waiting for login\u2026");
           }
-          await delay3(LOGIN_WAIT_DELAY_MS2);
+          await delay4(LOGIN_WAIT_DELAY_MS2);
         } else {
           Sentry21.captureException(error);
-          this.logger.warn(`Machine supervisor error: ${error.message}`);
-          await delay3(RECONNECT_DELAY_MS);
+          this.logger.warn(
+            `Machine supervisor error: ${error.message}. Retrying in ${Math.round(retryDelayMs / 1e3)}s.`
+          );
+          await delay4(retryDelayMs);
+          retryDelayMs = calculateBackoff(retryDelayMs);
         }
       }
     }
@@ -17883,9 +17975,13 @@ var MachineSupervisor = class {
         this.clearHeartbeatTimer();
         this.websocket = null;
         try {
-          ws.removeAllListeners();
-          if (ws.readyState === WebSocket2.OPEN || ws.readyState === WebSocket2.CONNECTING) {
+          if (ws.readyState === WebSocket2.CONNECTING) {
+            ws.terminate();
+          } else if (ws.readyState === WebSocket2.OPEN) {
+            ws.removeAllListeners();
             ws.close();
+          } else {
+            ws.removeAllListeners();
           }
         } catch {
         }
@@ -17897,7 +17993,7 @@ var MachineSupervisor = class {
       };
       connectTimer = setTimeout(() => {
         finish(new Error("machine websocket connection timed out"));
-      }, CONNECT_TIMEOUT_MS);
+      }, CONNECT_TIMEOUT_MS2);
       ws.on("open", () => {
         if (connectTimer) {
           clearTimeout(connectTimer);
@@ -18100,7 +18196,7 @@ var MachineSupervisor = class {
           return;
         }
       }
-      await delay3(250);
+      await delay4(250);
     }
     throw new Error("Machine has not finished registering yet. Try again in a few seconds.");
   }
@@ -18418,6 +18514,8 @@ function buildDaemonCommand() {
   daemon.command("start").description("Start the daemon if it is not already running.").option("--no-wait", "Do not wait for the daemon to become ready").action(async (options) => {
     const backendUrl = resolveBackendUrl();
     const frontendUrl = resolveFrontendUrl();
+    const configStore = new DaemonConfigStore();
+    await ensureMachineNameConfigured(configStore, logger);
     await ensureCliCredentials({ backendUrl, frontendUrl, logger });
     await startDaemon({
       logger,
@@ -18734,6 +18832,8 @@ async function launchSessionViaDaemon(options = {}) {
   const backendUrl = resolveBackendUrl(options.backendUrl);
   const frontendUrl = resolveFrontendUrl(options.frontendUrl);
   try {
+    const configStore = new DaemonConfigStore();
+    await ensureMachineNameConfigured(configStore, logger);
     await ensureCliCredentials({ backendUrl, frontendUrl, logger });
     await ensureDaemonForSession({
       cwd: process.cwd(),