@codexhost/cli-darwin-x64 0.3.4 → 0.3.5

package/app/host-runtime.mjs

@@ -3710,7 +3710,7 @@ var require_websocket_server = __commonJS({
 });
 
 // packages/host-runtime/src/run-host-runtime.ts
-import path28 from "node:path";
+import path29 from "node:path";
 import { fileURLToPath } from "node:url";
 
 // packages/update-manager/dist/distribution.js
@@ -3790,7 +3790,14 @@ function parseDistributionMetadata(value) {
   if (Object.keys(metadata).some((key) => !allowed2.includes(key))) {
     throw new Error("distribution metadata contains unknown fields");
   }
-  if (metadata.schemaVersion !== 1 || metadata.distribution !== "npm" && metadata.distribution !== "installer" || !["macos-arm64", "macos-x64", "windows-x64", "windows-arm64", "linux-x64"].includes(String(metadata.target)) || typeof metadata.version !== "string") {
+  if (metadata.schemaVersion !== 1 || metadata.distribution !== "npm" && metadata.distribution !== "installer" || ![
+    "macos-arm64",
+    "macos-x64",
+    "windows-x64",
+    "windows-arm64",
+    "linux-x64",
+    "linux-arm64"
+  ].includes(String(metadata.target)) || typeof metadata.version !== "string") {
     throw new Error("distribution metadata is invalid");
   }
   return {
@@ -3823,6 +3830,8 @@ function expectedTarget(platform, architecture) {
     return "windows-x64";
   if (platform === "linux" && architecture === "x64")
     return "linux-x64";
+  if (platform === "linux" && architecture === "arm64")
+    return "linux-arm64";
   throw new Error(`unsupported update host ${platform}/${architecture}`);
 }
 function defaultUpdateStateDirectory(platform = process.platform, environment = process.env) {
@@ -4078,7 +4087,7 @@ async function discoverLatestUpdateStatus(stateDirectory) {
       return null;
     throw error54;
   }
-  const candidates2 = [];
+  const candidates = [];
   for (const entry of entries) {
     if (!entry.isDirectory() || entry.isSymbolicLink() || !entry.name.startsWith("update-"))
       continue;
@@ -4086,15 +4095,15 @@ async function discoverLatestUpdateStatus(stateDirectory) {
     if (!await regularFile(statusPath))
       continue;
     try {
-      candidates2.push({
+      candidates.push({
         statusPath,
         status: parseUpdateStatus(JSON.parse(await readFile2(statusPath, "utf8")))
       });
     } catch {
     }
   }
-  candidates2.sort((left, right) => right.status.updatedAt - left.status.updatedAt);
-  return candidates2[0] ?? null;
+  candidates.sort((left, right) => right.status.updatedAt - left.status.updatedAt);
+  return candidates[0] ?? null;
 }
 async function cleanupTerminalUpdateState(stateDirectory, options = {}) {
   const now = Math.floor((options.now ?? Date.now()) / 1e3);
@@ -5319,10 +5328,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path31) {
-  if (!path31)
+function getElementAtPath(obj, path32) {
+  if (!path32)
     return obj;
-  return path31.reduce((acc, key) => acc?.[key], obj);
+  return path32.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -5731,11 +5740,11 @@ function explicitlyAborted(x2, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path31, issues) {
+function prefixIssues(path32, issues) {
   return issues.map((iss) => {
     var _a4;
     (_a4 = iss).path ?? (_a4.path = []);
-    iss.path.unshift(path31);
+    iss.path.unshift(path32);
     return iss;
   });
 }
@@ -5882,16 +5891,16 @@ function flattenError(error54, mapper = (issue2) => issue2.message) {
 }
 function formatError(error54, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error55, path31 = []) => {
+  const processError = (error55, path32 = []) => {
     for (const issue2 of error55.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path31, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path32, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path31, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path32, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path31, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path32, ...issue2.path]);
       } else {
-        const fullpath = [...path31, ...issue2.path];
+        const fullpath = [...path32, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -5918,17 +5927,17 @@ function formatError(error54, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error54, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error55, path31 = []) => {
+  const processError = (error55, path32 = []) => {
     var _a4, _b2;
     for (const issue2 of error55.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path31, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path32, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path31, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path32, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path31, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path32, ...issue2.path]);
       } else {
-        const fullpath = [...path31, ...issue2.path];
+        const fullpath = [...path32, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -5960,8 +5969,8 @@ function treeifyError(error54, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path31 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path31) {
+  const path32 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path32) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -18653,13 +18662,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path31 = ref.slice(1).split("/").filter(Boolean);
-  if (path31.length === 0) {
+  const path32 = ref.slice(1).split("/").filter(Boolean);
+  if (path32.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path31[0] === defsKey) {
-    const key = path31[1];
+  if (path32[0] === defsKey) {
+    const key = path32[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -19270,7 +19279,8 @@ var accountCreditsSnapshotSchema = external_exports.object({
   productUsage: external_exports.array(accountCreditsProductUsageSchema).min(1).optional()
 }).strict();
 var threadUsageInspectionParamsSchema = external_exports.object({
-  threadId: hostThreadIdSchema
+  threadId: hostThreadIdSchema,
+  refresh: external_exports.literal("exact").optional()
 }).strict();
 var threadUsageInspectionSchema = external_exports.object({
   threadId: hostThreadIdSchema,
@@ -19874,7 +19884,7 @@ var packageMetadata = {
 
 // packages/adapters/claude-code/dist/claude-code-adapter.js
 import { randomUUID as randomUUID2 } from "node:crypto";
-import path8 from "node:path";
+import path11 from "node:path";
 
 // node_modules/@anthropic-ai/claude-agent-sdk/sdk.mjs
 import { createRequire as DW } from "node:module";
@@ -23779,8 +23789,8 @@ var qU = v(function(BU) {
   BU._globalThis = void 0;
   BU._globalThis = typeof globalThis === "object" ? globalThis : global;
 });
-var GU = v(function(os9) {
-  var Axe = os9 && os9.__createBinding || (Object.create ? function(e, t, r, n) {
+var GU = v(function(os6) {
+  var Axe = os6 && os6.__createBinding || (Object.create ? function(e, t, r, n) {
     if (n === void 0) n = r;
     Object.defineProperty(e, n, { enumerable: true, get: function() {
       return t[r];
@@ -23788,11 +23798,11 @@ var GU = v(function(os9) {
   } : function(e, t, r, n) {
     if (n === void 0) n = r;
     e[n] = t[r];
-  }), kxe = os9 && os9.__exportStar || function(e, t) {
+  }), kxe = os6 && os6.__exportStar || function(e, t) {
     for (var r in e) if (r !== "default" && !Object.prototype.hasOwnProperty.call(t, r)) Axe(t, e, r);
   };
-  Object.defineProperty(os9, "__esModule", { value: true });
-  kxe(qU(), os9);
+  Object.defineProperty(os6, "__esModule", { value: true });
+  kxe(qU(), os6);
 });
 var WU = v(function(is) {
   var Oxe = is && is.__createBinding || (Object.create ? function(e, t, r, n) {
@@ -25735,7 +25745,7 @@ var sd = v(function(iB) {
     if (o.$async) r.throw(Ae._`new ${e.ValidationError}(${t})`);
     else r.assign(Ae._`${n}.errors`, t), r.return(false);
   }
-  var fs3 = { keyword: new Ae.Name("keyword"), schemaPath: new Ae.Name("schemaPath"), params: new Ae.Name("params"), propertyName: new Ae.Name("propertyName"), message: new Ae.Name("message"), schema: new Ae.Name("schema"), parentSchema: new Ae.Name("parentSchema") };
+  var fs2 = { keyword: new Ae.Name("keyword"), schemaPath: new Ae.Name("schemaPath"), params: new Ae.Name("params"), propertyName: new Ae.Name("propertyName"), message: new Ae.Name("message"), schema: new Ae.Name("schema"), parentSchema: new Ae.Name("parentSchema") };
   function oB(e, t, r) {
     let { createErrors: n } = e.it;
     if (n === false) return Ae._`{}`;
@@ -25752,13 +25762,13 @@ var sd = v(function(iB) {
   function XAe({ keyword: e, it: { errSchemaPath: t } }, { schemaPath: r, parentSchema: n }) {
     let o = n ? t : Ae.str`${t}/${e}`;
     if (r) o = Ae.str`${o}${(0, H_.getErrorPath)(r, H_.Type.Str)}`;
-    return [fs3.schemaPath, o];
+    return [fs2.schemaPath, o];
   }
   function QAe(e, { params: t, message: r }, n) {
     let { keyword: o, data: i, schemaValue: s, it: a } = e, { opts: c, propertyName: u, topSchemaRef: d, schemaPath: f } = a;
-    if (n.push([fs3.keyword, o], [fs3.params, typeof t == "function" ? t(e) : t || Ae._`{}`]), c.messages) n.push([fs3.message, typeof r == "function" ? r(e) : r]);
-    if (c.verbose) n.push([fs3.schema, s], [fs3.parentSchema, Ae._`${d}${f}`], [rr.default.data, i]);
-    if (u) n.push([fs3.propertyName, u]);
+    if (n.push([fs2.keyword, o], [fs2.params, typeof t == "function" ? t(e) : t || Ae._`{}`]), c.messages) n.push([fs2.message, typeof r == "function" ? r(e) : r]);
+    if (c.verbose) n.push([fs2.schema, s], [fs2.parentSchema, Ae._`${d}${f}`], [rr.default.data, i]);
+    if (u) n.push([fs2.propertyName, u]);
   }
 });
 var uB = v(function(cB) {
@@ -45566,88 +45576,76 @@ var ClaudeBackgroundOccupancy = class {
 };
 
 // packages/adapters/claude-code/dist/command.js
+import path7 from "node:path";
+
+// packages/harness-discovery/dist/environment.js
 import fs from "node:fs";
-import os from "node:os";
 import path4 from "node:path";
-var ClaudeCodeExecutableError = class extends Error {
-  code = "CLAUDE_NOT_FOUND";
-};
-function pathValue(environment) {
-  const key = Object.keys(environment).find((name) => name.toLowerCase() === "path");
-  return key ? environment[key] ?? "" : "";
+function targetPath(platform) {
+  return platform === "win32" ? path4.win32 : path4.posix;
 }
-function candidates(command, platform, environment) {
-  if (path4.isAbsolute(command) || command.includes("/") || command.includes("\\")) {
-    return [command];
+function environmentValue(environment, name) {
+  const lowered = name.toLowerCase();
+  for (const [key, value] of Object.entries(environment)) {
+    if (key.toLowerCase() === lowered)
+      return value;
   }
-  const delimiter = platform === "win32" ? ";" : ":";
-  const extensions = platform === "win32" && path4.extname(command) === "" ? (environment.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";") : [""];
-  return pathValue(environment).split(delimiter).filter(Boolean).flatMap((directory) => extensions.map((extension2) => path4.join(directory, command + extension2)));
+  return void 0;
+}
+function pathDelimiter(platform) {
+  return platform === "win32" ? ";" : ":";
 }
-function isExecutable(candidate, platform) {
+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((extension2) => extension2.trim()).filter(Boolean);
+}
+function isExecutableFile(filePath, platform) {
   try {
-    fs.accessSync(candidate, platform === "win32" ? fs.constants.F_OK : fs.constants.X_OK);
-    return fs.statSync(candidate).isFile();
+    fs.accessSync(filePath, platform === "win32" ? fs.constants.F_OK : fs.constants.X_OK);
+    return fs.statSync(filePath).isFile();
   } catch {
     return false;
   }
 }
-function claudeNpmNativeExecutable(npmDirectory) {
-  return path4.join(npmDirectory, "node_modules", "@anthropic-ai", "claude-code", "bin", "claude.exe");
-}
-function runnableCandidate(candidate, platform) {
-  if (platform === "win32" && path4.basename(candidate).toLowerCase() === "claude.cmd") {
-    const nativeExecutable = claudeNpmNativeExecutable(path4.dirname(candidate));
-    return isExecutable(nativeExecutable, platform) ? nativeExecutable : void 0;
-  }
-  return candidate;
-}
-function nvmCandidates(homeDirectory) {
-  const versionsDirectory = path4.join(homeDirectory, ".nvm", "versions", "node");
+function subdirectoryNames(directory) {
   try {
-    return fs.readdirSync(versionsDirectory, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort((left, right) => right.localeCompare(left, void 0, { numeric: true })).map((version2) => path4.join(versionsDirectory, version2, "bin", "claude"));
+    return fs.readdirSync(directory, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name);
   } catch {
     return [];
   }
 }
-function userInstallCandidates(platform, environment, homeDirectory) {
-  if (platform === "win32") {
-    const appData = environment.APPDATA ?? path4.join(homeDirectory, "AppData", "Roaming");
-    return [
-      claudeNpmNativeExecutable(path4.join(appData, "npm")),
-      path4.join(appData, "npm", "claude.cmd"),
-      path4.join(homeDirectory, ".local", "bin", "claude.exe"),
-      path4.join(homeDirectory, ".local", "bin", "claude.cmd")
-    ];
-  }
-  return [
-    path4.join(homeDirectory, ".npm-global", "bin", "claude"),
-    path4.join(homeDirectory, ".local", "bin", "claude"),
-    path4.join(homeDirectory, ".claude", "local", "claude"),
-    ...nvmCandidates(homeDirectory),
-    "/opt/homebrew/bin/claude",
-    "/usr/local/bin/claude"
-  ];
+function newestFirst(names) {
+  return [...names].sort((left, right) => right.localeCompare(left, void 0, { numeric: true }));
 }
-function resolveClaudeCodeExecutable(input = {}) {
-  const environment = input.environment ?? process.env;
-  const platform = input.platform ?? process.platform;
-  const configuredCommand = input.command ?? environment.CODEXHOST_CLAUDE_COMMAND;
-  const command = configuredCommand ?? "claude";
-  const homeDirectory = input.homeDirectory ?? environment.HOME ?? environment.USERPROFILE ?? os.homedir();
-  const resolutionCandidates = [
-    ...candidates(command, platform, environment),
-    ...configuredCommand ? [] : userInstallCandidates(platform, environment, homeDirectory)
-  ];
-  const executable2 = resolutionCandidates.map((candidate) => runnableCandidate(candidate, platform)).find((candidate) => candidate !== void 0 && isExecutable(candidate, platform));
-  if (!executable2)
-    throw new ClaudeCodeExecutableError("Claude Code is not installed");
-  return path4.resolve(executable2);
+
+// packages/harness-discovery/dist/invocation.js
+import path5 from "node:path";
+function commandInvocation(command, arguments_2, environment, platform = process.platform) {
+  const extension2 = path5.win32.extname(command).toLowerCase();
+  if (platform !== "win32" || ![".cmd", ".bat"].includes(extension2)) {
+    return { command, arguments: [...arguments_2], windowsVerbatimArguments: false };
+  }
+  const quote = (value) => `"${value.replaceAll("%", "%%").replaceAll('"', '""')}"`;
+  const commandLine = [command, ...arguments_2].map(quote).join(" ");
+  return {
+    command: environmentValue(environment, "ComSpec") ?? "cmd.exe",
+    arguments: ["/d", "/v:off", "/s", "/c", `"${commandLine}"`],
+    windowsVerbatimArguments: true
+  };
 }
+
+// packages/harness-discovery/dist/node-runtime.js
+import path6 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 = path4.dirname(runtimeExecutable);
+  const runtimeDirectory = path6.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))) {
@@ -45656,8 +45654,220 @@ function withNodeRuntimeOnPath(environment, runtimeExecutable = process.execPath
   return { ...environment, [pathKey]: directories.join(delimiter) };
 }
 
+// packages/harness-discovery/dist/resolve.js
+import os from "node:os";
+
+// packages/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;
+}
+
+// packages/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, dependencies2, 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,
+        ...dependencies2.subdirectories ? { subdirectories: dependencies2.subdirectories } : {}
+      }));
+      continue;
+    }
+    const directory = expandInstallRoot(template, input.environment, platform, home);
+    if (directory !== void 0)
+      directories.push(directory);
+  }
+  return directories;
+}
+function harnessCandidates(spec, input, dependencies2 = {}) {
+  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 extension2 of extensions) {
+      candidates.push({
+        candidate: pathFlavor.join(directory, command + extension2),
+        source: "path"
+      });
+    }
+  }
+  if (configured !== void 0)
+    return candidates;
+  const home = resolveHomeDirectory(input);
+  for (const directory of installRootDirectories(spec, input, dependencies2, platform, home)) {
+    for (const extension2 of installRootExtensions(platform)) {
+      candidates.push({
+        candidate: pathFlavor.join(directory, spec.command + extension2),
+        source: "install-root"
+      });
+    }
+  }
+  return candidates;
+}
+function resolveHarnessExecutable(spec, input, dependencies2 = {}) {
+  const platform = input.platform ?? process.platform;
+  const isExecutable = dependencies2.isExecutable ?? ((candidate) => isExecutableFile(candidate, platform));
+  const runnable = spec.runnableCandidate ?? ((candidate) => candidate);
+  const context = { platform, isExecutable };
+  for (const { candidate, source } of harnessCandidates(spec, input, dependencies2)) {
+    const executable2 = runnable(candidate, context);
+    if (executable2 !== void 0 && isExecutable(executable2))
+      return { executable: executable2, source };
+  }
+  return void 0;
+}
+
+// packages/adapters/claude-code/dist/command.js
+var ClaudeCodeExecutableError = class extends Error {
+  code = "CLAUDE_NOT_FOUND";
+};
+var CLAUDE_NPM_PACKAGE_BIN = "node_modules/@anthropic-ai/claude-code/bin";
+var claudeCodeDiscoverySpec = {
+  id: "claude-code",
+  command: "claude",
+  commandEnvironmentVariable: "CODEXHOST_CLAUDE_COMMAND",
+  installRoots: {
+    posix: [
+      "~/.npm-global/bin",
+      "~/.local/bin",
+      "~/.claude/local",
+      VERSION_MANAGER_ROOTS,
+      "/opt/homebrew/bin",
+      "/usr/local/bin"
+    ],
+    windows: [
+      `\${APPDATA}/npm/${CLAUDE_NPM_PACKAGE_BIN}`,
+      "${APPDATA}/npm",
+      "~/.local/bin",
+      VERSION_MANAGER_ROOTS
+    ]
+  },
+  // Prefer Claude Code's native binary over the npm CMD shim beside it: the
+  // shim spawns an extra cmd.exe and loses signal handling.
+  runnableCandidate: (candidate, { platform, isExecutable }) => {
+    const pathFlavor = targetPath(platform);
+    if (platform !== "win32" || pathFlavor.basename(candidate).toLowerCase() !== "claude.cmd") {
+      return candidate;
+    }
+    const native = pathFlavor.join(pathFlavor.dirname(candidate), ...CLAUDE_NPM_PACKAGE_BIN.split("/"), "claude.exe");
+    return isExecutable(native) ? native : void 0;
+  }
+};
+function resolveClaudeCodeExecutable(input = {}, dependencies2 = {}) {
+  const platform = input.platform ?? process.platform;
+  const resolution = resolveHarnessExecutable(claudeCodeDiscoverySpec, {
+    ...input.command ? { command: input.command } : {},
+    environment: input.environment ?? process.env,
+    ...input.homeDirectory ? { homeDirectory: input.homeDirectory } : {},
+    platform
+  }, dependencies2);
+  if (!resolution)
+    throw new ClaudeCodeExecutableError("Claude Code is not installed");
+  return targetPath(platform).isAbsolute(resolution.executable) ? resolution.executable : path7.resolve(resolution.executable);
+}
+
 // packages/adapters/claude-code/dist/claude-fork.js
-import path5 from "node:path";
+import path8 from "node:path";
 import { isDeepStrictEqual } from "node:util";
 
 // packages/adapters/claude-code/dist/item-identity.js
@@ -46177,7 +46387,7 @@ async function forkClaudeSession(input) {
       error: error51("protocolError", "Claude Code Session working directory is unavailable", false)
     };
   }
-  if (path5.resolve(sourceInfo.cwd) !== input.cwd) {
+  if (path8.resolve(sourceInfo.cwd) !== input.cwd) {
     return {
       ok: false,
       error: error51("unsupported", "Claude Code cannot Fork across working directories", false)
@@ -46247,13 +46457,13 @@ async function forkClaudeSession(input) {
 
 // packages/adapters/claude-code/dist/claude-transcript.js
 import os2 from "node:os";
-import path6 from "node:path";
+import path9 from "node:path";
 import { readFile as readFile4, readdir as readdir2, stat } from "node:fs/promises";
 function projectDirectoryName(cwd) {
   return cwd.replace(/[^A-Za-z0-9]/gu, "-");
 }
 function configDirectory(environment) {
-  return environment.CLAUDE_CONFIG_DIR ? path6.resolve(environment.CLAUDE_CONFIG_DIR) : path6.join(os2.homedir(), ".claude");
+  return environment.CLAUDE_CONFIG_DIR ? path9.resolve(environment.CLAUDE_CONFIG_DIR) : path9.join(os2.homedir(), ".claude");
 }
 async function existingFile(file2) {
   try {
@@ -46263,9 +46473,9 @@ async function existingFile(file2) {
   }
 }
 async function findTranscript(input) {
-  const projectsDirectory = path6.join(configDirectory(input.environment), "projects");
+  const projectsDirectory = path9.join(configDirectory(input.environment), "projects");
   const name = `${input.sessionId}.jsonl`;
-  const expected = path6.join(projectsDirectory, projectDirectoryName(input.cwd), name);
+  const expected = path9.join(projectsDirectory, projectDirectoryName(input.cwd), name);
   if (await existingFile(expected))
     return expected;
   let projects;
@@ -46275,7 +46485,7 @@ async function findTranscript(input) {
     return null;
   }
   for (const project of projects) {
-    const candidate = path6.join(projectsDirectory, project, name);
+    const candidate = path9.join(projectsDirectory, project, name);
     if (await existingFile(candidate))
       return candidate;
   }
@@ -46520,7 +46730,7 @@ function isClaudePermissionMode(value) {
 import { spawn as spawn2 } from "node:child_process";
 
 // packages/adapters/claude-code/dist/file-change.js
-import path7 from "node:path";
+import path10 from "node:path";
 var hunkSchema = external_exports.object({
   oldStart: external_exports.number().int().nonnegative(),
   oldLines: external_exports.number().int().nonnegative(),
@@ -46568,10 +46778,10 @@ function parseClaudeNativeFileChange(toolName, value) {
   };
 }
 function displayPath(nativePath, cwd) {
-  const resolvedCwd = path7.resolve(cwd);
-  const resolvedPath = path7.isAbsolute(nativePath) ? path7.resolve(nativePath) : path7.resolve(cwd, nativePath);
-  const relative = path7.relative(resolvedCwd, resolvedPath);
-  const selected = relative.length > 0 && relative !== ".." && !relative.startsWith(`..${path7.sep}`) ? relative : resolvedPath;
+  const resolvedCwd = path10.resolve(cwd);
+  const resolvedPath = path10.isAbsolute(nativePath) ? path10.resolve(nativePath) : path10.resolve(cwd, nativePath);
+  const relative = path10.relative(resolvedCwd, resolvedPath);
+  const selected = relative.length > 0 && relative !== ".." && !relative.startsWith(`..${path10.sep}`) ? relative : resolvedPath;
   const normalized = selected.replaceAll("\\", "/");
   return validNativePath(normalized) && normalized !== "." ? normalized : null;
 }
@@ -46583,7 +46793,7 @@ function projectClaudeFileChange(value, cwd) {
     `@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@`,
     ...hunk.lines
   ]);
-  const absoluteDisplayPath = path7.posix.isAbsolute(normalizedPath);
+  const absoluteDisplayPath = path10.posix.isAbsolute(normalizedPath);
   const oldHeader = value.kind === "add" ? "/dev/null" : absoluteDisplayPath ? normalizedPath : `a/${normalizedPath}`;
   const newHeader = absoluteDisplayPath ? normalizedPath : `b/${normalizedPath}`;
   const unifiedDiff = [`--- ${oldHeader}`, `+++ ${newHeader}`, ...body, ""].join("\n");
@@ -46682,16 +46892,37 @@ function parseResultModelUsage(value) {
   }
   return usage;
 }
-function parseLastRequestUsage(value) {
+function parseLastRequestUsage(value, attribution = {}) {
   if (!isRecord5(value))
     return void 0;
   const inputTokens = value.input_tokens;
+  const outputTokens = value.output_tokens;
   const cacheCreationInputTokens = value.cache_creation_input_tokens;
   const cacheReadInputTokens = value.cache_read_input_tokens;
-  if (!safeNonNegativeInteger(inputTokens) || !safeNonNegativeInteger(cacheCreationInputTokens) || !safeNonNegativeInteger(cacheReadInputTokens)) {
+  if (!safeNonNegativeInteger(inputTokens) || !safeNonNegativeInteger(outputTokens) || !safeNonNegativeInteger(cacheCreationInputTokens) || !safeNonNegativeInteger(cacheReadInputTokens)) {
     return void 0;
   }
-  return { inputTokens, cacheCreationInputTokens, cacheReadInputTokens };
+  const requestId = boundedString(attribution.requestId, 500);
+  const model = boundedString(attribution.model, 500);
+  const provider = boundedString(attribution.provider, 100);
+  return {
+    ...requestId ? { requestId } : {},
+    ...model ? { model } : {},
+    ...provider ? { provider } : {},
+    inputTokens,
+    outputTokens,
+    cacheCreationInputTokens,
+    cacheReadInputTokens
+  };
+}
+function assistantRequestUsage(message5, provider) {
+  if (!isRecord5(message5.message))
+    return void 0;
+  return parseLastRequestUsage(message5.message.usage, {
+    requestId: message5.message.id ?? message5.request_id,
+    model: message5.message.model,
+    provider: message5.provider ?? message5.message.provider ?? provider
+  });
 }
 function parseResultUsageEvent(message5) {
   const totalCostUsd = finiteNonNegativeNumber(message5.total_cost_usd) ? message5.total_cost_usd : void 0;
@@ -46826,6 +47057,7 @@ function taskStatus(value) {
   }
 }
 var ClaudeNativeTurnAccumulator = class {
+  #provider;
   #activeRootStreamMessageId = null;
   #assistantErrors = [];
   #cancelRequested = false;
@@ -46837,6 +47069,9 @@ var ClaudeNativeTurnAccumulator = class {
   #protocolConflict = false;
   #textConflict = false;
   #tools = /* @__PURE__ */ new Map();
+  constructor(options = {}) {
+    this.#provider = options.provider;
+  }
   requestCancel() {
     this.#cancelRequested = true;
   }
@@ -47080,7 +47315,7 @@ var ClaudeNativeTurnAccumulator = class {
     const state = this.#messageState(messageId);
     if (state.completed) {
       this.#consumeToolUseBlocks(message5, events, true);
-      const usage = isRecord5(message5.message) ? parseLastRequestUsage(message5.message.usage) : void 0;
+      const usage = assistantRequestUsage(message5, this.#provider);
       if (usage && !state.usagePublished) {
         state.usagePublished = true;
         events.push({
@@ -47109,7 +47344,7 @@ var ClaudeNativeTurnAccumulator = class {
     }
     this.#consumeToolUseBlocks(message5, events, false);
     if (!this.#protocolConflict && !this.#textConflict) {
-      const usage = isRecord5(message5.message) ? parseLastRequestUsage(message5.message.usage) : void 0;
+      const usage = assistantRequestUsage(message5, this.#provider);
       state.usagePublished = usage !== void 0;
       events.push({
         type: "message.completed",
@@ -47298,9 +47533,6 @@ function permissionModeFromMessage(value) {
   }
   return isClaudePermissionMode(value.permissionMode) ? value.permissionMode : void 0;
 }
-function safeNonNegativeInteger2(value) {
-  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
-}
 function parseContextUsage(value) {
   if (!isRecord6(value))
     throw new Error("Claude SDK context Usage is invalid");
@@ -47312,53 +47544,6 @@ function parseContextUsage(value) {
   }
   return { usedTokens, maxTokens, model };
 }
-function parseUsageQueryWindow(value) {
-  if (!isRecord6(value))
-    return void 0;
-  const utilization = value.utilization;
-  if (typeof utilization !== "number" || !Number.isFinite(utilization) || utilization < 0) {
-    return void 0;
-  }
-  const utilizationPercent = Math.min(100, Math.max(0, utilization));
-  const resetsAt = value.resets_at;
-  const resetsAtMs = typeof resetsAt === "string" ? Date.parse(resetsAt) : Number.NaN;
-  const resetsAtUnix = Number.isFinite(resetsAtMs) ? Math.floor(resetsAtMs / 1e3) : void 0;
-  return { utilizationPercent, ...resetsAtUnix !== void 0 ? { resetsAtUnix } : {} };
-}
-function parseUsageQueryPlanLimit(value) {
-  if (!isRecord6(value) || value.rate_limits_available !== true)
-    return null;
-  const rateLimits = value.rate_limits;
-  if (!isRecord6(rateLimits))
-    return null;
-  const fiveHour = parseUsageQueryWindow(rateLimits.five_hour);
-  const sevenDay = parseUsageQueryWindow(rateLimits.seven_day);
-  if (!fiveHour && !sevenDay)
-    return null;
-  return { ...fiveHour ? { fiveHour } : {}, ...sevenDay ? { sevenDay } : {} };
-}
-function parseUsageQuerySession(value) {
-  if (!isRecord6(value) || !isRecord6(value.session))
-    return null;
-  const session = value.session;
-  const totalCostUsd = session.total_cost_usd;
-  if (typeof totalCostUsd !== "number" || !Number.isFinite(totalCostUsd) || totalCostUsd < 0) {
-    return null;
-  }
-  const modelUsage = session.model_usage;
-  if (!isRecord6(modelUsage))
-    return { totalCostUsd };
-  let inputTokens = 0;
-  let outputTokens = 0;
-  for (const entry of Object.values(modelUsage)) {
-    if (!isRecord6(entry) || !safeNonNegativeInteger2(entry.inputTokens) || !safeNonNegativeInteger2(entry.outputTokens)) {
-      return { totalCostUsd };
-    }
-    inputTokens += entry.inputTokens;
-    outputTokens += entry.outputTokens;
-  }
-  return Number.isSafeInteger(inputTokens) && Number.isSafeInteger(outputTokens) ? { totalCostUsd, inputTokens, outputTokens } : { totalCostUsd };
-}
 function parseQuestions(input) {
   if (!Array.isArray(input.questions) || input.questions.length < 1 || input.questions.length > 4) {
     return null;
@@ -47495,6 +47680,7 @@ var ClaudeSdkTransport = class {
   #consumeTask = null;
   #stderrTail = "";
   #interactionOrdinal = 0;
+  #provider;
   #query = null;
   #started = false;
   constructor(options) {
@@ -47559,6 +47745,7 @@ var ClaudeSdkTransport = class {
     this.#query = activeQuery;
     try {
       await activeQuery.initializationResult();
+      this.#provider = (await activeQuery.accountInfo().catch(() => void 0))?.apiProvider;
     } catch (error54) {
       activeQuery.close();
       this.#query = null;
@@ -47573,18 +47760,6 @@ var ClaudeSdkTransport = class {
       return null;
     return parseContextUsage(await activeQuery.getContextUsage());
   }
-  async getSessionUsage() {
-    const activeQuery = this.#query;
-    if (!this.#started || !activeQuery)
-      return null;
-    return parseUsageQuerySession(await activeQuery.usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET());
-  }
-  async getPlanLimit() {
-    const activeQuery = this.#query;
-    if (!this.#started || !activeQuery)
-      return null;
-    return parseUsageQueryPlanLimit(await activeQuery.usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET());
-  }
   getPermissionMode() {
     if (!this.#started || !this.#query)
       throw new Error("Claude SDK transport is not started");
@@ -47629,7 +47804,7 @@ var ClaudeSdkTransport = class {
       return Promise.reject(new Error("Claude SDK transport is busy"));
     const promise2 = new Promise((resolve2, reject) => {
       this.#active = {
-        accumulator: new ClaudeNativeTurnAccumulator(),
+        accumulator: new ClaudeNativeTurnAccumulator(this.#provider ? { provider: this.#provider } : {}),
         controlRequestIds: /* @__PURE__ */ new Set(),
         interactions: /* @__PURE__ */ new Map(),
         onEvent,
@@ -47812,7 +47987,7 @@ var ClaudeSdkTransport = class {
           continue;
         }
         if (this.#idleLive && this.#idleHandler) {
-          const idle = this.#idleAccumulator ?? (this.#idleAccumulator = new ClaudeNativeTurnAccumulator());
+          const idle = this.#idleAccumulator ?? (this.#idleAccumulator = new ClaudeNativeTurnAccumulator(this.#provider ? { provider: this.#provider } : {}));
           const interpreted2 = idle.consume(message5);
           for (const event of interpreted2.events)
             this.#idleHandler.onEvent(event);
@@ -47825,7 +48000,7 @@ var ClaudeSdkTransport = class {
         if (!this.#autonomousTurnHandler)
           continue;
         const autonomous = this.#autonomous ?? (this.#autonomous = {
-          accumulator: new ClaudeNativeTurnAccumulator(),
+          accumulator: new ClaudeNativeTurnAccumulator(this.#provider ? { provider: this.#provider } : {}),
           events: [],
           nativeTurnKey: null
         });
@@ -48212,6 +48387,43 @@ var ClaudeToolLifecycle = class {
   }
 };
 
+// packages/adapters/claude-code/dist/usage-estimate.js
+var PER_MILLION = 1e6;
+function normalizedModel(model) {
+  return model.trim().toLowerCase().replaceAll("_", "-");
+}
+function firstPartyPrice(model) {
+  const value = normalizedModel(model);
+  if (/claude-opus-4-(5|6|7|8)(?:-|$)/u.test(value)) {
+    return { input: 5, cacheWrite: 6.25, cacheRead: 0.5, output: 25 };
+  }
+  if (/claude-opus-4-(0|1)(?:-|$)/u.test(value) || /claude-opus-4-2025/u.test(value)) {
+    return { input: 15, cacheWrite: 18.75, cacheRead: 1.5, output: 75 };
+  }
+  if (/claude-sonnet-5(?:-|$)/u.test(value)) {
+    return { input: 2, cacheWrite: 2.5, cacheRead: 0.2, output: 10 };
+  }
+  if (/claude-(?:3-7-)?sonnet-(?:4|3-7)(?:-|$)/u.test(value)) {
+    return { input: 3, cacheWrite: 3.75, cacheRead: 0.3, output: 15 };
+  }
+  if (/claude-(?:3-5-)?haiku-(?:4-5|3-5)(?:-|$)/u.test(value)) {
+    return value.includes("4-5") ? { input: 1, cacheWrite: 1.25, cacheRead: 0.1, output: 5 } : { input: 0.8, cacheWrite: 1, cacheRead: 0.08, output: 4 };
+  }
+  if (/claude-3-haiku(?:-|$)/u.test(value)) {
+    return { input: 0.25, cacheWrite: 0.3, cacheRead: 0.03, output: 1.25 };
+  }
+  return null;
+}
+function estimateClaudeRequestCostUsd(usage) {
+  if (!usage.model || usage.provider !== "firstParty")
+    return void 0;
+  const price = firstPartyPrice(usage.model);
+  if (!price)
+    return void 0;
+  const cost = (usage.inputTokens * price.input + usage.cacheCreationInputTokens * price.cacheWrite + usage.cacheReadInputTokens * price.cacheRead + usage.outputTokens * price.output) / PER_MILLION;
+  return Number.isFinite(cost) && cost >= 0 ? cost : void 0;
+}
+
 // packages/adapters/claude-code/dist/claude-code-adapter.js
 var claudeCodeHarnessId2 = harnessIdSchema.parse("claude-code");
 var claudeCommandCatalog = harnessCommandCatalogSchema.parse({
@@ -48290,15 +48502,14 @@ function parseClaudeHarnessCommand(command) {
 var DEFAULT_CLOSE_TIMEOUT_MS = 7e3;
 var DEFAULT_TOOL_OUTPUT_LIMIT = 64e3;
 var CONTEXT_USAGE_RETRY_DELAYS_MS = [0, 1e3, 2e3];
-var ACTIVE_CONTEXT_USAGE_RETRY_DELAYS_MS = [0, 250, 1e3];
+var CONTEXT_USAGE_TTL_MS = 1e4;
+var CONTEXT_USAGE_FAILURE_COOLDOWN_MS = 5e3;
 var REQUEST_USAGE_RETRY_DELAYS_MS = [0, 100, 250, 500, 1e3];
 var DEFAULT_CONTINUATION_QUIESCENCE_MS = 2e3;
-var PLAN_LIMIT_TTL_MS = 15e3;
-var ACTIVE_PLAN_LIMIT_POLL_INTERVAL_MS = 5e3;
 function isRecord8(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function safeNonNegativeInteger3(value) {
+function safeNonNegativeInteger2(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
 }
 function transcriptRequestUsage(messages, messageId) {
@@ -48308,10 +48519,19 @@ function transcriptRequestUsage(messages, messageId) {
       continue;
     }
     const inputTokens = entry.message.usage.input_tokens;
+    const outputTokens = entry.message.usage.output_tokens;
     const cacheCreationInputTokens = entry.message.usage.cache_creation_input_tokens;
     const cacheReadInputTokens = entry.message.usage.cache_read_input_tokens;
-    if (safeNonNegativeInteger3(inputTokens) && safeNonNegativeInteger3(cacheCreationInputTokens) && safeNonNegativeInteger3(cacheReadInputTokens)) {
-      return { inputTokens, cacheCreationInputTokens, cacheReadInputTokens };
+    if (safeNonNegativeInteger2(inputTokens) && safeNonNegativeInteger2(outputTokens) && safeNonNegativeInteger2(cacheCreationInputTokens) && safeNonNegativeInteger2(cacheReadInputTokens)) {
+      return {
+        requestId: typeof entry.request_id === "string" && entry.request_id.length > 0 ? entry.request_id : messageId,
+        ...typeof entry.message.model === "string" && entry.message.model.length > 0 ? { model: entry.message.model } : {},
+        ...typeof entry.provider === "string" && entry.provider.length > 0 ? { provider: entry.provider } : typeof entry.message.provider === "string" && entry.message.provider.length > 0 ? { provider: entry.message.provider } : {},
+        inputTokens,
+        outputTokens,
+        cacheCreationInputTokens,
+        cacheReadInputTokens
+      };
     }
   }
   return void 0;
@@ -48424,8 +48644,6 @@ var ClaudeHarnessSession = class {
   #cwd;
   #nativeRef;
   #onClosed;
-  #onTurnFinished;
-  #onTurnStarted;
   #onPlanLimitObserved;
   #openMode;
   #randomUUID;
@@ -48448,24 +48666,25 @@ var ClaudeHarnessSession = class {
   #usageGeneration = 0;
   #latestUsage = null;
   #minimumContextUsedTokens = null;
+  #calibratedInputTokens = 0;
+  #calibratedOutputTokens = 0;
+  #calibratedCostUsd = 0;
   #contextRefreshInFlight = null;
   #contextRefreshPending = null;
   #contextRefreshWake = null;
-  #sessionRefreshInFlight = null;
-  #sessionRefreshPending = null;
+  #contextUsageFreshUntilMs = 0;
+  #contextUsageCooldownUntilMs = 0;
   #requestUsageBoundary = 0;
   #autonomousOrdinal = 0;
   #occupancy = new ClaudeBackgroundOccupancy();
   #continuationQuiescence = null;
-  constructor(cwd, dependencies2, closeTimeoutMs, onClosed, onTurnStarted, onTurnFinished, onPlanLimitObserved, options) {
+  constructor(cwd, dependencies2, closeTimeoutMs, onClosed, onPlanLimitObserved, options) {
     this.#cwd = cwd;
     this.#createTransport = dependencies2.createTransport;
     this.#randomUUID = dependencies2.randomUUID;
     this.#readSessionMessages = dependencies2.readSessionMessages;
     this.#closeTimeoutMs = closeTimeoutMs;
     this.#onClosed = onClosed;
-    this.#onTurnStarted = onTurnStarted;
-    this.#onTurnFinished = onTurnFinished;
     this.#onPlanLimitObserved = onPlanLimitObserved;
     this.#openMode = options.openMode;
     this.#requestedModel = options.requestedModel;
@@ -48599,6 +48818,8 @@ var ClaudeHarnessSession = class {
     if (startingTransport)
       this.#publishState();
     this.#usageGeneration += 1;
+    this.#contextUsageFreshUntilMs = 0;
+    this.#contextUsageCooldownUntilMs = 0;
     let resolveCompletion = () => void 0;
     const completion = new Promise((resolve2) => {
       resolveCompletion = resolve2;
@@ -48634,12 +48855,18 @@ var ClaudeHarnessSession = class {
       nativeTurnKey: nativeTurnKey4,
       nativeTurnRef: null,
       cancellationRequested: false,
+      usageRequestIds: /* @__PURE__ */ new Set(),
+      estimatedInputTokens: 0,
+      estimatedOutputTokens: 0,
+      estimatedCostUsd: 0,
+      estimatedCostAvailable: false,
+      usageTokensCalibrated: false,
+      usageCostCalibrated: false,
       held: false,
       completion,
       resolveCompletion
     };
     this.#active = active;
-    this.#onTurnStarted();
     this.#event({ type: "turn.started", turnId: command.turnId });
     this.#event({ type: "item.started", turnId: command.turnId, item });
     try {
@@ -48692,6 +48919,8 @@ var ClaudeHarnessSession = class {
     if (startingTransport)
       this.#publishState();
     this.#usageGeneration += 1;
+    this.#contextUsageFreshUntilMs = 0;
+    this.#contextUsageCooldownUntilMs = 0;
     let resolveCompletion = () => void 0;
     const completion = new Promise((resolve2) => {
       resolveCompletion = resolve2;
@@ -48728,12 +48957,18 @@ var ClaudeHarnessSession = class {
       nativeTurnKey: nativeTurnKey4,
       nativeTurnRef: null,
       cancellationRequested: false,
+      usageRequestIds: /* @__PURE__ */ new Set(),
+      estimatedInputTokens: 0,
+      estimatedOutputTokens: 0,
+      estimatedCostUsd: 0,
+      estimatedCostAvailable: false,
+      usageTokensCalibrated: false,
+      usageCostCalibrated: false,
       held: false,
       completion,
       resolveCompletion
     };
     this.#active = active;
-    this.#onTurnStarted();
     this.#event({ type: "turn.started", turnId: command.turnId });
     if (item)
       this.#event({ type: "item.started", turnId: command.turnId, item });
@@ -48745,6 +48980,16 @@ var ClaudeHarnessSession = class {
     }
     return { ok: true, value: { turnId: command.turnId } };
   }
+  refreshUsage() {
+    if (this.#phase !== "open" || !this.#transport)
+      return Promise.resolve();
+    const now = Date.now();
+    if (now < this.#contextUsageFreshUntilMs || now < this.#contextUsageCooldownUntilMs) {
+      return Promise.resolve();
+    }
+    this.#requestContextUsage(this.#transport, this.#active?.command.turnId, CONTEXT_USAGE_RETRY_DELAYS_MS);
+    return this.#contextRefreshInFlight ?? Promise.resolve();
+  }
   close() {
     if (!this.#closePromise)
       this.#closePromise = this.#close();
@@ -48775,6 +49020,8 @@ var ClaudeHarnessSession = class {
       };
     }
     this.#usageGeneration += 1;
+    this.#contextUsageFreshUntilMs = 0;
+    this.#contextUsageCooldownUntilMs = 0;
     let resolveConfiguration = () => void 0;
     this.#configurationTask = new Promise((resolve2) => {
       resolveConfiguration = resolve2;
@@ -48828,6 +49075,8 @@ var ClaudeHarnessSession = class {
       };
     }
     this.#usageGeneration += 1;
+    this.#contextUsageFreshUntilMs = 0;
+    this.#contextUsageCooldownUntilMs = 0;
     let resolveConfiguration = () => void 0;
     this.#configurationTask = new Promise((resolve2) => {
       resolveConfiguration = resolve2;
@@ -48881,6 +49130,8 @@ var ClaudeHarnessSession = class {
       };
     }
     this.#usageGeneration += 1;
+    this.#contextUsageFreshUntilMs = 0;
+    this.#contextUsageCooldownUntilMs = 0;
     let resolveConfiguration = () => void 0;
     this.#configurationTask = new Promise((resolve2) => {
       resolveConfiguration = resolve2;
@@ -49032,8 +49283,9 @@ var ClaudeHarnessSession = class {
     if (this.#phase === "closed")
       return;
     this.#usageGeneration += 1;
+    this.#contextUsageFreshUntilMs = 0;
+    this.#contextUsageCooldownUntilMs = 0;
     this.#contextRefreshPending = null;
-    this.#sessionRefreshPending = null;
     this.#requestUsageBoundary += 1;
     this.#contextRefreshWake?.();
     this.#contextRefreshWake = null;
@@ -49081,7 +49333,7 @@ var ClaudeHarnessSession = class {
       permissionMode,
       onPermissionModeChanged: (mode) => this.#handlePermissionModeChanged(mode),
       onFault: () => this.#fault(faultError()),
-      onPlanLimit: (planLimit) => this.#handlePlanLimit(planLimit, "push")
+      onPlanLimit: (planLimit) => this.#handlePlanLimit(planLimit)
     });
     transport.setAutonomousTurnHandler((turn) => this.#handleAutonomousTurn(turn));
     transport.setIdleTurnHandler({
@@ -49170,9 +49422,6 @@ var ClaudeHarnessSession = class {
         } else {
           this.#requestLatestRequestUsage(active, event.messageId);
         }
-        const transport = this.#transport;
-        if (transport)
-          this.#refreshUsageSnapshot(transport, active.command.turnId, false);
         if (event.checkpointId)
           active.checkpointId = event.checkpointId;
         this.#completeReasoning(active, event.messageId, { status: "succeeded" });
@@ -49195,9 +49444,6 @@ var ClaudeHarnessSession = class {
         return;
       case "tool.completed":
         active.tools.complete(active.command.turnId, event, active.cancellationRequested);
-        if (this.#transport) {
-          this.#requestContextUsage(this.#transport, active.command.turnId, ACTIVE_CONTEXT_USAGE_RETRY_DELAYS_MS);
-        }
         return;
       case "subagent.started":
         this.#observeRootOutput();
@@ -49512,12 +49758,18 @@ var ClaudeHarnessSession = class {
         formatVersion: 1
       }),
       cancellationRequested: false,
+      usageRequestIds: /* @__PURE__ */ new Set(),
+      estimatedInputTokens: 0,
+      estimatedOutputTokens: 0,
+      estimatedCostUsd: 0,
+      estimatedCostAvailable: false,
+      usageTokensCalibrated: false,
+      usageCostCalibrated: false,
       held: false,
       completion,
       resolveCompletion
     };
     this.#active = active;
-    this.#onTurnStarted();
     this.#event({ type: "turn.autonomous.started", turnId, input: [] });
     this.#event({ type: "turn.started", turnId });
     this.#event({ type: "item.started", turnId, item });
@@ -49549,7 +49801,6 @@ var ClaudeHarnessSession = class {
   #finishResult(active, result) {
     if (this.#active !== active)
       return;
-    const transport = this.#transport;
     if (result.status === "succeeded" && (active.tools.size > 0 || active.subagents.size > 0)) {
       this.#finishFailed(active, transportFailure("protocol"));
     } else if (result.status === "succeeded") {
@@ -49559,70 +49810,18 @@ var ClaudeHarnessSession = class {
     } else {
       this.#finishFailed(active, transportFailure(result.kind));
     }
-    if (transport && this.#phase === "open") {
-      this.#refreshUsageSnapshot(transport, active.command.turnId, true);
-    }
-  }
-  #refreshUsageSnapshot(transport, turnId, retryContext) {
-    if (this.#phase !== "open" || this.#transport !== transport)
-      return;
-    this.#requestSessionUsage(transport, turnId);
-    this.#requestContextUsage(transport, turnId, retryContext ? CONTEXT_USAGE_RETRY_DELAYS_MS : ACTIVE_CONTEXT_USAGE_RETRY_DELAYS_MS);
-  }
-  #requestSessionUsage(transport, turnId) {
-    if (this.#phase !== "open" || this.#transport !== transport)
-      return;
-    this.#sessionRefreshPending = {
-      transport,
-      turnId,
-      generation: this.#usageGeneration
-    };
-    if (this.#sessionRefreshInFlight)
-      return;
-    this.#sessionRefreshInFlight = this.#drainSessionUsage();
-  }
-  async #drainSessionUsage() {
-    try {
-      while (this.#sessionRefreshPending) {
-        const request = this.#sessionRefreshPending;
-        this.#sessionRefreshPending = null;
-        await this.#readSessionUsage(request);
-      }
-    } finally {
-      this.#sessionRefreshInFlight = null;
-      if (this.#sessionRefreshPending && this.#phase === "open") {
-        this.#sessionRefreshInFlight = this.#drainSessionUsage();
-      }
-    }
-  }
-  async #readSessionUsage(request) {
-    try {
-      const usage = await request.transport.getSessionUsage();
-      if (this.#phase !== "open" || this.#transport !== request.transport || this.#usageGeneration !== request.generation || this.#sessionRefreshPending !== null || !usage) {
-        return;
-      }
-      this.#mergeAndPublishUsage({
-        ...usage.totalCostUsd !== void 0 ? { totalCostUsd: usage.totalCostUsd } : {},
-        ...usage.inputTokens !== void 0 ? { inputTokens: usage.inputTokens } : {},
-        ...usage.outputTokens !== void 0 ? { outputTokens: usage.outputTokens } : {}
-      }, request.turnId);
-    } catch {
-    }
   }
   #requestContextUsage(transport, turnId, retryDelaysMs) {
     if (this.#phase !== "open" || this.#transport !== transport)
       return;
+    if (this.#contextRefreshInFlight)
+      return;
     this.#contextRefreshPending = {
       transport,
-      turnId,
+      ...turnId !== void 0 ? { turnId } : {},
       generation: this.#usageGeneration,
       retryDelaysMs
     };
-    if (this.#contextRefreshInFlight) {
-      this.#contextRefreshWake?.();
-      this.#contextRefreshWake = null;
-      return;
-    }
     this.#contextRefreshInFlight = this.#drainContextUsage();
   }
   async #drainContextUsage() {
@@ -49653,13 +49852,19 @@ var ClaudeHarnessSession = class {
         }
         if (context === null)
           continue;
+        this.#contextUsageFreshUntilMs = Date.now() + CONTEXT_USAGE_TTL_MS;
+        this.#contextUsageCooldownUntilMs = 0;
         this.#mergeAndPublishUsage({
           contextUsedTokens: Math.max(context.usedTokens, this.#minimumContextUsedTokens ?? 0),
           contextWindowTokens: context.maxTokens
         }, request.turnId);
+        return;
       } catch {
       }
     }
+    if (this.#phase === "open" && this.#transport === request.transport && this.#usageGeneration === request.generation) {
+      this.#contextUsageCooldownUntilMs = Date.now() + CONTEXT_USAGE_FAILURE_COOLDOWN_MS;
+    }
   }
   async #waitForContextRetry(milliseconds) {
     let wake = () => void 0;
@@ -49709,6 +49914,17 @@ var ClaudeHarnessSession = class {
     }
   }
   #applyLatestRequestUsage(active, usage) {
+    const requestId = usage.requestId ?? `${active.nativeTurnKey}:${usage.model ?? "unknown"}`;
+    if (active.usageRequestIds.has(requestId))
+      return;
+    active.usageRequestIds.add(requestId);
+    active.estimatedInputTokens += usage.inputTokens + usage.cacheCreationInputTokens + usage.cacheReadInputTokens;
+    active.estimatedOutputTokens += usage.outputTokens;
+    const estimatedCostUsd = estimateClaudeRequestCostUsd(usage);
+    if (estimatedCostUsd !== void 0) {
+      active.estimatedCostUsd += estimatedCostUsd;
+      active.estimatedCostAvailable = true;
+    }
     const promptTokens = usage.inputTokens + usage.cacheCreationInputTokens + usage.cacheReadInputTokens;
     if (promptTokens > 0)
       this.#minimumContextUsedTokens = promptTokens;
@@ -49716,13 +49932,21 @@ var ClaudeHarnessSession = class {
     const contextWindowTokens = this.#latestUsage?.contextWindowTokens;
     this.#mergeAndPublishUsage({
       ...cacheHitRatePercent !== void 0 ? { cacheHitRatePercent } : {},
+      inputTokens: this.#calibratedInputTokens + active.estimatedInputTokens,
+      outputTokens: this.#calibratedOutputTokens + active.estimatedOutputTokens,
+      ...active.estimatedCostAvailable ? { totalCostUsd: this.#calibratedCostUsd + active.estimatedCostUsd } : {},
       ...contextWindowTokens !== void 0 && promptTokens > 0 ? { contextUsedTokens: promptTokens, contextWindowTokens } : {}
     }, active.command.turnId);
   }
   #applyResultUsage(active, event) {
     const delta = {};
-    if (event.totalCostUsd !== void 0)
+    if (event.totalCostUsd !== void 0) {
+      this.#calibratedCostUsd = event.totalCostUsd;
+      active.estimatedCostUsd = 0;
+      active.estimatedCostAvailable = false;
+      active.usageCostCalibrated = true;
       delta.totalCostUsd = event.totalCostUsd;
+    }
     if (event.modelUsage !== void 0) {
       let inputTokens = 0;
       let outputTokens = 0;
@@ -49731,6 +49955,11 @@ var ClaudeHarnessSession = class {
         outputTokens += model.outputTokens;
       }
       if (Number.isSafeInteger(inputTokens) && Number.isSafeInteger(outputTokens)) {
+        this.#calibratedInputTokens = inputTokens;
+        this.#calibratedOutputTokens = outputTokens;
+        active.estimatedInputTokens = 0;
+        active.estimatedOutputTokens = 0;
+        active.usageTokensCalibrated = true;
         delta.inputTokens = inputTokens;
         delta.outputTokens = outputTokens;
       }
@@ -49742,27 +49971,6 @@ var ClaudeHarnessSession = class {
     }
     this.#mergeAndPublishUsage(delta, active.command.turnId);
   }
-  /**
-   * On-demand counterpart to the passive `rate_limit_event` push: asks this
-   * Session's live Transport to pull plan usage right now (if it has one —
-   * a Session with no Turn yet has never opened a live connection to pull
-   * through). Routes any answer through the same `#handlePlanLimit` path as
-   * the push, so it updates both the Adapter's shared cache and this
-   * Thread's own Usage snapshot identically either way.
-   */
-  async refreshPlanLimit() {
-    if (this.#phase !== "open" || !this.#transport)
-      return null;
-    let planLimit;
-    try {
-      planLimit = await this.#transport.getPlanLimit();
-    } catch {
-      return null;
-    }
-    if (planLimit)
-      this.#handlePlanLimit(planLimit, "pull");
-    return planLimit;
-  }
   /**
    * Plan usage is account-wide, not Thread-scoped, so every observation is
    * offered to the Adapter's shared cache regardless of this Session's own
@@ -49770,8 +49978,8 @@ var ClaudeHarnessSession = class {
    * *accepted*, not the raw observation: a rejected push must not leave this
    * Thread's Usage popover showing a number the credits pill disagrees with.
    */
-  #handlePlanLimit(planLimit, source) {
-    const effective = this.#onPlanLimitObserved(planLimit, source);
+  #handlePlanLimit(planLimit) {
+    const effective = this.#onPlanLimitObserved(planLimit);
     if (effective)
       this.publishPlanLimit(effective);
   }
@@ -49890,7 +50098,6 @@ var ClaudeHarnessSession = class {
       outcome: checkpoint ? { ...outcome, checkpoint } : outcome
     });
     this.#active = null;
-    this.#onTurnFinished();
     this.#occupancy.clear();
     this.#transport?.setIdleLive(false);
     active.resolveCompletion();
@@ -49899,8 +50106,9 @@ var ClaudeHarnessSession = class {
     if (this.#phase === "closed" || this.#phase === "closing" || this.#phase === "faulted")
       return;
     this.#usageGeneration += 1;
+    this.#contextUsageFreshUntilMs = 0;
+    this.#contextUsageCooldownUntilMs = 0;
     this.#contextRefreshPending = null;
-    this.#sessionRefreshPending = null;
     this.#requestUsageBoundary += 1;
     this.#contextRefreshWake?.();
     this.#contextRefreshWake = null;
@@ -49967,13 +50175,8 @@ var ClaudeCodeAdapter = class {
   #inspectionInFlight = /* @__PURE__ */ new Map();
   #inspectors = /* @__PURE__ */ new Set();
   #sessions = /* @__PURE__ */ new Set();
-  #activeTurnSessions = /* @__PURE__ */ new Set();
   #closePromise = null;
   #latestPlanLimit = null;
-  #planLimitFreshUntilMs = 0;
-  #planLimitRefresh = null;
-  #planLimitPullUnavailable = false;
-  #planLimitPoller = null;
   constructor(options = {}, dependencies2) {
     this.#closeTimeoutMs = options.closeTimeoutMs ?? DEFAULT_CLOSE_TIMEOUT_MS;
     this.#toolOutputLimit = options.toolOutputLimit ?? DEFAULT_TOOL_OUTPUT_LIMIT;
@@ -50030,7 +50233,7 @@ var ClaudeCodeAdapter = class {
         error: invalidState("Claude Code Adapter is closing")
       };
     }
-    const cwd = path8.resolve(input.cwd ?? process.cwd());
+    const cwd = path11.resolve(input.cwd ?? process.cwd());
     if (!input.refresh) {
       const cached2 = this.#inspectionCache.get(cwd);
       if (cached2)
@@ -50151,7 +50354,7 @@ var ClaudeCodeAdapter = class {
       let sourceSnapshot;
       try {
         const messages = await this.#dependencies.readSessionMessages({
-          cwd: path8.resolve(input.cwd),
+          cwd: path11.resolve(input.cwd),
           sessionId: sourceRef.data.nativeSessionId
         });
         sourceSnapshot = mapClaudeSnapshot(messages, sourceRef.data.nativeSessionId);
@@ -50193,7 +50396,7 @@ var ClaudeCodeAdapter = class {
       } else {
         const forked2 = await forkClaudeSession({
           checkpoint: retained.checkpoint,
-          cwd: path8.resolve(input.cwd),
+          cwd: path11.resolve(input.cwd),
           dependencies: this.#dependencies,
           harnessId: this.harnessId,
           sourceRef: sourceRef.data
@@ -50248,7 +50451,7 @@ var ClaudeCodeAdapter = class {
         }
       };
     }
-    const cwd = path8.resolve(input.cwd);
+    const cwd = path11.resolve(input.cwd);
     const nativeRef2 = input.kind === "resume" ? nativeSessionRefSchema.safeParse(input.nativeRef) : null;
     if (nativeRef2 && (!nativeRef2.success || nativeRef2.data.harnessId !== this.harnessId)) {
       return {
@@ -50269,7 +50472,7 @@ var ClaudeCodeAdapter = class {
     }) : null;
     if (forked && !forked.ok)
       return forked;
-    const session = new ClaudeHarnessSession(cwd, this.#dependencies, this.#closeTimeoutMs, () => this.#sessions.delete(session), () => this.#startTurnCreditsPolling(session), () => this.#finishTurnCreditsPolling(session), (planLimit, source) => this.#recordPlanLimit(session, planLimit, source), {
+    const session = new ClaudeHarnessSession(cwd, this.#dependencies, this.#closeTimeoutMs, () => this.#sessions.delete(session), (planLimit) => this.#recordPlanLimit(session, planLimit), {
       openMode: rollback?.openMode ?? (input.kind === "create" ? "create" : "resume"),
       sessionId: rollback?.sessionId ?? (forked?.ok ? forked.value.sessionId : nativeRef2?.success ? nativeRef2.data.nativeSessionId : this.#dependencies.randomUUID()),
       ...input.kind === "create" && input.model ? { requestedModel: input.model } : {},
@@ -50281,41 +50484,12 @@ var ClaudeCodeAdapter = class {
     this.#sessions.add(session);
     return { ok: true, value: session };
   }
-  /**
-   * Plan usage (`credits()`) is scoped to the Adapter, not a single Thread: the
-   * Claude.ai 5-hour / 7-day windows are account-wide and shared by every
-   * concurrent Session, so an observation from any one of them updates the
-   * value every Thread reads.
-   *
-   * Because every Session pushes into this one slot, an unarbitrated
-   * last-write-wins merge let an idle Session's hours-old `rate_limit_event`
-   * overwrite an active Session's just-pulled value — the credits pill visibly
-   * flapped between the two whenever more than one Session was open. Rather
-   * than ordering the writes after the fact, the slot has a single
-   * authoritative writer:
-   *
-   * 1. `"pull"` always writes, and marks the value fresh for `PLAN_LIMIT_TTL_MS`.
-   * 2. `"push"` never overwrites a window that already has a value; it expires
-   *    the cache and immediately re-pulls through an open Session.
-   * 3. `"push"` may fill a window that is *empty*, so the pill lights up before
-   *    the first pull lands, and may write freely if pulling has proven
-   *    unavailable (an SDK without the experimental `/usage` query never
-   *    answers, and freezing on a cold-start reading would be worse).
-   *
-   * The two windows are arbitrated independently: a push reporting only the
-   * 7-day window carries no opinion about the 5-hour one, so it must be able to
-   * fill an empty 7-day slot without being rejected for disagreeing about a
-   * window it never mentioned.
-   *
-   * Returns the value now in the slot so the calling Session can mirror it into
-   * its own Usage snapshot, keeping popover and pill in agreement.
-   */
-  #recordPlanLimit(origin, planLimit, source) {
-    const mayOverwrite = source === "pull" || this.#planLimitPullUnavailable;
+  /** Account-level plan windows are shared, but only stable native pushes may update them. */
+  #recordPlanLimit(origin, planLimit) {
     const next = { ...this.#latestPlanLimit ?? {} };
-    if (planLimit.fiveHour && (mayOverwrite || !next.fiveHour))
+    if (planLimit.fiveHour)
       next.fiveHour = planLimit.fiveHour;
-    if (planLimit.sevenDay && (mayOverwrite || !next.sevenDay))
+    if (planLimit.sevenDay)
       next.sevenDay = planLimit.sevenDay;
     this.#latestPlanLimit = next.fiveHour || next.sevenDay ? next : null;
     if (this.#latestPlanLimit) {
@@ -50324,79 +50498,14 @@ var ClaudeCodeAdapter = class {
           session.publishPlanLimit(this.#latestPlanLimit);
       }
     }
-    this.#planLimitFreshUntilMs = source === "pull" ? Date.now() + PLAN_LIMIT_TTL_MS : 0;
-    if (source === "push")
-      void this.#refreshCredits(true);
     return this.#latestPlanLimit;
   }
   credits() {
     return projectClaudePlanLimitToCredits(this.#latestPlanLimit);
   }
-  /**
-   * Unlike the passive `rate_limit_event` push, this asks an open Session's
-   * live Transport to pull plan usage on demand (Claude Code's `/usage`
-   * control channel) — so, like Grok's credits, a refresh can actually
-   * produce a fresher value instead of only replaying what was last observed.
-   *
-   * Serves the cached value while it is still fresh, and collapses concurrent
-   * callers onto one in-flight pull: every mounted composer inspects Usage
-   * independently, and letting those race produced overlapping pulls whose
-   * answers landed out of order.
-   */
-  refreshCredits() {
-    return this.#refreshCredits(false);
-  }
-  #refreshCredits(force) {
-    if (!force && this.#latestPlanLimit && Date.now() < this.#planLimitFreshUntilMs) {
-      return Promise.resolve(this.credits());
-    }
-    this.#planLimitRefresh ??= this.#pullPlanLimit().finally(() => {
-      this.#planLimitRefresh = null;
-    });
-    return this.#planLimitRefresh;
-  }
-  #startTurnCreditsPolling(session) {
-    this.#activeTurnSessions.add(session);
-    if (this.#planLimitPoller)
-      return;
-    this.#planLimitPoller = setInterval(() => {
-      void this.#refreshCredits(true);
-    }, ACTIVE_PLAN_LIMIT_POLL_INTERVAL_MS);
-    this.#planLimitPoller.unref();
-  }
-  #finishTurnCreditsPolling(session) {
-    if (!this.#activeTurnSessions.delete(session))
-      return;
-    void this.#refreshCredits(true);
-    if (this.#activeTurnSessions.size > 0 || !this.#planLimitPoller)
-      return;
-    clearInterval(this.#planLimitPoller);
-    this.#planLimitPoller = null;
-  }
-  /**
-   * Plan usage is account-wide, so any one open Session's answer updates the
-   * value every Thread reads; the first Session that manages to answer wins
-   * and the rest are left untried.
-   */
-  async #pullPlanLimit() {
-    let pulled = false;
-    const candidates2 = /* @__PURE__ */ new Set([...this.#activeTurnSessions, ...this.#sessions]);
-    for (const session of candidates2) {
-      if (await session.refreshPlanLimit()) {
-        pulled = true;
-        break;
-      }
-    }
-    this.#planLimitPullUnavailable = this.#sessions.size > 0 && !pulled;
-    return this.credits();
-  }
   close() {
     if (!this.#closePromise) {
       this.#inspectionCache.clear();
-      if (this.#planLimitPoller)
-        clearInterval(this.#planLimitPoller);
-      this.#planLimitPoller = null;
-      this.#activeTurnSessions.clear();
       this.#closePromise = Promise.all([
         ...[...this.#inspectors].map((inspector) => inspector.close()),
         ...[...this.#sessions].map((session) => session.close()),
@@ -50416,12 +50525,12 @@ var packageMetadata2 = {
 
 // packages/adapters/deepseek-harness/dist/deepseek-harness-adapter.js
 import { randomUUID as randomUUID3 } from "node:crypto";
-import path10 from "node:path";
+import path13 from "node:path";
 
 // packages/adapters/deepseek-harness/dist/host-client.js
 import { spawn as spawn3 } from "node:child_process";
 import { accessSync, constants, statSync as statSync2 } from "node:fs";
-import path9 from "node:path";
+import path12 from "node:path";
 
 // node_modules/@deepseek-ai/dsh-host-apiproxy/lib/types/api/rpc.schema.js
 var rpcIdSchema = external_exports.string();
@@ -51331,16 +51440,16 @@ var AbstractApiClient = class {
    * Shared POST leg of both C→S carriers (callUnary/respond): JSON body,
    * optional default timeout merged with the caller's external signal, non-2xx → transport throw.
    */
-  async postJson(path31, body, signal, timeoutPolicy = "default") {
+  async postJson(path32, body, signal, timeoutPolicy = "default") {
     const requestSignal = timeoutPolicy === "default" ? signal === void 0 ? AbortSignal.timeout(this.timeoutMs) : AbortSignal.any([AbortSignal.timeout(this.timeoutMs), signal]) : signal;
-    const response = await this.doFetch(new URL(path31, this.resolveBase()), {
+    const response = await this.doFetch(new URL(path32, this.resolveBase()), {
       method: "POST",
       headers: { "content-type": "application/json" },
       body: JSON.stringify(body),
       ...requestSignal === void 0 ? {} : { signal: requestSignal }
     });
     if (!response.ok)
-      throw new Error(`transport failure for ${path31}: HTTP ${response.status}`);
+      throw new Error(`transport failure for ${path32}: HTTP ${response.status}`);
     return response;
   }
   /**
@@ -51376,10 +51485,10 @@ var AbstractApiClient = class {
    * either parse level is reported and skipped (one corrupt frame must not kill the stream; the
    * client's gap detection covers whatever the frame carried).
    */
-  async *readSse(path31, signal, frameSchema, onOpen) {
-    const response = await this.doFetch(new URL(path31, this.resolveBase()), { signal });
+  async *readSse(path32, signal, frameSchema, onOpen) {
+    const response = await this.doFetch(new URL(path32, this.resolveBase()), { signal });
     if (!response.ok || response.body === null)
-      throw new Error(`transport failure for ${path31}: HTTP ${response.status}`);
+      throw new Error(`transport failure for ${path32}: HTTP ${response.status}`);
     onOpen?.();
     const reader = response.body.getReader();
     const decoder2 = new TextDecoder();
@@ -51403,7 +51512,7 @@ var AbstractApiClient = class {
             full = serverRequestSchema.parse(JSON.parse(data));
             frame = frameSchema.parse(full.payload);
           } catch (error54) {
-            console.error(`[apiproxy] dropping malformed SSE frame on ${path31}:`, error54);
+            console.error(`[apiproxy] dropping malformed SSE frame on ${path32}:`, error54);
             continue;
           }
           this.onEnvelope(full);
@@ -51599,7 +51708,7 @@ var DEFAULT_ENDPOINT = "http://127.0.0.1:3080";
 var DEFAULT_STARTUP_TIMEOUT_MS = 2e4;
 var DEFAULT_COMMAND_TIMEOUT_MS = 5e3;
 var DEFAULT_CLOSE_TIMEOUT_MS2 = 3e3;
-function environmentValue(environment, name) {
+function environmentValue2(environment, name) {
   return Object.entries(environment).find(([key]) => key.toLowerCase() === name.toLowerCase())?.[1];
 }
 function parseLoopbackEndpoint(endpoint) {
@@ -51619,12 +51728,12 @@ function parseLoopbackEndpoint(endpoint) {
   return parsed;
 }
 function executableCandidates(command, environment) {
-  const targetPath = process.platform === "win32" ? path9.win32 : path9.posix;
-  if (targetPath.isAbsolute(command) || command.includes("/") || command.includes("\\")) {
+  const targetPath2 = process.platform === "win32" ? path12.win32 : path12.posix;
+  if (targetPath2.isAbsolute(command) || command.includes("/") || command.includes("\\")) {
     return [command];
   }
-  const extensions = process.platform === "win32" && targetPath.extname(command) === "" ? (environmentValue(environment, "PATHEXT") ?? ".COM;.EXE;.BAT;.CMD").split(";").map((extension2) => extension2.trim()).filter(Boolean) : [""];
-  return (environmentValue(environment, "PATH") ?? "").split(targetPath.delimiter).map((directory) => directory.trim().replace(/^"|"$/gu, "")).filter(Boolean).flatMap((directory) => extensions.map((extension2) => targetPath.join(directory, command + extension2)));
+  const extensions = process.platform === "win32" && targetPath2.extname(command) === "" ? (environmentValue2(environment, "PATHEXT") ?? ".COM;.EXE;.BAT;.CMD").split(";").map((extension2) => extension2.trim()).filter(Boolean) : [""];
+  return (environmentValue2(environment, "PATH") ?? "").split(targetPath2.delimiter).map((directory) => directory.trim().replace(/^"|"$/gu, "")).filter(Boolean).flatMap((directory) => extensions.map((extension2) => targetPath2.join(directory, command + extension2)));
 }
 function resolveExecutable(command, environment) {
   const accessMode = process.platform === "win32" ? constants.F_OK : constants.X_OK;
@@ -51654,14 +51763,14 @@ function resolveDeepSeekCommand(configured, environment) {
   } : null;
 }
 function deepSeekProcessInvocation(command, arguments_2, environment, platform = process.platform) {
-  const extension2 = path9.win32.extname(command).toLowerCase();
+  const extension2 = path12.win32.extname(command).toLowerCase();
   if (platform !== "win32" || ![".cmd", ".bat"].includes(extension2)) {
     return { command, arguments: arguments_2, windowsVerbatimArguments: false };
   }
   const quote = (value) => `"${value.replaceAll("%", "%%").replaceAll('"', '""')}"`;
   const commandLine = [command, ...arguments_2].map(quote).join(" ");
   return {
-    command: environmentValue(environment, "ComSpec") ?? "cmd.exe",
+    command: environmentValue2(environment, "ComSpec") ?? "cmd.exe",
     arguments: ["/d", "/v:off", "/s", "/c", `"${commandLine}"`],
     windowsVerbatimArguments: true
   };
@@ -51714,8 +51823,15 @@ var DeepSeekHostConnection = class {
     return this.#stderrTail;
   }
   connect() {
-    this.#connectPromise ??= this.#performConnect();
-    return this.#connectPromise;
+    if (this.#connectPromise)
+      return this.#connectPromise;
+    const attempt = this.#performConnect();
+    this.#connectPromise = attempt;
+    void attempt.catch(() => {
+      if (this.#connectPromise === attempt)
+        this.#connectPromise = null;
+    });
+    return attempt;
   }
   subscribe(sessionId, subscriber) {
     if (this.#subscribers.has(sessionId)) {
@@ -52015,16 +52131,16 @@ var Diff = class {
       }
     }
   }
-  addToPath(path31, added, removed, oldPosInc, options) {
-    const last = path31.lastComponent;
+  addToPath(path32, added, removed, oldPosInc, options) {
+    const last = path32.lastComponent;
     if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
       return {
-        oldPos: path31.oldPos + oldPosInc,
+        oldPos: path32.oldPos + oldPosInc,
         lastComponent: { count: last.count + 1, added, removed, previousComponent: last.previousComponent }
       };
     } else {
       return {
-        oldPos: path31.oldPos + oldPosInc,
+        oldPos: path32.oldPos + oldPosInc,
         lastComponent: { count: 1, added, removed, previousComponent: last }
       };
     }
@@ -52894,7 +53010,7 @@ var DeepSeekHarnessSession = class {
   harnessId = deepSeekHarnessId;
   capabilities = {
     configuration: {
-      selectModel: false,
+      selectModel: true,
       selectThinkingOption: false,
       selectPermissionMode: false
     },
@@ -52912,7 +53028,9 @@ var DeepSeekHarnessSession = class {
   #active = null;
   #closePromise = null;
   #closed = false;
+  #configuring = false;
   #lastSeq;
+  #reading = false;
   #model;
   #contextWindowTokens;
   #turns;
@@ -52946,16 +53064,17 @@ var DeepSeekHarnessSession = class {
     if (this.#closed) {
       return { ok: false, error: invalidState2("DeepSeek Harness Session is closed") };
     }
-    if (this.#active) {
+    if (this.#active || this.#configuring || this.#reading) {
       return {
         ok: false,
         error: {
           code: "sessionBusy",
-          message: "DeepSeek Harness Session cannot read while a Turn is active",
+          message: "DeepSeek Harness Session cannot read while another operation is active",
           retryable: true
         }
       };
     }
+    this.#reading = true;
     try {
       const entries = await readAllDeepSeekHistory(this.#client, this.#nativeRef.nativeSessionId);
       const projection = projectDeepSeekHistory({
@@ -52987,6 +53106,8 @@ var DeepSeekHarnessSession = class {
       };
     } catch (error54) {
       return { ok: false, error: normalizedError(error54, "nativeFailure") };
+    } finally {
+      this.#reading = false;
     }
   }
   async execute(command) {
@@ -52996,18 +53117,20 @@ var DeepSeekHarnessSession = class {
       return this.#cancel(command);
     if (command.type === "interaction.respond")
       return this.#respond(command);
+    if (command.type === "model.select")
+      return this.#selectModel(command);
     if (command.type !== "turn.start") {
       return {
         ok: false,
         error: unsupported(`DeepSeek Harness does not support '${command.type}'`)
       };
     }
-    if (this.#active) {
+    if (this.#active || this.#configuring || this.#reading) {
       return {
         ok: false,
         error: {
           code: "sessionBusy",
-          message: "DeepSeek Harness Session already has an active Turn",
+          message: "DeepSeek Harness Session already has another active operation",
           retryable: true
         }
       };
@@ -53115,6 +53238,57 @@ var DeepSeekHarnessSession = class {
     this.#channel.end();
     this.#onClosed();
   }
+  async #selectModel(command) {
+    if (this.#active || this.#configuring || this.#reading) {
+      return {
+        ok: false,
+        error: {
+          code: "sessionBusy",
+          message: "DeepSeek Harness Session cannot select a Model while another operation is active",
+          retryable: true
+        }
+      };
+    }
+    let requested;
+    try {
+      requested = decodeDeepSeekHarnessModelRef(command.model);
+    } catch (error54) {
+      return { ok: false, error: normalizedError(error54, "invalidRequest") };
+    }
+    this.#configuring = true;
+    try {
+      try {
+        unwrapRpc(await this.#client.sessions.selectModel({
+          sessionId: this.#nativeRef.nativeSessionId,
+          provider: requested.provider,
+          model: requested.model
+        }), "session.selectModel");
+        const models = unwrapRpc(await this.#client.sessions.models({
+          sessionId: this.#nativeRef.nativeSessionId
+        }), "session.models");
+        if (models.current.provider !== requested.provider || models.current.model !== requested.model) {
+          return {
+            ok: false,
+            error: {
+              code: "nativeFailure",
+              message: "DeepSeek Harness did not activate the requested Model",
+              retryable: false
+            }
+          };
+        }
+        this.#model = encodeDeepSeekHarnessModelRef(models.current);
+        this.#emit({
+          type: "session.state.changed",
+          state: { nativeRef: this.#nativeRef, effectiveModel: this.#model }
+        });
+        return { ok: true, value: { completed: true } };
+      } catch (error54) {
+        return { ok: false, error: normalizedError(error54, "nativeFailure") };
+      }
+    } finally {
+      this.#configuring = false;
+    }
+  }
   async #cancel(command) {
     const active = this.#active;
     if (!active || active.command.turnId !== command.turnId) {
@@ -53689,7 +53863,7 @@ var DeepSeekHarnessAdapter = class {
     }
     try {
       await this.#connection.connect();
-      const cwd = path10.resolve(input.cwd);
+      const cwd = path13.resolve(input.cwd);
       let sessionId;
       if (input.kind === "create") {
         sessionId = `session-${this.#dependencies.randomUUID()}`;
@@ -53785,13 +53959,13 @@ var packageMetadata3 = {
 
 // packages/adapters/grok/dist/grok-adapter.js
 import { randomUUID as randomUUID4 } from "node:crypto";
-import path17 from "node:path";
+import path20 from "node:path";
 
 // packages/adapters/grok/dist/acp-transport.js
 import { spawn as spawn4, spawnSync } from "node:child_process";
 import { readdir as readdir3, readFile as readFile5 } from "node:fs/promises";
-import os4 from "node:os";
-import path15 from "node:path";
+import os3 from "node:os";
+import path18 from "node:path";
 import { Readable, Writable } from "node:stream";
 
 // node_modules/@agentclientprotocol/sdk/dist/schema/index.js
@@ -57956,91 +58130,61 @@ var ClientSideConnection = class {
 };
 
 // packages/adapters/grok/dist/command.js
-import fs2 from "node:fs";
-import os3 from "node:os";
-import path11 from "node:path";
+import path14 from "node:path";
 var GrokExecutableError = class extends Error {
   code = "GROK_NOT_FOUND";
 };
-function pathValue2(environment) {
-  const key = Object.keys(environment).find((name) => name.toLowerCase() === "path");
-  return key ? environment[key] ?? "" : "";
-}
-function commandCandidates(command, platform, environment) {
-  if (path11.isAbsolute(command) || command.includes("/") || command.includes("\\")) {
-    return [command];
-  }
-  const delimiter = platform === "win32" ? ";" : ":";
-  const extensions = platform === "win32" && path11.extname(command) === "" ? (environment.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";") : [""];
-  return pathValue2(environment).split(delimiter).filter(Boolean).flatMap((directory) => extensions.map((extension2) => path11.join(directory, command + extension2)));
-}
-function isExecutable2(candidate, platform) {
-  try {
-    fs2.accessSync(candidate, platform === "win32" ? fs2.constants.F_OK : fs2.constants.X_OK);
-    return fs2.statSync(candidate).isFile();
-  } catch {
-    return false;
+var grokDiscoverySpec = {
+  id: "grok",
+  command: "grok",
+  commandEnvironmentVariable: "CODEXHOST_GROK_COMMAND",
+  installRoots: {
+    posix: [
+      "~/.grok/bin",
+      "~/.local/bin",
+      VERSION_MANAGER_ROOTS,
+      "/opt/homebrew/bin",
+      "/usr/local/bin"
+    ],
+    windows: ["~/.grok/bin", "${APPDATA}/npm", "~/.local/bin", VERSION_MANAGER_ROOTS]
   }
-}
+};
 function resolveGrokExecutable(input = {}) {
-  const environment = input.environment ?? process.env;
   const platform = input.platform ?? process.platform;
-  const configured = input.command ?? environment.CODEXHOST_GROK_COMMAND;
-  const home = input.homeDirectory ?? environment.HOME ?? environment.USERPROFILE ?? os3.homedir();
-  const command = configured ?? "grok";
-  const userCandidates = platform === "win32" ? [
-    path11.join(home, ".grok", "bin", "grok.exe"),
-    path11.join(home, ".grok", "bin", "grok.cmd"),
-    path11.join(environment.APPDATA ?? path11.join(home, "AppData", "Roaming"), "npm", "grok.cmd")
-  ] : [
-    path11.join(home, ".grok", "bin", "grok"),
-    path11.join(home, ".local", "bin", "grok"),
-    "/opt/homebrew/bin/grok",
-    "/usr/local/bin/grok"
-  ];
-  const found = [
-    ...commandCandidates(command, platform, environment),
-    ...configured ? [] : userCandidates
-  ].find((candidate) => isExecutable2(candidate, platform));
-  if (!found)
+  const resolution = resolveHarnessExecutable(grokDiscoverySpec, {
+    ...input.command ? { command: input.command } : {},
+    environment: input.environment ?? process.env,
+    ...input.homeDirectory ? { homeDirectory: input.homeDirectory } : {},
+    platform
+  });
+  if (!resolution)
     throw new GrokExecutableError("Grok CLI is not installed");
-  return path11.resolve(found);
+  return targetPath(platform).isAbsolute(resolution.executable) ? resolution.executable : path14.resolve(resolution.executable);
 }
 function grokInvocation(command, platform = process.platform) {
-  const arguments_2 = ["agent", "--no-leader", "stdio"];
-  const extension2 = path11.win32.extname(command).toLowerCase();
-  if (platform !== "win32" || ![".cmd", ".bat"].includes(extension2)) {
-    return { command, arguments: arguments_2, windowsVerbatimArguments: false };
-  }
-  const quote = (value) => `"${value.replaceAll("%", "%%").replaceAll('"', '""')}"`;
-  const commandLine = [command, ...arguments_2].map(quote).join(" ");
-  return {
-    command: process.env.ComSpec ?? process.env.COMSPEC ?? "cmd.exe",
-    arguments: ["/d", "/v:off", "/s", "/c", `"${commandLine}"`],
-    windowsVerbatimArguments: true
-  };
+  return commandInvocation(command, ["agent", "--no-leader", "stdio"], process.env, platform);
 }
 
 // packages/adapters/grok/dist/grok-fork.js
 import { isDeepStrictEqual as isDeepStrictEqual2 } from "node:util";
-import path13 from "node:path";
+import path16 from "node:path";
 
 // packages/adapters/grok/dist/grok-file-change.js
 import { Buffer as Buffer4 } from "node:buffer";
-import path12 from "node:path";
+import path15 from "node:path";
 var DEFAULT_GROK_FILE_CHANGE_TEXT_LIMIT = 4 * 1024 * 1024;
 var MAX_GROK_FILE_CHANGES_PER_TOOL = 32;
 function isRecord11(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function validAbsolutePath(value) {
-  return typeof value === "string" && path12.isAbsolute(value) && value.trim().length > 0 && !value.includes("\0") && !value.includes("\n") && !value.includes("\r");
+  return typeof value === "string" && path15.isAbsolute(value) && value.trim().length > 0 && !value.includes("\0") && !value.includes("\n") && !value.includes("\r");
 }
 function displayPath2(nativePath, cwd) {
-  const resolvedCwd = path12.resolve(cwd);
-  const resolvedPath = path12.resolve(nativePath);
-  const relative = path12.relative(resolvedCwd, resolvedPath);
-  const inside = relative.length > 0 && relative !== ".." && !relative.startsWith(`..${path12.sep}`);
+  const resolvedCwd = path15.resolve(cwd);
+  const resolvedPath = path15.resolve(nativePath);
+  const relative = path15.relative(resolvedCwd, resolvedPath);
+  const inside = relative.length > 0 && relative !== ".." && !relative.startsWith(`..${path15.sep}`);
   const selected = inside ? relative : resolvedPath;
   const normalized = selected.replaceAll("\\", "/");
   if (normalized.length === 0 || normalized === ".")
@@ -58079,17 +58223,17 @@ function projectDiff(value, cwd, remainingTextBytes) {
 function projectGrokFileChanges(content, cwd, textLimit = DEFAULT_GROK_FILE_CHANGE_TEXT_LIMIT) {
   if (!Number.isSafeInteger(textLimit) || textLimit <= 0 || !Array.isArray(content))
     return null;
-  const candidates2 = [];
+  const candidates = [];
   for (const entry of content) {
     if (isRecord11(entry) && entry.type === "diff")
-      candidates2.push(entry);
+      candidates.push(entry);
   }
-  if (candidates2.length === 0 || candidates2.length > MAX_GROK_FILE_CHANGES_PER_TOOL)
+  if (candidates.length === 0 || candidates.length > MAX_GROK_FILE_CHANGES_PER_TOOL)
     return null;
   const changes = [];
   const paths = /* @__PURE__ */ new Set();
   let textBytes = 0;
-  for (const candidate of candidates2) {
+  for (const candidate of candidates) {
     const projected = projectDiff(candidate, cwd, textLimit - textBytes);
     if (!projected || paths.has(projected.change.path))
       return null;
@@ -58129,8 +58273,8 @@ function decodeBytes(value) {
     return void 0;
   }
 }
-function firstReadableText(...candidates2) {
-  for (const candidate of candidates2) {
+function firstReadableText(...candidates) {
+  for (const candidate of candidates) {
     if (typeof candidate === "string" && candidate.length > 0)
       return candidate;
     if (isRecord12(candidate)) {
@@ -58616,11 +58760,11 @@ function parseGrokForkResponse(value) {
 }
 function projectRelativePath(value, cwds) {
   const normalized = value.replaceAll("\\", "/");
-  if (!path13.isAbsolute(value))
+  if (!path16.isAbsolute(value))
     return normalized;
   for (const cwd of cwds) {
-    const relative = path13.relative(path13.resolve(cwd), path13.resolve(value));
-    if (relative.length > 0 && relative !== ".." && !relative.startsWith(`..${path13.sep}`)) {
+    const relative = path16.relative(path16.resolve(cwd), path16.resolve(value));
+    if (relative.length > 0 && relative !== ".." && !relative.startsWith(`..${path16.sep}`)) {
       return relative.replaceAll("\\", "/");
     }
   }
@@ -58685,8 +58829,8 @@ async function forkGrokSession(input) {
       error: error52("sessionNotFound", "Grok Native Session is unavailable")
     };
   }
-  const sourceCwd = path13.resolve(located.cwd);
-  const targetCwd = path13.resolve(input.cwd);
+  const sourceCwd = path16.resolve(located.cwd);
+  const targetCwd = path16.resolve(input.cwd);
   const source = await readSnapshot2({ ...input, cwd: sourceCwd }, sourceRef.data.nativeSessionId);
   if (!source.ok)
     return source;
@@ -58868,7 +59012,7 @@ function parseGrokCompactResult(value, cancelled = false) {
 }
 
 // packages/adapters/grok/dist/grok-rewind.js
-import path14 from "node:path";
+import path17 from "node:path";
 var GROK_REWIND_EXECUTE_METHOD = "_x.ai/rewind/execute";
 function error53(code, message5, retryable = false) {
   return { code, message: message5, retryable };
@@ -58941,8 +59085,8 @@ async function rewindGrokLastTurn(input) {
       error: error53("sessionNotFound", "Grok Native Session is unavailable")
     };
   }
-  const sourceCwd = path14.resolve(located.cwd);
-  const targetCwd = path14.resolve(input.cwd);
+  const sourceCwd = path17.resolve(located.cwd);
+  const targetCwd = path17.resolve(input.cwd);
   if (sourceCwd !== targetCwd) {
     return {
       ok: false,
@@ -59187,11 +59331,11 @@ function transportEvent(update, metadata) {
 }
 function grokHomeDir(options) {
   const environment = { ...process.env, ...options.environment };
-  const home = environment.HOME ?? environment.USERPROFILE ?? os4.homedir();
-  return environment.GROK_HOME ?? path15.join(home, ".grok");
+  const home = environment.HOME ?? environment.USERPROFILE ?? os3.homedir();
+  return environment.GROK_HOME ?? path18.join(home, ".grok");
 }
 function nativeSessionFile(options, sessionId, fileName) {
-  return path15.join(grokHomeDir(options), "sessions", encodeURIComponent(path15.resolve(options.cwd)), sessionId, fileName);
+  return path18.join(grokHomeDir(options), "sessions", encodeURIComponent(path18.resolve(options.cwd)), sessionId, fileName);
 }
 function nativeHistoryPath(options, sessionId) {
   return nativeSessionFile(options, sessionId, "updates.jsonl");
@@ -59211,7 +59355,7 @@ async function locateGrokNativeSession(options, sessionId) {
     return null;
   let entries;
   try {
-    entries = await readdir3(path15.join(grokHomeDir(options), "sessions"), { withFileTypes: true });
+    entries = await readdir3(path18.join(grokHomeDir(options), "sessions"), { withFileTypes: true });
   } catch (error54) {
     if (isMissingFile(error54))
       return null;
@@ -59225,7 +59369,7 @@ async function locateGrokNativeSession(options, sessionId) {
       continue;
     let summaryRaw;
     try {
-      summaryRaw = await readFile5(path15.join(grokHomeDir(options), "sessions", entry.name, sessionId, "summary.json"), "utf8");
+      summaryRaw = await readFile5(path18.join(grokHomeDir(options), "sessions", entry.name, sessionId, "summary.json"), "utf8");
     } catch (error54) {
       if (isMissingFile(error54) || isRecord17(error54) && error54.code === "ENOTDIR")
         continue;
@@ -59242,8 +59386,8 @@ async function locateGrokNativeSession(options, sessionId) {
     if (!isRecord17(parsed))
       continue;
     const info = parsed.info;
-    const cwd = isRecord17(info) && typeof info.cwd === "string" && info.cwd.length > 0 ? path15.resolve(info.cwd) : path15.resolve(decodeURIComponent(entry.name));
-    const sourceWorkspaceDir = typeof parsed.source_workspace_dir === "string" && parsed.source_workspace_dir.length > 0 ? path15.resolve(parsed.source_workspace_dir) : void 0;
+    const cwd = isRecord17(info) && typeof info.cwd === "string" && info.cwd.length > 0 ? path18.resolve(info.cwd) : path18.resolve(decodeURIComponent(entry.name));
+    const sourceWorkspaceDir = typeof parsed.source_workspace_dir === "string" && parsed.source_workspace_dir.length > 0 ? path18.resolve(parsed.source_workspace_dir) : void 0;
     matches.push({
       cwd,
       ...sourceWorkspaceDir ? { sourceWorkspaceDir } : {}
@@ -59253,7 +59397,7 @@ async function locateGrokNativeSession(options, sessionId) {
 }
 async function readGrokNativeHistory(options, sessionId) {
   try {
-    return parseNativeHistory(await readFile5(nativeHistoryPath({ ...options, cwd: path15.resolve(options.cwd) }, sessionId), "utf8"), sessionId);
+    return parseNativeHistory(await readFile5(nativeHistoryPath({ ...options, cwd: path18.resolve(options.cwd) }, sessionId), "utf8"), sessionId);
   } catch (error54) {
     if (isMissingFile(error54))
       return [];
@@ -59764,8 +59908,8 @@ function stateForGrokModel(modelState, nativeState, model = modelState.currentMo
 
 // packages/adapters/grok/dist/grok-credits.js
 import { readFile as readFile6 } from "node:fs/promises";
-import os5 from "node:os";
-import path16 from "node:path";
+import os4 from "node:os";
+import path19 from "node:path";
 var GROK_CREDITS_ENDPOINT = "https://cli-chat-proxy.grok.com/v1/billing?format=credits";
 var REQUEST_TIMEOUT_MS = 15e3;
 function isRecord19(value) {
@@ -59782,7 +59926,7 @@ function nonNegativeNumber(value) {
   return value;
 }
 function grokHome(environment) {
-  return environment.GROK_HOME ?? path16.join(environment.HOME ?? environment.USERPROFILE ?? os5.homedir(), ".grok");
+  return environment.GROK_HOME ?? path19.join(environment.HOME ?? environment.USERPROFILE ?? os4.homedir(), ".grok");
 }
 function periodTypeFrom(value) {
   if (typeof value !== "string")
@@ -59845,7 +59989,7 @@ async function fetchGrokCredits(input = {}) {
   try {
     const environment = input.environment ?? process.env;
     const now = input.now ?? /* @__PURE__ */ new Date();
-    const authPath = path16.join(grokHome(environment), "auth.json");
+    const authPath = path19.join(grokHome(environment), "auth.json");
     const raw = input.readAuthFile ? await input.readAuthFile(authPath) : await readFile6(authPath, "utf8");
     const token = selectAccessToken(JSON.parse(raw), now);
     if (!token)
@@ -60905,7 +61049,7 @@ var GrokAdapter = class {
   async inspect(input = {}) {
     if (this.#closePromise)
       return { status: "unavailable", error: invalidState3("Grok Adapter is closed") };
-    const cwd = path17.resolve(input.cwd ?? process.cwd());
+    const cwd = path20.resolve(input.cwd ?? process.cwd());
     if (!input.refresh) {
       const cached2 = this.#inspectionCache.get(cwd);
       if (cached2)
@@ -60967,7 +61111,7 @@ var GrokAdapter = class {
         }
       };
     }
-    const cwd = path17.resolve(input.cwd);
+    const cwd = path20.resolve(input.cwd);
     const parsedRef = input.kind === "resume" ? nativeSessionRefSchema.safeParse(input.nativeRef) : null;
     if (parsedRef && (!parsedRef.success || parsedRef.data.harnessId !== this.harnessId)) {
       return {
@@ -61554,79 +61698,32 @@ async function rollbackPiLastTurn(transport, sourceSessionId, cwd) {
 // packages/adapters/pi/dist/pi-rpc-session.js
 import { spawn as spawn5, spawnSync as spawnSync2 } from "node:child_process";
 import { randomUUID as randomUUID5 } from "node:crypto";
-import path19 from "node:path";
+import path21 from "node:path";
 
 // packages/adapters/pi/dist/command.js
-import { accessSync as accessSync2, constants as constants2, readdirSync as readdirSync2, statSync as statSync3 } from "node:fs";
-import os6 from "node:os";
-import path18 from "node:path";
-function environmentValue2(environment, name) {
-  return Object.entries(environment).find(([key]) => key.toLowerCase() === name.toLowerCase())?.[1];
-}
-function isExecutable3(filePath, platform) {
-  try {
-    accessSync2(filePath, platform === "win32" ? constants2.F_OK : constants2.X_OK);
-    return statSync3(filePath).isFile();
-  } catch {
-    return false;
-  }
-}
-function pathCandidates(command, platform, environment) {
-  const targetPath = platform === "win32" ? path18.win32 : path18.posix;
-  if (targetPath.isAbsolute(command) || command.includes("/") || command.includes("\\")) {
-    return [command];
-  }
-  const extensions = platform === "win32" && targetPath.extname(command) === "" ? (environmentValue2(environment, "PATHEXT") ?? ".COM;.EXE;.BAT;.CMD").split(";").map((extension2) => extension2.trim()).filter(Boolean) : [""];
-  return (environmentValue2(environment, "PATH") ?? "").split(targetPath.delimiter).map((directory) => directory.trim().replace(/^"|"$/gu, "")).filter(Boolean).flatMap((directory) => extensions.map((extension2) => targetPath.join(directory, command + extension2)));
-}
-function nvmCandidates2(homeDirectory, executableName, targetPath) {
-  const versionsDirectory = targetPath.join(homeDirectory, ".nvm", "versions", "node");
-  try {
-    return readdirSync2(versionsDirectory, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort((left, right) => right.localeCompare(left, void 0, { numeric: true })).map((version2) => targetPath.join(versionsDirectory, version2, "bin", executableName));
-  } catch {
-    return [];
-  }
-}
-function userInstallCandidates2(platform, environment, homeDirectory) {
-  const targetPath = platform === "win32" ? path18.win32 : path18.posix;
-  if (platform === "win32") {
-    const appData = environment.APPDATA ?? targetPath.join(homeDirectory, "AppData", "Roaming");
-    return [
-      targetPath.join(appData, "npm", "pi.cmd"),
-      targetPath.join(homeDirectory, ".local", "bin", "pi.exe"),
-      targetPath.join(homeDirectory, ".local", "bin", "pi.cmd")
-    ];
+var piDiscoverySpec = {
+  id: "pi",
+  command: "pi",
+  commandEnvironmentVariable: "PI_COMMAND",
+  installRoots: {
+    posix: [
+      "~/.npm-global/bin",
+      "~/.local/bin",
+      VERSION_MANAGER_ROOTS,
+      "/opt/homebrew/bin",
+      "/usr/local/bin"
+    ],
+    windows: ["${APPDATA}/npm", "~/.local/bin", VERSION_MANAGER_ROOTS]
   }
-  return [
-    targetPath.join(homeDirectory, ".npm-global", "bin", "pi"),
-    targetPath.join(homeDirectory, ".local", "bin", "pi"),
-    ...nvmCandidates2(homeDirectory, "pi", targetPath),
-    "/opt/homebrew/bin/pi",
-    "/usr/local/bin/pi"
-  ];
-}
+};
 function resolvePiExecutable(input, dependencies2 = {}) {
-  const platform = dependencies2.platform ?? process.platform;
-  const configuredCommand = input.command ?? input.environment.PI_COMMAND;
-  const command = configuredCommand ?? "pi";
-  const homeDirectory = dependencies2.homeDirectory ?? input.environment.HOME ?? input.environment.USERPROFILE ?? os6.homedir();
-  const candidates2 = [
-    ...pathCandidates(command, platform, input.environment),
-    ...configuredCommand ? [] : userInstallCandidates2(platform, input.environment, homeDirectory)
-  ];
-  const check2 = dependencies2.isExecutable ?? ((candidate) => isExecutable3(candidate, platform));
-  return candidates2.find(check2) ?? command;
-}
-function withNodeRuntimeOnPath2(environment, runtimeExecutable = process.execPath, platform = process.platform) {
-  const pathKey = Object.keys(environment).find((name) => name.toLowerCase() === "path") ?? "PATH";
-  const delimiter = platform === "win32" ? ";" : ":";
-  const runtimeDirectory = path18.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.unshift(runtimeDirectory);
-  }
-  return { ...environment, [pathKey]: directories.join(delimiter) };
+  const resolution = resolveHarnessExecutable(piDiscoverySpec, {
+    ...input.command ? { command: input.command } : {},
+    environment: input.environment,
+    ...dependencies2.platform ? { platform: dependencies2.platform } : {},
+    ...dependencies2.homeDirectory ? { homeDirectory: dependencies2.homeDirectory } : {}
+  }, { ...dependencies2.isExecutable ? { isExecutable: dependencies2.isExecutable } : {} });
+  return resolution?.executable ?? input.command ?? input.environment.PI_COMMAND ?? "pi";
 }
 
 // packages/adapters/pi/dist/pi-usage.js
@@ -61931,7 +62028,7 @@ function piRpcProcessCommand(options, dependencies2 = {}) {
   const sessionArguments = options.forkSessionFile ? ["--fork", options.forkSessionFile] : options.sessionFile ? ["--session", options.sessionFile] : [];
   const modelArguments = options.model ? ["--provider", options.model.provider, "--model", options.model.id] : [];
   const arguments_2 = ["--mode", "rpc", ...modelArguments, ...sessionArguments];
-  const extension2 = path19.win32.extname(command).toLowerCase();
+  const extension2 = path21.win32.extname(command).toLowerCase();
   if (platform !== "win32" || ![".cmd", ".bat"].includes(extension2)) {
     return { command, arguments: arguments_2, windowsVerbatimArguments: false };
   }
@@ -62002,7 +62099,7 @@ var PiRpcSession = class {
     const child = this.#processAdapter.spawn({
       cwd: this.#options.cwd,
       ...this.#options.command ? { command: this.#options.command } : {},
-      environment: withNodeRuntimeOnPath2({
+      environment: withNodeRuntimeOnPath({
         ...process.env,
         ...this.#options.environment,
         PI_SKIP_VERSION_CHECK: "1",
@@ -62898,8 +62995,8 @@ function numberField2(value, key) {
   const field = value[key];
   return typeof field === "number" || field === null ? field : void 0;
 }
-function stripDiffPrefix(path31) {
-  return path31.startsWith("a/") || path31.startsWith("b/") ? path31.slice(2) : path31;
+function stripDiffPrefix(path32) {
+  return path32.startsWith("a/") || path32.startsWith("b/") ? path32.slice(2) : path32;
 }
 function reliableFileChange(result) {
   if (!isRecord25(result) || !isRecord25(result.details) || typeof result.details.patch !== "string") {
@@ -62918,10 +63015,10 @@ function reliableFileChange(result) {
   const oldFile = file2.oldFileName;
   const newFile = file2.newFileName;
   const kind = oldFile === "/dev/null" ? "add" : newFile === "/dev/null" ? "delete" : "update";
-  const path31 = stripDiffPrefix(kind === "delete" ? oldFile : newFile);
-  if (!path31 || path31 === "/dev/null")
+  const path32 = stripDiffPrefix(kind === "delete" ? oldFile : newFile);
+  if (!path32 || path32 === "/dev/null")
     return null;
-  return [{ path: path31, kind, unifiedDiff: patch }];
+  return [{ path: path32, kind, unifiedDiff: patch }];
 }
 function delay4(milliseconds) {
   return new Promise((resolve2) => setTimeout(resolve2, milliseconds));
@@ -64645,79 +64742,32 @@ async function rollbackOmpLastTurn(transport, sourceSessionId, cwd) {
 // packages/adapters/omp/dist/omp-rpc-session.js
 import { spawn as spawn6, spawnSync as spawnSync3 } from "node:child_process";
 import { randomUUID as randomUUID7 } from "node:crypto";
-import path21 from "node:path";
+import path22 from "node:path";
 
 // packages/adapters/omp/dist/command.js
-import { accessSync as accessSync3, constants as constants3, readdirSync as readdirSync3, statSync as statSync4 } from "node:fs";
-import os7 from "node:os";
-import path20 from "node:path";
-function environmentValue3(environment, name) {
-  return Object.entries(environment).find(([key]) => key.toLowerCase() === name.toLowerCase())?.[1];
-}
-function isExecutable4(filePath, platform) {
-  try {
-    accessSync3(filePath, platform === "win32" ? constants3.F_OK : constants3.X_OK);
-    return statSync4(filePath).isFile();
-  } catch {
-    return false;
-  }
-}
-function pathCandidates2(command, platform, environment) {
-  const targetPath = platform === "win32" ? path20.win32 : path20.posix;
-  if (targetPath.isAbsolute(command) || command.includes("/") || command.includes("\\")) {
-    return [command];
-  }
-  const extensions = platform === "win32" && targetPath.extname(command) === "" ? (environmentValue3(environment, "PATHEXT") ?? ".COM;.EXE;.BAT;.CMD").split(";").map((extension2) => extension2.trim()).filter(Boolean) : [""];
-  return (environmentValue3(environment, "PATH") ?? "").split(targetPath.delimiter).map((directory) => directory.trim().replace(/^"|"$/gu, "")).filter(Boolean).flatMap((directory) => extensions.map((extension2) => targetPath.join(directory, command + extension2)));
-}
-function nvmCandidates3(homeDirectory, executableName, targetPath) {
-  const versionsDirectory = targetPath.join(homeDirectory, ".nvm", "versions", "node");
-  try {
-    return readdirSync3(versionsDirectory, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort((left, right) => right.localeCompare(left, void 0, { numeric: true })).map((version2) => targetPath.join(versionsDirectory, version2, "bin", executableName));
-  } catch {
-    return [];
-  }
-}
-function userInstallCandidates3(platform, environment, homeDirectory) {
-  const targetPath = platform === "win32" ? path20.win32 : path20.posix;
-  if (platform === "win32") {
-    const appData = environment.APPDATA ?? targetPath.join(homeDirectory, "AppData", "Roaming");
-    return [
-      targetPath.join(appData, "npm", "omp.cmd"),
-      targetPath.join(homeDirectory, ".local", "bin", "omp.exe"),
-      targetPath.join(homeDirectory, ".local", "bin", "omp.cmd")
-    ];
+var ompDiscoverySpec = {
+  id: "omp",
+  command: "omp",
+  commandEnvironmentVariable: "OMP_COMMAND",
+  installRoots: {
+    posix: [
+      "~/.npm-global/bin",
+      "~/.local/bin",
+      VERSION_MANAGER_ROOTS,
+      "/opt/homebrew/bin",
+      "/usr/local/bin"
+    ],
+    windows: ["${APPDATA}/npm", "~/.local/bin", VERSION_MANAGER_ROOTS]
   }
-  return [
-    targetPath.join(homeDirectory, ".npm-global", "bin", "omp"),
-    targetPath.join(homeDirectory, ".local", "bin", "omp"),
-    ...nvmCandidates3(homeDirectory, "omp", targetPath),
-    "/opt/homebrew/bin/omp",
-    "/usr/local/bin/omp"
-  ];
-}
+};
 function resolveOmpExecutable(input, dependencies2 = {}) {
-  const platform = dependencies2.platform ?? process.platform;
-  const configuredCommand = input.command ?? input.environment.OMP_COMMAND;
-  const command = configuredCommand ?? "omp";
-  const homeDirectory = dependencies2.homeDirectory ?? input.environment.HOME ?? input.environment.USERPROFILE ?? os7.homedir();
-  const candidates2 = [
-    ...pathCandidates2(command, platform, input.environment),
-    ...configuredCommand ? [] : userInstallCandidates3(platform, input.environment, homeDirectory)
-  ];
-  const check2 = dependencies2.isExecutable ?? ((candidate) => isExecutable4(candidate, platform));
-  return candidates2.find(check2) ?? command;
-}
-function withNodeRuntimeOnPath3(environment, runtimeExecutable = process.execPath, platform = process.platform) {
-  const pathKey = Object.keys(environment).find((name) => name.toLowerCase() === "path") ?? "PATH";
-  const delimiter = platform === "win32" ? ";" : ":";
-  const runtimeDirectory = path20.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.unshift(runtimeDirectory);
-  }
-  return { ...environment, [pathKey]: directories.join(delimiter) };
+  const resolution = resolveHarnessExecutable(ompDiscoverySpec, {
+    ...input.command ? { command: input.command } : {},
+    environment: input.environment,
+    ...dependencies2.platform ? { platform: dependencies2.platform } : {},
+    ...dependencies2.homeDirectory ? { homeDirectory: dependencies2.homeDirectory } : {}
+  }, { ...dependencies2.isExecutable ? { isExecutable: dependencies2.isExecutable } : {} });
+  return resolution?.executable ?? input.command ?? input.environment.OMP_COMMAND ?? "omp";
 }
 
 // packages/adapters/omp/dist/omp-usage.js
@@ -65139,7 +65189,7 @@ function ompRpcProcessCommand(options, dependencies2 = {}) {
   const sessionArguments = options.forkSessionFile ? ["--fork", options.forkSessionFile] : options.sessionFile ? ["--resume", options.sessionFile] : [];
   const modelArguments = options.model ? ["--provider", options.model.provider, "--model", options.model.id] : [];
   const arguments_2 = ["--mode", "rpc", ...modelArguments, ...sessionArguments];
-  const extension2 = path21.win32.extname(command).toLowerCase();
+  const extension2 = path22.win32.extname(command).toLowerCase();
   if (platform !== "win32" || ![".cmd", ".bat"].includes(extension2)) {
     return { command, arguments: arguments_2, windowsVerbatimArguments: false };
   }
@@ -65215,7 +65265,7 @@ var OmpRpcSession = class {
     const child = this.#processAdapter.spawn({
       cwd: this.#options.cwd,
       ...this.#options.command ? { command: this.#options.command } : {},
-      environment: withNodeRuntimeOnPath3({
+      environment: withNodeRuntimeOnPath({
         ...process.env,
         ...this.#options.environment,
         OMP_SKIP_VERSION_CHECK: "1",
@@ -66229,8 +66279,8 @@ function numberField3(value, key) {
   const field = value[key];
   return typeof field === "number" || field === null ? field : void 0;
 }
-function stripDiffPrefix2(path31) {
-  return path31.startsWith("a/") || path31.startsWith("b/") ? path31.slice(2) : path31;
+function stripDiffPrefix2(path32) {
+  return path32.startsWith("a/") || path32.startsWith("b/") ? path32.slice(2) : path32;
 }
 function reliableFileChange2(result) {
   if (!isRecord30(result) || !isRecord30(result.details) || typeof result.details.patch !== "string") {
@@ -66249,10 +66299,10 @@ function reliableFileChange2(result) {
   const oldFile = file2.oldFileName;
   const newFile = file2.newFileName;
   const kind = oldFile === "/dev/null" ? "add" : newFile === "/dev/null" ? "delete" : "update";
-  const path31 = stripDiffPrefix2(kind === "delete" ? oldFile : newFile);
-  if (!path31 || path31 === "/dev/null")
+  const path32 = stripDiffPrefix2(kind === "delete" ? oldFile : newFile);
+  if (!path32 || path32 === "/dev/null")
     return null;
-  return [{ path: path31, kind, unifiedDiff: patch }];
+  return [{ path: path32, kind, unifiedDiff: patch }];
 }
 function delay5(milliseconds) {
   return new Promise((resolve2) => setTimeout(resolve2, milliseconds));
@@ -67739,9 +67789,9 @@ import nodePath from "node:path";
 // packages/mapping-store/dist/mapping-store.js
 import { execFileSync } from "node:child_process";
 import { randomUUID as randomUUID9 } from "node:crypto";
-import { constants as constants4 } from "node:fs";
+import { constants as constants2 } from "node:fs";
 import { copyFile as copyFile2, mkdir as mkdir3, open as open5, readFile as readFile7, readdir as readdir4, rename as rename2, rm as rm4, stat as stat2 } from "node:fs/promises";
-import path22 from "node:path";
+import path23 from "node:path";
 
 // packages/mapping-store/dist/records.js
 var nonBlankTextSchema3 = external_exports.string().refine((value) => value.trim().length > 0, {
@@ -67963,11 +68013,11 @@ var MappingStore = class {
   #initialized = false;
   #lockHandle = null;
   constructor(options) {
-    this.#directory = path22.resolve(options.directory);
-    this.#threadsDirectory = path22.join(this.#directory, "threads");
-    this.#backupsDirectory = path22.join(this.#directory, "backups");
-    this.#quarantineDirectory = path22.join(this.#directory, "quarantine");
-    this.#lockPath = path22.join(this.#directory, "store.lock");
+    this.#directory = path23.resolve(options.directory);
+    this.#threadsDirectory = path23.join(this.#directory, "threads");
+    this.#backupsDirectory = path23.join(this.#directory, "backups");
+    this.#quarantineDirectory = path23.join(this.#directory, "quarantine");
+    this.#lockPath = path23.join(this.#directory, "store.lock");
     this.#instanceId = options.instanceId ?? randomUUID9();
     this.#now = options.now ?? (() => /* @__PURE__ */ new Date());
     this.#beforeReplace = options.beforeReplace;
@@ -67985,8 +68035,8 @@ var MappingStore = class {
       await this.#cleanupTemps();
       const names = (await readdir4(this.#threadsDirectory)).filter((name) => name.endsWith(".json"));
       for (const name of names) {
-        const primary = path22.join(this.#threadsDirectory, name);
-        const backup = path22.join(this.#backupsDirectory, name);
+        const primary = path23.join(this.#threadsDirectory, name);
+        const backup = path23.join(this.#backupsDirectory, name);
         let record3 = null;
         try {
           record3 = await this.#readRecord(primary, name);
@@ -67995,7 +68045,7 @@ var MappingStore = class {
             record3 = await this.#readRecord(backup, name);
             await this.#replaceFile(primary, record3, false);
           } catch (backupError) {
-            const quarantine = path22.join(this.#quarantineDirectory, `${name}.${this.#now().getTime()}.invalid`);
+            const quarantine = path23.join(this.#quarantineDirectory, `${name}.${this.#now().getTime()}.invalid`);
             await rename2(primary, quarantine).catch(() => void 0);
             void primaryError;
             void backupError;
@@ -68245,7 +68295,7 @@ var MappingStore = class {
     let handle = null;
     try {
       await this.#beforeReplace?.(cloneRecord(record3));
-      handle = await open5(temp, "wx", constants4.S_IRUSR | constants4.S_IWUSR);
+      handle = await open5(temp, "wx", constants2.S_IRUSR | constants2.S_IWUSR);
       await handle.writeFile(`${JSON.stringify(record3, null, 2)}
 `, "utf8");
       await handle.sync();
@@ -68279,11 +68329,11 @@ var MappingStore = class {
   }
   async #cleanupTemps() {
     const names = await readdir4(this.#threadsDirectory);
-    await Promise.all(names.filter((name) => name.includes(".tmp-")).map((name) => rm4(path22.join(this.#threadsDirectory, name), { force: true })));
+    await Promise.all(names.filter((name) => name.includes(".tmp-")).map((name) => rm4(path23.join(this.#threadsDirectory, name), { force: true })));
   }
   async #acquireLock() {
     const attempt = async () => {
-      const handle = await open5(this.#lockPath, "wx", constants4.S_IRUSR | constants4.S_IWUSR);
+      const handle = await open5(this.#lockPath, "wx", constants2.S_IRUSR | constants2.S_IWUSR);
       const lock = {
         pid: process.pid,
         instanceId: this.#instanceId,
@@ -68372,10 +68422,10 @@ var MappingStore = class {
     }
   }
   #recordPath(hostThreadId) {
-    return path22.join(this.#threadsDirectory, `${hostThreadId}.json`);
+    return path23.join(this.#threadsDirectory, `${hostThreadId}.json`);
   }
   #backupPath(hostThreadId) {
-    return path22.join(this.#backupsDirectory, `${hostThreadId}.json`);
+    return path23.join(this.#backupsDirectory, `${hostThreadId}.json`);
   }
   #requireInitialized() {
     if (!this.#initialized) {
@@ -68774,17 +68824,17 @@ function rateLimitCandidates(value) {
   const result = isRecord33(value.result) ? value.result : value;
   if (!isRecord33(result))
     return [];
-  const candidates2 = [];
+  const candidates = [];
   const base = parseRateLimitCandidate(result.rateLimits, { genericOnly: true });
   if (base)
-    candidates2.push(base);
+    candidates.push(base);
   const notificationParams = isRecord33(value.params) ? value.params : void 0;
   const notificationSnapshot = parseRateLimitCandidate(notificationParams?.rateLimits, {
     genericOnly: true
   });
   if (notificationSnapshot)
-    candidates2.push(notificationSnapshot);
-  return candidates2;
+    candidates.push(notificationSnapshot);
+  return candidates;
 }
 function candidateScore(candidate) {
   return [candidate.primary, candidate.secondary].filter((window2) => window2?.windowDurationMins === 300 || window2?.windowDurationMins === 10080).length;
@@ -68919,8 +68969,8 @@ function projectItem(item, outcome, defaultCwd, includeCommandOutput = true, sen
       return {
         id: item.itemId,
         type: "fileChange",
-        changes: item.changes.map(({ path: path31, kind, unifiedDiff }) => ({
-          path: path31,
+        changes: item.changes.map(({ path: path32, kind, unifiedDiff }) => ({
+          path: path32,
           kind,
           diff: unifiedDiff
         })),
@@ -69367,8 +69417,8 @@ var CodexTurnProjector = class {
     return messages;
   }
   #fileChangeUpdates(itemId4, changes) {
-    const projectedChanges = changes.map(({ path: path31, kind, unifiedDiff }) => ({
-      path: path31,
+    const projectedChanges = changes.map(({ path: path32, kind, unifiedDiff }) => ({
+      path: path32,
       kind,
       diff: unifiedDiff
     }));
@@ -69451,13 +69501,13 @@ function decodeThreadForkRequest(request) {
   if (runtimeWorkspaceRoots !== void 0 && runtimeWorkspaceRoots !== null && (!Array.isArray(runtimeWorkspaceRoots) || runtimeWorkspaceRoots.some((root) => typeof root !== "string" || root.length === 0))) {
     throw new Error("thread/fork params.runtimeWorkspaceRoots must be text paths or null");
   }
-  const path31 = optionalText(params, "path", { allowEmpty: true });
+  const path32 = optionalText(params, "path", { allowEmpty: true });
   const ephemeral = optionalBoolean(params, "ephemeral");
   return {
     threadId: threadId2,
     ...lastTurnText ? { lastTurnId: hostTurnIdSchema.parse(lastTurnText) } : {},
     ...beforeTurnText ? { beforeTurnId: hostTurnIdSchema.parse(beforeTurnText) } : {},
-    ...path31 ? { path: path31 } : {},
+    ...path32 ? { path: path32 } : {},
     ...optionalField(params, "model"),
     ...optionalField(params, "modelProvider"),
     ...optionalField(params, "cwd"),
@@ -70192,8 +70242,8 @@ var packageMetadata7 = {
 
 // packages/host-runtime/src/external-thread-repository.ts
 import { randomUUID as randomUUID10 } from "node:crypto";
-import os8 from "node:os";
-import path23 from "node:path";
+import os5 from "node:os";
+import path24 from "node:path";
 function nativeTurnKey2(ref) {
   return `${ref.harnessId}\0${ref.nativeSessionId}\0${ref.nativeTurnKey}\0${ref.formatVersion}`;
 }
@@ -70202,8 +70252,8 @@ function sameMapping(left, right) {
 }
 function defaultMappingStoreDirectory(environment) {
   const dataDirectory = environment.CODEXHOST_DATA_DIR;
-  return path23.join(
-    dataDirectory ? path23.resolve(dataDirectory) : path23.join(os8.homedir(), ".codexhost"),
+  return path24.join(
+    dataDirectory ? path24.resolve(dataDirectory) : path24.join(os5.homedir(), ".codexhost"),
     "mapping-store"
   );
 }
@@ -71724,25 +71774,25 @@ function resolveExternalSessionTreeIds(records) {
   const resolve2 = (start) => {
     const cached2 = resolved.get(start.hostThreadId);
     if (cached2) return cached2;
-    const path31 = [];
+    const path32 = [];
     const visited = /* @__PURE__ */ new Set();
     let current = start;
     while (true) {
       const known = resolved.get(current.hostThreadId);
       if (known) {
-        for (const record3 of path31) resolved.set(record3.hostThreadId, known);
+        for (const record3 of path32) resolved.set(record3.hostThreadId, known);
         return known;
       }
       if (visited.has(current.hostThreadId)) {
         throw new Error("External Thread Fork tree contains a cycle");
       }
       visited.add(current.hostThreadId);
-      path31.push(current);
+      path32.push(current);
       const sourceId = current.forkSource?.hostThreadId;
       const source = sourceId ? byId.get(sourceId) : void 0;
       if (!source) {
         const root = current.hostThreadId;
-        for (const record3 of path31) resolved.set(record3.hostThreadId, root);
+        for (const record3 of path32) resolved.set(record3.hostThreadId, root);
         return root;
       }
       current = source;
@@ -71967,7 +72017,7 @@ function isRecord39(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isCreditsAdapter(adapter) {
-  return typeof adapter.credits === "function" && typeof adapter.refreshCredits === "function";
+  return typeof adapter.credits === "function";
 }
 function projectAccountCredits(value) {
   if (!isRecord39(value)) return null;
@@ -72803,6 +72853,12 @@ var AppServerHost = class {
       return;
     }
     if (resolution.kind === "official") {
+      if (params.data.refresh !== void 0) {
+        await this.#writer.json(
+          rpcError(request, -32602, "Exact Usage refresh is only available for External Threads")
+        );
+        return;
+      }
       const rateLimitRefresh = this.#refreshOfficialRateLimits();
       if (this.#officialUsageByThread.has(params.data.threadId)) {
         await rateLimitRefresh;
@@ -72816,8 +72872,9 @@ var AppServerHost = class {
       await this.#writer.json(rpcEnvelope(request, { result: jsonValueSchema.parse(result2) }));
       return;
     }
+    if (params.data.refresh === "exact") void resolution.thread.session.refreshUsage?.();
     const adapter = this.#externalAdapters.get(resolution.thread.harnessId);
-    if (adapter && isCreditsAdapter(adapter)) void adapter.refreshCredits();
+    if (adapter && isCreditsAdapter(adapter)) void adapter.refreshCredits?.();
     const credits = adapter && isCreditsAdapter(adapter) ? projectAccountCredits(adapter.credits()) : null;
     const result = threadUsageInspectionSchema.parse({
       threadId: params.data.threadId,
@@ -74437,7 +74494,7 @@ var AppServerHost = class {
 // packages/host-runtime/src/remote-control-app-server.ts
 import { randomUUID as randomUUID13 } from "node:crypto";
 import { mkdir as mkdir4, open as open6, rename as rename3, rm as rm5 } from "node:fs/promises";
-import path24 from "node:path";
+import path25 from "node:path";
 
 // packages/host-runtime/src/remote-official-connection.ts
 import net from "node:net";
@@ -74627,8 +74684,8 @@ var BRIDGE_READY_METHOD = "codexhost/remote-control-bridge/ready";
 function absoluteEnvironmentPath2(environment, name, fallback, platform = process.platform) {
   const value = environment[name] ?? fallback;
   if (!value) return null;
-  if (path24.isAbsolute(value)) return path24.normalize(value);
-  return platform === "win32" && path24.win32.isAbsolute(value) ? path24.win32.normalize(value) : null;
+  if (path25.isAbsolute(value)) return path25.normalize(value);
+  return platform === "win32" && path25.win32.isAbsolute(value) ? path25.win32.normalize(value) : null;
 }
 function nodeCompatibleWindowsPath(value) {
   if (value.startsWith("\\\\?\\UNC\\")) return `\\\\${value.slice(8)}`;
@@ -74642,13 +74699,13 @@ function remoteControlBridgePipePath(processId = process.pid, instanceId = rando
 }
 function remoteControlBridgeDescriptorPath(environment) {
   const root = environment.LOCALAPPDATA;
-  if (!root || !path24.isAbsolute(root)) return null;
-  return path24.join(path24.normalize(root), "codexhost", REMOTE_CONTROL_BRIDGE_DESCRIPTOR_FILE);
+  if (!root || !path25.isAbsolute(root)) return null;
+  return path25.join(path25.normalize(root), "codexhost", REMOTE_CONTROL_BRIDGE_DESCRIPTOR_FILE);
 }
 async function publishRemoteControlAppServerDescriptor(plan) {
-  const directory = path24.dirname(plan.descriptorPath);
+  const directory = path25.dirname(plan.descriptorPath);
   await mkdir4(directory, { recursive: true, mode: 448 });
-  const temporaryPath = path24.join(
+  const temporaryPath = path25.join(
     directory,
     `.${REMOTE_CONTROL_BRIDGE_DESCRIPTOR_FILE}.${plan.descriptor.ownerPid}.${randomUUID13()}.tmp`
   );
@@ -74741,14 +74798,14 @@ async function runRemoteControlAppServerBridge(input = {}) {
 import { createServer } from "node:http";
 import net2 from "node:net";
 import { chmod as chmod3, lstat as lstat6, mkdir as mkdir6, rm as rm7 } from "node:fs/promises";
-import path26 from "node:path";
+import path27 from "node:path";
 import { PassThrough as PassThrough2 } from "node:stream";
 
 // packages/host-runtime/src/remote-socket-lock.ts
 import { randomUUID as randomUUID14 } from "node:crypto";
 import { chmod as chmod2, lstat as lstat5, mkdir as mkdir5, open as open7, readFile as readFile8, readdir as readdir5, rename as rename4, rm as rm6 } from "node:fs/promises";
 import { uptime } from "node:os";
-import path25 from "node:path";
+import path26 from "node:path";
 import { setTimeout as delay7 } from "node:timers/promises";
 var LOCK_RETRY_COUNT = 200;
 var LOCK_RETRY_DELAY_MS = 25;
@@ -74822,7 +74879,7 @@ async function readLockEntrySnapshot(filePath) {
     source,
     identity: { dev: metadata.dev, ino: metadata.ino },
     mtimeMs: metadata.mtimeMs,
-    record: record3 && path25.basename(filePath) === lockEntryName(record3.ownerToken) ? record3 : null
+    record: record3 && path26.basename(filePath) === lockEntryName(record3.ownerToken) ? record3 : null
   };
 }
 function lockEntryIsAbandoned(snapshot) {
@@ -74843,7 +74900,7 @@ async function readLockEntryCatalog(lockDirectory) {
   let unsettled = false;
   for (const name of names) {
     if (!name.startsWith(LOCK_ENTRY_PREFIX) || !name.endsWith(LOCK_ENTRY_SUFFIX)) continue;
-    const snapshot = await readLockEntrySnapshot(path25.join(lockDirectory, name));
+    const snapshot = await readLockEntrySnapshot(path26.join(lockDirectory, name));
     if (snapshot === null) continue;
     if (lockEntryIsAbandoned(snapshot)) {
       if (!await removeAbandonedLockEntry(snapshot)) unsettled = true;
@@ -74871,7 +74928,7 @@ async function preparePrivateLockDirectory(lockDirectory) {
   await chmod2(lockDirectory, 448);
 }
 async function writeLockRecordAtomic(lockDirectory, entryPath, record3) {
-  const temporary = path25.join(lockDirectory, `.tmp-${record3.ownerToken}-${randomUUID14()}`);
+  const temporary = path26.join(lockDirectory, `.tmp-${record3.ownerToken}-${randomUUID14()}`);
   const handle = await open7(temporary, "wx", 384);
   try {
     await handle.writeFile(`${JSON.stringify(record3)}
@@ -74947,7 +75004,7 @@ async function withRemoteAppServerSocketInitializationLock(socketPath, action) {
   const lockDirectory = `${socketPath}.initializers`;
   await preparePrivateLockDirectory(lockDirectory);
   const ownerToken = randomUUID14();
-  const entryPath = path25.join(lockDirectory, lockEntryName(ownerToken));
+  const entryPath = path26.join(lockDirectory, lockEntryName(ownerToken));
   const baseRecord = {
     version: 2,
     ownerToken,
@@ -75121,14 +75178,14 @@ function remoteAppServerSocketPath(environment, listenUrl = "unix://") {
     throw new Error("Remote app-server listener must use a Unix URL");
   }
   const explicit = listenUrl.slice("unix://".length);
-  if (explicit.length > 0) return path26.posix.resolve(decodeURIComponent(explicit));
-  const codexHome = environment.CODEX_HOME ?? (environment.HOME ? path26.posix.join(environment.HOME, ".codex") : void 0);
+  if (explicit.length > 0) return path27.posix.resolve(decodeURIComponent(explicit));
+  const codexHome = environment.CODEX_HOME ?? (environment.HOME ? path27.posix.join(environment.HOME, ".codex") : void 0);
   if (!codexHome)
     throw new Error("CODEX_HOME or HOME is required for the remote app-server socket");
-  return path26.posix.join(codexHome, "app-server-control", "app-server-control.sock");
+  return path27.posix.join(codexHome, "app-server-control", "app-server-control.sock");
 }
 function officialListenerArgumentsForRemoteListener(arguments_2, socketPath) {
-  if (!path26.posix.isAbsolute(socketPath)) {
+  if (!path27.posix.isAbsolute(socketPath)) {
     throw new Error("Shared official app-server socket path must be absolute");
   }
   if (remoteUnixListenerUrl(arguments_2) === null) {
@@ -75239,7 +75296,7 @@ async function removeStaleSocket(socketPath) {
   await rm7(socketPath, { force: true });
 }
 async function prepareRemoteAppServerSocketDirectory(socketPath) {
-  const socketDirectory = path26.dirname(socketPath);
+  const socketDirectory = path27.dirname(socketPath);
   const existing = await lstat6(socketDirectory).catch((error54) => {
     if (error54.code === "ENOENT") return null;
     throw error54;
@@ -75422,18 +75479,18 @@ function createRemoteAppServerWebSocketListener(input) {
 import { spawn as spawn8 } from "node:child_process";
 import { randomUUID as randomUUID15 } from "node:crypto";
 import { lstat as lstat7, rm as rm8 } from "node:fs/promises";
-import path27 from "node:path";
+import path28 from "node:path";
 var DEFAULT_CLOSE_TIMEOUT_MS4 = 2e3;
 var DEFAULT_LISTEN_TIMEOUT_MS = 1e4;
 function remoteOfficialAppServerSocketPath(desktopControlSocketPath, token = randomUUID15()) {
-  if (!path27.posix.isAbsolute(desktopControlSocketPath)) {
+  if (!path28.posix.isAbsolute(desktopControlSocketPath)) {
     throw new Error("Desktop control socket path must be absolute");
   }
   if (!/^[A-Za-z0-9-]+$/u.test(token) || !/[A-Za-z0-9]/u.test(token)) {
     throw new Error("Shared official app-server socket token is invalid");
   }
   const compactToken = token.replaceAll("-", "").slice(0, 15);
-  return path27.posix.join(path27.posix.dirname(desktopControlSocketPath), `.c-${compactToken}.sock`);
+  return path28.posix.join(path28.posix.dirname(desktopControlSocketPath), `.c-${compactToken}.sock`);
 }
 function errorMessage7(error54) {
   return error54 instanceof Error ? error54.message : String(error54);
@@ -75737,7 +75794,7 @@ function createHostUpdateCoordinator(options) {
   async function installable(context, release) {
     if (context.installation.kind === "npm") return true;
     const target = context.metadata.target;
-    if (target === "linux-x64") return false;
+    if (target === "linux-x64" || target === "linux-arm64") return false;
     try {
       selectInstallerReleaseArtifact(release, target);
       return true;
@@ -75838,7 +75895,7 @@ function createHostUpdateCoordinator(options) {
               });
             } else {
               const target = context.metadata.target;
-              if (target === "linux-x64") {
+              if (target === "linux-x64" || target === "linux-arm64") {
                 throw new Error("Linux installer updates are unsupported");
               }
               const artifact = selectInstallerReleaseArtifact(release, target).source;
@@ -75899,9 +75956,9 @@ function hasLauncherManagedUpdateRuntime(environment, hostRuntimePath) {
   if (!environment[UPDATE_RUNTIME_ENV.launcherPid]) return false;
   const npmPackageRoot = environment[UPDATE_RUNTIME_ENV.npmPackageRoot];
   if (!npmPackageRoot || !hostRuntimePath) return true;
-  if (!path28.isAbsolute(npmPackageRoot) || !path28.isAbsolute(hostRuntimePath)) return false;
-  const runtimePackageRoot = path28.dirname(path28.dirname(path28.normalize(hostRuntimePath)));
-  return path28.relative(path28.normalize(npmPackageRoot), runtimePackageRoot) === "";
+  if (!path29.isAbsolute(npmPackageRoot) || !path29.isAbsolute(hostRuntimePath)) return false;
+  const runtimePackageRoot = path29.dirname(path29.dirname(path29.normalize(hostRuntimePath)));
+  return path29.relative(path29.normalize(npmPackageRoot), runtimePackageRoot) === "";
 }
 function requiredRuntimeConfiguration(environment) {
   const stockCodexPath = environment[STOCK_CODEX_PATH_ENV];
@@ -76106,7 +76163,7 @@ import {
   stat as stat3,
   writeFile as writeFile3
 } from "node:fs/promises";
-import path29 from "node:path";
+import path30 from "node:path";
 var MANIFEST_FORMAT = 1;
 var WRAPPER_MARKER = "# codexhost remote SSH wrapper v1";
 var PROFILE_START = "# >>> codexhost remote SSH >>>";
@@ -76117,25 +76174,25 @@ function resolvePaths(options) {
   if (!configuredHome) {
     throw new Error("A non-root HOME is required for remote Host installation");
   }
-  const home = path29.resolve(configuredHome);
-  if (!home || home === path29.parse(home).root) {
+  const home = path30.resolve(configuredHome);
+  if (!home || home === path30.parse(home).root) {
     throw new Error("A non-root HOME is required for remote Host installation");
   }
-  const installRoot = path29.resolve(options.installRoot ?? path29.join(home, ".codexhost", "remote"));
-  const profilePath = path29.resolve(
-    options.profilePath ?? path29.join(
+  const installRoot = path30.resolve(options.installRoot ?? path30.join(home, ".codexhost", "remote"));
+  const profilePath = path30.resolve(
+    options.profilePath ?? path30.join(
       home,
-      path29.basename(environment.SHELL ?? "") === "zsh" ? ".zshenv" : path29.basename(environment.SHELL ?? "") === "bash" ? ".bashrc" : ".profile"
+      path30.basename(environment.SHELL ?? "") === "zsh" ? ".zshenv" : path30.basename(environment.SHELL ?? "") === "bash" ? ".bashrc" : ".profile"
     )
   );
-  const binDirectory = path29.join(installRoot, "bin");
+  const binDirectory = path30.join(installRoot, "bin");
   return {
     home,
     installRoot,
     binDirectory,
-    wrapperPath: path29.join(binDirectory, "codex"),
-    manifestPath: path29.join(installRoot, "manifest.json"),
-    dataDirectory: path29.join(installRoot, "data"),
+    wrapperPath: path30.join(binDirectory, "codex"),
+    manifestPath: path30.join(installRoot, "manifest.json"),
+    dataDirectory: path30.join(installRoot, "data"),
     profilePath
   };
 }
@@ -76154,7 +76211,7 @@ async function fileSha256(filePath) {
   return createHash3("sha256").update(await readFile9(filePath)).digest("hex");
 }
 async function executable(filePath, label) {
-  const absolute = path29.resolve(filePath);
+  const absolute = path30.resolve(filePath);
   try {
     if (!(await stat3(absolute)).isFile()) throw new Error("not a regular file");
     await access(absolute, fsConstants.X_OK);
@@ -76164,7 +76221,7 @@ async function executable(filePath, label) {
   return absolute;
 }
 async function existingFile2(filePath, label) {
-  const absolute = path29.resolve(filePath);
+  const absolute = path30.resolve(filePath);
   try {
     const metadata = await stat3(absolute);
     if (!metadata.isFile()) throw new Error("not a regular file");
@@ -76174,9 +76231,9 @@ async function existingFile2(filePath, label) {
   return absolute;
 }
 async function discoverExecutable(name, environment) {
-  for (const directory of (environment.PATH ?? "").split(path29.delimiter)) {
+  for (const directory of (environment.PATH ?? "").split(path30.delimiter)) {
     if (!directory) continue;
-    const candidate = path29.resolve(directory, name);
+    const candidate = path30.resolve(directory, name);
     try {
       await access(candidate, fsConstants.X_OK);
       return candidate;
@@ -76187,10 +76244,10 @@ async function discoverExecutable(name, environment) {
   return null;
 }
 async function writeAtomic(filePath, contents, mode) {
-  await mkdir7(path29.dirname(filePath), { recursive: true, mode: 448 });
-  const temporary = path29.join(
-    path29.dirname(filePath),
-    `.${path29.basename(filePath)}.${process.pid}.${randomUUID16()}.tmp`
+  await mkdir7(path30.dirname(filePath), { recursive: true, mode: 448 });
+  const temporary = path30.join(
+    path30.dirname(filePath),
+    `.${path30.basename(filePath)}.${process.pid}.${randomUUID16()}.tmp`
   );
   try {
     if (typeof contents === "string") {
@@ -76211,10 +76268,10 @@ async function writeAtomic(filePath, contents, mode) {
   }
 }
 async function writeAtomicExecutable(filePath, sourcePath) {
-  await mkdir7(path29.dirname(filePath), { recursive: true, mode: 448 });
-  const temporary = path29.join(
-    path29.dirname(filePath),
-    `.${path29.basename(filePath)}.${process.pid}.${randomUUID16()}.tmp`
+  await mkdir7(path30.dirname(filePath), { recursive: true, mode: 448 });
+  const temporary = path30.join(
+    path30.dirname(filePath),
+    `.${path30.basename(filePath)}.${process.pid}.${randomUUID16()}.tmp`
   );
   try {
     await copyFile3(sourcePath, temporary);
@@ -76255,7 +76312,7 @@ function removeManagedProfileBlock(contents) {
 function installManagedProfileBlock(contents, manifest) {
   const base = removeManagedProfileBlock(contents);
   const environment = [
-    `export CODEX_INSTALL_DIR=${shellQuote(path29.dirname(manifest.wrapperPath))}`,
+    `export CODEX_INSTALL_DIR=${shellQuote(path30.dirname(manifest.wrapperPath))}`,
     `export CODEXHOST_STOCK_CODEX_PATH=${shellQuote(manifest.stockCodexPath)}`,
     `export CODEXHOST_HOST_NODE_PATH=${shellQuote(manifest.nodePath)}`,
     `export CODEXHOST_HOST_RUNTIME_PATH=${shellQuote(manifest.hostRuntimePath)}`,
@@ -76272,7 +76329,7 @@ function installManagedProfileBlock(contents, manifest) {
     PROFILE_END,
     ""
   ].join("\n");
-  if (path29.basename(manifest.profilePath) === ".bashrc") return `${block}${base}`;
+  if (path30.basename(manifest.profilePath) === ".bashrc") return `${block}${base}`;
   const separator = base.length > 0 && !base.endsWith("\n") ? "\n" : "";
   return `${base}${separator}${block}`;
 }
@@ -76337,9 +76394,9 @@ async function readManifest(filePath) {
   ];
   const optionalPaths = ["claudeCommand", "profileBackupPath"];
   if (manifest.format !== MANIFEST_FORMAT || Object.keys(manifest).some((key) => !allowed2.has(key)) || requiredPaths.some(
-    (key) => typeof manifest[key] !== "string" || !path29.isAbsolute(manifest[key])
+    (key) => typeof manifest[key] !== "string" || !path30.isAbsolute(manifest[key])
   ) || optionalPaths.some(
-    (key) => manifest[key] !== void 0 && (typeof manifest[key] !== "string" || !path29.isAbsolute(manifest[key]))
+    (key) => manifest[key] !== void 0 && (typeof manifest[key] !== "string" || !path30.isAbsolute(manifest[key]))
   ) || manifest.entrypointSha256 !== void 0 && (typeof manifest.entrypointSha256 !== "string" || !/^[a-f0-9]{64}$/u.test(manifest.entrypointSha256))) {
     throw new Error("Remote Host manifest has an unsupported format");
   }
@@ -76568,7 +76625,7 @@ async function uninstallRemoteHost(options) {
 import { spawn as spawn9 } from "node:child_process";
 import { stat as stat4 } from "node:fs/promises";
 import net3 from "node:net";
-import path30 from "node:path";
+import path31 from "node:path";
 import { Duplex } from "node:stream";
 var CODEXHOST_STATUS_METHOD = "codexhost/update/status";
 var DIRECT_PROBE_TIMEOUT_MS = 5e3;
@@ -76587,9 +76644,9 @@ function classifyRemoteHostProbeResponse(response, socketPath) {
 }
 var lifecycleDependencyOverrides = {};
 function socketPathFor(environment) {
-  const codexHome = environment.CODEX_HOME ?? (environment.HOME ? path30.join(environment.HOME, ".codex") : void 0);
+  const codexHome = environment.CODEX_HOME ?? (environment.HOME ? path31.join(environment.HOME, ".codex") : void 0);
   if (!codexHome) throw new Error("CODEX_HOME or HOME is required for remote Host lifecycle");
-  return path30.join(codexHome, "app-server-control", "app-server-control.sock");
+  return path31.join(codexHome, "app-server-control", "app-server-control.sock");
 }
 async function defaultSocketExists(socketPath) {
   const metadata = await stat4(socketPath).catch((error54) => {
@@ -76716,7 +76773,7 @@ function installedManifest(status) {
 function managedEnvironment(manifest, environment) {
   return {
     ...environment,
-    CODEX_INSTALL_DIR: path30.dirname(manifest.wrapperPath),
+    CODEX_INSTALL_DIR: path31.dirname(manifest.wrapperPath),
     CODEXHOST_STOCK_CODEX_PATH: manifest.stockCodexPath,
     CODEXHOST_HOST_NODE_PATH: manifest.nodePath,
     CODEXHOST_HOST_RUNTIME_PATH: manifest.hostRuntimePath,
@@ -76724,7 +76781,7 @@ function managedEnvironment(manifest, environment) {
     CODEXHOST_DEFAULT_AGENT: "codex",
     CODEXHOST_REMOTE_SSH_MANAGED: "1",
     ...manifest.claudeCommand ? { CODEXHOST_CLAUDE_COMMAND: manifest.claudeCommand } : {},
-    PATH: `${path30.dirname(manifest.wrapperPath)}${path30.delimiter}${path30.dirname(manifest.stockCodexPath)}${path30.delimiter}${environment.PATH ?? "/usr/bin:/bin"}`
+    PATH: `${path31.dirname(manifest.wrapperPath)}${path31.delimiter}${path31.dirname(manifest.stockCodexPath)}${path31.delimiter}${environment.PATH ?? "/usr/bin:/bin"}`
   };
 }
 async function defaultRunTerminator(manifest, socketPath, role, environment) {