nolo-cli 0.143.0-alpha.1 → 0.145.0-alpha.1

package/{chromeCommands-NKU3OWKH.js → chromeCommands-2N6MEWRU.js}

@@ -1,9 +1,11 @@
 import {
   NOLO_CHROME_CONNECTOR_EXTENSION_ID,
   NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION,
+  NOLO_CONNECTOR_EXTENSION_IDS,
+  NOLO_FIREFOX_CONNECTOR_EXTENSION_ID,
   REQUIRED_CHROME_CONNECTOR_FEATURES,
   createChromeConnectorClient
-} from "./chunk-OY5IJI2N.js";
+} from "./chunk-YUNJN43V.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -11,11 +13,11 @@ import "./chunk-KUG52IAP.js";
 import "./chunk-4VNS5WPM.js";
 
 // packages/cli/chromeCommands.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2, statSync } from "node:fs";
+import { existsSync as existsSync2, readFileSync as readFileSync2, statSync as statSync2 } from "node:fs";
 import { resolve as resolve2 } from "node:path";
 
 // packages/desktop-chrome-connector/nativeHostInstall.mjs
-import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { chmodSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { createHash, randomBytes } from "node:crypto";
 import { dirname, resolve } from "node:path";
 import { execFileSync } from "node:child_process";
@@ -144,6 +146,21 @@ var CLI_CONNECTOR_ROOT_CANDIDATES = [
 var FULL_SUPPORT_CHROME_FEATURES = [
   ...new Set(Object.values(REQUIRED_CHROME_CONNECTOR_FEATURES).flat())
 ].sort();
+var FIREFOX_UNAVAILABLE_FEATURES = ["browser_debug", "file_upload"];
+function resolveConnectorBrowser(extensionId) {
+  if (!extensionId) return null;
+  if (extensionId === NOLO_FIREFOX_CONNECTOR_EXTENSION_ID) return "firefox";
+  if (NOLO_CONNECTOR_EXTENSION_IDS.includes(extensionId)) return "chrome";
+  return null;
+}
+function expectedFeaturesForBrowser(browser) {
+  return browser === "firefox" ? FULL_SUPPORT_CHROME_FEATURES.filter(
+    (feature) => !FIREFOX_UNAVAILABLE_FEATURES.includes(feature)
+  ) : FULL_SUPPORT_CHROME_FEATURES;
+}
+function browserLabel(browser) {
+  return browser === "firefox" ? "Firefox" : browser === "chrome" ? "Chrome" : "browser";
+}
 function pickCliConnectorRoot(candidates) {
   for (const candidate of candidates) {
     if (existsSync2(resolve2(candidate, "extension", "manifest.json"))) return candidate;
@@ -183,7 +200,7 @@ function detectWorktreeCheckout(connectorRoot) {
     if (existsSync2(gitEntry)) {
       let isGitFile = null;
       try {
-        isGitFile = statSync(gitEntry).isFile();
+        isGitFile = statSync2(gitEntry).isFile();
       } catch {
       }
       if (isGitFile === true) {
@@ -258,9 +275,13 @@ async function probeConnectorRpc(requestChrome) {
   }
 }
 function resolveStatusNextStep(report) {
+  const targetBrowser = report.rpc.browser ?? report.nativeHost.browser;
+  const installCmd = targetBrowser === "firefox" ? "nolo chrome install --browser firefox" : "nolo chrome install";
+  const connectedLabel = browserLabel(targetBrowser);
+  const browserText = connectedLabel === "browser" ? "the browser" : connectedLabel;
   if (!report.connectorRoot) {
     if (report.rpc.online && report.rpc.protocolVersion === report.rpc.expectedProtocolVersion) {
-      return "Chrome connector is online, but this CLI cannot see a connector checkout, so `nolo chrome install` / manifest checks are unavailable here. Set NOLO_CHROME_CONNECTOR_ROOT (or run the CLI from a repo checkout) to enable them.";
+      return "The Nolo Browser Connector is online, but this CLI cannot see a connector checkout, so `nolo chrome install` / manifest checks are unavailable here. Set NOLO_CHROME_CONNECTOR_ROOT (or run the CLI from a repo checkout) to enable them.";
     }
     return "Run the CLI from a repo checkout that contains packages/desktop-chrome-connector, or set NOLO_CHROME_CONNECTOR_ROOT to one, then rerun `nolo chrome status`.";
   }
@@ -268,20 +289,20 @@ function resolveStatusNextStep(report) {
     return `This platform has no supported native messaging host install (Chrome looks the host up through a registry value on Windows), so non-interactive install is not available: ${report.nativeHost.platformError ?? "unsupported platform"}`;
   }
   if (!report.nativeHost.installed || !report.token.present) {
-    return "nolo chrome install";
+    return installCmd;
   }
   if (!report.nativeHost.wrapperPathMatches || !report.nativeHost.allowedOriginMatches) {
     const installedWrapperPath = report.nativeHost.installedWrapperPath;
     if (!report.nativeHost.wrapperPathMatches && installedWrapperPath && installedWrapperPath !== report.nativeHost.wrapperPath && existsSync2(installedWrapperPath)) {
-      return `Native host is installed for a different checkout (${installedWrapperPath}); this CLI is looking at ${report.connectorRoot}. Run \`nolo chrome status\` from the checkout that installed it, or run \`nolo chrome install\` from here only if Chrome should switch to this one.`;
+      return `Native host is installed for a different checkout (${installedWrapperPath}); this CLI is looking at ${report.connectorRoot}. Run \`nolo chrome status\` from the checkout that installed it, or run \`${installCmd}\` from here only if ${browserText} should switch to this one.`;
     }
-    return "nolo chrome install (the installed manifest does not point at this checkout's wrapper / extension id, which Chrome silently ignores)";
+    return `${installCmd} (the installed manifest does not point at this checkout's wrapper / extension id, which ${browserText} silently ignores)`;
   }
   if (!report.rpc.online) {
-    return `Load the unpacked extension from ${report.extension.path} in chrome://extensions (Developer mode), or install the Nolo Browser Connector from https://nolo.chat/downloads (Chrome or Firefox), then rerun \`nolo chrome status\`.`;
+    return `Load the unpacked extension from ${report.extension.path} in chrome://extensions (Chrome) or about:debugging#/runtime/this-firefox (Firefox), or install the Nolo Browser Connector from https://nolo.chat/downloads, then rerun \`nolo chrome status\`.`;
   }
-  if (report.rpc.extensionId && report.rpc.extensionId !== report.extension.expectedId) {
-    return `The connected extension (${report.rpc.extensionId}) is not the connector at ${report.extension.path}; remove the other copy and rerun \`nolo chrome status\`.`;
+  if (report.rpc.extensionId && report.rpc.browser === null) {
+    return `The connected extension (${report.rpc.extensionId}) is not a recognized Nolo Browser Connector build; reload it (\`nolo chrome reload\`) or remove the other copy, then rerun \`nolo chrome status\`.`;
   }
   if (report.rpc.protocolVersion !== report.rpc.expectedProtocolVersion) {
     return `nolo chrome reload (the running extension does not speak protocol ${report.rpc.expectedProtocolVersion}; a reload restarts the worker with the files on disk)`;
@@ -289,7 +310,7 @@ function resolveStatusNextStep(report) {
   if (report.rpc.missingFeatures.length > 0) {
     return `nolo chrome reload (the running extension is missing ${report.rpc.missingFeatures.join(", ")}); if that persists, the checkout's extension is older than the CLI expects.`;
   }
-  return "Chrome connector is online: chrome_* tools execute against this Chrome profile.";
+  return `The Nolo Browser Connector is online (${connectedLabel}): connector tools execute against this ${connectedLabel} profile.`;
 }
 async function buildChromeConnectorStatus(args = {}) {
   const env = args.env ?? process.env;
@@ -320,7 +341,8 @@ async function buildChromeConnectorStatus(args = {}) {
       wrapperPath: null,
       installedWrapperPath: null,
       wrapperPathMatches: false,
-      allowedOriginMatches: false
+      allowedOriginMatches: false,
+      browser: null
     },
     token: { path: null, present: false },
     rpc: {
@@ -328,6 +350,7 @@ async function buildChromeConnectorStatus(args = {}) {
       extensionId: null,
       protocolVersion: null,
       features: [],
+      browser: null,
       missingFeatures: [...FULL_SUPPORT_CHROME_FEATURES],
       expectedProtocolVersion: NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION
     },
@@ -339,19 +362,48 @@ async function buildChromeConnectorStatus(args = {}) {
   report.rpc.extensionId = probe.extensionId;
   report.rpc.protocolVersion = probe.protocolVersion;
   report.rpc.features = probe.features;
-  report.rpc.missingFeatures = FULL_SUPPORT_CHROME_FEATURES.filter(
+  report.rpc.browser = probe.online ? resolveConnectorBrowser(probe.extensionId) ?? (probe.extensionId === expectedId ? "chrome" : null) : null;
+  report.rpc.missingFeatures = expectedFeaturesForBrowser(report.rpc.browser).filter(
     (feature) => !probe.features.includes(feature)
   );
   if (!probe.online) report.rpc.error = probe.error;
   if (!connectorRoot) {
     if (rootError) report.connectorRootError = rootError;
-    report.ok = report.rpc.online && probe.extensionId === expectedId && probe.protocolVersion === NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION && report.rpc.missingFeatures.length === 0;
+    report.nativeHost.browser = report.rpc.browser;
+    report.ok = report.rpc.online && report.rpc.browser !== null && probe.protocolVersion === NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION && report.rpc.missingFeatures.length === 0;
     report.nextStep = resolveStatusNextStep(report);
     return report;
   }
+  let manifestBrowser = report.rpc.browser === "firefox" ? "firefox" : "chrome";
+  if (!report.rpc.browser) {
+    try {
+      const chromeManifestPath = resolveNativeHostInstallPaths({
+        home,
+        connectorRoot,
+        platform,
+        browser: "chrome"
+      }).nativeManifestPath;
+      const firefoxManifestPath = resolveNativeHostInstallPaths({
+        home,
+        connectorRoot,
+        platform,
+        browser: "firefox"
+      }).nativeManifestPath;
+      if (!existsSync2(chromeManifestPath) && existsSync2(firefoxManifestPath)) {
+        manifestBrowser = "firefox";
+      }
+    } catch {
+    }
+  }
+  report.nativeHost.browser = manifestBrowser;
   let paths = null;
   try {
-    paths = resolveNativeHostInstallPaths({ home, connectorRoot, platform });
+    paths = resolveNativeHostInstallPaths({
+      home,
+      connectorRoot,
+      platform,
+      browser: manifestBrowser
+    });
   } catch (error) {
     report.nativeHost.supported = false;
     report.nativeHost.platformError = toErrorMessage(error);
@@ -365,8 +417,7 @@ async function buildChromeConnectorStatus(args = {}) {
   report.nativeHost.installed = installedManifest !== null;
   report.nativeHost.installedWrapperPath = typeof installedManifest?.path === "string" ? installedManifest.path : null;
   report.nativeHost.wrapperPathMatches = report.nativeHost.installedWrapperPath === paths.wrapperPath;
-  const expectedOrigin = `chrome-extension://${expectedId}/`;
-  report.nativeHost.allowedOriginMatches = Array.isArray(installedManifest?.allowed_origins) && installedManifest.allowed_origins.includes(expectedOrigin);
+  report.nativeHost.allowedOriginMatches = manifestBrowser === "firefox" ? Array.isArray(installedManifest?.allowed_extensions) && installedManifest.allowed_extensions.includes(NOLO_FIREFOX_CONNECTOR_EXTENSION_ID) : Array.isArray(installedManifest?.allowed_origins) && installedManifest.allowed_origins.includes(`chrome-extension://${expectedId}/`);
   if (existsSync2(paths.tokenPath)) {
     try {
       report.token.present = readFileSync2(paths.tokenPath, "utf8").trim().length > 0;
@@ -374,7 +425,7 @@ async function buildChromeConnectorStatus(args = {}) {
       report.token.present = false;
     }
   }
-  report.ok = report.nativeHost.supported && report.nativeHost.installed && report.nativeHost.wrapperPathMatches && report.nativeHost.allowedOriginMatches && report.token.present && probe.online && probe.extensionId === expectedId && probe.protocolVersion === NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION && report.rpc.missingFeatures.length === 0;
+  report.ok = report.nativeHost.supported && report.nativeHost.installed && report.nativeHost.wrapperPathMatches && report.nativeHost.allowedOriginMatches && report.token.present && probe.online && report.rpc.browser !== null && probe.protocolVersion === NOLO_CHROME_CONNECTOR_PROTOCOL_VERSION && report.rpc.missingFeatures.length === 0;
   report.nextStep = resolveStatusNextStep(report);
   return report;
 }
@@ -382,7 +433,7 @@ function yesNo(value) {
   return value ? "ok" : "mismatch";
 }
 function formatChromeConnectorStatus(report) {
-  const lines = ["Nolo Chrome connector"];
+  const lines = ["Nolo Browser Connector"];
   lines.push(
     `  connector source : ${report.connectorRoot ?? "(not found)"}`
   );
@@ -402,7 +453,7 @@ function formatChromeConnectorStatus(report) {
   const rpc = report.rpc;
   if (rpc.online) {
     lines.push(
-      `  RPC              : online  extension ${rpc.extensionId ?? "unknown"}  protocolVersion ${rpc.protocolVersion ?? "unknown"}  features ${rpc.features.length > 0 ? rpc.features.join(", ") : "(none)"}`
+      `  RPC              : online  browser ${rpc.browser ?? "unrecognized"}  extension ${rpc.extensionId ?? "unknown"}  protocolVersion ${rpc.protocolVersion ?? "unknown"}  features ${rpc.features.length > 0 ? rpc.features.join(", ") : "(none)"}`
     );
   } else {
     lines.push(
@@ -431,9 +482,25 @@ async function runChromeStatusCommand(args, deps = {}) {
   }
   return report.ok ? 0 : 1;
 }
+function readBrowserOption(args) {
+  const equalsForm = args.find((arg) => arg.startsWith("--browser="));
+  const index = args.indexOf("--browser");
+  const raw = equalsForm !== void 0 ? equalsForm.slice("--browser=".length) : index >= 0 ? args[index + 1] : void 0;
+  if (raw === void 0) return "chrome";
+  const value = raw.trim();
+  if (value === "chrome" || value === "firefox") return value;
+  return null;
+}
 async function runChromeInstallCommand(args, deps = {}) {
   const env = deps.env ?? process.env;
   const output = deps.output ?? process.stdout;
+  const browser = readBrowserOption(args);
+  if (browser === null) {
+    output.write(
+      '[nolo] Chrome native host install failed: --browser must be "chrome" or "firefox".\n'
+    );
+    return 1;
+  }
   const install = deps.installNativeHost ?? installNativeHostManifest;
   let connectorRoot;
   try {
@@ -457,6 +524,7 @@ async function runChromeInstallCommand(args, deps = {}) {
     result = install({
       home: deps.home ?? env.HOME ?? "",
       connectorRoot,
+      browser,
       ...deps.platform ? { platform: deps.platform } : {},
       ...deps.nodePath ? { nodePath: deps.nodePath } : {}
     });
@@ -471,12 +539,12 @@ async function runChromeInstallCommand(args, deps = {}) {
   } else {
     output.write(
       [
-        "Nolo Chrome connector native host installed.",
+        `Nolo Browser Connector native host installed (${browser}).`,
         `  manifest : ${result.nativeManifestPath}`,
         `  wrapper  : ${result.wrapperPath} -> ${result.nodePath}`,
         `  token    : ${result.tokenPath} (an existing token is kept, so reruns are idempotent)`,
         `  extension: ${result.extensionId}`,
-        `Next step: load the unpacked extension from ${resolve2(connectorRoot, "extension")} in chrome://extensions (Developer mode), or install the Nolo Browser Connector from https://nolo.chat/downloads (Chrome or Firefox), then run \`nolo chrome status\`.`,
+        `Next step: load the unpacked extension from ${resolve2(connectorRoot, "extension")} in ` + (browser === "firefox" ? "about:debugging#/runtime/this-firefox, or install the signed Nolo Browser Connector add-on from https://nolo.chat/downloads, then run `nolo chrome status`." : "chrome://extensions (Developer mode), or install the Nolo Browser Connector from https://nolo.chat/downloads (Chrome or Firefox), then run `nolo chrome status`."),
         ""
       ].join("\n")
     );
@@ -513,11 +581,14 @@ The connector service worker restarts within ~1s; verify with \`nolo chrome stat
 }
 export {
   CLI_CONNECTOR_ROOT_CANDIDATES,
+  FIREFOX_UNAVAILABLE_FEATURES,
   FULL_SUPPORT_CHROME_FEATURES,
   buildChromeConnectorStatus,
   detectWorktreeCheckout,
+  expectedFeaturesForBrowser,
   formatChromeConnectorStatus,
   resolveCliConnectorRoot,
+  resolveConnectorBrowser,
   runChromeInstallCommand,
   runChromeReloadCommand,
   runChromeStatusCommand

package/{chromeOpsCommands-OQDJGD4Y.js → chromeOpsCommands-IXRLN57H.js}

@@ -1,6 +1,6 @@
 import {
   createChromeConnectorClient
-} from "./chunk-OY5IJI2N.js";
+} from "./chunk-YUNJN43V.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -197,8 +197,8 @@ var CHROME_OPS_SUBCOMMANDS = {
 };
 function renderChromeOpsHelp() {
   const lines = [
-    "Operate the user's Chrome through the Nolo Chrome connector (the desktop bridge;",
-    "the same RPC the chrome_* agent tools use).",
+    "Operate the user's browser (Chrome or Firefox) through the Nolo Browser Connector",
+    "(the desktop bridge; the same RPC the browser_* agent tools use \u2014 legacy `chrome_*` names still work).",
     "",
     "Usage:",
     "  nolo chrome <subcommand> [flags]",
@@ -213,6 +213,7 @@ function renderChromeOpsHelp() {
     "    preferred over --selector); --selector takes a CSS selector.",
     "  Actions the connector classifies as irreversible (Submit / Delete / Pay ...)",
     "    are refused with CONFIRMATION_REQUIRED \u2014 ask the user to perform them.",
+    "  read-console / read-network / upload work on Chrome only (Firefox lacks chrome.debugger).",
     "  Every subcommand prints the connector's raw JSON result; failures exit 1.",
     "  Endpoint: NOLO_CHROME_CONNECTOR_RPC_URL or http://127.0.0.1:38947/rpc."
   ];

package/{chunk-7MUSNQ6E.js → chunk-27ONFIEY.js}

@@ -164,10 +164,28 @@ function resolveProviderAuthHeaderName(args) {
   if (/xiaomimimo\.com/i.test(args.endpoint)) return "api-key";
   return "Authorization";
 }
+var OPENCODE_GO_ENDPOINT_RE = /^https?:\/\/opencode\.ai\/zen\/go\//i;
+var OPENCODE_SESSION_HEADER = "x-opencode-session";
+var OPENCODE_USER_AGENT = "nolo-agent/1.0";
+var PROCESS_FALLBACK_SESSION_ID = `nolo-${Math.random().toString(36).slice(2)}${Date.now().toString(36)}`;
+function isOpenCodeGoEndpoint(endpoint) {
+  return typeof endpoint === "string" && OPENCODE_GO_ENDPOINT_RE.test(endpoint.trim());
+}
+function buildProviderSessionHeaders(args) {
+  if (!isOpenCodeGoEndpoint(args.endpoint)) return {};
+  return {
+    [OPENCODE_SESSION_HEADER]: args.sessionId?.trim() || PROCESS_FALLBACK_SESSION_ID,
+    "User-Agent": OPENCODE_USER_AGENT
+  };
+}
 function buildProviderAuthHeaders(args) {
-  if (!args.apiKey) return {};
+  const sessionHeaders = buildProviderSessionHeaders(args);
+  if (!args.apiKey) return sessionHeaders;
   const headerName = resolveProviderAuthHeaderName(args);
-  return headerName.toLowerCase() === "authorization" ? { Authorization: `Bearer ${args.apiKey}` } : { [headerName]: args.apiKey };
+  return {
+    ...sessionHeaders,
+    ...headerName.toLowerCase() === "authorization" ? { Authorization: `Bearer ${args.apiKey}` } : { [headerName]: args.apiKey }
+  };
 }
 async function buildProviderExecutionPlan(args) {
   const { agentConfig, env } = args;

package/{chunk-OZ6V53WV.js → chunk-2EE5UD3N.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-H6A6X4EK.js";
 import {
   isAntigravityOAuthAgent
-} from "./chunk-M6NK74VP.js";
+} from "./chunk-S5XGT6GB.js";
 import {
   getModelAbility
 } from "./chunk-CYSYR67N.js";

package/{chunk-44QZPYLI.js → chunk-2SYTUTLI.js}

@@ -362,6 +362,27 @@ const isWithin = (root, candidate) => {
 const quoteCmd = (value) => '"' + String(value).replace(/"/g, '""') + '"';
 const quotePowerShell = (value) => "'" + String(value).replace(/'/g, "''") + "'";
 const quoteSh = (value) => "'" + String(value).replace(/'/g, "'\\''") + "'";
+
+let stagedDirReferenced = false;
+let lockOwnershipLost = false;
+let shimLeftUnrestored = false;
+
+const assertLockOwnership = () => {
+  try {
+    if (!existsSync(payload.lockPath)) {
+      throw new Error("Update lock was released or removed; aborting to avoid racing another process");
+    }
+    const raw = readFileSync(payload.lockPath, "utf8").trim();
+    const owner = raw.startsWith("{") ? JSON.parse(raw).updateId : raw;
+    if (owner !== payload.updateId) {
+      throw new Error("Update lock was reclaimed by " + owner + "; aborting to avoid racing another updater");
+    }
+  } catch (e) {
+    lockOwnershipLost = true;
+    throw new Error("Lock ownership check failed: " + (e && e.message ? e.message : String(e)));
+  }
+};
+
 const switchWindowsShims = (shimDir, entrypoint) => {
   const shims = [
     { path: join(shimDir, "nolo.cmd"), content: "@ECHO off\r\n" + quoteCmd(payload.nodePath) + " " + quoteCmd(entrypoint) + " %*\r\n" },
@@ -376,14 +397,45 @@ const switchWindowsShims = (shimDir, entrypoint) => {
     return { ...shim, temp, backup, existed: existsSync(shim.path) };
   });
   const activated = [];
+  const attemptRollback = () => {
+    let allRestored = true;
+    for (const shim of [...activated].reverse()) {
+      try { rmSync(shim.path, { force: true }); } catch (e) {
+        log("CRITICAL: Failed to remove new shim " + shim.path + ": " + (e && e.message ? e.message : String(e)));
+      }
+      if (shim.existed) {
+        try {
+          renameSync(shim.backup, shim.path);
+        } catch (e) {
+          allRestored = false;
+          log("CRITICAL: Failed to restore backup shim for " + shim.path + ": " + (e && e.message ? e.message : String(e)));
+        }
+      } else if (existsSync(shim.path)) {
+        // The delete above did not remove this shim (locked file, ACL, ...).
+        // It still points at the staged directory, so the rollback is NOT clean.
+        allRestored = false;
+        log("CRITICAL: New shim still present after rollback attempt: " + shim.path);
+      }
+    }
+    for (const shim of prepared) try { rmSync(shim.temp, { force: true }); } catch {}
+    stagedDirReferenced = !allRestored;
+    return allRestored;
+  };
+
   try {
     for (const shim of prepared) {
       if (shim.existed) renameSync(shim.path, shim.backup);
       try {
         renameSync(shim.temp, shim.path);
+        stagedDirReferenced = true;
       } catch (error) {
         if (shim.existed) {
-          try { renameSync(shim.backup, shim.path); } catch {}
+          try {
+            renameSync(shim.backup, shim.path);
+          } catch (restoreErr) {
+            shimLeftUnrestored = true;
+            log("CRITICAL: Failed to restore backup shim for " + shim.path + ": " + (restoreErr && restoreErr.message ? restoreErr.message : String(restoreErr)));
+          }
         }
         throw error;
       }
@@ -391,22 +443,19 @@ const switchWindowsShims = (shimDir, entrypoint) => {
       activated.push(shim);
     }
   } catch (error) {
-    for (const shim of [...activated].reverse()) {
-      try { rmSync(shim.path, { force: true }); } catch {}
-      if (shim.existed) {
-        try { renameSync(shim.backup, shim.path); } catch {}
+    if (!attemptRollback() || shimLeftUnrestored) {
+      if (error && typeof error === "object") {
+        error.message = (error.message ? error.message : String(error)) + "; rollback incomplete";
       }
+      log("CRITICAL: Rollback incomplete while switching launch shims");
     }
-    for (const shim of prepared) try { rmSync(shim.temp, { force: true }); } catch {}
     throw error;
   }
   return {
     rollback: () => {
-      for (const shim of [...activated].reverse()) {
-        try { rmSync(shim.path, { force: true }); } catch {}
-        if (shim.existed) {
-          try { renameSync(shim.backup, shim.path); } catch {}
-        }
+      const restored = attemptRollback();
+      if (!restored) {
+        throw new Error("Rollback incomplete: one or more launch shims could not be restored or removed");
       }
     },
     commit: () => {
@@ -492,6 +541,7 @@ const switchWindowsShims = (shimDir, entrypoint) => {
       }
       const stagedEntrypoint = join(versionPrefix, "node_modules", "nolo-cli", "index.js");
       if (!existsSync(stagedEntrypoint)) throw new Error("Staged nolo entrypoint is missing");
+      assertLockOwnership();
       progress = setPhase(progress, "switch-shims", 60 * 1000);
       const switchedShims = switchWindowsShims(prefix, stagedEntrypoint);
       const verify = spawnSync(payload.nodePath, [stagedEntrypoint, "-v"], {
@@ -502,17 +552,31 @@ const switchWindowsShims = (shimDir, entrypoint) => {
         timeout: 30 * 1000,
       });
       if (verify.error || verify.status !== 0 || !String(verify.stdout || "").includes(targetVersion)) {
-        switchedShims.rollback();
+        let rollbackError = null;
+        try {
+          switchedShims.rollback();
+        } catch (e) {
+          rollbackError = e;
+        }
+        if (rollbackError) {
+          throw new Error(
+            "The staged CLI failed its post-switch version check; " +
+              (rollbackError && rollbackError.message ? rollbackError.message : String(rollbackError)),
+          );
+        }
         throw new Error("The staged CLI failed its post-switch version check; the previous launch shims were restored");
       }
+      // The lock could have been reclaimed (stale timeout / competing updater)
+      // during the verify window. Re-check before committing so we never claim
+      // success for an update we no longer own. We deliberately do not roll the
+      // shims back here: a competing updater may be mid-switch, and nothing is
+      // deleted, so leaving our shims in place is recoverable (last writer wins).
+      assertLockOwnership();
       switchedShims.commit();
       uncommittedVersionPrefix = null;
-      for (const entry of readdirSync(payload.managedRoot)) {
-        const candidate = join(payload.managedRoot, entry);
-        if (normalize(candidate) !== normalize(versionPrefix)) {
-          try { rmSync(candidate, { recursive: true, force: true }); } catch {}
-        }
-      }
+      // Previous versions are intentionally retained (unbounded until a
+      // reference-aware cleanup exists) because deleting them risks removing a
+      // directory that a shim or a rolled-back update still references.
       log("Verified nolo-cli " + targetVersion + " at " + stagedEntrypoint);
     } else {
       log("Already current at " + targetVersion);
@@ -522,9 +586,17 @@ const switchWindowsShims = (shimDir, entrypoint) => {
     const message = error && error.message ? error.message : String(error);
     log("ERROR: " + message);
     if (uncommittedVersionPrefix) {
-      try { rmSync(uncommittedVersionPrefix, { recursive: true, force: true }); } catch {}
+      if (stagedDirReferenced) {
+        log("PRESERVING staged directory " + uncommittedVersionPrefix + " because launch shims may still reference it; deleting it would cause MODULE_NOT_FOUND");
+      } else {
+        try { rmSync(uncommittedVersionPrefix, { recursive: true, force: true }); } catch {}
+      }
+    }
+    if (lockOwnershipLost) {
+      log("Not writing a failed status record: the update lock belongs to another updater");
+    } else {
+      writeState({ ...progress, status: "failed", finishedAt: new Date().toISOString(), message });
     }
-    writeState({ ...progress, status: "failed", finishedAt: new Date().toISOString(), message });
     process.exitCode = 1;
   } finally {
     try {

package/{chunk-DID5AVGT.js → chunk-2TKVOEQF.js}

@@ -10,7 +10,7 @@ import {
 import {
   clipMultilineText,
   fetchAndSerializeTable
-} from "./chunk-K25DK52L.js";
+} from "./chunk-OKSJZ4UU.js";
 import {
   resolvePageReadMarkdown,
   slateToSimplifiedMarkdown
@@ -20,19 +20,19 @@ import {
 } from "./chunk-MEYIRKDN.js";
 import {
   fetchAndCacheMessages
-} from "./chunk-KUPDS66Q.js";
+} from "./chunk-ANX7Z7Z2.js";
 import {
   shouldUseServerProxy
 } from "./chunk-YYLHWIW6.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-MXRUAINC.js";
+} from "./chunk-UMB7CHAY.js";
 import {
   buildSkillGuidancePromptBlock,
   extractRuntimePageCapabilities,
   resolveBuiltinSkillPage,
   resolveSkillGraphFromRoots
-} from "./chunk-J5H6SUOW.js";
+} from "./chunk-B2XUQXQX.js";
 import {
   DELETE_SAFETY_RED_LINE,
   buildIdentityBlock,
@@ -41,7 +41,7 @@ import {
   detectDispatchIntentFromMessages,
   normalizeChatCompletionsBodyForProvider,
   resolveToolGuidedSections
-} from "./chunk-CTGZO35O.js";
+} from "./chunk-JLQKV2ZJ.js";
 import {
   convertMessagesToResponsesInput,
   getUsageRequestOptions,
@@ -51,10 +51,10 @@ import {
 import {
   ANTIGRAVITY_CLOUD_CODE_BASE_URL,
   isAntigravityOAuthAgent
-} from "./chunk-M6NK74VP.js";
+} from "./chunk-S5XGT6GB.js";
 import {
   buildProviderAuthHeaders
-} from "./chunk-7MUSNQ6E.js";
+} from "./chunk-27ONFIEY.js";
 import {
   estimateTokenCount
 } from "./chunk-PSCNXBYA.js";
@@ -84,7 +84,7 @@ import {
 } from "./chunk-2GRGFCF6.js";
 import {
   canonicalizeToolNames
-} from "./chunk-O6OSWFZQ.js";
+} from "./chunk-XUWRURDF.js";
 import {
   isDeepInfraKimiModel,
   isFireworksKimiModel,
@@ -1124,7 +1124,7 @@ var buildProxyPayload = (bodyData, api, agentConfig, dialogId) => {
   };
 };
 var fetchDirectly = async (params) => {
-  const { api, agentConfig, bodyData, signal, currentServer, token } = params;
+  const { api, agentConfig, bodyData, signal, currentServer, token, dialogId } = params;
   try {
     const apiKey = await resolveDirectRequestApiKey(agentConfig, {
       syncFetcher: currentServer && token ? (ref) => fetchServerSyncedCredential({ currentServer, authToken: token }, ref) : void 0,
@@ -1144,7 +1144,8 @@ var fetchDirectly = async (params) => {
     const authHeaders = buildProviderAuthHeaders({
       endpoint: api,
       apiKey: apiKey ?? "",
-      apiKeyHeader: agentConfig.apiKeyHeader
+      apiKeyHeader: agentConfig.apiKeyHeader,
+      sessionId: dialogId || agentConfig.dbKey || agentConfig.key
     });
     return await fetch(api, {
       method: "POST",