nolo-cli 0.179.0-alpha.1 → 0.180.0-alpha.2

package/{machineCommands-TVCJZ5K5.js → machineCommands-R2IP5OVT.js}

@@ -2,7 +2,7 @@ import {
   buildMachinePermissionPromptBlock,
   handleConnectorRunMessage,
   resolveMachineRunPermissionPolicy
-} from "./chunk-X7YSFSY3.js";
+} from "./chunk-QUCQVMYZ.js";
 import {
   MAX_CONNECTOR_TIMER_DELAY_MS,
   clampConnectorTimerDelayMs,
@@ -11,7 +11,7 @@ import {
   resolveConnectorProbeTimeoutMs,
   resolveConnectorWebSocketTarget
 } from "./chunk-BLVSFYQ3.js";
-import "./chunk-LOCHKPC4.js";
+import "./chunk-SGATEZV5.js";
 import "./chunk-D2J22QSE.js";
 import "./chunk-R4BMKAR5.js";
 import "./chunk-TDX2L4W2.js";
@@ -19,26 +19,27 @@ import {
   parsePositiveFiniteNumberOrFallback
 } from "./chunk-Y5GCAMGP.js";
 import "./chunk-VP3BINY7.js";
-import "./chunk-RPZNVBA5.js";
+import "./chunk-CTEEJJVR.js";
 import "./chunk-NBTY7YJF.js";
 import "./chunk-VL5KOY2C.js";
 import {
-  detectMachineInfo
+  detectMachineInfo,
+  resolveMachineId
 } from "./chunk-S73EPYNC.js";
 import "./chunk-ZEZC7IIM.js";
 import "./chunk-VIWDGTDA.js";
 import "./chunk-HGDKT2D6.js";
-import "./chunk-YUXSWHQC.js";
+import "./chunk-GKKIZRJ6.js";
 import "./chunk-W6E5IXIP.js";
 import "./chunk-ATNTHIZI.js";
 import "./chunk-INFHX73M.js";
-import "./chunk-IAOVXFL7.js";
+import "./chunk-GCAOOTIS.js";
 import "./chunk-HS7MLR74.js";
-import "./chunk-GPA3EA3Q.js";
-import "./chunk-KPSNHLFI.js";
+import "./chunk-CGKN34IJ.js";
+import "./chunk-2D3YKEAQ.js";
 import "./chunk-KFHREHUQ.js";
 import "./chunk-OXME3PEE.js";
-import "./chunk-FSTHTTI6.js";
+import "./chunk-NJI5HZQA.js";
 import "./chunk-NF64D32W.js";
 import {
   CORE_DRAIN_REASON
@@ -52,17 +53,17 @@ import "./chunk-KSTEXKL6.js";
 import "./chunk-AGIM7IMJ.js";
 import "./chunk-63W5N6P3.js";
 import "./chunk-VF4K2QE6.js";
-import "./chunk-CUVJE3L5.js";
+import "./chunk-4KDYRX3O.js";
 import "./chunk-BAWAKW7X.js";
-import "./chunk-M7ZURZLR.js";
+import "./chunk-PD4KNHVU.js";
 import "./chunk-IF7V3CBU.js";
 import "./chunk-YPG7TUQD.js";
-import "./chunk-LM7VJUSD.js";
-import "./chunk-YOXGSXOV.js";
+import "./chunk-TCCBECTT.js";
+import "./chunk-HTSXDJHA.js";
 import "./chunk-OFFL4DCR.js";
 import "./chunk-523DITKR.js";
 import "./chunk-QYPE3TS3.js";
-import "./chunk-PP4TMS3T.js";
+import "./chunk-HS7JBDUJ.js";
 import "./chunk-4JH2UMJR.js";
 import "./chunk-ZJ7UHBJS.js";
 import "./chunk-BYXBJQAS.js";
@@ -88,8 +89,8 @@ import "./chunk-QQ56R7KS.js";
 import "./chunk-OW765XBU.js";
 import "./chunk-PXYBUFDB.js";
 import "./chunk-D2MDMY2M.js";
-import "./chunk-3LNVSFTH.js";
-import "./chunk-WXOKJP3W.js";
+import "./chunk-5LZBJZLT.js";
+import "./chunk-SK2UMOZC.js";
 import "./chunk-EUGTFFO6.js";
 import "./chunk-AETZ7AD6.js";
 import "./chunk-Y6ORVLSS.js";
@@ -99,7 +100,7 @@ import {
   PATH_FIELD_ALIASES,
   createLocalWorkspaceToolExecutors,
   resolveRequestedWorkspacePath
-} from "./chunk-UVPKOBVG.js";
+} from "./chunk-COXNBVP7.js";
 import "./chunk-KMSMIOOL.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-YO776XHS.js";
@@ -113,10 +114,10 @@ import "./chunk-P2BGRAW7.js";
 import "./chunk-G6OOUQWJ.js";
 import "./chunk-56GBUMO5.js";
 import "./chunk-WJZOQR2J.js";
-import "./chunk-ZEOR6XPJ.js";
+import "./chunk-POYXVOYU.js";
 import "./chunk-JDCX5RWD.js";
 import "./chunk-E2BESSAW.js";
-import "./chunk-2GRXE3YJ.js";
+import "./chunk-ZEQ6L6MZ.js";
 import "./chunk-JLR5NWP2.js";
 import "./chunk-XAFCJN32.js";
 import "./chunk-2MBTWINN.js";
@@ -133,8 +134,8 @@ import "./chunk-7DPNBQSV.js";
 import "./chunk-ZWQUWF6W.js";
 import "./chunk-VEA7H5FG.js";
 import "./chunk-4VJAC32I.js";
-import "./chunk-5EBLANFT.js";
-import "./chunk-NYYFIKHI.js";
+import "./chunk-XJBWPOIL.js";
+import "./chunk-MMKP2XWK.js";
 import "./chunk-LOEO7LRC.js";
 import "./chunk-M2EJHDJP.js";
 import "./chunk-5EMSBTQ6.js";
@@ -194,11 +195,169 @@ async function runHeartbeatLoop(options) {
   }
 }
 
+// packages/cli/connectorInstanceLock.ts
+import {
+  closeSync,
+  mkdirSync,
+  openSync,
+  readFileSync,
+  renameSync,
+  statSync,
+  unlinkSync,
+  writeFileSync
+} from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+function resolveConnectorStateDir(args = {}) {
+  const homeDir = args.homeDir?.trim();
+  if (homeDir) return join(homeDir, ".nolo", "connector");
+  const noloHome = args.noloHome?.trim() || process.env.NOLO_HOME?.trim();
+  if (noloHome) return join(noloHome, "connector");
+  return join(homedir(), ".nolo", "connector");
+}
+function sanitizeMachineId(machineId) {
+  const safe = String(machineId ?? "").replace(/[^A-Za-z0-9._-]/g, "_");
+  return safe || "unknown";
+}
+function connectorInstanceLockPath(args) {
+  return join(resolveConnectorStateDir(args), `${sanitizeMachineId(args.machineId)}.lock`);
+}
+function connectorAliveSignalPath(args) {
+  return join(resolveConnectorStateDir(args), `${sanitizeMachineId(args.machineId)}.alive`);
+}
+function isProcessAlive(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error?.code === "EPERM";
+  }
+}
+function readLockPid(lockPath) {
+  let raw;
+  try {
+    raw = readFileSync(lockPath, "utf8");
+  } catch {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    const pid = Number(parsed?.pid);
+    return Number.isInteger(pid) && pid > 0 ? pid : null;
+  } catch {
+    return null;
+  }
+}
+function isEexist(error) {
+  return error?.code === "EEXIST";
+}
+var CONNECTOR_LOCK_CORRUPT_RECLAIM_SECONDS = 300;
+function inspectCorruptLock(lockPath, now = Date.now()) {
+  try {
+    const stat2 = statSync(lockPath);
+    const ageMs = now - stat2.mtimeMs;
+    return ageMs > CONNECTOR_LOCK_CORRUPT_RECLAIM_SECONDS * 1e3 ? "expired" : "fresh";
+  } catch (error) {
+    const code = error?.code;
+    if (code === "ENOENT") return "gone";
+    return "fresh";
+  }
+}
+function acquireConnectorInstanceLock(args) {
+  const lockPath = connectorInstanceLockPath(args);
+  mkdirSync(resolveConnectorStateDir(args), { recursive: true });
+  let reclaimed;
+  for (let attempt = 0; attempt < 2; attempt += 1) {
+    let fd = null;
+    try {
+      fd = openSync(lockPath, "wx");
+    } catch (error) {
+      if (!isEexist(error)) throw error;
+      const ownerPid2 = readLockPid(lockPath);
+      if (ownerPid2 !== null) {
+        if (isProcessAlive(ownerPid2)) {
+          return { ok: false, pid: ownerPid2 };
+        }
+        try {
+          unlinkSync(lockPath);
+        } catch {
+        }
+        continue;
+      }
+      const state = inspectCorruptLock(lockPath);
+      if (state === "gone") {
+        continue;
+      }
+      if (state === "fresh") {
+        return { ok: false, pid: 0 };
+      }
+      try {
+        unlinkSync(lockPath);
+      } catch {
+      }
+      reclaimed = "corrupt";
+      continue;
+    }
+    try {
+      writeFileSync(fd, JSON.stringify({ pid: process.pid, startedAt: Date.now() }), "utf8");
+    } finally {
+      closeSync(fd);
+    }
+    return {
+      ok: true,
+      release: () => releaseConnectorInstanceLock(lockPath),
+      ...reclaimed ? { reclaimed } : {}
+    };
+  }
+  const ownerPid = readLockPid(lockPath);
+  return { ok: false, pid: ownerPid ?? 0 };
+}
+function releaseConnectorInstanceLock(lockPath) {
+  const ownerPid = readLockPid(lockPath);
+  if (ownerPid !== process.pid) return;
+  try {
+    unlinkSync(lockPath);
+  } catch {
+  }
+}
+function markConnectorAlive(args) {
+  const path = connectorAliveSignalPath(args);
+  try {
+    mkdirSync(resolveConnectorStateDir(args), { recursive: true });
+    const tmpPath = `${path}.${process.pid}.tmp`;
+    writeFileSync(tmpPath, String(Date.now()), "utf8");
+    try {
+      renameSync(tmpPath, path);
+    } catch (error) {
+      try {
+        unlinkSync(tmpPath);
+      } catch {
+      }
+      throw error;
+    }
+  } catch {
+  }
+}
+function clearConnectorAlive(args) {
+  try {
+    unlinkSync(connectorAliveSignalPath(args));
+  } catch {
+  }
+}
+function withConnectorAliveSignal(sendHeartbeat, args) {
+  return async () => {
+    const result = await sendHeartbeat();
+    markConnectorAlive(args);
+    return result;
+  };
+}
+
 // packages/cli/machineDaemonCommands.ts
 import { spawn } from "node:child_process";
-import { existsSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, isAbsolute, join, relative, resolve } from "node:path";
+import { existsSync, mkdirSync as mkdirSync2, openSync as openSync2, readFileSync as readFileSync2, readdirSync, realpathSync } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import { dirname, isAbsolute, join as join2, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 var CONNECTOR_RUNTIME_WORKSPACE_PACKAGES = /* @__PURE__ */ new Set([
   "connector-experimental",
@@ -206,7 +365,7 @@ var CONNECTOR_RUNTIME_WORKSPACE_PACKAGES = /* @__PURE__ */ new Set([
 ]);
 function readJsonFile(path) {
   try {
-    return JSON.parse(readFileSync(path, "utf8"));
+    return JSON.parse(readFileSync2(path, "utf8"));
   } catch {
     return null;
   }
@@ -226,7 +385,7 @@ function isInsideOrSame(path, parent) {
 function findWorkspaceRoot(startPath) {
   let current = resolve(startPath);
   while (true) {
-    const packageJsonPath = join(current, "package.json");
+    const packageJsonPath = join2(current, "package.json");
     if (existsSync(packageJsonPath)) {
       const packageJson = readJsonFile(packageJsonPath);
       if (packageJson && getWorkspacePatterns(packageJson).length > 0) {
@@ -249,7 +408,7 @@ function listWorkspacePackageJsonFiles(workspaceParent) {
   for (const entry of entries) {
     if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
     const relativePath = `${entry.name}/package.json`;
-    if (existsSync(join(workspaceParent, relativePath))) {
+    if (existsSync(join2(workspaceParent, relativePath))) {
       results.push(relativePath);
     }
   }
@@ -258,21 +417,21 @@ function listWorkspacePackageJsonFiles(workspaceParent) {
 function validateConnectorWorkspaceLinks(cwd) {
   const repoRoot = findWorkspaceRoot(cwd);
   if (!repoRoot) return [];
-  const rootPackageJson = readJsonFile(join(repoRoot, "package.json"));
+  const rootPackageJson = readJsonFile(join2(repoRoot, "package.json"));
   if (!rootPackageJson) return [];
   const normalizedRepoRoot = normalizePath(realpathSync(repoRoot));
   const errors = [];
   for (const pattern of getWorkspacePatterns(rootPackageJson)) {
     if (!pattern.endsWith("/*")) continue;
-    const workspaceParent = join(repoRoot, pattern.slice(0, -2));
+    const workspaceParent = join2(repoRoot, pattern.slice(0, -2));
     if (!existsSync(workspaceParent)) continue;
     for (const entry of listWorkspacePackageJsonFiles(workspaceParent)) {
-      const packageDir = join(workspaceParent, dirname(entry));
-      const packageJson = readJsonFile(join(workspaceParent, entry));
+      const packageDir = join2(workspaceParent, dirname(entry));
+      const packageJson = readJsonFile(join2(workspaceParent, entry));
       if (!packageJson?.name || !CONNECTOR_RUNTIME_WORKSPACE_PACKAGES.has(packageJson.name)) {
         continue;
       }
-      const linkPath = join(repoRoot, "node_modules", ...packageJson.name.split("/"));
+      const linkPath = join2(repoRoot, "node_modules", ...packageJson.name.split("/"));
       if (!existsSync(linkPath)) {
         errors.push(`${linkPath} is missing. Run bun install in ${repoRoot}.`);
         continue;
@@ -308,7 +467,7 @@ async function checkConnectorWorkspaceLinks(cwd, output, validateWorkspaceLinks)
   return false;
 }
 function resolveDaemonLogPath(env) {
-  return env.NOLO_CONNECT_LOG || join(homedir(), ".nolo", "logs", "connector.log");
+  return env.NOLO_CONNECT_LOG || join2(homedir2(), ".nolo", "logs", "connector.log");
 }
 function buildDaemonCommand(cliEntrypointPath) {
   const execPath = process.execPath;
@@ -319,8 +478,8 @@ function buildDaemonCommand(cliEntrypointPath) {
   return [execPath, entrypoint, "connect", "--ws"];
 }
 function defaultSpawnDaemon(args) {
-  mkdirSync(dirname(args.logPath), { recursive: true });
-  const out = openSync(args.logPath, "a");
+  mkdirSync2(dirname(args.logPath), { recursive: true });
+  const out = openSync2(args.logPath, "a");
   const env = Object.fromEntries(
     Object.entries(args.env).filter((entry) => typeof entry[1] === "string")
   );
@@ -340,6 +499,20 @@ async function runMachineDaemonCommand(deps = {}) {
   if (!await checkConnectorWorkspaceLinks(process.cwd(), output, validateWorkspaceLinks)) {
     return 1;
   }
+  const probe = acquireConnectorInstanceLock({
+    machineId: deps.machineId ?? resolveMachineId(),
+    homeDir: deps.connectorHomeDir,
+    noloHome: env.NOLO_HOME,
+    kind: "daemon"
+  });
+  if (!probe.ok) {
+    output.write(
+      `[nolo] A connector for this machine is already running (pid=${probe.pid}). Do not start two connectors at the same time \u2014 stop the running one first (or check whether it is still healthy) before starting a new one.
+`
+    );
+    return 3;
+  }
+  probe.release();
   const logPath = resolveDaemonLogPath(env);
   const result = (deps.spawnDaemon ?? defaultSpawnDaemon)({
     cmd: buildDaemonCommand(deps.cliEntrypointPath),
@@ -400,8 +573,8 @@ async function runMachineWatchCommand(deps) {
 
 // packages/cli/machineToolInvokeDispatch.ts
 import { appendFile, lstat, mkdir, realpath, stat } from "node:fs/promises";
-import { homedir as homedir2 } from "node:os";
-import { dirname as dirname2, isAbsolute as isAbsolute2, join as join2, relative as relative2, resolve as resolve2, sep } from "node:path";
+import { homedir as homedir3 } from "node:os";
+import { dirname as dirname2, isAbsolute as isAbsolute2, join as join3, relative as relative2, resolve as resolve2, sep } from "node:path";
 
 // packages/agent-runtime/machineToolGrants.ts
 function isRecord2(value) {
@@ -464,8 +637,8 @@ function isMachineToolGranted(grants, toolName, agentKey) {
 }
 function resolveMachineToolAuditLogPath() {
   const noloHome = process.env.NOLO_HOME?.trim();
-  const base = noloHome ? noloHome : join2(homedir2(), ".nolo");
-  return join2(base, "logs", "machine-tool-audit.jsonl");
+  const base = noloHome ? noloHome : join3(homedir3(), ".nolo");
+  return join3(base, "logs", "machine-tool-audit.jsonl");
 }
 function auditTargetFor(executorArgs) {
   const target = extractMachineToolRequestPath(executorArgs) ?? "";
@@ -1261,11 +1434,13 @@ async function runMachineConnectCommand(args, deps = {}) {
       output,
       cliEntrypointPath: deps.cliEntrypointPath,
       validateWorkspaceLinks: deps.validateWorkspaceLinks,
-      spawnDaemon: deps.spawnDaemon
+      spawnDaemon: deps.spawnDaemon,
+      connectorHomeDir: deps.connectorHomeDir
     });
   }
   const machine = (deps.machineInfo ?? detectLaunchableMachineInfo)();
-  const sendHeartbeat = () => postMachineHeartbeat({
+  const machineId = machine.machineId;
+  const sendHeartbeatBase = () => postMachineHeartbeat({
     fetchImpl,
     serverUrl,
     authToken,
@@ -1277,96 +1452,130 @@ async function runMachineConnectCommand(args, deps = {}) {
     if (!await checkConnectorWorkspaceLinks(process.cwd(), output, validateWorkspaceLinks)) {
       return 1;
     }
-    const maxAttempts = deps.maxConnectorAttempts ?? Infinity;
-    const sleep = deps.sleep ?? defaultSleep2;
-    const reconnectDelayMs = resolveConnectorReconnectDelayMs(env);
-    const toolGrants = readMachineToolGrants(env);
-    const toolInvokeHandlers = createMachineToolInvokeHandlers({
-      workspaceRoot: process.cwd(),
-      // M2 修复：机器侧授权复核与握手上报共用同一来源——本次 `deps.env ??
-      // process.env`。grants 快照与 WS URL 上报的那份逐字节相同；未配置时也
-      // 显式传 env，工厂不再回落到 process.env（调用方经 deps.env 注入环境时
-      // 两端曾不一致）。
-      env,
-      ...toolGrants ? { grants: toolGrants } : {}
+    const instanceLock = acquireConnectorInstanceLock({
+      machineId,
+      homeDir: deps.connectorHomeDir,
+      noloHome: env.NOLO_HOME,
+      kind: "ws"
     });
-    for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
-      if (deps.signal?.aborted) {
-        return 0;
-      }
-      const runtimeServerUrl = env.NOLO_CONNECT_RUNTIME_SERVER_URL || env.NOLO_RUNTIME_SERVER_URL || serverUrl;
-      const sessionResult = await runMachineWsSession({
+    if (!instanceLock.ok) {
+      const owner = instanceLock.pid > 0 ? `pid=${instanceLock.pid}` : "owner pid unknown";
+      output.write(
+        `[nolo] A connector for this machine is already running (${owner}). Do not start two connectors at the same time \u2014 stop the running one first (or check whether it is still healthy) before starting a new one.
+`
+      );
+      return 3;
+    }
+    if (instanceLock.reclaimed === "corrupt") {
+      output.write(
+        `[nolo] Reclaimed a corrupt connector lock (no readable pid, older than ${CONNECTOR_LOCK_CORRUPT_RECLAIM_SECONDS}s) \u2014 a previous connector likely crashed while writing it.
+`
+      );
+    }
+    const sendHeartbeat = withConnectorAliveSignal(sendHeartbeatBase, {
+      machineId,
+      homeDir: deps.connectorHomeDir,
+      noloHome: env.NOLO_HOME
+    });
+    try {
+      const maxAttempts = deps.maxConnectorAttempts ?? Infinity;
+      const sleep = deps.sleep ?? defaultSleep2;
+      const reconnectDelayMs = resolveConnectorReconnectDelayMs(env);
+      const toolGrants = readMachineToolGrants(env);
+      const toolInvokeHandlers = createMachineToolInvokeHandlers({
+        workspaceRoot: process.cwd(),
+        // M2 修复：机器侧授权复核与握手上报共用同一来源——本次 `deps.env ??
+        // process.env`。grants 快照与 WS URL 上报的那份逐字节相同；未配置时也
+        // 显式传 env，工厂不再回落到 process.env（调用方经 deps.env 注入环境时
+        // 两端曾不一致）。
         env,
-        output,
-        signal: deps.signal,
-        machine,
-        sendHeartbeat,
-        runHeartbeatLoop: deps.runHeartbeatLoop ?? runHeartbeatLoop,
-        connectWebSocket: deps.connectWebSocket ?? defaultConnectWebSocket,
-        serverUrl,
-        authToken,
-        resolveConnectorWebSocketTarget: async (options) => appendToolGrantsToWsUrl(
-          await resolveConnectorWebSocketTarget({
-            ...options,
-            fetchImpl
-          }),
-          toolGrants
-        ),
-        onMessage: (message, send) => handleMachineWsMessageDemux(
-          message,
-          send,
-          { toolInvoke: toolInvokeHandlers },
-          () => handleConnectorRunMessage(
+        ...toolGrants ? { grants: toolGrants } : {}
+      });
+      for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+        if (deps.signal?.aborted) {
+          return 0;
+        }
+        const runtimeServerUrl = env.NOLO_CONNECT_RUNTIME_SERVER_URL || env.NOLO_RUNTIME_SERVER_URL || serverUrl;
+        const sessionResult = await runMachineWsSession({
+          env,
+          output,
+          signal: deps.signal,
+          machine,
+          sendHeartbeat,
+          runHeartbeatLoop: deps.runHeartbeatLoop ?? runHeartbeatLoop,
+          connectWebSocket: deps.connectWebSocket ?? defaultConnectWebSocket,
+          serverUrl,
+          authToken,
+          resolveConnectorWebSocketTarget: async (options) => appendToolGrantsToWsUrl(
+            await resolveConnectorWebSocketTarget({
+              ...options,
+              fetchImpl
+            }),
+            toolGrants
+          ),
+          onMessage: (message, send) => handleMachineWsMessageDemux(
             message,
             send,
-            deps.executeCli ?? defaultExecuteCli,
-            {
-              ...env,
-              NOLO_SERVER: runtimeServerUrl,
-              NOLO_SERVER_URL: runtimeServerUrl,
-              BASE_URL: runtimeServerUrl,
-              AUTH_TOKEN: authToken,
-              NOLO_MACHINE_API_KEY: authToken
-            },
-            fetchImpl,
-            {
-              buildConnectorCliPrompt
-            }
+            { toolInvoke: toolInvokeHandlers },
+            () => handleConnectorRunMessage(
+              message,
+              send,
+              deps.executeCli ?? defaultExecuteCli,
+              {
+                ...env,
+                NOLO_SERVER: runtimeServerUrl,
+                NOLO_SERVER_URL: runtimeServerUrl,
+                BASE_URL: runtimeServerUrl,
+                AUTH_TOKEN: authToken,
+                NOLO_MACHINE_API_KEY: authToken
+              },
+              fetchImpl,
+              {
+                buildConnectorCliPrompt
+              }
+            )
           )
-        )
-      });
-      const exitCode = sessionResult.exitCode;
-      if (exitCode === 2) return 1;
-      if (deps.signal?.aborted) {
-        return 0;
-      }
-      if (attempt >= maxAttempts) return exitCode;
-      const retryDelayMs = Math.min(
-        sessionResult.retryAfterMs ?? reconnectDelayMs,
-        MAX_CONNECTOR_TIMER_DELAY_MS
-      );
-      const reconnectContext = sessionResult.reconnectReason === CORE_DRAIN_REASON ? " during core draining" : "";
-      output.write(
-        `[nolo] Connector websocket disconnected${reconnectContext}. Reconnecting in ${retryDelayMs}ms.
+        });
+        const exitCode = sessionResult.exitCode;
+        if (exitCode === 2) return 1;
+        if (deps.signal?.aborted) {
+          return 0;
+        }
+        if (attempt >= maxAttempts) return exitCode;
+        const retryDelayMs = Math.min(
+          sessionResult.retryAfterMs ?? reconnectDelayMs,
+          MAX_CONNECTOR_TIMER_DELAY_MS
+        );
+        const reconnectContext = sessionResult.reconnectReason === CORE_DRAIN_REASON ? " during core draining" : "";
+        output.write(
+          `[nolo] Connector websocket disconnected${reconnectContext}. Reconnecting in ${retryDelayMs}ms.
 `
-      );
-      await sleepWithAbort(retryDelayMs, sleep, deps.signal);
+        );
+        await sleepWithAbort(retryDelayMs, sleep, deps.signal);
+      }
+      return 0;
+    } finally {
+      instanceLock.release();
+      clearConnectorAlive({
+        machineId,
+        homeDir: deps.connectorHomeDir,
+        noloHome: env.NOLO_HOME
+      });
     }
-    return 0;
   }
   if (hasFlag(args, "--watch")) {
     return runMachineWatchCommand({
       env,
       output,
       machine,
-      sendHeartbeat,
+      sendHeartbeat: sendHeartbeatBase,
       runHeartbeatLoop: deps.runHeartbeatLoop ?? runHeartbeatLoop
     });
   }
   return runMachineHeartbeatConnectCommand({
     output,
     machine,
-    sendHeartbeat
+    sendHeartbeat: sendHeartbeatBase
   });
 }
 export {