@codexhost/cli-darwin-x64 0.11.0 → 0.12.1

package/app/plugins/cursor-cli/plugin.mjs

@@ -12694,6 +12694,373 @@ var require_content_type = __commonJS({
   }
 });
 
+// ../../harness-discovery/dist/environment.js
+import fs from "node:fs";
+import path from "node:path";
+function targetPath(platform) {
+  return platform === "win32" ? path.win32 : path.posix;
+}
+function environmentValue(environment, name) {
+  const lowered = name.toLowerCase();
+  for (const [key, value] of Object.entries(environment)) {
+    if (key.toLowerCase() === lowered)
+      return value;
+  }
+  return void 0;
+}
+function pathDelimiter(platform) {
+  return platform === "win32" ? ";" : ":";
+}
+function pathDirectories(environment, platform) {
+  return (environmentValue(environment, "PATH") ?? "").split(pathDelimiter(platform)).map((directory) => directory.trim().replace(/^"|"$/gu, "")).filter(Boolean);
+}
+function executableExtensions(command, platform, environment) {
+  if (platform !== "win32")
+    return [""];
+  if (targetPath(platform).extname(command) !== "")
+    return [""];
+  return (environmentValue(environment, "PATHEXT") ?? ".COM;.EXE;.BAT;.CMD").split(";").map((extension) => extension.trim()).filter(Boolean);
+}
+function isExecutableFile(filePath, platform) {
+  try {
+    fs.accessSync(filePath, platform === "win32" ? fs.constants.F_OK : fs.constants.X_OK);
+    return fs.statSync(filePath).isFile();
+  } catch {
+    return false;
+  }
+}
+function subdirectoryNames(directory) {
+  try {
+    return fs.readdirSync(directory, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
+  } catch {
+    return [];
+  }
+}
+function newestFirst(names) {
+  return [...names].sort((left, right) => right.localeCompare(left, void 0, { numeric: true }));
+}
+
+// ../../harness-discovery/dist/invocation.js
+import path2 from "node:path";
+function commandInvocation(command, arguments_, environment, platform = process.platform) {
+  const extension = path2.win32.extname(command).toLowerCase();
+  if (platform !== "win32" || ![".cmd", ".bat"].includes(extension)) {
+    return { command, arguments: [...arguments_], windowsVerbatimArguments: false };
+  }
+  const quote2 = (value) => `"${value.replaceAll("%", "%%").replaceAll('"', '""')}"`;
+  const commandLine = [command, ...arguments_].map(quote2).join(" ");
+  return {
+    command: environmentValue(environment, "ComSpec") ?? "cmd.exe",
+    arguments: ["/d", "/v:off", "/s", "/c", `"${commandLine}"`],
+    windowsVerbatimArguments: true
+  };
+}
+
+// ../../harness-discovery/dist/node-runtime.js
+import path3 from "node:path";
+function withNodeRuntimeOnPath(environment, runtimeExecutable = process.execPath, platform = process.platform) {
+  const pathKey = Object.keys(environment).find((name) => name.toLowerCase() === "path") ?? "PATH";
+  const delimiter = platform === "win32" ? ";" : ":";
+  const runtimeDirectory = path3.dirname(runtimeExecutable);
+  const directories = (environment[pathKey] ?? "").split(delimiter).filter(Boolean);
+  const equal = platform === "win32" ? (value) => value.toLowerCase() : (value) => value;
+  if (!directories.some((directory) => equal(directory) === equal(runtimeDirectory))) {
+    directories.push(runtimeDirectory);
+  }
+  return { ...environment, [pathKey]: directories.join(delimiter) };
+}
+
+// ../../harness-discovery/dist/resolve.js
+import os from "node:os";
+
+// ../../harness-discovery/dist/version-managers.js
+function versionManagerBinaryDirectories(context) {
+  const { platform, environment, home } = context;
+  const list = context.subdirectories ?? subdirectoryNames;
+  const pathFlavor = targetPath(platform);
+  const value = (name) => environmentValue(environment, name);
+  const directories = [];
+  const versioned = (root, ...tail) => {
+    for (const version2 of newestFirst(list(root))) {
+      directories.push(pathFlavor.join(root, version2, ...tail));
+    }
+  };
+  if (platform === "win32") {
+    const appData = value("APPDATA") ?? pathFlavor.join(home, "AppData", "Roaming");
+    const localAppData = value("LOCALAPPDATA") ?? pathFlavor.join(home, "AppData", "Local");
+    versioned(pathFlavor.join(appData, "nvm"));
+    versioned(value("FNM_DIR") ?? pathFlavor.join(appData, "fnm", "node-versions"), "installation");
+    directories.push(pathFlavor.join(localAppData, "Volta", "bin"));
+    directories.push(pathFlavor.join(home, ".bun", "bin"));
+    const pnpmHome2 = value("PNPM_HOME");
+    if (pnpmHome2)
+      directories.push(pnpmHome2);
+    directories.push(pathFlavor.join(localAppData, "pnpm"));
+    return directories;
+  }
+  versioned(pathFlavor.join(value("NVM_DIR") ?? pathFlavor.join(home, ".nvm"), "versions", "node"), "bin");
+  const fnmRoots = [
+    value("FNM_DIR"),
+    pathFlavor.join(home, ".local", "share", "fnm"),
+    pathFlavor.join(home, "Library", "Application Support", "fnm")
+  ].filter((root) => root !== void 0);
+  for (const root of fnmRoots) {
+    versioned(pathFlavor.join(root, "node-versions"), "installation", "bin");
+  }
+  const voltaHome = value("VOLTA_HOME") ?? pathFlavor.join(home, ".volta");
+  versioned(pathFlavor.join(voltaHome, "tools", "image", "node"), "bin");
+  directories.push(pathFlavor.join(voltaHome, "bin"));
+  const asdfHome = value("ASDF_DATA_DIR") ?? pathFlavor.join(home, ".asdf");
+  versioned(pathFlavor.join(asdfHome, "installs", "nodejs"), "bin");
+  directories.push(pathFlavor.join(asdfHome, "shims"));
+  const nodenvHome = value("NODENV_ROOT") ?? pathFlavor.join(home, ".nodenv");
+  versioned(pathFlavor.join(nodenvHome, "versions"), "bin");
+  directories.push(pathFlavor.join(nodenvHome, "shims"));
+  versioned(pathFlavor.join(value("N_PREFIX") ?? "/usr/local", "n", "versions", "node"), "bin");
+  directories.push(pathFlavor.join(home, ".bun", "bin"));
+  const pnpmHome = value("PNPM_HOME");
+  if (pnpmHome)
+    directories.push(pnpmHome);
+  directories.push(pathFlavor.join(home, "Library", "pnpm"));
+  directories.push(pathFlavor.join(home, ".local", "share", "pnpm"));
+  for (const prefix of ["/opt/homebrew/opt", "/usr/local/opt"]) {
+    for (const formula of newestFirst(list(prefix).filter((name) => name.startsWith("node@")))) {
+      directories.push(pathFlavor.join(prefix, formula, "bin"));
+    }
+  }
+  return directories;
+}
+
+// ../../harness-discovery/dist/resolve.js
+var VERSION_MANAGER_ROOTS = "<version-managers>";
+function installRootExtensions(platform) {
+  return platform === "win32" ? [".exe", ".cmd"] : [""];
+}
+function resolveHomeDirectory(input) {
+  return input.homeDirectory ?? environmentValue(input.environment, "HOME") ?? environmentValue(input.environment, "USERPROFILE") ?? os.homedir();
+}
+function templateVariables(environment, platform, home) {
+  const pathFlavor = targetPath(platform);
+  return {
+    HOME: home,
+    USERPROFILE: home,
+    APPDATA: environmentValue(environment, "APPDATA") ?? pathFlavor.join(home, "AppData", "Roaming"),
+    LOCALAPPDATA: environmentValue(environment, "LOCALAPPDATA") ?? pathFlavor.join(home, "AppData", "Local")
+  };
+}
+function joinTemplate(platform, value) {
+  const pathFlavor = targetPath(platform);
+  const segments = value.split("/");
+  const head = segments[0] ?? "";
+  const tail = segments.slice(1);
+  if (head === "")
+    return pathFlavor.join(pathFlavor.sep, ...tail);
+  return tail.length === 0 ? head : pathFlavor.join(head, ...tail);
+}
+function expandInstallRoot(template, environment, platform, home) {
+  const variables = templateVariables(environment, platform, home);
+  let unresolved = false;
+  const substituted = template.replace(/^~(?=\/|$)/u, home).replace(/\$\{(\w+)\}/gu, (_match, name) => {
+    const value = variables[name] ?? environmentValue(environment, name);
+    if (value === void 0 || value === "") {
+      unresolved = true;
+      return "";
+    }
+    return value;
+  });
+  return unresolved ? void 0 : joinTemplate(platform, substituted);
+}
+function installRootDirectories(spec, input, dependencies, platform, home) {
+  const templates = (platform === "win32" ? spec.installRoots?.windows : spec.installRoots?.posix) ?? [];
+  const directories = [];
+  for (const template of templates) {
+    if (template === VERSION_MANAGER_ROOTS) {
+      directories.push(...versionManagerBinaryDirectories({
+        platform,
+        environment: input.environment,
+        home,
+        ...dependencies.subdirectories ? { subdirectories: dependencies.subdirectories } : {}
+      }));
+      continue;
+    }
+    const directory = expandInstallRoot(template, input.environment, platform, home);
+    if (directory !== void 0)
+      directories.push(directory);
+  }
+  return directories;
+}
+function harnessCandidates(spec, input, dependencies = {}) {
+  const platform = input.platform ?? process.platform;
+  const pathFlavor = targetPath(platform);
+  const configured = input.command ?? (spec.commandEnvironmentVariable ? environmentValue(input.environment, spec.commandEnvironmentVariable) : void 0);
+  const command = configured ?? spec.command;
+  if (pathFlavor.isAbsolute(command) || command.includes("/") || command.includes("\\")) {
+    return [{ candidate: command, source: "configured" }];
+  }
+  const candidates = [];
+  const extensions = executableExtensions(command, platform, input.environment);
+  for (const directory of pathDirectories(input.environment, platform)) {
+    for (const extension of extensions) {
+      candidates.push({
+        candidate: pathFlavor.join(directory, command + extension),
+        source: "path"
+      });
+    }
+  }
+  if (configured !== void 0)
+    return candidates;
+  const home = resolveHomeDirectory(input);
+  for (const directory of installRootDirectories(spec, input, dependencies, platform, home)) {
+    for (const extension of installRootExtensions(platform)) {
+      candidates.push({
+        candidate: pathFlavor.join(directory, spec.command + extension),
+        source: "install-root"
+      });
+    }
+  }
+  return candidates;
+}
+function resolveHarnessExecutable(spec, input, dependencies = {}) {
+  const platform = input.platform ?? process.platform;
+  const isExecutable = dependencies.isExecutable ?? ((candidate) => isExecutableFile(candidate, platform));
+  const runnable = spec.runnableCandidate ?? ((candidate) => candidate);
+  const context = { platform, isExecutable };
+  for (const { candidate, source } of harnessCandidates(spec, input, dependencies)) {
+    const executable = runnable(candidate, context);
+    if (executable !== void 0 && isExecutable(executable))
+      return { executable, source };
+  }
+  return void 0;
+}
+
+// ../../harness-discovery/dist/installation.js
+import { execFile } from "node:child_process";
+import { homedir } from "node:os";
+function runInstallationCommand(command, args, environment, timeout = 3e4) {
+  const env = withNodeRuntimeOnPath(environment);
+  const invocation = /\.[cm]?js$/i.test(command) ? commandInvocation(process.execPath, [command, ...args], env) : commandInvocation(command, args, env);
+  return new Promise((resolve, reject) => {
+    const child = execFile(invocation.command, invocation.arguments, {
+      env,
+      cwd: env.HOME ?? env.USERPROFILE ?? homedir(),
+      encoding: "utf8",
+      timeout,
+      killSignal: "SIGKILL",
+      maxBuffer: 1024 * 1024,
+      windowsHide: true,
+      windowsVerbatimArguments: invocation.windowsVerbatimArguments
+    }, (error51, stdout, stderr) => {
+      if (error51)
+        reject(new Error(error51.killed ? "Harness command timed out" : "Harness command failed; check the native installation and retry"));
+      else
+        resolve((stdout || stderr).trim());
+    });
+    child.stdin?.end();
+  });
+}
+function installationVersion(value) {
+  if (typeof value !== "string" || !/^v?\d+(?:\.\d+){1,3}(?:-[\w.-]+)?(?:\+[\w.-]+)?$/.test(value.trim()))
+    throw new Error("Harness returned an invalid version");
+  return value.trim().replace(/^v/, "");
+}
+function createInstallationManager(options) {
+  let checking;
+  let updating;
+  const check2 = () => checking ??= options.check().finally(() => {
+    checking = void 0;
+  });
+  return (action) => {
+    if (updating)
+      return updating;
+    if (action === "check")
+      return check2();
+    updating = (async () => {
+      const before = await check2();
+      if (!before.updateAvailable)
+        return before;
+      if (!before.canUpdate)
+        throw new Error(before.message ?? "This installation cannot be updated automatically");
+      await options.update(before);
+      const after = await check2();
+      if (after.currentVersion === before.currentVersion)
+        throw new Error("The Harness version did not change; check the native updater and retry");
+      return after;
+    })().finally(() => {
+      updating = void 0;
+    });
+    return updating;
+  };
+}
+async function fetchInstallationText(url2) {
+  const request = async () => {
+    const response = await fetch(url2, { signal: AbortSignal.timeout(15e3) });
+    if (!response.ok)
+      throw new Error("Could not check the latest Harness version");
+    return response.text();
+  };
+  try {
+    return await request();
+  } catch (error51) {
+    if (error51 instanceof DOMException && (error51.name === "AbortError" || error51.name === "TimeoutError"))
+      throw error51;
+    return request();
+  }
+}
+
+// ../../harness-discovery/dist/installer.js
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+function createHarnessInstaller(environment, source) {
+  return async () => {
+    if (!["darwin", "linux", "win32"].includes(process.platform))
+      throw new Error("Unsupported installation platform");
+    const env = withNodeRuntimeOnPath(environment);
+    if ("npm" in source) {
+      const npm = resolveHarnessExecutable({
+        id: "npm",
+        command: "npm",
+        installRoots: {
+          posix: [
+            "~/.npm-global/bin",
+            "~/.local/bin",
+            VERSION_MANAGER_ROOTS,
+            "/opt/homebrew/bin",
+            "/usr/local/bin",
+            "/usr/bin"
+          ],
+          windows: [
+            "${APPDATA}/npm",
+            VERSION_MANAGER_ROOTS,
+            "${ProgramFiles}/nodejs",
+            "${LOCALAPPDATA}/Programs/nodejs"
+          ]
+        }
+      }, { environment: env });
+      if (!npm)
+        throw new Error("Install Node.js and npm first");
+      await runInstallationCommand(npm.executable, ["install", "--global", source.npm], {
+        ...env,
+        ...source.allowScripts ? { npm_config_allow_scripts: source.allowScripts } : {}
+      }, 6e5);
+      return;
+    }
+    const windows = process.platform === "win32";
+    const url2 = windows ? source.windows : source.posix;
+    if (new URL(url2).protocol !== "https:")
+      throw new Error("Installer requires HTTPS");
+    const script = await fetchInstallationText(url2);
+    const directory = await mkdtemp(join(tmpdir(), "codexhost-installer-"));
+    try {
+      const file2 = join(directory, windows ? "install.ps1" : "install.sh");
+      await writeFile(file2, script, { mode: 384 });
+      await runInstallationCommand(windows ? "powershell.exe" : source.shell ?? "bash", windows ? ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-File", file2] : [file2], env, 6e5);
+    } finally {
+      await rm(directory, { recursive: true, force: true });
+    }
+  };
+}
+
 // ../../../node_modules/zod/v4/classic/external.js
 var external_exports = {};
 __export(external_exports, {
@@ -27278,6 +27645,20 @@ var harnessDisplaySetSchema = external_exports.strictObject({
   initializeOnly: external_exports.boolean().optional()
 });
 
+// ../../shared-contracts/dist/ids.js
+var opaqueIdSchema = external_exports.string().refine((value) => value.trim().length > 0, {
+  message: "Identifier must not be empty or whitespace"
+});
+var harnessIdSchema = opaqueIdSchema.brand();
+var hostThreadIdSchema = opaqueIdSchema.brand();
+var hostTurnIdSchema = opaqueIdSchema.brand();
+var hostItemIdSchema = opaqueIdSchema.brand();
+var hostInteractionIdSchema = opaqueIdSchema.brand();
+
+// ../../shared-contracts/dist/thread-prewarm.js
+var threadPrewarmDiscardParamsSchema = external_exports.object({ threadId: hostThreadIdSchema });
+var threadPrewarmDiscardResultSchema = external_exports.object({ discarded: external_exports.boolean() });
+
 // ../../shared-contracts/dist/console.js
 var consoleAnnouncementSchema = external_exports.strictObject({
   title: external_exports.string().trim().min(1).max(200),
@@ -27290,10 +27671,14 @@ var consoleOpenResultSchema = external_exports.strictObject({
   url: external_exports.string().max(2048).regex(/^http:\/\/(?:127\.0\.0\.1|localhost):\d{1,5}\/(?:\?.*)?$/u)
 });
 var CONSOLE_HOST_METHODS = Object.freeze([
+  "codexhost/console/remote-connections",
+  "codexhost/runtime/status",
+  "codexhost/remote/ssh-setup",
   "codexhost/harness/plugins/list",
   "codexhost/harness/display-settings/get",
   "codexhost/harness/display-settings/set",
   "codexhost/harness/inspect",
+  "codexhost/harness/installation",
   "codexhost/harness/launch-settings/get",
   "codexhost/harness/launch-settings/set",
   "codexhost/harness/web-ui/open",
@@ -27355,16 +27740,6 @@ var loadedSessionsSchema = external_exports.array(external_exports.strictObject(
   inactiveMs: external_exports.number().nonnegative()
 }));
 
-// ../../shared-contracts/dist/ids.js
-var opaqueIdSchema = external_exports.string().refine((value) => value.trim().length > 0, {
-  message: "Identifier must not be empty or whitespace"
-});
-var harnessIdSchema = opaqueIdSchema.brand();
-var hostThreadIdSchema = opaqueIdSchema.brand();
-var hostTurnIdSchema = opaqueIdSchema.brand();
-var hostItemIdSchema = opaqueIdSchema.brand();
-var hostInteractionIdSchema = opaqueIdSchema.brand();
-
 // ../../shared-contracts/dist/manual-compaction.js
 var threadManualCompactionStartedSchema = external_exports.strictObject({
   threadId: hostThreadIdSchema,
@@ -27940,14 +28315,17 @@ var harnessLaunchSettingsSchema = external_exports.object({
 // ../../shared-contracts/dist/harness-installation.js
 var harnessInstallationParamsSchema = external_exports.object({
   harnessId: harnessIdSchema,
-  action: external_exports.enum(["check", "update"])
+  action: external_exports.enum(["check", "update", "install"])
 }).strict();
 var harnessInstallationStateSchema = external_exports.object({
   currentVersion: external_exports.string().min(1).max(128),
   latestVersion: external_exports.string().min(1).max(128),
   updateAvailable: external_exports.boolean(),
   canUpdate: external_exports.boolean(),
-  message: external_exports.string().max(2048).optional()
+  // Adapter-owned diagnostic text; UI uses messageCode rather than displaying it verbatim.
+  message: external_exports.string().max(2048).optional(),
+  messageCode: external_exports.string().min(1).max(128).optional(),
+  latestVersionKind: external_exports.enum(["unknown", "tracking-branch"]).optional()
 }).strict();
 
 // ../../shared-contracts/dist/codex-accounts.js
@@ -28249,6 +28627,80 @@ var updateStatusResultSchema = external_exports.strictObject({
   status: updateStatusSchema.nullable()
 });
 
+// ../../shared-contracts/dist/remote-runtime.js
+var remoteUpdatePhaseSchema = external_exports.enum([
+  "idle",
+  "installing",
+  "restarting",
+  "succeeded",
+  "failed"
+]);
+var runtimeStatusSchema = external_exports.object({
+  runningVersion: external_exports.string().nullable(),
+  installedVersion: external_exports.string().nullable(),
+  restartRequired: external_exports.boolean(),
+  remote: external_exports.boolean(),
+  updateSupported: external_exports.boolean(),
+  update: external_exports.object({
+    phase: remoteUpdatePhaseSchema,
+    targetVersion: external_exports.string().nullable(),
+    error: external_exports.string().nullable()
+  })
+});
+var remoteUpdateParamsSchema = external_exports.object({
+  version: external_exports.string().regex(/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/u)
+}).strict();
+var remoteSshSetupParamsSchema = external_exports.object({
+  hostname: external_exports.string().min(1).max(1024).refine((value) => !value.startsWith("-") && !/\s/u.test(value)),
+  port: external_exports.number().int().min(1).max(65535).nullable(),
+  identity: external_exports.string().max(4096).nullable(),
+  action: external_exports.enum(["inspect", "install", "update", "repair", "uninstall"]),
+  uninstallPackage: external_exports.boolean().optional(),
+  version: external_exports.string().regex(/^\d+\.\d+\.\d+$/u).nullable()
+}).strict();
+var remoteSshSetupResultSchema = external_exports.object({ state: external_exports.enum(["installed", "not-installed"]) }).strict();
+
+// ../../shared-contracts/dist/remote-connections.js
+var hostId = external_exports.string().min(1).max(1024);
+var codexSshConnectionSchema = external_exports.object({
+  hostId,
+  displayName: external_exports.string().min(1).max(1024),
+  source: external_exports.enum(["codex-managed", "discovered"]),
+  sshAlias: external_exports.string().max(1024).nullable(),
+  sshHost: external_exports.string().min(1).max(1024),
+  sshPort: external_exports.number().int().min(1).max(65535).nullable(),
+  identity: external_exports.string().max(4096).nullable(),
+  autoConnect: external_exports.boolean(),
+  connectionAnalyticsId: external_exports.string().max(1024).optional()
+});
+var codexSshDraftSchema = external_exports.strictObject({
+  displayName: external_exports.string().min(1).max(1024),
+  hostname: external_exports.string().min(1).max(1024),
+  sshPort: external_exports.number().int().min(1).max(65535).nullable(),
+  identity: external_exports.string().max(4096).nullable()
+});
+var remoteConnectionsRequestSchema = external_exports.discriminatedUnion("action", [
+  external_exports.strictObject({ action: external_exports.literal("list") }),
+  external_exports.strictObject({
+    action: external_exports.literal("save"),
+    draft: codexSshDraftSchema,
+    previous: codexSshConnectionSchema.nullable()
+  }),
+  external_exports.strictObject({ action: external_exports.literal("remove"), previous: codexSshConnectionSchema }),
+  external_exports.strictObject({ action: external_exports.literal("connect"), hostId, enabled: external_exports.boolean() }),
+  external_exports.strictObject({ action: external_exports.literal("state"), hostId }),
+  external_exports.strictObject({ action: external_exports.literal("runtime"), hostId }),
+  external_exports.strictObject({
+    action: external_exports.literal("update"),
+    hostId: hostId.refine((id) => id !== "local"),
+    version: remoteUpdateParamsSchema.shape.version
+  })
+]);
+var remoteConnectionsReplySchema = external_exports.union([
+  external_exports.strictObject({ result: jsonValueSchema }),
+  external_exports.strictObject({ error: external_exports.strictObject({ code: external_exports.number().int(), message: external_exports.string() }) })
+]);
+
 // ../../shared-contracts/dist/index.js
 var workspaceContractVersionSchema = external_exports.literal(WORKSPACE_CONTRACT_VERSION);
 
@@ -28587,304 +29039,6 @@ function cursorCommandPrompt(command, catalog) {
   return { ok: true, value: `${descriptor.invocation}${text2 ? ` ${text2}` : ""}` };
 }
 
-// ../../harness-discovery/dist/environment.js
-import fs from "node:fs";
-import path from "node:path";
-function targetPath(platform) {
-  return platform === "win32" ? path.win32 : path.posix;
-}
-function environmentValue(environment, name) {
-  const lowered = name.toLowerCase();
-  for (const [key, value] of Object.entries(environment)) {
-    if (key.toLowerCase() === lowered)
-      return value;
-  }
-  return void 0;
-}
-function pathDelimiter(platform) {
-  return platform === "win32" ? ";" : ":";
-}
-function pathDirectories(environment, platform) {
-  return (environmentValue(environment, "PATH") ?? "").split(pathDelimiter(platform)).map((directory) => directory.trim().replace(/^"|"$/gu, "")).filter(Boolean);
-}
-function executableExtensions(command, platform, environment) {
-  if (platform !== "win32")
-    return [""];
-  if (targetPath(platform).extname(command) !== "")
-    return [""];
-  return (environmentValue(environment, "PATHEXT") ?? ".COM;.EXE;.BAT;.CMD").split(";").map((extension) => extension.trim()).filter(Boolean);
-}
-function isExecutableFile(filePath, platform) {
-  try {
-    fs.accessSync(filePath, platform === "win32" ? fs.constants.F_OK : fs.constants.X_OK);
-    return fs.statSync(filePath).isFile();
-  } catch {
-    return false;
-  }
-}
-function subdirectoryNames(directory) {
-  try {
-    return fs.readdirSync(directory, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
-  } catch {
-    return [];
-  }
-}
-function newestFirst(names) {
-  return [...names].sort((left, right) => right.localeCompare(left, void 0, { numeric: true }));
-}
-
-// ../../harness-discovery/dist/invocation.js
-import path2 from "node:path";
-function commandInvocation(command, arguments_, environment, platform = process.platform) {
-  const extension = path2.win32.extname(command).toLowerCase();
-  if (platform !== "win32" || ![".cmd", ".bat"].includes(extension)) {
-    return { command, arguments: [...arguments_], windowsVerbatimArguments: false };
-  }
-  const quote2 = (value) => `"${value.replaceAll("%", "%%").replaceAll('"', '""')}"`;
-  const commandLine = [command, ...arguments_].map(quote2).join(" ");
-  return {
-    command: environmentValue(environment, "ComSpec") ?? "cmd.exe",
-    arguments: ["/d", "/v:off", "/s", "/c", `"${commandLine}"`],
-    windowsVerbatimArguments: true
-  };
-}
-
-// ../../harness-discovery/dist/node-runtime.js
-import path3 from "node:path";
-function withNodeRuntimeOnPath(environment, runtimeExecutable = process.execPath, platform = process.platform) {
-  const pathKey = Object.keys(environment).find((name) => name.toLowerCase() === "path") ?? "PATH";
-  const delimiter = platform === "win32" ? ";" : ":";
-  const runtimeDirectory = path3.dirname(runtimeExecutable);
-  const directories = (environment[pathKey] ?? "").split(delimiter).filter(Boolean);
-  const equal = platform === "win32" ? (value) => value.toLowerCase() : (value) => value;
-  if (!directories.some((directory) => equal(directory) === equal(runtimeDirectory))) {
-    directories.push(runtimeDirectory);
-  }
-  return { ...environment, [pathKey]: directories.join(delimiter) };
-}
-
-// ../../harness-discovery/dist/resolve.js
-import os from "node:os";
-
-// ../../harness-discovery/dist/version-managers.js
-function versionManagerBinaryDirectories(context) {
-  const { platform, environment, home } = context;
-  const list = context.subdirectories ?? subdirectoryNames;
-  const pathFlavor = targetPath(platform);
-  const value = (name) => environmentValue(environment, name);
-  const directories = [];
-  const versioned = (root, ...tail) => {
-    for (const version2 of newestFirst(list(root))) {
-      directories.push(pathFlavor.join(root, version2, ...tail));
-    }
-  };
-  if (platform === "win32") {
-    const appData = value("APPDATA") ?? pathFlavor.join(home, "AppData", "Roaming");
-    const localAppData = value("LOCALAPPDATA") ?? pathFlavor.join(home, "AppData", "Local");
-    versioned(pathFlavor.join(appData, "nvm"));
-    versioned(value("FNM_DIR") ?? pathFlavor.join(appData, "fnm", "node-versions"), "installation");
-    directories.push(pathFlavor.join(localAppData, "Volta", "bin"));
-    directories.push(pathFlavor.join(home, ".bun", "bin"));
-    const pnpmHome2 = value("PNPM_HOME");
-    if (pnpmHome2)
-      directories.push(pnpmHome2);
-    directories.push(pathFlavor.join(localAppData, "pnpm"));
-    return directories;
-  }
-  versioned(pathFlavor.join(value("NVM_DIR") ?? pathFlavor.join(home, ".nvm"), "versions", "node"), "bin");
-  const fnmRoots = [
-    value("FNM_DIR"),
-    pathFlavor.join(home, ".local", "share", "fnm"),
-    pathFlavor.join(home, "Library", "Application Support", "fnm")
-  ].filter((root) => root !== void 0);
-  for (const root of fnmRoots) {
-    versioned(pathFlavor.join(root, "node-versions"), "installation", "bin");
-  }
-  const voltaHome = value("VOLTA_HOME") ?? pathFlavor.join(home, ".volta");
-  versioned(pathFlavor.join(voltaHome, "tools", "image", "node"), "bin");
-  directories.push(pathFlavor.join(voltaHome, "bin"));
-  const asdfHome = value("ASDF_DATA_DIR") ?? pathFlavor.join(home, ".asdf");
-  versioned(pathFlavor.join(asdfHome, "installs", "nodejs"), "bin");
-  directories.push(pathFlavor.join(asdfHome, "shims"));
-  const nodenvHome = value("NODENV_ROOT") ?? pathFlavor.join(home, ".nodenv");
-  versioned(pathFlavor.join(nodenvHome, "versions"), "bin");
-  directories.push(pathFlavor.join(nodenvHome, "shims"));
-  versioned(pathFlavor.join(value("N_PREFIX") ?? "/usr/local", "n", "versions", "node"), "bin");
-  directories.push(pathFlavor.join(home, ".bun", "bin"));
-  const pnpmHome = value("PNPM_HOME");
-  if (pnpmHome)
-    directories.push(pnpmHome);
-  directories.push(pathFlavor.join(home, "Library", "pnpm"));
-  directories.push(pathFlavor.join(home, ".local", "share", "pnpm"));
-  for (const prefix of ["/opt/homebrew/opt", "/usr/local/opt"]) {
-    for (const formula of newestFirst(list(prefix).filter((name) => name.startsWith("node@")))) {
-      directories.push(pathFlavor.join(prefix, formula, "bin"));
-    }
-  }
-  return directories;
-}
-
-// ../../harness-discovery/dist/resolve.js
-var VERSION_MANAGER_ROOTS = "<version-managers>";
-function installRootExtensions(platform) {
-  return platform === "win32" ? [".exe", ".cmd"] : [""];
-}
-function resolveHomeDirectory(input) {
-  return input.homeDirectory ?? environmentValue(input.environment, "HOME") ?? environmentValue(input.environment, "USERPROFILE") ?? os.homedir();
-}
-function templateVariables(environment, platform, home) {
-  const pathFlavor = targetPath(platform);
-  return {
-    HOME: home,
-    USERPROFILE: home,
-    APPDATA: environmentValue(environment, "APPDATA") ?? pathFlavor.join(home, "AppData", "Roaming"),
-    LOCALAPPDATA: environmentValue(environment, "LOCALAPPDATA") ?? pathFlavor.join(home, "AppData", "Local")
-  };
-}
-function joinTemplate(platform, value) {
-  const pathFlavor = targetPath(platform);
-  const segments = value.split("/");
-  const head = segments[0] ?? "";
-  const tail = segments.slice(1);
-  if (head === "")
-    return pathFlavor.join(pathFlavor.sep, ...tail);
-  return tail.length === 0 ? head : pathFlavor.join(head, ...tail);
-}
-function expandInstallRoot(template, environment, platform, home) {
-  const variables = templateVariables(environment, platform, home);
-  let unresolved = false;
-  const substituted = template.replace(/^~(?=\/|$)/u, home).replace(/\$\{(\w+)\}/gu, (_match, name) => {
-    const value = variables[name] ?? environmentValue(environment, name);
-    if (value === void 0 || value === "") {
-      unresolved = true;
-      return "";
-    }
-    return value;
-  });
-  return unresolved ? void 0 : joinTemplate(platform, substituted);
-}
-function installRootDirectories(spec, input, dependencies, platform, home) {
-  const templates = (platform === "win32" ? spec.installRoots?.windows : spec.installRoots?.posix) ?? [];
-  const directories = [];
-  for (const template of templates) {
-    if (template === VERSION_MANAGER_ROOTS) {
-      directories.push(...versionManagerBinaryDirectories({
-        platform,
-        environment: input.environment,
-        home,
-        ...dependencies.subdirectories ? { subdirectories: dependencies.subdirectories } : {}
-      }));
-      continue;
-    }
-    const directory = expandInstallRoot(template, input.environment, platform, home);
-    if (directory !== void 0)
-      directories.push(directory);
-  }
-  return directories;
-}
-function harnessCandidates(spec, input, dependencies = {}) {
-  const platform = input.platform ?? process.platform;
-  const pathFlavor = targetPath(platform);
-  const configured = input.command ?? (spec.commandEnvironmentVariable ? environmentValue(input.environment, spec.commandEnvironmentVariable) : void 0);
-  const command = configured ?? spec.command;
-  if (pathFlavor.isAbsolute(command) || command.includes("/") || command.includes("\\")) {
-    return [{ candidate: command, source: "configured" }];
-  }
-  const candidates = [];
-  const extensions = executableExtensions(command, platform, input.environment);
-  for (const directory of pathDirectories(input.environment, platform)) {
-    for (const extension of extensions) {
-      candidates.push({
-        candidate: pathFlavor.join(directory, command + extension),
-        source: "path"
-      });
-    }
-  }
-  if (configured !== void 0)
-    return candidates;
-  const home = resolveHomeDirectory(input);
-  for (const directory of installRootDirectories(spec, input, dependencies, platform, home)) {
-    for (const extension of installRootExtensions(platform)) {
-      candidates.push({
-        candidate: pathFlavor.join(directory, spec.command + extension),
-        source: "install-root"
-      });
-    }
-  }
-  return candidates;
-}
-function resolveHarnessExecutable(spec, input, dependencies = {}) {
-  const platform = input.platform ?? process.platform;
-  const isExecutable = dependencies.isExecutable ?? ((candidate) => isExecutableFile(candidate, platform));
-  const runnable = spec.runnableCandidate ?? ((candidate) => candidate);
-  const context = { platform, isExecutable };
-  for (const { candidate, source } of harnessCandidates(spec, input, dependencies)) {
-    const executable = runnable(candidate, context);
-    if (executable !== void 0 && isExecutable(executable))
-      return { executable, source };
-  }
-  return void 0;
-}
-
-// ../../harness-discovery/dist/installation.js
-import { execFile } from "node:child_process";
-import { homedir } from "node:os";
-function runInstallationCommand(command, args, environment, timeout = 3e4) {
-  const env = withNodeRuntimeOnPath(environment);
-  const invocation = /\.[cm]?js$/i.test(command) ? commandInvocation(process.execPath, [command, ...args], env) : commandInvocation(command, args, env);
-  return new Promise((resolve, reject) => {
-    const child = execFile(invocation.command, invocation.arguments, {
-      env,
-      cwd: env.HOME ?? env.USERPROFILE ?? homedir(),
-      encoding: "utf8",
-      timeout,
-      killSignal: "SIGKILL",
-      maxBuffer: 1024 * 1024,
-      windowsHide: true,
-      windowsVerbatimArguments: invocation.windowsVerbatimArguments
-    }, (error51, stdout, stderr) => {
-      if (error51)
-        reject(new Error(error51.killed ? "Harness command timed out" : "Harness command failed; check the native installation and retry"));
-      else
-        resolve((stdout || stderr).trim());
-    });
-    child.stdin?.end();
-  });
-}
-function installationVersion(value) {
-  if (typeof value !== "string" || !/^v?\d+(?:\.\d+){1,3}(?:-[\w.-]+)?(?:\+[\w.-]+)?$/.test(value.trim()))
-    throw new Error("Harness returned an invalid version");
-  return value.trim().replace(/^v/, "");
-}
-function createInstallationManager(options) {
-  let checking;
-  let updating;
-  const check2 = () => checking ??= options.check().finally(() => {
-    checking = void 0;
-  });
-  return (action) => {
-    if (updating)
-      return updating;
-    if (action === "check")
-      return check2();
-    updating = (async () => {
-      const before = await check2();
-      if (!before.updateAvailable)
-        return before;
-      if (!before.canUpdate)
-        throw new Error(before.message ?? "This installation cannot be updated automatically");
-      await options.update(before);
-      const after = await check2();
-      if (after.currentVersion === before.currentVersion)
-        throw new Error("The Harness version did not change; check the native updater and retry");
-      return after;
-    })().finally(() => {
-      updating = void 0;
-    });
-    return updating;
-  };
-}
-
 // dist/command.js
 import { existsSync, readdirSync } from "node:fs";
 import path4 from "node:path";
@@ -28903,11 +29057,13 @@ function cursorDiscoverySpec(skipPinnedVersions) {
     } : {}
   };
 }
+var CursorNotInstalledError = class extends Error {
+};
 function resolveCursorExecutable(environment, command) {
   const input = { environment, ...command ? { command } : {} };
   const pinned = resolveHarnessExecutable(cursorDiscoverySpec(false), input);
   if (!pinned)
-    throw new Error("Cursor CLI is not installed; install cursor-agent or set CODEXHOST_CURSOR_COMMAND");
+    throw new CursorNotInstalledError("Cursor CLI is not installed; install cursor-agent or set CODEXHOST_CURSOR_COMMAND");
   const explicit = command?.trim() || environment.CODEXHOST_CURSOR_COMMAND?.trim();
   if (explicit || !PINNED_VERSION_AGENT.test(pinned.executable))
     return pinned;
@@ -29051,6 +29207,99 @@ async function fetchCursorAccount(input = {}) {
 import { lstat, opendir, readFile as readFile2, realpath, stat } from "node:fs/promises";
 import path7 from "node:path";
 
+// ../../harness-adapter/dist/session-import.js
+var SessionImportChangedError = class extends Error {
+  constructor(message = "Native Session changed during discovery; refresh and retry") {
+    super(message);
+    this.name = "SessionImportChangedError";
+  }
+};
+function isMissingFileError(error51) {
+  return typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "ENOENT";
+}
+function sameFileFingerprint(left, right) {
+  return left === null || right === null ? left === right : left.dev === right.dev && left.ino === right.ino && left.size === right.size && left.mtimeMs === right.mtimeMs && left.ctimeMs === right.ctimeMs;
+}
+function sessionImportTitle(value, maxLength = HARNESS_SESSION_IMPORT_TITLE_MAX_LENGTH) {
+  if (typeof value !== "string")
+    return null;
+  const normalized = value.replaceAll("\0", "").replaceAll(/\s+/gu, " ").trim();
+  if (!normalized)
+    return null;
+  if (normalized.length <= maxLength)
+    return normalized;
+  const characters = [...normalized];
+  if (characters.length <= maxLength)
+    return normalized;
+  return `${characters.slice(0, maxLength - 1).join("").trimEnd()}…`;
+}
+function sessionImportCandidate(input) {
+  const time3 = typeof input.updatedAt === "number" ? input.updatedAt : typeof input.updatedAt === "string" ? Date.parse(input.updatedAt) : Number.NaN;
+  const parsed = harnessSessionImportCandidateSchema.safeParse({
+    nativeSessionId: input.nativeSessionId,
+    cwd: input.cwd,
+    title: typeof input.title === "string" && input.title.trim().length > 0 ? input.title : null,
+    updatedAt: Math.floor(time3),
+    // Unknown must stay unknown; only an explicit boolean is a native statement.
+    running: typeof input.running === "boolean" ? input.running : null
+  });
+  return parsed.success ? parsed.data : null;
+}
+var SessionImportScope = class {
+  #abort = new AbortController();
+  #options;
+  #pending = /* @__PURE__ */ new Set();
+  constructor(options) {
+    this.#options = options;
+  }
+  #closed() {
+    return {
+      ok: false,
+      error: { code: "invalidState", message: this.#options.closedMessage, retryable: false }
+    };
+  }
+  read(operation) {
+    const signal = this.#abort.signal;
+    if (signal.aborted)
+      return Promise.resolve(this.#closed());
+    let started;
+    try {
+      started = operation(signal);
+    } catch (error51) {
+      started = Promise.reject(error51 instanceof Error ? error51 : new Error("Session read failed"));
+    }
+    const request = started.then((value) => signal.aborted ? this.#closed() : { ok: true, value }).catch(() => signal.aborted ? this.#closed() : {
+      ok: false,
+      error: {
+        code: "unavailable",
+        message: this.#options.unavailableMessage,
+        retryable: true
+      }
+    }).finally(() => this.#pending.delete(request));
+    this.#pending.add(request);
+    return request;
+  }
+  /** `read` for `resolveCandidate`: a null source is the selected Session having disappeared. */
+  async resolve(operation) {
+    const result = await this.read(operation);
+    if (!result.ok)
+      return result;
+    return result.value ? { ok: true, value: result.value } : {
+      ok: false,
+      error: {
+        code: "sessionNotFound",
+        message: this.#options.notFoundMessage,
+        retryable: false
+      }
+    };
+  }
+  /** Idempotent. Resolves after every started read has settled. */
+  async close() {
+    this.#abort.abort();
+    await Promise.allSettled(this.#pending);
+  }
+};
+
 // dist/native-history.js
 import { existsSync as existsSync2, readFileSync, realpathSync } from "node:fs";
 import os2 from "node:os";
@@ -29196,8 +29445,6 @@ function cursorExecutionPolicy(ref) {
 // dist/session-import.js
 var SESSION_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/iu;
 var MAX_METADATA_BYTES = 1024 * 1024;
-var CursorSessionChangedError = class extends Error {
-};
 function errorCode(error51) {
   return typeof error51 === "object" && error51 !== null && "code" in error51 && typeof error51.code === "string" ? error51.code : void 0;
 }
@@ -29205,23 +29452,23 @@ async function optionalStat(file2) {
   try {
     return await lstat(file2);
   } catch (error51) {
-    if (errorCode(error51) === "ENOENT")
+    if (isMissingFileError(error51))
       return null;
     throw error51;
   }
 }
-function sameFile(left, right) {
-  return left === null || right === null ? left === right : left.dev === right.dev && left.ino === right.ino && left.size === right.size && left.mtimeMs === right.mtimeMs && left.ctimeMs === right.ctimeMs;
-}
 var CursorSessionImport = class {
   #environment;
-  #abort = new AbortController();
-  #pending = /* @__PURE__ */ new Set();
+  #scope = new SessionImportScope({
+    closedMessage: "Cursor Session import is closed",
+    unavailableMessage: "Cursor ACP sessions could not be read; close native clients, check storage access and retry",
+    notFoundMessage: "Cursor ACP Session is no longer importable"
+  });
   constructor(environment) {
     this.#environment = { ...environment };
   }
   listCandidates() {
-    return this.#read(async (signal) => {
+    return this.#scope.read(async (signal) => {
       const root = path7.join(cursorConfigDirectory(this.#environment), "acp-sessions");
       const info = await optionalStat(root);
       if (!info)
@@ -29239,7 +29486,7 @@ var CursorSessionImport = class {
           if (candidate)
             candidates.push(candidate);
         } catch (error51) {
-          if (!(error51 instanceof CursorSessionChangedError))
+          if (!(error51 instanceof SessionImportChangedError))
             throw error51;
         }
       }
@@ -29256,27 +29503,15 @@ var CursorSessionImport = class {
           retryable: false
         }
       };
-    const result = await this.#read((signal) => this.#candidate(nativeSessionId, signal));
-    if (!result.ok)
-      return result;
-    if (!result.value)
-      return {
-        ok: false,
-        error: {
-          code: "sessionNotFound",
-          message: "Cursor ACP Session is no longer importable",
-          retryable: false
-        }
-      };
-    return {
-      ok: true,
-      value: {
-        candidate: result.value,
+    return this.#scope.resolve(async (signal) => {
+      const candidate = await this.#candidate(nativeSessionId, signal);
+      return candidate ? {
+        candidate,
         // Native ACP stores do not attest to --force. Imported sessions must not
         // acquire unattended privileges from UI defaults or a guessed locator.
         nativeRef: cursorNativeSessionRef(nativeSessionId, "default")
-      }
-    };
+      } : null;
+    });
   }
   async #candidate(id, signal) {
     signal.throwIfAborted();
@@ -29307,7 +29542,7 @@ var CursorSessionImport = class {
       const turns = readCursorNativeTurns(id, cwd, this.#environment);
       if (!turns.length)
         return null;
-      title = turns[0]?.text.replaceAll("\0", "").replace(/\s+/gu, " ").trim().slice(0, HARNESS_SESSION_IMPORT_TITLE_MAX_LENGTH) || null;
+      title = sessionImportTitle(turns[0]?.text);
     } catch (error51) {
       signal.throwIfAborted();
       if (["EACCES", "EPERM", "EIO", "EMFILE", "ENFILE"].includes(errorCode(error51) ?? ""))
@@ -29316,46 +29551,17 @@ var CursorSessionImport = class {
     }
     signal.throwIfAborted();
     const after = await Promise.all(files.map(optionalStat));
-    if (before.some((info, index) => !sameFile(info, after[index] ?? null)))
-      throw new CursorSessionChangedError("Cursor Session changed during discovery");
-    const parsed = harnessSessionImportCandidateSchema.safeParse({
+    if (before.some((info, index) => !sameFileFingerprint(info, after[index] ?? null)))
+      throw new SessionImportChangedError("Cursor Session changed during discovery");
+    return sessionImportCandidate({
       nativeSessionId: id,
       cwd,
       title,
-      updatedAt: Math.floor(Math.max(database.mtimeMs, wal?.mtimeMs ?? 0)),
-      // A stable read does not establish that another Cursor process is idle.
-      running: null
+      updatedAt: Math.max(database.mtimeMs, wal?.mtimeMs ?? 0)
     });
-    return parsed.success ? parsed.data : null;
-  }
-  #read(operation) {
-    const signal = this.#abort.signal;
-    if (signal.aborted)
-      return Promise.resolve({
-        ok: false,
-        error: {
-          code: "invalidState",
-          message: "Cursor Session import is closed",
-          retryable: false
-        }
-      });
-    const request = operation(signal).then((value) => {
-      signal.throwIfAborted();
-      return { ok: true, value };
-    }).catch(() => ({
-      ok: false,
-      error: {
-        code: signal.aborted ? "invalidState" : "unavailable",
-        message: signal.aborted ? "Cursor Session import is closed" : "Cursor ACP sessions could not be read; close native clients, check storage access and retry",
-        retryable: !signal.aborted
-      }
-    })).finally(() => this.#pending.delete(request));
-    this.#pending.add(request);
-    return request;
   }
-  async close() {
-    this.#abort.abort();
-    await Promise.allSettled(this.#pending);
+  close() {
+    return this.#scope.close();
   }
 };
 
@@ -46538,7 +46744,7 @@ var CursorInteractions = class {
 
 // dist/fork.js
 import { createHash as createHash2 } from "node:crypto";
-import { copyFile, mkdir, mkdtemp, readdir, readFile as readFile3, realpath as realpath2, rm, writeFile } from "node:fs/promises";
+import { copyFile, mkdir, mkdtemp as mkdtemp2, readdir, readFile as readFile3, realpath as realpath2, rm as rm2, writeFile as writeFile2 } from "node:fs/promises";
 import { readdirSync as readdirSync2 } from "node:fs";
 import os3 from "node:os";
 import path9 from "node:path";
@@ -46709,12 +46915,12 @@ async function forkCursorSession(source, checkpoint, options, signal) {
   if (rewindTurn && !rewindTurn.rewindRoot)
     throw new Error("Cursor target has no native rewind checkpoint");
   const original = storeIdentity(sourceDirectory);
-  const temporary = await mkdtemp(path9.join(os3.tmpdir(), "codexhost-cursor-fork-"));
+  const temporary = await mkdtemp2(path9.join(os3.tmpdir(), "codexhost-cursor-fork-"));
   let target;
   let committed = false;
   const discard = async () => {
     if (target && !committed)
-      await rm(target, { recursive: true, force: true });
+      await rm2(target, { recursive: true, force: true });
   };
   try {
     signal.throwIfAborted();
@@ -46731,7 +46937,7 @@ async function forkCursorSession(source, checkpoint, options, signal) {
       if (!(error51 instanceof Error && "code" in error51 && error51.code === "ENOENT"))
         throw error51;
     }
-    await writeFile(path9.join(config2, "cli-config.json"), JSON.stringify({ ...settings, rewind: true }), { mode: 384 });
+    await writeFile2(path9.join(config2, "cli-config.json"), JSON.stringify({ ...settings, rewind: true }), { mode: 384 });
     const chats = path9.join(config2, "chats", createHash2("md5").update(await realpath2(options.cwd)).digest("hex"));
     const copy = path9.join(chats, source.nativeSessionId);
     await mkdir(copy, { recursive: true });
@@ -46785,7 +46991,7 @@ async function forkCursorSession(source, checkpoint, options, signal) {
     throw error51;
   } finally {
     try {
-      await rm(temporary, { recursive: true, force: true });
+      await rm2(temporary, { recursive: true, force: true });
     } catch (error51) {
       await discard();
       throw error51;
@@ -47402,6 +47608,7 @@ var CursorSession = class {
 };
 
 // ../../harness-broker/dist/client.js
+import { execFile as execFile4 } from "node:child_process";
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { lstat as lstat2, readFile as readFile4 } from "node:fs/promises";
 import net, {} from "node:net";
@@ -47411,9 +47618,12 @@ var HARNESS_BROKER_PROTOCOL_VERSION = 1;
 var HARNESS_BROKER_MAX_FRAME_BYTES = 8 * 1024 * 1024;
 var HARNESS_BROKER_MAX_PENDING_REQUESTS = 32;
 var HARNESS_BROKER_REQUEST_TIMEOUT_MS = 15e3;
+var HARNESS_BROKER_IDLE_TIMEOUT_MS = 60 * 60 * 1e3;
+var HARNESS_BROKER_RETIRING_ERROR_CODE = "brokerRetiring";
 var harnessBrokerMethodSchema = external_exports.enum([
   "adapter.inspect",
   "adapter.inspectAccount",
+  "adapter.credits",
   "adapter.open",
   "adapter.subagent.readSnapshot",
   "session.readSnapshot",
@@ -47531,6 +47741,14 @@ function defaultHarnessBrokerDescriptorPath(environment = process.env, harnessId
     return path11.join(defaultHarnessBrokerDirectory(environment), `${harnessId}-broker-v1.json`);
   return environment[HARNESS_BROKER_DESCRIPTOR_ENV] ?? path11.join(defaultHarnessBrokerDirectory(environment), HARNESS_BROKER_DESCRIPTOR_FILE);
 }
+function harnessBrokerLaunchAgentLabel(harnessId = "claude-code") {
+  harnessPluginIdSchema.parse(harnessId);
+  return harnessId === "claude-code" ? "ai.bytepioneer.codexhost.native-harness-broker" : `ai.bytepioneer.codexhost.${harnessId}-broker`;
+}
+function harnessBrokerLaunchAgentPlistPath(environment = process.env, harnessId = "claude-code") {
+  const home = environment.HOME || os4.homedir();
+  return path11.join(home, "Library", "LaunchAgents", `${harnessBrokerLaunchAgentLabel(harnessId)}.plist`);
+}
 
 // ../../harness-broker/dist/validation.js
 var cwdSchema = external_exports.string().min(1).max(16384);
@@ -47836,10 +48054,55 @@ async function readDescriptor(descriptorPath) {
   try {
     process.kill(descriptor.ownerPid, 0);
   } catch {
-    throw new Error("Aqua Harness broker owner process is unavailable");
+    throw new BrokerNotRunningError("its owner process has exited");
   }
   return descriptor;
 }
+var BrokerNotRunningError = class extends Error {
+};
+var BrokerRetiringError = class extends Error {
+};
+var BrokerRequestNotDeliveredError = class extends Error {
+};
+var HarnessNotInstalledError = class extends Error {
+};
+var BROKER_NOT_RUNNING_CODES = /* @__PURE__ */ new Set(["ENOENT", "ECONNREFUSED"]);
+var BROKER_START_TIMEOUT_MS = 15e3;
+var BROKER_START_POLL_MS = 250;
+function classifyConnectFailure(error51) {
+  if (error51 instanceof BrokerNotRunningError)
+    return error51;
+  const code = error51?.code;
+  if (code && BROKER_NOT_RUNNING_CODES.has(code)) {
+    return new BrokerNotRunningError(code === "ENOENT" ? "its descriptor or socket is missing" : "its socket refused the connection");
+  }
+  return error51 instanceof Error ? error51 : new Error(String(error51));
+}
+function describeBrokerFailure(error51, harnessId) {
+  if (error51 instanceof BrokerNotRunningError) {
+    return `The ${harnessId} Aqua Harness broker on this Mac could not be started (${error51.message}). Keep the desktop user logged in, then repair the remote service or run on this Mac: codexhost broker install --harness ${harnessId}`;
+  }
+  return error51 instanceof Error ? error51.message : String(error51);
+}
+function runLaunchctl(arguments_) {
+  return new Promise((resolve) => {
+    execFile4("/bin/launchctl", arguments_, { timeout: 1e4 }, (error51) => resolve(!error51));
+  });
+}
+async function startBrokerLaunchAgent(harnessId, environment) {
+  const uid = process.getuid?.();
+  if (uid === void 0)
+    return;
+  const target = `gui/${uid}/${harnessBrokerLaunchAgentLabel(harnessId)}`;
+  if (await runLaunchctl(["kickstart", target]))
+    return;
+  await runLaunchctl([
+    "bootstrap",
+    `gui/${uid}`,
+    harnessBrokerLaunchAgentPlistPath(environment, harnessId)
+  ]);
+  await runLaunchctl(["kickstart", target]);
+}
 var BrokerConnection = class _BrokerConnection {
   #onClose;
   onClose(callback) {
@@ -47863,21 +48126,31 @@ var BrokerConnection = class _BrokerConnection {
     socket.once("error", (error51) => this.#fail(error51));
   }
   static async connect(descriptorPath, harnessId) {
-    const descriptor = await readDescriptor(descriptorPath);
-    if (descriptor.harnessId !== harnessId)
-      throw new Error("Aqua broker belongs to another Harness");
-    const socket = net.createConnection(descriptor.socketPath);
-    await new Promise((resolve, reject) => {
-      const timeout = setTimeout(() => reject(new Error("Timed out connecting to Aqua Harness broker")), HARNESS_BROKER_REQUEST_TIMEOUT_MS);
-      socket.once("connect", () => {
-        clearTimeout(timeout);
-        resolve();
-      });
-      socket.once("error", (error51) => {
-        clearTimeout(timeout);
-        reject(error51);
+    let descriptor;
+    let socket;
+    let connecting;
+    try {
+      descriptor = await readDescriptor(descriptorPath);
+      if (descriptor.harnessId !== harnessId)
+        throw new Error("Aqua broker belongs to another Harness");
+      connecting = net.createConnection(descriptor.socketPath);
+      const pending = connecting;
+      await new Promise((resolve, reject) => {
+        const timeout = setTimeout(() => reject(new Error("Timed out connecting to Aqua Harness broker")), HARNESS_BROKER_REQUEST_TIMEOUT_MS);
+        pending.once("connect", () => {
+          clearTimeout(timeout);
+          resolve();
+        });
+        pending.once("error", (error51) => {
+          clearTimeout(timeout);
+          reject(error51);
+        });
       });
-    });
+      socket = pending;
+    } catch (error51) {
+      connecting?.destroy();
+      throw classifyConnectFailure(error51);
+    }
     const connection = new _BrokerConnection(descriptor, socket);
     const hello = connection.#waitForHello();
     await writeBrokerFrame(socket, {
@@ -47930,15 +48203,24 @@ var BrokerConnection = class _BrokerConnection {
       }, HARNESS_BROKER_REQUEST_TIMEOUT_MS);
       this.#pending.set(id, { resolve, reject, timeout });
     });
-    await writeBrokerFrame(this.#socket, {
-      version: HARNESS_BROKER_PROTOCOL_VERSION,
-      generation: this.#descriptor.generation,
-      sequence: this.#inputSequence,
-      kind: "request",
-      id,
-      method,
-      params
-    });
+    try {
+      await writeBrokerFrame(this.#socket, {
+        version: HARNESS_BROKER_PROTOCOL_VERSION,
+        generation: this.#descriptor.generation,
+        sequence: this.#inputSequence,
+        kind: "request",
+        id,
+        method,
+        params
+      });
+    } catch (error51) {
+      const pending = this.#pending.get(id);
+      if (pending)
+        clearTimeout(pending.timeout);
+      this.#pending.delete(id);
+      response.catch(() => void 0);
+      throw new BrokerRequestNotDeliveredError(error51 instanceof Error ? error51.message : String(error51));
+    }
     return response;
   }
   close() {
@@ -47982,6 +48264,8 @@ var BrokerConnection = class _BrokerConnection {
     this.#pending.delete(frame.id);
     if (frame.ok)
       pending.resolve(frame.value);
+    else if (frame.error?.code === HARNESS_BROKER_RETIRING_ERROR_CODE)
+      pending.reject(new BrokerRetiringError(frame.error.message));
     else
       pending.reject(new Error(frame.error?.message ?? "Broker request failed"));
   }
@@ -48207,17 +48491,19 @@ var BrokeredHarnessAdapter = class {
   harnessId;
   #descriptorPath;
   #forwardEnvironment;
+  #isInstalled;
+  #startBroker;
+  #startTimeoutMs;
   #connection = null;
   #closed = false;
+  #credits = null;
+  #creditsRefresh = null;
   subagents = {
     readSnapshot: async (input) => {
       try {
-        return parseHarnessResult(await (await this.#connect()).request("adapter.subagent.readSnapshot", input));
+        return parseHarnessResult(await this.#request("adapter.subagent.readSnapshot", input));
       } catch (error51) {
-        return {
-          ok: false,
-          error: unavailable(error51 instanceof Error ? error51.message : String(error51))
-        };
+        return { ok: false, error: this.#error(error51) };
       }
     }
   };
@@ -48229,12 +48515,39 @@ var BrokeredHarnessAdapter = class {
     if (input.liveCommandCatalog)
       this.liveCommandCatalog = true;
     this.#descriptorPath = input.descriptorPath ?? defaultHarnessBrokerDescriptorPath(input.environment, this.harnessId);
+    this.#isInstalled = input.isInstalled;
+    const environment = input.environment ?? process.env;
+    this.#startBroker = input.startBroker === false ? void 0 : input.startBroker ?? (process.platform === "darwin" && !input.descriptorPath ? () => startBrokerLaunchAgent(this.harnessId, environment) : void 0);
+    this.#startTimeoutMs = input.startTimeoutMs ?? BROKER_START_TIMEOUT_MS;
+  }
+  credits() {
+    return this.#credits;
+  }
+  refreshCredits() {
+    if (this.#closed)
+      return Promise.resolve(null);
+    if (this.#creditsRefresh)
+      return this.#creditsRefresh;
+    this.#creditsRefresh = this.#readCredits().finally(() => {
+      this.#creditsRefresh = null;
+    });
+    return this.#creditsRefresh;
+  }
+  async #readCredits() {
+    try {
+      const value = await this.#request("adapter.credits", {}, true);
+      const credits = accountCreditsSnapshotSchema.nullable().parse(value);
+      if (!this.#closed)
+        this.#credits = credits;
+    } catch {
+    }
+    return this.#credits;
   }
   async inspectAccount() {
     if (this.#closed)
       return null;
     try {
-      const value = await (await this.#connect()).request("adapter.inspectAccount", {});
+      const value = await this.#request("adapter.inspectAccount", {}, true);
       return harnessAccountSnapshotSchema.nullable().parse(value);
     } catch {
       return null;
@@ -48244,33 +48557,46 @@ var BrokeredHarnessAdapter = class {
     if (this.#closed)
       return failedInspection("Aqua Harness broker adapter is closed");
     try {
-      return harnessInspectionSchema.parse(await (await this.#connect()).request("adapter.inspect", input));
+      return harnessInspectionSchema.parse(await this.#request("adapter.inspect", input, true));
     } catch (error51) {
       this.#connection = null;
-      return failedInspection(error51 instanceof Error ? error51.message : String(error51));
+      if (error51 instanceof HarnessNotInstalledError)
+        return { status: "notInstalled", error: this.#error(error51) };
+      return failedInspection(describeBrokerFailure(error51, this.harnessId));
     }
   }
   async open(input) {
     if (this.#closed)
       return { ok: false, error: unavailable("Aqua Harness broker adapter is closed", false) };
+    const safeInput = { ...input };
+    delete safeInput.environment;
+    if (this.#forwardEnvironment && input.environment) {
+      const allowed = [
+        "CODEXHOST_CLI_PATH",
+        "CODEXHOST_CLI_NODE_PATH",
+        "CODEXHOST_RUNTIME_ENDPOINT",
+        "CODEXHOST_RUNTIME_TOKEN",
+        "CODEXHOST_THREAD_ID"
+      ];
+      const environment = Object.fromEntries(Object.entries(input.environment).filter(([key, value]) => allowed.includes(key) && value !== void 0));
+      if (Object.keys(environment).length)
+        safeInput.environment = environment;
+    }
     let connection;
     try {
-      const safeInput = { ...input };
-      delete safeInput.environment;
-      if (this.#forwardEnvironment && input.environment) {
-        const allowed = [
-          "CODEXHOST_CLI_PATH",
-          "CODEXHOST_CLI_NODE_PATH",
-          "CODEXHOST_RUNTIME_ENDPOINT",
-          "CODEXHOST_RUNTIME_TOKEN",
-          "CODEXHOST_THREAD_ID"
-        ];
-        const environment = Object.fromEntries(Object.entries(input.environment).filter(([key, value]) => allowed.includes(key) && value !== void 0));
-        if (Object.keys(environment).length)
-          safeInput.environment = environment;
-      }
-      connection = await this.#connect();
-      const result = parseHarnessResult(await connection.request("adapter.open", safeInput));
+      let value;
+      for (let attempt = 0; ; attempt += 1) {
+        connection = await this.#connect();
+        try {
+          value = await connection.request("adapter.open", safeInput);
+          break;
+        } catch (error51) {
+          if (attempt > 0 || !(error51 instanceof BrokerRetiringError || error51 instanceof BrokerRequestNotDeliveredError))
+            throw error51;
+          this.#connection = null;
+        }
+      }
+      const result = parseHarnessResult(value);
       if (!result.ok)
         return result;
       const session = new BrokeredHarnessSession(connection, parseSessionMetadata(result.value), this.harnessId, safeInput, () => this.#connect(), () => {
@@ -48281,25 +48607,51 @@ var BrokeredHarnessAdapter = class {
     } catch (error51) {
       connection?.close();
       this.#connection = null;
-      return {
-        ok: false,
-        error: unavailable(error51 instanceof Error ? error51.message : String(error51))
-      };
+      return { ok: false, error: this.#error(error51) };
     }
   }
   async close() {
     this.#closed = true;
+    this.#credits = null;
     await Promise.allSettled([...this.#sessions].map((session) => session.close()));
     this.#sessions.clear();
     const connection = await this.#connection?.catch(() => null);
     await connection?.dispose();
     this.#connection = null;
   }
+  #error(error51) {
+    if (error51 instanceof HarnessNotInstalledError)
+      return {
+        code: "notInstalled",
+        message: error51.message,
+        retryable: false,
+        stage: "harnessBroker"
+      };
+    return unavailable(describeBrokerFailure(error51, this.harnessId));
+  }
+  /**
+   * Sends one adapter-level request. A broker that retired between requests refuses it
+   * unprocessed, so it is retried once on a fresh broker. Idempotent reads also retry
+   * once after a plain disconnect.
+   */
+  async #request(method, params, idempotent = false) {
+    for (let attempt = 0; ; attempt += 1) {
+      const connection = await this.#connect();
+      try {
+        return await connection.request(method, params);
+      } catch (error51) {
+        const retryable = error51 instanceof BrokerRetiringError || error51 instanceof BrokerRequestNotDeliveredError || idempotent && connection.closed;
+        if (attempt > 0 || !retryable)
+          throw error51;
+        this.#connection = null;
+      }
+    }
+  }
   #connect() {
     if (this.#closed)
       return Promise.reject(new Error("Aqua Harness broker adapter is closed"));
     if (!this.#connection) {
-      const pending = BrokerConnection.connect(this.#descriptorPath, this.harnessId).then((connection) => {
+      const pending = this.#establish().then((connection) => {
         connection.onClose(() => {
           if (this.#connection === pending)
             this.#connection = null;
@@ -48314,21 +48666,57 @@ var BrokeredHarnessAdapter = class {
     }
     return this.#connection;
   }
+  async #establish() {
+    try {
+      return await BrokerConnection.connect(this.#descriptorPath, this.harnessId);
+    } catch (error51) {
+      if (!(error51 instanceof BrokerNotRunningError) || !this.#startBroker)
+        throw error51;
+    }
+    if (this.#isInstalled && !this.#isInstalled()) {
+      throw new HarnessNotInstalledError(`${this.harnessId} is not installed on this Mac`);
+    }
+    const deadline = Date.now() + this.#startTimeoutMs;
+    for (; ; ) {
+      await this.#startBroker();
+      try {
+        return await BrokerConnection.connect(this.#descriptorPath, this.harnessId);
+      } catch (error51) {
+        if (!(error51 instanceof BrokerNotRunningError) || Date.now() >= deadline)
+          throw error51;
+      }
+      await new Promise((resolve) => setTimeout(resolve, BROKER_START_POLL_MS));
+    }
+  }
 };
 
 // dist/plugin.js
 function createHarnessAdapter(context) {
-  if (context.platform === "darwin" && context.managedRemoteHost)
+  if (context.platform === "darwin" && context.managedRemoteHost) {
+    const environment2 = { ...context.environment };
     return new BrokeredHarnessAdapter({
       harnessId: "cursor-cli",
       forwardDelegationEnvironment: true,
       commandCatalog: CURSOR_COMMAND_CATALOG,
       liveCommandCatalog: true,
-      environment: { ...context.environment }
+      environment: environment2,
+      isInstalled: () => {
+        try {
+          resolveCursorExecutable(environment2);
+          return true;
+        } catch (error51) {
+          return !(error51 instanceof CursorNotInstalledError);
+        }
+      }
     });
+  }
   const environment = { ...context.environment };
   return Object.assign(new CursorAdapter({ environment }), {
-    installation: createCursorInstallation(environment)
+    installation: createCursorInstallation(environment),
+    install: createHarnessInstaller(environment, {
+      posix: "https://cursor.com/install",
+      windows: "https://cursor.com/install?win32=true"
+    })
   });
 }
 export {