@codexhost/cli-darwin-x64 0.11.0 → 0.12.0

package/app/plugins/omp/plugin.mjs

@@ -5,6 +5,409 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// ../../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 quote = (value) => `"${value.replaceAll("%", "%%").replaceAll('"', '""')}"`;
+  const commandLine = [command, ...arguments_].map(quote).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 versionFromOutput(output) {
+  return installationVersion(output.match(/\b\d+(?:\.\d+){1,3}(?:-[\w.-]+)?(?:\+[\w.-]+)?\b/)?.[0]);
+}
+function newerInstallationVersion(current, latest) {
+  const a = installationVersion(current).replace(/\+.*/, "");
+  const b = installationVersion(latest).replace(/\+.*/, "");
+  const coreA = a.replace(/-.*/, "").split(".").map(BigInt);
+  const coreB = b.replace(/-.*/, "").split(".").map(BigInt);
+  for (let i = 0; i < Math.max(coreA.length, coreB.length); i++) {
+    if ((coreA[i] ?? 0n) !== (coreB[i] ?? 0n))
+      return (coreB[i] ?? 0n) > (coreA[i] ?? 0n);
+  }
+  const preA = a.includes("-") ? a.slice(a.indexOf("-") + 1).split(".") : [];
+  const preB = b.includes("-") ? b.slice(b.indexOf("-") + 1).split(".") : [];
+  if (!preA.length || !preB.length)
+    return !!preA.length && !preB.length;
+  for (let i = 0; i < Math.max(preA.length, preB.length); i++) {
+    const x = preA[i];
+    const y = preB[i];
+    if (x === y)
+      continue;
+    if (x === void 0 || y === void 0)
+      return x === void 0;
+    const numericX = /^\d+$/.test(x);
+    const numericY = /^\d+$/.test(y);
+    if (numericX && numericY) {
+      if (BigInt(x) === BigInt(y))
+        continue;
+      return BigInt(y) > BigInt(x);
+    }
+    if (numericX !== numericY)
+      return numericX;
+    return y > x;
+  }
+  return false;
+}
+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/diff/libesm/diff/base.js
 var Diff = class {
   diff(oldStr, newStr, options = {}) {
@@ -105,16 +508,16 @@ var Diff = class {
       }
     }
   }
-  addToPath(path7, added, removed, oldPosInc, options) {
-    const last = path7.lastComponent;
+  addToPath(path8, added, removed, oldPosInc, options) {
+    const last = path8.lastComponent;
     if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
       return {
-        oldPos: path7.oldPos + oldPosInc,
+        oldPos: path8.oldPos + oldPosInc,
         lastComponent: { count: last.count + 1, added, removed, previousComponent: last.previousComponent }
       };
     } else {
       return {
-        oldPos: path7.oldPos + oldPosInc,
+        oldPos: path8.oldPos + oldPosInc,
         lastComponent: { count: 1, added, removed, previousComponent: last }
       };
     }
@@ -527,8 +930,8 @@ function splitLines(text) {
 
 // dist/omp-adapter.js
 import { randomUUID as randomUUID2 } from "node:crypto";
-import { realpath as realpath2, stat } from "node:fs/promises";
-import path5 from "node:path";
+import { realpath as realpath3, stat as stat2 } from "node:fs/promises";
+import path6 from "node:path";
 
 // ../../../node_modules/zod/v4/classic/external.js
 var external_exports = {};
@@ -1296,10 +1699,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path7) {
-  if (!path7)
+function getElementAtPath(obj, path8) {
+  if (!path8)
     return obj;
-  return path7.reduce((acc, key) => acc?.[key], obj);
+  return path8.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -1708,11 +2111,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path7, issues) {
+function prefixIssues(path8, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path7);
+    iss.path.unshift(path8);
     return iss;
   });
 }
@@ -1859,16 +2262,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path7 = []) => {
+  const processError = (error52, path8 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path7, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path8, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path7, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path8, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path7, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path8, ...issue2.path]);
       } else {
-        const fullpath = [...path7, ...issue2.path];
+        const fullpath = [...path8, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -1895,17 +2298,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path7 = []) => {
+  const processError = (error52, path8 = []) => {
     var _a3, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path7, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path8, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path7, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path8, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path7, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path8, ...issue2.path]);
       } else {
-        const fullpath = [...path7, ...issue2.path];
+        const fullpath = [...path8, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -1937,8 +2340,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path7 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path7) {
+  const path8 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path8) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -14630,13 +15033,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path7 = ref.slice(1).split("/").filter(Boolean);
-  if (path7.length === 0) {
+  const path8 = ref.slice(1).split("/").filter(Boolean);
+  if (path8.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path7[0] === defsKey) {
-    const key = path7[1];
+  if (path8[0] === defsKey) {
+    const key = path8[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -15130,6 +15533,7 @@ var CONSOLE_HOST_METHODS = Object.freeze([
   "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",
@@ -15776,14 +16180,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
@@ -16085,6 +16492,38 @@ 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"]),
+  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/index.js
 var workspaceContractVersionSchema = external_exports.literal(WORKSPACE_CONTRACT_VERSION);
 
@@ -16792,512 +17231,502 @@ function mapOmpSnapshot(history, state) {
       const changed = modelChange(entry);
       if (changed)
         effectiveModel = changed;
-    }
-    index = end;
-  }
-  return { turns };
-}
-function resolveOmpLastTurnBoundary(history) {
-  const users = activeOmpEntries(history).filter((entry) => messageRole(entry) === "user");
-  const last = users.at(-1);
-  return last ? { lastUserEntryId: last.id, sourceTurnCount: users.length } : null;
-}
-function resolveOmpForkBoundary(history, checkpointId) {
-  const active = activeOmpEntries(history);
-  const users = active.filter((entry) => messageRole(entry) === "user");
-  const targetTurnIndex = users.findIndex((entry) => entry.id === checkpointId);
-  if (targetTurnIndex < 0)
-    throw new Error("Omp Checkpoint is not on the active branch");
-  return {
-    targetTurnIndex,
-    nextUserEntryId: users[targetTurnIndex + 1]?.id ?? null
-  };
-}
-
-// dist/omp-session-file.js
-import { createReadStream } from "node:fs";
-import { open, realpath } from "node:fs/promises";
-import readline from "node:readline";
-var MAX_SESSION_HEADER_BYTES = 64 * 1024;
-var utf8Decoder = new TextDecoder("utf-8", { fatal: true });
-function isRecord5(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function historyEntry(value) {
-  if (!isRecord5(value) || value.type === "title" || value.type === "session" || typeof value.id !== "string" || value.id.length === 0 || value.parentId !== null && typeof value.parentId !== "string" || typeof value.type !== "string") {
-    return null;
-  }
-  return value;
-}
-async function readOmpSessionHistory(sessionFile, maxBytes) {
-  const entries = [];
-  let leafId = null;
-  const lines = readline.createInterface({
-    input: createReadStream(sessionFile, {
-      encoding: "utf8",
-      ...maxBytes === void 0 ? {} : { end: maxBytes - 1 }
-    }),
-    crlfDelay: Number.POSITIVE_INFINITY
-  });
-  try {
-    for await (const line of lines) {
-      if (line.length === 0)
-        continue;
-      let parsed;
-      try {
-        parsed = JSON.parse(line);
-      } catch {
-        continue;
-      }
-      const entry = historyEntry(parsed);
-      if (!entry)
-        continue;
-      entries.push(entry);
-      leafId = entry.id;
-    }
-  } finally {
-    lines.close();
-  }
-  return { entries, leafId };
-}
-async function readOmpSessionHeader(sessionFile) {
-  const handle = await open(sessionFile, "r");
-  try {
-    const buffer = Buffer.allocUnsafe(MAX_SESSION_HEADER_BYTES);
-    const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0);
-    const contents = buffer.subarray(0, bytesRead);
-    const newline = contents.indexOf(10);
-    if (newline < 0 && bytesRead === buffer.length) {
-      throw new Error("Omp Session header exceeds the supported size");
-    }
-    const contentsText = utf8Decoder.decode(contents);
-    for (const line of contentsText.split("\n")) {
-      if (line.length === 0)
-        continue;
-      let parsed;
-      try {
-        parsed = JSON.parse(line);
-      } catch {
-        continue;
-      }
-      if (!isRecord5(parsed) || parsed.type !== "session")
-        continue;
-      if (typeof parsed.id !== "string" || parsed.id.length === 0 || typeof parsed.cwd !== "string" || parsed.cwd.length === 0) {
-        throw new Error("Omp Session header is invalid");
-      }
-      return { type: "session", id: parsed.id, cwd: parsed.cwd };
-    }
-    throw new Error("Omp Session header is invalid");
-  } finally {
-    await handle.close();
-  }
-}
-async function verifyOmpSessionCwd(input) {
-  if (!input.sessionFile)
-    throw new Error("Omp Fork Session has no persisted Session file");
-  const header = await readOmpSessionHeader(input.sessionFile);
-  if (header.id !== input.sessionId) {
-    throw new Error("Omp Fork Session header identity does not match RPC state");
-  }
-  const [actualCwd, expectedCwd] = await Promise.all([
-    realpath(header.cwd),
-    realpath(input.expectedCwd)
-  ]);
-  if (actualCwd !== expectedCwd) {
-    throw new Error("Omp Fork Session did not bind the requested cwd");
-  }
-}
-
-// dist/omp-last-turn-rollback.js
-function modelFromState(state) {
-  if (state.provider === null && state.modelId === null)
-    return null;
-  if (state.provider === null || state.modelId === null) {
-    throw new Error("Omp state contains a partial Model identity");
-  }
-  return { provider: state.provider, id: state.modelId };
-}
-async function rollbackOmpLastTurn(transport, sourceSessionId, cwd) {
-  const startupState = transport.state;
-  const startupSessionId = startupState.sessionId;
-  const currentModel = modelFromState(startupState);
-  const currentThinking = startupState.thinkingLevel;
-  const copiedHistory = await transport.getEntries();
-  const boundary = resolveOmpLastTurnBoundary(copiedHistory);
-  if (!boundary)
-    return { ok: false, reason: "empty" };
-  const sourceSnapshot = mapOmpSnapshot(copiedHistory, {
-    sessionId: startupSessionId,
-    model: currentModel
-  });
-  let state = await transport.fork(boundary.lastUserEntryId);
-  if (state.sessionId === sourceSessionId || state.sessionId === startupSessionId) {
-    throw new Error("Omp last-Turn rollback did not create a distinct Native Session");
-  }
-  if (!sameOmpModel(modelFromState(state), currentModel)) {
-    if (!currentModel)
-      throw new Error("Omp last-Turn rollback changed the current Model");
-    state = await transport.selectModel(currentModel);
-  }
-  if (state.thinkingLevel !== currentThinking) {
-    if (!currentThinking)
-      throw new Error("Omp last-Turn rollback changed current Thinking");
-    state = await transport.selectThinkingOption(currentThinking);
-  }
-  if (!sameOmpModel(modelFromState(state), currentModel) || state.thinkingLevel !== currentThinking) {
-    throw new Error("Omp last-Turn rollback could not restore current Model and Thinking");
-  }
-  const snapshot = mapOmpSnapshot(await transport.getEntries(), {
-    sessionId: state.sessionId,
-    model: modelFromState(state)
-  });
-  const expectedTurnKeys = sourceSnapshot.turns.slice(0, -1).map((turn) => turn.nativeTurnRef.nativeTurnKey);
-  const actualTurnKeys = snapshot.turns.map((turn) => turn.nativeTurnRef.nativeTurnKey);
-  if (snapshot.turns.length !== boundary.sourceTurnCount - 1 || actualTurnKeys.some((key, index) => key !== expectedTurnKeys[index])) {
-    throw new Error("Omp last-Turn rollback did not produce the exact retained history prefix");
-  }
-  await transport.verifySessionCwd(cwd);
-  return { ok: true };
-}
-
-// dist/omp-rpc-session.js
-import { spawn, spawnSync } from "node:child_process";
-import { randomUUID } from "node:crypto";
-import path4 from "node:path";
-
-// ../../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 [];
+    }
+    index = end;
   }
+  return { turns };
 }
-function newestFirst(names) {
-  return [...names].sort((left, right) => right.localeCompare(left, void 0, { numeric: true }));
+function resolveOmpLastTurnBoundary(history) {
+  const users = activeOmpEntries(history).filter((entry) => messageRole(entry) === "user");
+  const last = users.at(-1);
+  return last ? { lastUserEntryId: last.id, sourceTurnCount: users.length } : null;
 }
-
-// ../../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 quote = (value) => `"${value.replaceAll("%", "%%").replaceAll('"', '""')}"`;
-  const commandLine = [command, ...arguments_].map(quote).join(" ");
+function resolveOmpForkBoundary(history, checkpointId) {
+  const active = activeOmpEntries(history);
+  const users = active.filter((entry) => messageRole(entry) === "user");
+  const targetTurnIndex = users.findIndex((entry) => entry.id === checkpointId);
+  if (targetTurnIndex < 0)
+    throw new Error("Omp Checkpoint is not on the active branch");
   return {
-    command: environmentValue(environment, "ComSpec") ?? "cmd.exe",
-    arguments: ["/d", "/v:off", "/s", "/c", `"${commandLine}"`],
-    windowsVerbatimArguments: true
+    targetTurnIndex,
+    nextUserEntryId: users[targetTurnIndex + 1]?.id ?? null
   };
 }
 
-// ../../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);
+// dist/omp-session-file.js
+import { createReadStream } from "node:fs";
+import { open, realpath } from "node:fs/promises";
+import readline from "node:readline";
+var MAX_SESSION_HEADER_BYTES = 64 * 1024;
+var utf8Decoder = new TextDecoder("utf-8", { fatal: true });
+function isRecord5(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function historyEntry(value) {
+  if (!isRecord5(value) || value.type === "title" || value.type === "session" || typeof value.id !== "string" || value.id.length === 0 || value.parentId !== null && typeof value.parentId !== "string" || typeof value.type !== "string") {
+    return null;
   }
-  return { ...environment, [pathKey]: directories.join(delimiter) };
+  return value;
 }
-
-// ../../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));
+async function readOmpSessionHistory(sessionFile, maxBytes) {
+  const entries = [];
+  let leafId = null;
+  const lines = readline.createInterface({
+    input: createReadStream(sessionFile, {
+      encoding: "utf8",
+      ...maxBytes === void 0 ? {} : { end: maxBytes - 1 }
+    }),
+    crlfDelay: Number.POSITIVE_INFINITY
+  });
+  try {
+    for await (const line of lines) {
+      if (line.length === 0)
+        continue;
+      let parsed;
+      try {
+        parsed = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      const entry = historyEntry(parsed);
+      if (!entry)
+        continue;
+      entries.push(entry);
+      leafId = entry.id;
     }
-  };
-  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");
+  } finally {
+    lines.close();
   }
-  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 { entries, leafId };
+}
+async function readOmpSessionHeader(sessionFile) {
+  const handle = await open(sessionFile, "r");
+  try {
+    const buffer = Buffer.allocUnsafe(MAX_SESSION_HEADER_BYTES);
+    const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0);
+    const contents = buffer.subarray(0, bytesRead);
+    const newline = contents.indexOf(10);
+    if (newline < 0 && bytesRead === buffer.length) {
+      throw new Error("Omp Session header exceeds the supported size");
+    }
+    const contentsText = utf8Decoder.decode(contents);
+    for (const line of contentsText.split("\n")) {
+      if (line.length === 0)
+        continue;
+      let parsed;
+      try {
+        parsed = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      if (!isRecord5(parsed) || parsed.type !== "session")
+        continue;
+      if (typeof parsed.id !== "string" || parsed.id.length === 0 || typeof parsed.cwd !== "string" || parsed.cwd.length === 0) {
+        throw new Error("Omp Session header is invalid");
+      }
+      return { type: "session", id: parsed.id, cwd: parsed.cwd };
     }
+    throw new Error("Omp Session header is invalid");
+  } finally {
+    await handle.close();
   }
-  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();
+async function verifyOmpSessionCwd(input) {
+  if (!input.sessionFile)
+    throw new Error("Omp Fork Session has no persisted Session file");
+  const header = await readOmpSessionHeader(input.sessionFile);
+  if (header.id !== input.sessionId) {
+    throw new Error("Omp Fork Session header identity does not match RPC state");
+  }
+  const [actualCwd, expectedCwd] = await Promise.all([
+    realpath(header.cwd),
+    realpath(input.expectedCwd)
+  ]);
+  if (actualCwd !== expectedCwd) {
+    throw new Error("Omp Fork Session did not bind the requested cwd");
+  }
 }
-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")
-  };
+
+// dist/session-import.js
+import { createReadStream as createReadStream2 } from "node:fs";
+import { opendir, realpath as realpath2, stat } from "node:fs/promises";
+import os2 from "node:os";
+import path4 from "node:path";
+import { createInterface } from "node:readline";
+
+// ../../harness-adapter/dist/session-import.js
+import { lstat } from "node:fs/promises";
+var SessionImportChangedError = class extends Error {
+  constructor(message3 = "Native Session changed during discovery; refresh and retry") {
+    super(message3);
+    this.name = "SessionImportChangedError";
+  }
+};
+function isMissingFileError(error51) {
+  return typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "ENOENT";
 }
-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 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 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);
+var STORAGE_ACCESS_ERRORS = /* @__PURE__ */ new Set(["EACCES", "EPERM", "EIO", "EMFILE", "ENFILE"]);
+function isStorageAccessError(error51) {
+  return typeof error51 === "object" && error51 !== null && "code" in error51 && typeof error51.code === "string" && STORAGE_ACCESS_ERRORS.has(error51.code);
 }
-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);
+async function optionalLstat(file2) {
+  try {
+    return await lstat(file2);
+  } catch (error51) {
+    if (isMissingFileError(error51))
+      return null;
+    throw error51;
   }
-  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" }];
+async function readStableFiles(files, read) {
+  const before = await Promise.all(files.map(optionalLstat));
+  const value = await read(before);
+  const after = await Promise.all(files.map(optionalLstat));
+  if (before.some((info, index) => !sameFileFingerprint(info, after[index] ?? null)))
+    throw new SessionImportChangedError();
+  return value;
+}
+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;
   }
-  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"
-      });
-    }
+  #closed() {
+    return {
+      ok: false,
+      error: { code: "invalidState", message: this.#options.closedMessage, retryable: false }
+    };
   }
-  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"
-      });
+  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;
   }
-  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 };
+  /** `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
+      }
+    };
   }
-  return void 0;
-}
+  /** Idempotent. Resolves after every started read has settled. */
+  async close() {
+    this.#abort.abort();
+    await Promise.allSettled(this.#pending);
+  }
+};
 
-// ../../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();
-  });
+// dist/session-import.js
+function isRecord6(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-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 expandDirectory(value, home) {
+  return path4.resolve(value === "~" ? home : value.startsWith(`~${path4.sep}`) || value.startsWith("~/") ? path4.join(home, value.slice(2)) : value);
 }
-function versionFromOutput(output) {
-  return installationVersion(output.match(/\b\d+(?:\.\d+){1,3}(?:-[\w.-]+)?(?:\+[\w.-]+)?\b/)?.[0]);
+function ompSessionImportDirectory(environment) {
+  const home = (process.platform === "win32" ? environment.USERPROFILE : environment.HOME) || os2.homedir();
+  const custom2 = environment.PI_CODING_AGENT_SESSION_DIR;
+  if (custom2)
+    return { directory: expandDirectory(custom2, home), flat: true };
+  const agent = environment.PI_CODING_AGENT_DIR;
+  return {
+    directory: path4.join(agent ? expandDirectory(agent, home) : path4.join(home, ".omp", "agent"), "sessions"),
+    flat: false
+  };
 }
-function newerInstallationVersion(current, latest) {
-  const a = installationVersion(current).replace(/\+.*/, "");
-  const b = installationVersion(latest).replace(/\+.*/, "");
-  const coreA = a.replace(/-.*/, "").split(".").map(BigInt);
-  const coreB = b.replace(/-.*/, "").split(".").map(BigInt);
-  for (let i = 0; i < Math.max(coreA.length, coreB.length); i++) {
-    if ((coreA[i] ?? 0n) !== (coreB[i] ?? 0n))
-      return (coreB[i] ?? 0n) > (coreA[i] ?? 0n);
-  }
-  const preA = a.includes("-") ? a.slice(a.indexOf("-") + 1).split(".") : [];
-  const preB = b.includes("-") ? b.slice(b.indexOf("-") + 1).split(".") : [];
-  if (!preA.length || !preB.length)
-    return !!preA.length && !preB.length;
-  for (let i = 0; i < Math.max(preA.length, preB.length); i++) {
-    const x = preA[i];
-    const y = preB[i];
-    if (x === y)
-      continue;
-    if (x === void 0 || y === void 0)
-      return x === void 0;
-    const numericX = /^\d+$/.test(x);
-    const numericY = /^\d+$/.test(y);
-    if (numericX && numericY) {
-      if (BigInt(x) === BigInt(y))
+function messageText(content) {
+  if (typeof content === "string")
+    return content;
+  if (!Array.isArray(content))
+    return "";
+  return content.filter((part) => isRecord6(part) && part.type === "text" && typeof part.text === "string").map((part) => String(part.text)).join(" ");
+}
+async function readFacts(file2, signal) {
+  const stream = createReadStream2(file2, { encoding: "utf8", signal });
+  const lines = createInterface({ input: stream, crlfDelay: Infinity });
+  let header = null;
+  let nativeTitle = null;
+  let firstPrompt = null;
+  let updatedAt = null;
+  let leafHasUser = false;
+  const hasUserAncestry = /* @__PURE__ */ new Map();
+  try {
+    for await (const line of lines) {
+      signal.throwIfAborted();
+      if (!line.trim())
         continue;
-      return BigInt(y) > BigInt(x);
+      let entry;
+      try {
+        entry = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      if (!isRecord6(entry))
+        continue;
+      if (entry.type === "title") {
+        nativeTitle = sessionImportTitle(entry.title);
+        continue;
+      }
+      if (entry.type === "session") {
+        if (header)
+          return null;
+        if (typeof entry.id !== "string" || entry.id.length === 0 || typeof entry.cwd !== "string" || !path4.isAbsolute(entry.cwd))
+          return null;
+        header = { id: entry.id, cwd: entry.cwd };
+        continue;
+      }
+      if (typeof entry.id !== "string" || entry.id.length === 0)
+        continue;
+      const message3 = isRecord6(entry.message) ? entry.message : null;
+      const isUser = entry.type === "message" && message3?.role === "user";
+      if (isUser)
+        firstPrompt ??= sessionImportTitle(messageText(message3?.content));
+      leafHasUser = isUser || typeof entry.parentId === "string" && hasUserAncestry.get(entry.parentId) === true;
+      hasUserAncestry.set(entry.id, leafHasUser);
+      if (entry.type === "message" && (message3?.role === "user" || message3?.role === "assistant")) {
+        const time3 = typeof message3.timestamp === "number" ? message3.timestamp : typeof entry.timestamp === "string" ? Date.parse(entry.timestamp) : Number.NaN;
+        if (Number.isFinite(time3) && time3 >= 0)
+          updatedAt = time3;
+      }
     }
-    if (numericX !== numericY)
-      return numericX;
-    return y > x;
+  } finally {
+    lines.close();
+    stream.destroy();
   }
-  return false;
-}
-function createInstallationManager(options) {
-  let checking;
-  let updating;
-  const check2 = () => checking ??= options.check().finally(() => {
-    checking = void 0;
+  if (!header || !leafHasUser)
+    return null;
+  return {
+    nativeSessionId: header.id,
+    cwd: header.cwd,
+    title: nativeTitle ?? firstPrompt,
+    updatedAt
+  };
+}
+var OmpSessionImport = class {
+  #location;
+  #scope = new SessionImportScope({
+    closedMessage: "Omp Session import is closed",
+    unavailableMessage: "Omp sessions could not be read; close native clients, check storage access and retry",
+    notFoundMessage: "Omp Session is no longer importable"
   });
-  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;
+  constructor(environment) {
+    this.#location = ompSessionImportDirectory(environment);
+  }
+  listCandidates() {
+    return this.#scope.read(async (signal) => [...(await this.#sources(signal)).values()].flatMap((sources) => (
+      // One identity in two files cannot be resumed unambiguously.
+      sources.length === 1 && sources[0] ? [sources[0].candidate] : []
+    )));
+  }
+  resolveCandidate(nativeSessionId) {
+    return this.#scope.resolve(async (signal) => {
+      const sources = (await this.#sources(signal)).get(nativeSessionId);
+      if (sources?.length !== 1 || !sources[0])
+        return null;
+      const source = await this.#source(sources[0].file, signal);
+      return source?.nativeRef.nativeSessionId === nativeSessionId ? { candidate: source.candidate, nativeRef: source.nativeRef } : null;
     });
-    return updating;
-  };
+  }
+  close() {
+    return this.#scope.close();
+  }
+  async #sessionFiles(signal) {
+    const { directory, flat } = this.#location;
+    const info = await optionalLstat(directory);
+    if (!info)
+      return [];
+    if (!info.isDirectory())
+      throw new Error("Omp Session store is not a directory");
+    const files = [];
+    const visit = async (current, projectLevel) => {
+      const entries = await opendir(current).catch((error51) => {
+        if (isMissingFileError(error51))
+          return null;
+        throw error51;
+      });
+      if (!entries)
+        return;
+      for await (const entry of entries) {
+        signal.throwIfAborted();
+        if (projectLevel && entry.isDirectory())
+          await visit(path4.join(current, entry.name), false);
+        else if (!projectLevel && entry.isFile() && entry.name.endsWith(".jsonl"))
+          files.push(path4.join(current, entry.name));
+      }
+    };
+    await visit(directory, !flat);
+    return files;
+  }
+  /** Session ID to every readable file claiming it. Files changing under the read are skipped. */
+  async #sources(signal) {
+    const found = /* @__PURE__ */ new Map();
+    for (const file2 of await this.#sessionFiles(signal)) {
+      signal.throwIfAborted();
+      try {
+        const source = await this.#source(file2, signal);
+        if (!source)
+          continue;
+        const sources = found.get(source.nativeRef.nativeSessionId) ?? [];
+        sources.push(source);
+        found.set(source.nativeRef.nativeSessionId, sources);
+      } catch (error51) {
+        if (!(error51 instanceof SessionImportChangedError))
+          throw error51;
+      }
+    }
+    return found;
+  }
+  async #source(file2, signal) {
+    signal.throwIfAborted();
+    return readStableFiles([file2], async ([info]) => {
+      if (!info?.isFile() || info.size === 0)
+        return null;
+      try {
+        const facts = await readFacts(file2, signal);
+        if (!facts)
+          return null;
+        const cwd = await realpath2(facts.cwd);
+        if (!(await stat(cwd)).isDirectory())
+          return null;
+        const candidate = sessionImportCandidate({
+          nativeSessionId: facts.nativeSessionId,
+          cwd,
+          title: facts.title,
+          updatedAt: facts.updatedAt ?? info.mtimeMs
+          // OMP has no cross-process activity marker: idleness cannot be established.
+        });
+        if (!candidate)
+          return null;
+        return {
+          file: file2,
+          candidate,
+          // Resume needs the file itself: OMP is started with `--session <file>`.
+          nativeRef: nativeSessionRefSchema.parse({
+            harnessId: "omp",
+            nativeSessionId: facts.nativeSessionId,
+            locator: { sessionFile: await realpath2(file2) },
+            formatVersion: 1
+          })
+        };
+      } catch (error51) {
+        signal.throwIfAborted();
+        if (isStorageAccessError(error51))
+          throw error51;
+        return null;
+      }
+    });
+  }
+};
+
+// dist/omp-last-turn-rollback.js
+function modelFromState(state) {
+  if (state.provider === null && state.modelId === null)
+    return null;
+  if (state.provider === null || state.modelId === null) {
+    throw new Error("Omp state contains a partial Model identity");
+  }
+  return { provider: state.provider, id: state.modelId };
 }
+async function rollbackOmpLastTurn(transport, sourceSessionId, cwd) {
+  const startupState = transport.state;
+  const startupSessionId = startupState.sessionId;
+  const currentModel = modelFromState(startupState);
+  const currentThinking = startupState.thinkingLevel;
+  const copiedHistory = await transport.getEntries();
+  const boundary = resolveOmpLastTurnBoundary(copiedHistory);
+  if (!boundary)
+    return { ok: false, reason: "empty" };
+  const sourceSnapshot = mapOmpSnapshot(copiedHistory, {
+    sessionId: startupSessionId,
+    model: currentModel
+  });
+  let state = await transport.fork(boundary.lastUserEntryId);
+  if (state.sessionId === sourceSessionId || state.sessionId === startupSessionId) {
+    throw new Error("Omp last-Turn rollback did not create a distinct Native Session");
+  }
+  if (!sameOmpModel(modelFromState(state), currentModel)) {
+    if (!currentModel)
+      throw new Error("Omp last-Turn rollback changed the current Model");
+    state = await transport.selectModel(currentModel);
+  }
+  if (state.thinkingLevel !== currentThinking) {
+    if (!currentThinking)
+      throw new Error("Omp last-Turn rollback changed current Thinking");
+    state = await transport.selectThinkingOption(currentThinking);
+  }
+  if (!sameOmpModel(modelFromState(state), currentModel) || state.thinkingLevel !== currentThinking) {
+    throw new Error("Omp last-Turn rollback could not restore current Model and Thinking");
+  }
+  const snapshot = mapOmpSnapshot(await transport.getEntries(), {
+    sessionId: state.sessionId,
+    model: modelFromState(state)
+  });
+  const expectedTurnKeys = sourceSnapshot.turns.slice(0, -1).map((turn) => turn.nativeTurnRef.nativeTurnKey);
+  const actualTurnKeys = snapshot.turns.map((turn) => turn.nativeTurnRef.nativeTurnKey);
+  if (snapshot.turns.length !== boundary.sourceTurnCount - 1 || actualTurnKeys.some((key, index) => key !== expectedTurnKeys[index])) {
+    throw new Error("Omp last-Turn rollback did not produce the exact retained history prefix");
+  }
+  await transport.verifySessionCwd(cwd);
+  return { ok: true };
+}
+
+// dist/omp-rpc-session.js
+import { spawn, spawnSync } from "node:child_process";
+import { randomUUID } from "node:crypto";
+import path5 from "node:path";
 
 // dist/command.js
 var ompDiscoverySpec = {
@@ -17326,14 +17755,14 @@ function resolveOmpExecutable(input, dependencies = {}) {
 }
 
 // dist/omp-usage.js
-function isRecord6(value) {
+function isRecord7(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function nonNegativeSafeInteger(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
 }
 function optionalOmpCacheHitRatePercent(value) {
-  if (!isRecord6(value) || value.role !== "assistant" || !isRecord6(value.usage))
+  if (!isRecord7(value) || value.role !== "assistant" || !isRecord7(value.usage))
     return null;
   const input = nonNegativeSafeInteger(value.usage.input);
   const cacheRead = nonNegativeSafeInteger(value.usage.cacheRead);
@@ -17346,20 +17775,20 @@ function optionalOmpCacheHitRatePercent(value) {
 function latestOmpCacheHitRatePercent(history) {
   let latest = null;
   for (const entry of activeOmpEntries(history)) {
-    if (entry.type === "message" && isRecord6(entry.message) && entry.message.role === "assistant") {
+    if (entry.type === "message" && isRecord7(entry.message) && entry.message.role === "assistant") {
       latest = optionalOmpCacheHitRatePercent(entry.message);
     }
   }
   return latest;
 }
 function responseData(response, operation) {
-  if (!isRecord6(response.data)) {
+  if (!isRecord7(response.data)) {
     throw new Error(`Omp RPC ${operation} response has no data`);
   }
   return response.data;
 }
 function contextUsage(value) {
-  if (!isRecord6(value))
+  if (!isRecord7(value))
     throw new Error("Omp RPC context Usage is invalid");
   return parseHostUsage({
     contextUsedTokens: value.tokens,
@@ -17369,15 +17798,15 @@ function contextUsage(value) {
 function parseOmpSessionUsage(response) {
   const data = responseData(response, "Session stats");
   const tokens = data.tokens;
-  if (tokens !== void 0 && !isRecord6(tokens)) {
+  if (tokens !== void 0 && !isRecord7(tokens)) {
     throw new Error("Omp RPC Session stats tokens are invalid");
   }
   return parseHostUsage({
-    ...isRecord6(tokens) && tokens.input !== void 0 ? { inputTokens: tokens.input } : {},
-    ...isRecord6(tokens) && tokens.cacheRead !== void 0 ? { cachedInputTokens: tokens.cacheRead } : {},
-    ...isRecord6(tokens) && tokens.cacheWrite !== void 0 ? { cacheWriteInputTokens: tokens.cacheWrite } : {},
-    ...isRecord6(tokens) && tokens.output !== void 0 ? { outputTokens: tokens.output } : {},
-    ...isRecord6(tokens) && tokens.total !== void 0 ? { totalTokens: tokens.total } : {},
+    ...isRecord7(tokens) && tokens.input !== void 0 ? { inputTokens: tokens.input } : {},
+    ...isRecord7(tokens) && tokens.cacheRead !== void 0 ? { cachedInputTokens: tokens.cacheRead } : {},
+    ...isRecord7(tokens) && tokens.cacheWrite !== void 0 ? { cacheWriteInputTokens: tokens.cacheWrite } : {},
+    ...isRecord7(tokens) && tokens.output !== void 0 ? { outputTokens: tokens.output } : {},
+    ...isRecord7(tokens) && tokens.total !== void 0 ? { totalTokens: tokens.total } : {},
     ...data.cost !== void 0 ? { totalCostUsd: data.cost } : {},
     ...data.contextUsage !== void 0 ? contextUsage(data.contextUsage) : {}
   });
@@ -17492,7 +17921,7 @@ var OmpRpcUnsupportedCommandError = class extends Error {
   }
 };
 var textDecoder = new TextDecoder("utf-8", { fatal: true });
-function isRecord7(value) {
+function isRecord8(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function message2(value) {
@@ -17504,13 +17933,13 @@ function nonBlankString(value) {
 function parseNativeModel(value, context) {
   if (value === null || value === void 0)
     return null;
-  if (!isRecord7(value) || !nonBlankString(value.provider) || !nonBlankString(value.id)) {
+  if (!isRecord8(value) || !nonBlankString(value.provider) || !nonBlankString(value.id)) {
     throw new OmpRpcFaultError("protocolError", `Omp RPC returned an invalid ${context} Model`);
   }
   return { provider: value.provider, id: value.id };
 }
 function sessionStateData(response) {
-  const data = isRecord7(response.data) ? response.data : null;
+  const data = isRecord8(response.data) ? response.data : null;
   if (!data)
     throw new OmpRpcFaultError("protocolError", "Omp RPC state response has no data");
   return data;
@@ -17525,7 +17954,7 @@ function parseSessionState(response) {
   if (thinkingLevel !== null && !thinkingLevel.success) {
     throw new OmpRpcFaultError("protocolError", "Omp RPC state has an invalid Thinking level");
   }
-  const thinking = isRecord7(data.model) && isRecord7(data.model.thinking) ? data.model.thinking : null;
+  const thinking = isRecord8(data.model) && isRecord8(data.model.thinking) ? data.model.thinking : null;
   const availableThinkingLevels = thinking && Array.isArray(thinking.efforts) ? thinking.efforts.flatMap((level) => {
     const parsed = harnessThinkingOptionIdSchema.safeParse(level);
     return parsed.success ? [parsed.data] : [];
@@ -17548,25 +17977,25 @@ function parseSessionStreaming(response) {
   return isStreaming;
 }
 function parseAvailableModels(response) {
-  const data = isRecord7(response.data) ? response.data : null;
+  const data = isRecord8(response.data) ? response.data : null;
   if (!data || !Array.isArray(data.models)) {
     throw new OmpRpcFaultError("protocolError", "Omp RPC Model catalog response has no models");
   }
   return data.models.map((model) => {
     const parsed = parseNativeModel(model, "catalog");
-    if (!parsed || !isRecord7(model) || typeof model.reasoning !== "boolean") {
+    if (!parsed || !isRecord8(model) || typeof model.reasoning !== "boolean") {
       throw new OmpRpcFaultError("protocolError", "Omp RPC catalog contains a Model without reasoning capability");
     }
     return { ...parsed, reasoning: model.reasoning };
   });
 }
 function parseSubagentMessages(response) {
-  const data = isRecord7(response.data) ? response.data : null;
+  const data = isRecord8(response.data) ? response.data : null;
   if (!data || !nonBlankString(data.sessionFile) || !Number.isSafeInteger(data.fromByte) || !Number.isSafeInteger(data.nextByte) || data.fromByte < 0 || data.nextByte < data.fromByte || typeof data.reset !== "boolean" || !Array.isArray(data.entries) || !Array.isArray(data.messages)) {
     throw new OmpRpcFaultError("protocolError", "Omp RPC Subagent transcript response is invalid");
   }
-  const entries = data.entries.flatMap((value) => isRecord7(value) ? [value] : []);
-  const messages = data.messages.flatMap((value) => isRecord7(value) ? [value] : []);
+  const entries = data.entries.flatMap((value) => isRecord8(value) ? [value] : []);
+  const messages = data.messages.flatMap((value) => isRecord8(value) ? [value] : []);
   if (entries.length !== data.entries.length || messages.length !== data.messages.length) {
     throw new OmpRpcFaultError("protocolError", "Omp RPC Subagent transcript contains invalid data");
   }
@@ -17587,17 +18016,17 @@ function subagentStatus(value) {
   throw new OmpRpcFaultError("protocolError", "Omp RPC Subagent status is invalid");
 }
 function assistantText(value) {
-  if (!isRecord7(value) || value.role !== "assistant" || !Array.isArray(value.content))
+  if (!isRecord8(value) || value.role !== "assistant" || !Array.isArray(value.content))
     return null;
-  return value.content.filter((content) => isRecord7(content) && content.type === "text" && typeof content.text === "string").map((content) => content.text).join("");
+  return value.content.filter((content) => isRecord8(content) && content.type === "text" && typeof content.text === "string").map((content) => content.text).join("");
 }
 function assistantMessageId(value) {
-  if (!isRecord7(value) || value.role !== "assistant")
+  if (!isRecord8(value) || value.role !== "assistant")
     return null;
   return nonBlankString(value.responseId) ? value.responseId : null;
 }
 function extractReasoningText(content) {
-  if (!isRecord7(content))
+  if (!isRecord8(content))
     return null;
   const type = String(content.type ?? "");
   if (type === "thinking" || type === "reasoning" || type === "thought") {
@@ -17607,12 +18036,12 @@ function extractReasoningText(content) {
   return null;
 }
 function assistantReasoning(value) {
-  if (!isRecord7(value) || value.role !== "assistant" || !Array.isArray(value.content))
+  if (!isRecord8(value) || value.role !== "assistant" || !Array.isArray(value.content))
     return null;
   return value.content.map(extractReasoningText).filter((text) => typeof text === "string").join("");
 }
 function assistantFailure(value) {
-  if (!isRecord7(value) || value.role !== "assistant")
+  if (!isRecord8(value) || value.role !== "assistant")
     return void 0;
   if (value.stopReason !== "error" && value.stopReason !== "aborted")
     return null;
@@ -17632,7 +18061,7 @@ function signalProcessTree(child, signal) {
   try {
     process.kill(-child.pid, signal);
   } catch (error51) {
-    if (!isRecord7(error51) || error51.code !== "ESRCH")
+    if (!isRecord8(error51) || error51.code !== "ESRCH")
       throw error51;
   }
 }
@@ -17671,7 +18100,7 @@ function ompRpcProcessCommand(options, dependencies = {}) {
     ...modelArguments,
     ...sessionArguments
   ];
-  const extension = path4.win32.extname(command).toLowerCase();
+  const extension = path5.win32.extname(command).toLowerCase();
   if (platform !== "win32" || ![".cmd", ".bat"].includes(extension)) {
     return { command, arguments: arguments_, windowsVerbatimArguments: false };
   }
@@ -17714,6 +18143,10 @@ var OmpRpcSession = class {
   #manualCompaction = null;
   #stderrTail = "";
   #frameDecoder = new OmpFrameDecoder();
+  #startupFaultResolve = null;
+  #startupFault = new Promise((resolve) => {
+    this.#startupFaultResolve = resolve;
+  });
   #readyResolve = null;
   #ready = new Promise((resolve) => {
     this.#readyResolve = resolve;
@@ -17770,7 +18203,7 @@ var OmpRpcSession = class {
       this.#stderrTail = sanitizeDiagnosticTail(`${this.#stderrTail}${chunk.toString()}`);
     });
     child.once("error", (error51) => {
-      const kind = isRecord7(error51) && error51.code === "ENOENT" ? "notInstalled" : "unavailable";
+      const kind = isRecord8(error51) && error51.code === "ENOENT" ? "notInstalled" : "unavailable";
       this.#fail(new OmpRpcFaultError(kind, `Omp RPC failed to start: ${error51.message}`, this.stderrTail));
     });
     child.once("exit", (code, signal) => {
@@ -17785,10 +18218,20 @@ var OmpRpcSession = class {
       }),
       new Promise((_resolve, reject) => setTimeout(() => reject(new Error("Omp RPC start timed out")), this.#options.commandTimeoutMs))
     ]);
-    await Promise.race([
-      this.#ready,
-      new Promise((_resolve, reject) => setTimeout(() => reject(new Error("Omp RPC ready signal timed out")), this.#options.commandTimeoutMs))
-    ]);
+    let readyTimeout;
+    try {
+      await Promise.race([
+        this.#ready,
+        this.#startupFault.then((error51) => {
+          throw error51;
+        }),
+        new Promise((_resolve, reject) => {
+          readyTimeout = setTimeout(() => reject(new Error("Omp RPC ready signal timed out")), this.#options.commandTimeoutMs);
+        })
+      ]);
+    } finally {
+      clearTimeout(readyTimeout);
+    }
     await this.#send("negotiate_protocol", { protocolVersion: 2 }).catch(() => void 0);
     if (this.#options.subscribeSubagentEvents !== false) {
       await this.#send("set_subagent_subscription", { level: "events" }).catch(() => void 0);
@@ -17808,17 +18251,17 @@ var OmpRpcSession = class {
         return await readOmpSessionHistory(this.state.sessionFile);
       }
       const response = await this.#send("get_messages", {});
-      const data = isRecord7(response.data) ? response.data : null;
+      const data = isRecord8(response.data) ? response.data : null;
       if (!data || !Array.isArray(data.messages)) {
         throw new OmpRpcFaultError("protocolError", "Omp RPC messages response has no messages");
       }
       let branchEntryIds = null;
       try {
         const branchResponse = await this.#send("get_branch_messages", {});
-        const branchData = isRecord7(branchResponse.data) ? branchResponse.data : null;
+        const branchData = isRecord8(branchResponse.data) ? branchResponse.data : null;
         if (branchData && Array.isArray(branchData.messages)) {
           const parsed = branchData.messages.flatMap((entry) => {
-            if (!isRecord7(entry) || !nonBlankString(entry.entryId))
+            if (!isRecord8(entry) || !nonBlankString(entry.entryId))
               return [];
             return [entry.entryId];
           });
@@ -17832,11 +18275,11 @@ var OmpRpcSession = class {
       let userIndex = 0;
       let parentId = null;
       const entries = data.messages.map((nativeMessage, index) => {
-        const role = isRecord7(nativeMessage) ? nativeMessage.role : void 0;
+        const role = isRecord8(nativeMessage) ? nativeMessage.role : void 0;
         const branchId = role === "user" ? branchEntryIds?.[userIndex] : void 0;
         if (branchId)
           userIndex += 1;
-        const id = branchId ?? (isRecord7(nativeMessage) && nonBlankString(nativeMessage.id) ? nativeMessage.id : `omp-message-${index}`);
+        const id = branchId ?? (isRecord8(nativeMessage) && nonBlankString(nativeMessage.id) ? nativeMessage.id : `omp-message-${index}`);
         const entry = { id, parentId, type: "message", message: nativeMessage };
         parentId = id;
         return entry;
@@ -17916,7 +18359,7 @@ var OmpRpcSession = class {
       throw new Error("Omp RPC Fork requires an Entry identity");
     try {
       const response = await this.#send("branch", { entryId });
-      const data = isRecord7(response.data) ? response.data : null;
+      const data = isRecord8(response.data) ? response.data : null;
       if (!data || data.cancelled === true) {
         throw new OmpRpcFaultError("unavailable", "Omp RPC Fork was cancelled");
       }
@@ -18109,7 +18552,7 @@ var OmpRpcSession = class {
           continue;
         }
         const value = decoded;
-        if (!isRecord7(value) || typeof value.type !== "string") {
+        if (!isRecord8(value) || typeof value.type !== "string") {
           throw new OmpRpcFaultError("protocolError", "Omp RPC returned an invalid envelope");
         }
         this.#handle(value);
@@ -18168,7 +18611,7 @@ var OmpRpcSession = class {
           this.#armCommandTimeout(id, pending);
         }
       }
-      const outcome = value.aborted === true ? "cancelled" : isRecord7(value.result) ? "succeeded" : "failed";
+      const outcome = value.aborted === true ? "cancelled" : isRecord8(value.result) ? "succeeded" : "failed";
       const event = {
         type: "compaction.completed",
         outcome,
@@ -18201,12 +18644,12 @@ var OmpRpcSession = class {
       this.#startAssistantMessage(active, value.message);
       return;
     }
-    if (value.type === "message_update" && isRecord7(value.assistantMessageEvent)) {
+    if (value.type === "message_update" && isRecord8(value.assistantMessageEvent)) {
       const event = value.assistantMessageEvent;
       const eventType = String(event.type ?? "");
       const isThinking = eventType === "thinking_delta" || eventType === "reasoning_delta" || eventType === "thought_delta" || eventType === "thinking" || eventType === "reasoning";
       const isText = eventType === "text_delta" || eventType === "text" || eventType === "content_block_delta";
-      const delta = typeof event.delta === "string" ? event.delta : typeof event.thinking === "string" ? event.thinking : typeof event.reasoning === "string" ? event.reasoning : typeof event.text === "string" ? event.text : isRecord7(event.delta) && typeof event.delta.thinking === "string" ? event.delta.thinking : isRecord7(event.delta) && typeof event.delta.text === "string" ? event.delta.text : null;
+      const delta = typeof event.delta === "string" ? event.delta : typeof event.thinking === "string" ? event.thinking : typeof event.reasoning === "string" ? event.reasoning : typeof event.text === "string" ? event.text : isRecord8(event.delta) && typeof event.delta.thinking === "string" ? event.delta.thinking : isRecord8(event.delta) && typeof event.delta.text === "string" ? event.delta.text : null;
       if (isThinking && delta !== null && delta.length > 0) {
         const messageId = this.#ensureAssistantMessage(active, value.message);
         active.reasoningMessageOpen = true;
@@ -18246,7 +18689,7 @@ var OmpRpcSession = class {
     if (value.type === "agent_end" && Array.isArray(value.messages)) {
       for (let index = value.messages.length - 1; index >= 0; index -= 1) {
         const message3 = value.messages[index];
-        if (!isRecord7(message3) || message3.role !== "assistant")
+        if (!isRecord8(message3) || message3.role !== "assistant")
           continue;
         this.#finalizeAssistantMessage(active, message3);
         break;
@@ -18263,8 +18706,8 @@ var OmpRpcSession = class {
     if (value.type !== "subagent_lifecycle" && value.type !== "subagent_progress" && value.type !== "subagent_event") {
       return false;
     }
-    const payload = isRecord7(value.payload) ? value.payload : null;
-    const progressPayload = value.type === "subagent_progress" && payload && isRecord7(payload.progress) ? payload.progress : null;
+    const payload = isRecord8(value.payload) ? value.payload : null;
+    const progressPayload = value.type === "subagent_progress" && payload && isRecord8(payload.progress) ? payload.progress : null;
     const nativeIdValue = progressPayload?.id ?? payload?.id;
     if (!payload || !nonBlankString(nativeIdValue)) {
       throw new OmpRpcFaultError("protocolError", "Omp RPC Subagent frame has no stable ID");
@@ -18681,6 +19124,8 @@ var OmpRpcSession = class {
     if (this.#closed || this.#failed)
       return;
     this.#failed = true;
+    this.#startupFaultResolve?.(error51);
+    this.#startupFaultResolve = null;
     this.#rejectAll(error51);
     this.#options.onFault?.(error51);
   }
@@ -18841,7 +19286,7 @@ var ompCommandCatalog = harnessCommandCatalogSchema.parse({
   ]
 });
 var DEFAULT_TOOL_OUTPUT_LIMIT = 64e3;
-function isRecord8(value) {
+function isRecord9(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function errorMessage(error51) {
@@ -18856,7 +19301,7 @@ var OmpAdapterFaultError = class extends Error {
   }
 };
 function normalizedError(error51, fallbackCode) {
-  if (isRecord8(error51) && error51.code === "ENOENT") {
+  if (isRecord9(error51) && error51.code === "ENOENT") {
     return { code: "notInstalled", message: errorMessage(error51), retryable: false };
   }
   if (error51 instanceof OmpAdapterFaultError)
@@ -18933,7 +19378,7 @@ function nativeModelForHistory(state) {
   return nativeModelFromState(state);
 }
 function sessionFileFromRef(ref) {
-  if (ref.harnessId !== ompHarnessId2 || !isRecord8(ref.locator) || typeof ref.locator.sessionFile !== "string" || ref.locator.sessionFile.length === 0) {
+  if (ref.harnessId !== ompHarnessId2 || !isRecord9(ref.locator) || typeof ref.locator.sessionFile !== "string" || ref.locator.sessionFile.length === 0) {
     throw new Error("Omp Native Session Ref has no resumable Session file");
   }
   return ref.locator.sessionFile;
@@ -18943,7 +19388,7 @@ function subagentTranscriptPath(parentSessionFile, nativeSubagentId) {
   if (nativeSubagentId.includes("/") || nativeSubagentId.includes("\\") || nativeSubagentId.includes("\0") || nativeSubagentId === "." || nativeSubagentId === "..") {
     throw new Error("Omp Subagent ID is not a plain transcript file name");
   }
-  if (!parentSessionFile.endsWith(".jsonl") || !path5.isAbsolute(parentSessionFile)) {
+  if (!parentSessionFile.endsWith(".jsonl") || !path6.isAbsolute(parentSessionFile)) {
     return null;
   }
   return `${parentSessionFile.slice(0, -".jsonl".length)}/${nativeSubagentId}.jsonl`;
@@ -18952,10 +19397,10 @@ async function readSubagentTranscriptFile(parentSessionFile, nativeSubagentId) {
   const transcriptFile = subagentTranscriptPath(parentSessionFile, nativeSubagentId);
   if (transcriptFile === null)
     return { status: "missing" };
-  const parentDirectory = path5.dirname(transcriptFile);
+  const parentDirectory = path6.dirname(transcriptFile);
   let metadata;
   try {
-    metadata = await stat(transcriptFile);
+    metadata = await stat2(transcriptFile);
   } catch (error51) {
     if (error51.code === "ENOENT")
       return { status: "missing" };
@@ -18967,10 +19412,10 @@ async function readSubagentTranscriptFile(parentSessionFile, nativeSubagentId) {
     throw new Error("Omp Subagent transcript exceeds the supported size");
   }
   const [resolvedTranscript, resolvedParentDirectory] = await Promise.all([
-    realpath2(transcriptFile),
-    realpath2(parentDirectory)
+    realpath3(transcriptFile),
+    realpath3(parentDirectory)
   ]);
-  if (path5.dirname(resolvedTranscript) !== resolvedParentDirectory) {
+  if (path6.dirname(resolvedTranscript) !== resolvedParentDirectory) {
     throw new Error("Omp Subagent transcript resolves outside its parent Session directory");
   }
   return {
@@ -18988,9 +19433,9 @@ function toolFailure(toolName) {
 function nativeText(value) {
   if (typeof value === "string")
     return value;
-  if (!isRecord8(value) || !Array.isArray(value.content))
+  if (!isRecord9(value) || !Array.isArray(value.content))
     return "";
-  return value.content.filter((content) => isRecord8(content) && content.type === "text" && typeof content.text === "string").map(({ text }) => text).join("");
+  return value.content.filter((content) => isRecord9(content) && content.type === "text" && typeof content.text === "string").map(({ text }) => text).join("");
 }
 function boundedOutput(value, limit) {
   const text = nativeText(value);
@@ -19006,17 +19451,17 @@ function outputText(output) {
   return output?.content.filter((content) => content.type === "text").map(({ text }) => text).join("") ?? "";
 }
 function stringField2(value, key) {
-  if (!isRecord8(value))
+  if (!isRecord9(value))
     return void 0;
   const field = value[key];
   if (typeof field === "string" && field.length > 0)
     return field;
-  if (isRecord8(value.input)) {
+  if (isRecord9(value.input)) {
     const nested = value.input[key];
     if (typeof nested === "string" && nested.length > 0)
       return nested;
   }
-  if (isRecord8(value.arguments)) {
+  if (isRecord9(value.arguments)) {
     const nested = value.arguments[key];
     if (typeof nested === "string" && nested.length > 0)
       return nested;
@@ -19024,7 +19469,7 @@ function stringField2(value, key) {
   return void 0;
 }
 function numberField(value, key) {
-  if (!isRecord8(value))
+  if (!isRecord9(value))
     return void 0;
   const field = value[key];
   return typeof field === "number" || field === null ? field : void 0;
@@ -19035,10 +19480,10 @@ function stripDiffPrefix(pathString) {
   return pathString.startsWith("a/") || pathString.startsWith("b/") ? pathString.slice(2) : pathString;
 }
 function displayPath(nativePath, cwd) {
-  const resolvedCwd = path5.resolve(cwd);
-  const resolvedPath = path5.isAbsolute(nativePath) ? path5.resolve(nativePath) : path5.resolve(cwd, nativePath);
-  const relative = path5.relative(resolvedCwd, resolvedPath);
-  const inside = relative.length > 0 && relative !== ".." && !relative.startsWith(`..${path5.sep}`);
+  const resolvedCwd = path6.resolve(cwd);
+  const resolvedPath = path6.isAbsolute(nativePath) ? path6.resolve(nativePath) : path6.resolve(cwd, nativePath);
+  const relative = path6.relative(resolvedCwd, resolvedPath);
+  const inside = relative.length > 0 && relative !== ".." && !relative.startsWith(`..${path6.sep}`);
   const selected = inside ? relative : resolvedPath;
   const normalized = selected.replaceAll("\\", "/");
   if (normalized.length === 0 || normalized === ".")
@@ -19063,7 +19508,7 @@ function fileMutatingKind(toolName) {
   return null;
 }
 function nestedToolString(value, keys) {
-  if (!isRecord8(value))
+  if (!isRecord9(value))
     return void 0;
   for (const key of keys) {
     const field = value[key];
@@ -19078,14 +19523,14 @@ function nestedToolString(value, keys) {
   return void 0;
 }
 function patchFromResult(result) {
-  if (!isRecord8(result))
+  if (!isRecord9(result))
     return void 0;
   for (const key of ["patch", "diff", "unifiedDiff"]) {
     const field = result[key];
     if (typeof field === "string" && field.length > 0)
       return field;
   }
-  if (isRecord8(result.details)) {
+  if (isRecord9(result.details)) {
     for (const key of ["patch", "diff", "unifiedDiff"]) {
       const field = result.details[key];
       if (typeof field === "string" && field.length > 0)
@@ -20567,6 +21012,7 @@ var OmpAdapter = class {
   commandCatalog = ompCommandCatalog;
   liveCommandCatalog = true;
   harnessId = ompHarnessId2;
+  sessionImport;
   subagents = {
     readSnapshot: async (input) => {
       if (input.parent.harnessId !== this.harnessId || input.nativeSubagentId.trim().length === 0 || input.cwd.length === 0) {
@@ -20626,6 +21072,7 @@ var OmpAdapter = class {
     createTransport: (sessionOptions) => new OmpRpcSession({ ...options, ...sessionOptions })
   }) {
     this.#createTransport = dependencies.createTransport;
+    this.sessionImport = new OmpSessionImport({ ...process.env, ...options.environment });
     this.#closeTimeoutMs = options.closeTimeoutMs ?? 2e3;
     this.#toolOutputLimit = options.toolOutputLimit ?? DEFAULT_TOOL_OUTPUT_LIMIT;
   }
@@ -20697,7 +21144,11 @@ var OmpAdapter = class {
       };
     } catch (error51) {
       await transport.close().catch(() => void 0);
-      const normalized = normalizedError(error51, "unavailable");
+      const normalized = stage === "startup" && /No models available\.\s*Use \/login or set an API key environment variable\./i.test(transport.stderrTail ?? "") ? {
+        code: "configurationRequired",
+        message: "No models are configured for use in Oh My Pi. Configure a Provider and its API key or models.yml, then run `omp` and use `/model` to select a model. For Providers that support it, `/login` configures Provider authentication, not an Oh My Pi account.",
+        retryable: false
+      } : normalizedError(error51, "unavailable");
       return {
         status: normalized.code === "notInstalled" ? "notInstalled" : "error",
         error: {
@@ -20887,6 +21338,7 @@ var OmpAdapter = class {
   close() {
     if (!this.#closePromise) {
       this.#closePromise = Promise.all([
+        this.sessionImport.close(),
         ...[...this.#inspections].map((transport) => transport.close()),
         ...[...this.#sessions].map((session) => session.close())
       ]).then(() => void 0);
@@ -20896,22 +21348,22 @@ var OmpAdapter = class {
 };
 
 // dist/installation.js
-import { realpath as realpath3 } from "node:fs/promises";
-import path6 from "node:path";
+import { realpath as realpath4 } from "node:fs/promises";
+import path7 from "node:path";
 function createOmpInstallation(environment, command) {
   let executable;
   let env;
   return createInstallationManager({
     async check() {
       executable = resolveOmpExecutable({ environment, ...command ? { command } : {} });
-      const selected = await realpath3(executable);
+      const selected = await realpath4(executable);
       const pathKey = Object.keys(environment).find((key) => key.toLowerCase() === "path") ?? "PATH";
       env = {
         ...environment,
-        [pathKey]: `${path6.dirname(executable)}${path6.delimiter}${environment[pathKey] ?? ""}`
+        [pathKey]: `${path7.dirname(executable)}${path7.delimiter}${environment[pathKey] ?? ""}`
       };
       const target = resolveHarnessExecutable({ id: "omp", command: "omp", installRoots: { posix: [], windows: [] } }, { environment: env });
-      const canUpdate = !selected.includes("/nix/store/") && !!target && await realpath3(target.executable) === selected;
+      const canUpdate = !selected.includes("/nix/store/") && !!target && await realpath4(target.executable) === selected;
       const output = await runInstallationCommand(executable, ["update", "--check"], env);
       const currentVersion = versionFromOutput(output);
       const available = output.match(/New version available:\s*(\S+)/i);
@@ -20923,7 +21375,10 @@ function createOmpInstallation(environment, command) {
         latestVersion,
         updateAvailable: newerInstallationVersion(currentVersion, latestVersion),
         canUpdate,
-        ...!canUpdate ? { message: "Update this installation with its original package manager or launcher." } : {}
+        ...!canUpdate ? {
+          messageCode: "original-installer",
+          message: "Update this installation with its original package manager or launcher."
+        } : {}
       };
     },
     async update() {
@@ -20939,7 +21394,14 @@ function createHarnessAdapter(context) {
   return Object.assign(new OmpAdapter({
     ...environment[OMP_COMMAND_ENV] ? { command: environment[OMP_COMMAND_ENV] } : {},
     environment
-  }), { installation: createOmpInstallation(environment, environment[OMP_COMMAND_ENV]) });
+  }), {
+    installation: createOmpInstallation(environment, environment[OMP_COMMAND_ENV]),
+    install: createHarnessInstaller(environment, {
+      posix: "https://omp.sh/install",
+      windows: "https://omp.sh/install.ps1",
+      shell: "sh"
+    })
+  });
 }
 export {
   OMP_COMMAND_ENV,