@liberseek/boft-cli-win32-arm64 0.6.6 → 0.6.8

package/app/host-runtime.mjs

@@ -2278,7 +2278,7 @@ var require_websocket = __commonJS({
     var http = __require("http");
     var net5 = __require("net");
     var tls = __require("tls");
-    var { randomBytes: randomBytes3, createHash: createHash8 } = __require("crypto");
+    var { randomBytes: randomBytes3, createHash: createHash9 } = __require("crypto");
     var { Duplex: Duplex2, Readable } = __require("stream");
     var { URL: URL2 } = __require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -2946,7 +2946,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest2 = createHash8("sha1").update(key + GUID).digest("base64");
+        const digest2 = createHash9("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest2) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -3315,7 +3315,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter = __require("events");
     var http = __require("http");
     var { Duplex: Duplex2 } = __require("stream");
-    var { createHash: createHash8 } = __require("crypto");
+    var { createHash: createHash9 } = __require("crypto");
     var extension2 = require_extension();
     var PerMessageDeflate2 = require_permessage_deflate();
     var subprotocol2 = require_subprotocol();
@@ -3622,7 +3622,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest2 = createHash8("sha1").update(key + GUID).digest("base64");
+        const digest2 = createHash9("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -4283,7 +4283,7 @@ async function runDelegationCli(input) {
 
 // packages/host-runtime/src/run-host-runtime.ts
 import { randomBytes } from "node:crypto";
-import path21 from "node:path";
+import path22 from "node:path";
 import { homedir } from "node:os";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
@@ -4629,9 +4629,85 @@ function selectInstallerReleaseArtifact(release, target) {
   });
 }
 
+// packages/update-manager/dist/github-cli-release.js
+import { execFile } from "node:child_process";
+import path2 from "node:path";
+var GITHUB_LATEST_RELEASE_ENDPOINT = "repos/BytePioneer-AI/codex-host/releases/latest";
+var MAX_RELEASE_RESPONSE_BYTES = 1024 * 1024;
+var GITHUB_CLI_TIMEOUT_MS = 5e3;
+function defaultExecutableCandidates(environment, platform) {
+  if (environment.CODEXHOST_GH_COMMAND)
+    return [environment.CODEXHOST_GH_COMMAND];
+  const candidates = ["gh"];
+  if (platform === "darwin") {
+    candidates.push("/opt/homebrew/bin/gh", "/usr/local/bin/gh");
+  } else if (platform === "win32") {
+    const programFiles = environment.ProgramFiles ?? environment.PROGRAMFILES;
+    const localAppData = environment.LOCALAPPDATA;
+    if (programFiles)
+      candidates.push(path2.win32.join(programFiles, "GitHub CLI", "gh.exe"));
+    if (localAppData) {
+      candidates.push(path2.win32.join(localAppData, "Programs", "GitHub CLI", "gh.exe"));
+    }
+  } else {
+    candidates.push("/usr/local/bin/gh", "/usr/bin/gh", "/snap/bin/gh");
+  }
+  return [...new Set(candidates.filter((candidate) => Boolean(candidate)))];
+}
+function runGitHubCli(executable2, arguments_2, options2) {
+  return new Promise((resolve, reject) => {
+    execFile(executable2, [...arguments_2], {
+      encoding: "utf8",
+      env: options2.environment,
+      maxBuffer: MAX_RELEASE_RESPONSE_BYTES,
+      timeout: GITHUB_CLI_TIMEOUT_MS,
+      windowsHide: true,
+      ...options2.signal ? { signal: options2.signal } : {}
+    }, (error51, stdout) => {
+      if (error51)
+        reject(error51);
+      else
+        resolve(stdout);
+    });
+  });
+}
+async function fetchLatestGitHubReleaseWithGitHubCli(options2 = {}) {
+  const environment = options2.environment ?? process.env;
+  const platform = options2.platform ?? process.platform;
+  const candidates = options2.executableCandidates ?? defaultExecutableCandidates(environment, platform);
+  const run = options2.run ?? runGitHubCli;
+  const arguments_2 = [
+    "api",
+    "--hostname",
+    "github.com",
+    "--method",
+    "GET",
+    "--header",
+    "Accept: application/vnd.github+json",
+    "--header",
+    "X-GitHub-Api-Version: 2022-11-28",
+    GITHUB_LATEST_RELEASE_ENDPOINT
+  ];
+  for (const executable2 of candidates) {
+    options2.signal?.throwIfAborted();
+    try {
+      return parseLatestGitHubRelease(JSON.parse(await run(executable2, arguments_2, {
+        environment,
+        ...options2.signal ? { signal: options2.signal } : {}
+      })));
+    } catch (error51) {
+      options2.signal?.throwIfAborted();
+      const code = error51?.code;
+      if (code !== "ENOENT" && code !== "EACCES")
+        return null;
+    }
+  }
+  return null;
+}
+
 // packages/update-manager/dist/operation-state.js
 import { lstat as lstat2, mkdir, open, readFile as readFile2, readdir, rm, writeFile } from "node:fs/promises";
-import path2 from "node:path";
+import path3 from "node:path";
 var LOCK_FILE = "active-update-v1.lock";
 var STATUS_FILE = "status-v1.json";
 var TERMINAL_PHASES = /* @__PURE__ */ new Set(["succeeded", "failed"]);
@@ -4646,12 +4722,12 @@ async function regularFile(filePath) {
   }
 }
 async function isUpdateOperationActive(stateDirectory) {
-  if (!path2.isAbsolute(stateDirectory))
+  if (!path3.isAbsolute(stateDirectory))
     throw new Error("update state directory must be absolute");
-  return regularFile(path2.join(stateDirectory, LOCK_FILE));
+  return regularFile(path3.join(stateDirectory, LOCK_FILE));
 }
 async function discoverLatestUpdateStatus(stateDirectory) {
-  if (!path2.isAbsolute(stateDirectory))
+  if (!path3.isAbsolute(stateDirectory))
     throw new Error("update state directory must be absolute");
   let entries;
   try {
@@ -4665,7 +4741,7 @@ async function discoverLatestUpdateStatus(stateDirectory) {
   for (const entry of entries) {
     if (!entry.isDirectory() || entry.isSymbolicLink() || !entry.name.startsWith("update-"))
       continue;
-    const statusPath = path2.join(stateDirectory, entry.name, STATUS_FILE);
+    const statusPath = path3.join(stateDirectory, entry.name, STATUS_FILE);
     if (!await regularFile(statusPath))
       continue;
     try {
@@ -4693,8 +4769,8 @@ async function cleanupTerminalUpdateState(stateDirectory, options2 = {}) {
   for (const entry of entries) {
     if (!entry.isDirectory() || entry.isSymbolicLink() || !entry.name.startsWith("update-"))
       continue;
-    const directory = path2.join(stateDirectory, entry.name);
-    const statusPath = path2.join(directory, STATUS_FILE);
+    const directory = path3.join(stateDirectory, entry.name);
+    const statusPath = path3.join(directory, STATUS_FILE);
     try {
       const status = parseUpdateStatus(JSON.parse(await readFile2(statusPath, "utf8")));
       if (TERMINAL_PHASES.has(status.phase) && now - status.updatedAt > retentionSeconds) {
@@ -4705,10 +4781,10 @@ async function cleanupTerminalUpdateState(stateDirectory, options2 = {}) {
   }
 }
 async function acquireUpdateOperationLock(stateDirectory) {
-  if (!path2.isAbsolute(stateDirectory))
+  if (!path3.isAbsolute(stateDirectory))
     throw new Error("update state directory must be absolute");
   await mkdir(stateDirectory, { recursive: true, mode: 448 });
-  const lockPath = path2.join(stateDirectory, LOCK_FILE);
+  const lockPath = path3.join(stateDirectory, LOCK_FILE);
   let handle;
   try {
     handle = await open(lockPath, "wx", 384);
@@ -4727,9 +4803,9 @@ async function acquireUpdateOperationLock(stateDirectory) {
     async setStatusPath(statusPath) {
       if (released)
         throw new Error("update operation lock is released");
-      if (!path2.isAbsolute(statusPath))
+      if (!path3.isAbsolute(statusPath))
         throw new Error("update status path must be absolute");
-      await writeFile(lockPath, `${JSON.stringify({ ownerPid: process.pid, statusPath: path2.normalize(statusPath) })}
+      await writeFile(lockPath, `${JSON.stringify({ ownerPid: process.pid, statusPath: path3.normalize(statusPath) })}
 `, { encoding: "utf8", mode: 384 });
     },
     async release() {
@@ -4751,7 +4827,7 @@ function processIsAlive(processId) {
   }
 }
 async function recoverUpdateOperationLock(stateDirectory) {
-  const lockPath = path2.join(stateDirectory, LOCK_FILE);
+  const lockPath = path3.join(stateDirectory, LOCK_FILE);
   if (!await regularFile(lockPath))
     return;
   let ownerPid;
@@ -4763,7 +4839,7 @@ async function recoverUpdateOperationLock(stateDirectory) {
   } catch {
     return;
   }
-  if (typeof statusPath !== "string" || !path2.isAbsolute(statusPath))
+  if (typeof statusPath !== "string" || !path3.isAbsolute(statusPath))
     return;
   try {
     const status = parseUpdateStatus(JSON.parse(await readFile2(statusPath, "utf8")));
@@ -4778,7 +4854,7 @@ async function recoverUpdateOperationLock(stateDirectory) {
 import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { chmod, copyFile, lstat as lstat4, mkdir as mkdir2, readFile as readFile3, rename, rm as rm2, writeFile as writeFile2 } from "node:fs/promises";
-import path3 from "node:path";
+import path4 from "node:path";
 
 // packages/update-manager/dist/artifact.js
 import { createHash } from "node:crypto";
@@ -4899,9 +4975,9 @@ async function replaceStatusFile(temporaryPath, statusPath) {
   }
 }
 function requireAbsolutePath(value2, label) {
-  if (!path3.isAbsolute(value2))
+  if (!path4.isAbsolute(value2))
     throw new Error(`${label} must be an absolute path`);
-  return path3.normalize(value2);
+  return path4.normalize(value2);
 }
 async function requireRegularFile(value2, label) {
   const filePath = requireAbsolutePath(value2, label);
@@ -4944,7 +5020,7 @@ function createBackgroundUpdateManager(dependencies2 = {}) {
   const now = dependencies2.now ?? Date.now;
   const preparedRequests = /* @__PURE__ */ new Set();
   async function writeStatusSnapshot(statusPath, status) {
-    const temporaryPath = path3.join(path3.dirname(statusPath), `.update-status-${randomId()}.tmp`);
+    const temporaryPath = path4.join(path4.dirname(statusPath), `.update-status-${randomId()}.tmp`);
     try {
       await writeFile2(temporaryPath, `${JSON.stringify(status)}
 `, {
@@ -5004,15 +5080,15 @@ function createBackgroundUpdateManager(dependencies2 = {}) {
     const updaterExecutable = await requireRegularFile(options2.updaterExecutable, "Updater executable");
     const stateDirectory = requireAbsolutePath(options2.stateDirectory, "update state directory");
     await mkdir2(stateDirectory, { recursive: true, mode: 448 });
-    const workDirectory = path3.join(stateDirectory, `update-${version2}-${randomId()}`);
+    const workDirectory = path4.join(stateDirectory, `update-${version2}-${randomId()}`);
     await mkdir2(workDirectory, { recursive: false, mode: 448 });
     const executableSuffix = platform === "win32" ? ".exe" : "";
-    const helperPath = path3.join(workDirectory, `boft-updater${executableSuffix}`);
+    const helperPath = path4.join(workDirectory, `boft-updater${executableSuffix}`);
     await copyFile(updaterExecutable, helperPath);
     if (platform !== "win32")
       await chmod(helperPath, 448);
-    const requestPath = path3.join(workDirectory, "request-v1.json");
-    const statusPath = path3.join(workDirectory, "status-v1.json");
+    const requestPath = path4.join(workDirectory, "request-v1.json");
+    const statusPath = path4.join(workDirectory, "status-v1.json");
     await writePrivateJson(statusPath, preparedStatus(version2, installation, now()));
     await options2.onPrepared?.({ version: version2, installation, statusPath });
     return {
@@ -5028,8 +5104,8 @@ function createBackgroundUpdateManager(dependencies2 = {}) {
   }
   async function prepareArtifact(common, installation, sourceValue, fileName) {
     const source = validateArtifact(sourceValue);
-    const temporaryPath = path3.join(common.workDirectory, `.${fileName}.download`);
-    const artifactPath = path3.join(common.workDirectory, fileName);
+    const temporaryPath = path4.join(common.workDirectory, `.${fileName}.download`);
+    const artifactPath = path4.join(common.workDirectory, fileName);
     const progress = progressReporter(common.statusPath, common.version, installation, source.size);
     try {
       const result = await download(source, temporaryPath, progress.update);
@@ -5103,7 +5179,7 @@ function createBackgroundUpdateManager(dependencies2 = {}) {
         throw new Error("macOS DMG updates require macOS");
       const common = await prepareCommon(options2, "macos-dmg");
       const appPath = requireAbsolutePath(options2.appPath, "macOS application path");
-      if (path3.extname(appPath) !== ".app") {
+      if (path4.extname(appPath) !== ".app") {
         throw new Error("macOS application path must end in .app");
       }
       const artifact = await prepareArtifact(common, "macos-dmg", options2.artifact, "update.dmg");
@@ -5138,7 +5214,7 @@ function createBackgroundUpdateManager(dependencies2 = {}) {
 
 // packages/host-runtime/src/account/codex-home-auth.ts
 import { readFile as readFile4 } from "node:fs/promises";
-import path4 from "node:path";
+import path5 from "node:path";
 var CODEX_API_AUTH_IDENTITY_FALLBACK = "BANK OF TOKEN";
 function tomlUnquote(value2) {
   const trimmed = value2.trim();
@@ -5284,10 +5360,10 @@ function inspectCodexApiUsageSource(input) {
   return { baseUrl, apiKey };
 }
 async function inspectCodexHomeAuth(codexHome) {
-  const root = path4.resolve(codexHome);
+  const root = path5.resolve(codexHome);
   const [configToml, authJson] = await Promise.all([
-    readOptionalUtf8(path4.join(root, "config.toml")),
-    readOptionalUtf8(path4.join(root, "auth.json"))
+    readOptionalUtf8(path5.join(root, "config.toml")),
+    readOptionalUtf8(path5.join(root, "auth.json"))
   ]);
   return inspectCodexAuthDocuments({
     ...configToml ? { configToml } : {},
@@ -5295,10 +5371,10 @@ async function inspectCodexHomeAuth(codexHome) {
   });
 }
 async function inspectCodexHomeApiUsageSource(codexHome, env = process.env) {
-  const root = path4.resolve(codexHome);
+  const root = path5.resolve(codexHome);
   const [configToml, authJson] = await Promise.all([
-    readOptionalUtf8(path4.join(root, "config.toml")),
-    readOptionalUtf8(path4.join(root, "auth.json"))
+    readOptionalUtf8(path5.join(root, "config.toml")),
+    readOptionalUtf8(path5.join(root, "auth.json"))
   ]);
   return inspectCodexApiUsageSource({
     ...configToml ? { configToml } : {},
@@ -6142,10 +6218,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path26) {
-  if (!path26)
+function getElementAtPath(obj, path27) {
+  if (!path27)
     return obj;
-  return path26.reduce((acc, key) => acc?.[key], obj);
+  return path27.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -6554,11 +6630,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path26, issues) {
+function prefixIssues(path27, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path26);
+    iss.path.unshift(path27);
     return iss;
   });
 }
@@ -6705,16 +6781,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path26 = []) => {
+  const processError = (error52, path27 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path26, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path27, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path26, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path27, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path26, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path27, ...issue2.path]);
       } else {
-        const fullpath = [...path26, ...issue2.path];
+        const fullpath = [...path27, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -6741,17 +6817,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path26 = []) => {
+  const processError = (error52, path27 = []) => {
     var _a3, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path26, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path27, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path26, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path27, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path26, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path27, ...issue2.path]);
       } else {
-        const fullpath = [...path26, ...issue2.path];
+        const fullpath = [...path27, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -6783,8 +6859,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path26 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path26) {
+  const path27 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path27) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -19476,13 +19552,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path26 = ref.slice(1).split("/").filter(Boolean);
-  if (path26.length === 0) {
+  const path27 = ref.slice(1).split("/").filter(Boolean);
+  if (path27.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path26[0] === defsKey) {
-    const key = path26[1];
+  if (path27[0] === defsKey) {
+    const key = path27[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -20935,7 +21011,7 @@ import { execFileSync } from "node:child_process";
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { constants } from "node:fs";
 import { copyFile as copyFile2, mkdir as mkdir3, open as open3, readFile as readFile5, readdir as readdir2, rename as rename2, rm as rm3, stat } from "node:fs/promises";
-import path5 from "node:path";
+import path6 from "node:path";
 
 // packages/mapping-store/dist/records.js
 var nonBlankTextSchema6 = external_exports.string().refine((value2) => value2.trim().length > 0, {
@@ -21188,12 +21264,12 @@ var MappingStore = class {
   #initialized = false;
   #lockHandle = null;
   constructor(options2) {
-    this.#directory = path5.resolve(options2.directory);
-    this.#threadsDirectory = path5.join(this.#directory, "threads");
-    this.#delegationsDirectory = path5.join(this.#directory, "delegations");
-    this.#backupsDirectory = path5.join(this.#directory, "backups");
-    this.#quarantineDirectory = path5.join(this.#directory, "quarantine");
-    this.#lockPath = path5.join(this.#directory, "store.lock");
+    this.#directory = path6.resolve(options2.directory);
+    this.#threadsDirectory = path6.join(this.#directory, "threads");
+    this.#delegationsDirectory = path6.join(this.#directory, "delegations");
+    this.#backupsDirectory = path6.join(this.#directory, "backups");
+    this.#quarantineDirectory = path6.join(this.#directory, "quarantine");
+    this.#lockPath = path6.join(this.#directory, "store.lock");
     this.#instanceId = options2.instanceId ?? randomUUID2();
     this.#now = options2.now ?? (() => /* @__PURE__ */ new Date());
     this.#beforeReplace = options2.beforeReplace;
@@ -21212,8 +21288,8 @@ var MappingStore = class {
       await this.#cleanupResidue();
       const names = (await readdir2(this.#threadsDirectory)).filter((name) => name.endsWith(".json"));
       for (const name of names) {
-        const primary = path5.join(this.#threadsDirectory, name);
-        const backup = path5.join(this.#backupsDirectory, name);
+        const primary = path6.join(this.#threadsDirectory, name);
+        const backup = path6.join(this.#backupsDirectory, name);
         let record3 = null;
         try {
           record3 = await this.#readRecord(primary, name);
@@ -21222,7 +21298,7 @@ var MappingStore = class {
             record3 = await this.#readRecord(backup, name);
             await this.#replaceFile(primary, record3, false);
           } catch (backupError) {
-            const quarantine = path5.join(this.#quarantineDirectory, `${name}.${this.#now().getTime()}.invalid`);
+            const quarantine = path6.join(this.#quarantineDirectory, `${name}.${this.#now().getTime()}.invalid`);
             await rename2(primary, quarantine).catch(() => void 0);
             void primaryError;
             void backupError;
@@ -21238,14 +21314,14 @@ var MappingStore = class {
       }
       const delegationNames = (await readdir2(this.#delegationsDirectory)).filter((name) => name.endsWith(".json"));
       for (const name of delegationNames) {
-        const file2 = path5.join(this.#delegationsDirectory, name);
+        const file2 = path6.join(this.#delegationsDirectory, name);
         try {
           const parsed = storedDelegationRecordV1Schema.parse(JSON.parse(await readFile5(file2, "utf8")));
           if (`${parsed.delegationId}.json` !== name)
             throw new Error("filename mismatch");
           this.#delegations.set(parsed.delegationId, parsed);
         } catch {
-          const quarantine = path5.join(this.#quarantineDirectory, `${name}.${this.#now().getTime()}.invalid-delegation`);
+          const quarantine = path6.join(this.#quarantineDirectory, `${name}.${this.#now().getTime()}.invalid-delegation`);
           await rename2(file2, quarantine).catch(() => void 0);
         }
       }
@@ -21404,10 +21480,35 @@ var MappingStore = class {
       turnMappings: this.#mergeMappings(current.turnMappings, input.turnMappings ?? [])
     }));
   }
+  // Keep native ref, Turn mappings and the indexed create request in one serialized
+  // record mutation; separate setters could leave a child pointing at mixed Sessions.
+  async rebindSubagentSession(input) {
+    return this.#update(input.hostThreadId, (current) => {
+      const parent = this.#records.get(input.parentHostThreadId);
+      if (current.state !== "ready" || !current.nativeSessionRef || current.subagent?.parentHostThreadId !== input.parentHostThreadId || parent?.state !== "ready" || parent.harnessId !== current.harnessId || input.previousNativeSessionRef.harnessId !== current.harnessId || input.nativeSessionRef.harnessId !== current.harnessId || !sameJson(parent.nativeSessionRef, input.nativeSessionRef))
+        throw new MappingStoreError("MAPPING_CONFLICT", "Subagent replacement must belong to its current parent Session");
+      if (sameJson(current.nativeSessionRef, input.nativeSessionRef) && current.createRequestId === input.createRequestId)
+        return null;
+      if (!sameJson(current.nativeSessionRef, input.previousNativeSessionRef)) {
+        throw new MappingStoreError("MAPPING_CONFLICT", "Subagent replacement source Session is stale");
+      }
+      const nativeSessionId = input.nativeSessionRef.nativeSessionId;
+      return {
+        ...current,
+        createRequestId: input.createRequestId,
+        nativeSessionRef: input.nativeSessionRef,
+        turnMappings: current.turnMappings.map((mapping) => ({
+          ...mapping,
+          nativeTurnRef: { ...mapping.nativeTurnRef, nativeSessionId },
+          ...mapping.nativeCheckpointRef ? { nativeCheckpointRef: { ...mapping.nativeCheckpointRef, nativeSessionId } } : {}
+        }))
+      };
+    });
+  }
   async replaceReadySession(input) {
     return this.#update(input.hostThreadId, (current) => {
-      if (current.state !== "ready" || !current.nativeSessionRef || !current.forkSource || current.forkSource.hostThreadId !== input.forkSource.hostThreadId || current.nativeSessionRef.nativeSessionId === input.nativeSessionRef.nativeSessionId || input.turnMappings.length < 1 || input.turnMappings.length >= current.turnMappings.length || input.turnMappings.some(({ hostTurnId }, index) => hostTurnId !== current.turnMappings[index]?.hostTurnId)) {
-        throw new MappingStoreError("MAPPING_CONFLICT", "Ready Session replacement must retain an exact shorter derived prefix");
+      if (current.state !== "ready" || !current.nativeSessionRef || current.revision !== input.expectedRevision || !sameJson(current.nativeSessionRef, input.expectedNativeSessionRef) || !current.forkSource || current.forkSource.hostThreadId !== input.forkSource.hostThreadId || current.nativeSessionRef.nativeSessionId === input.nativeSessionRef.nativeSessionId || input.turnMappings.length < 1 || input.turnMappings.length >= current.turnMappings.length || input.turnMappings.some(({ hostTurnId }, index) => hostTurnId !== current.turnMappings[index]?.hostTurnId)) {
+        throw new MappingStoreError("MAPPING_CONFLICT", "Ready Session replacement must match the expected record and retain an exact shorter derived prefix");
       }
       return {
         ...current,
@@ -21419,8 +21520,8 @@ var MappingStore = class {
   }
   async replaceReadySessionAfterLastTurn(input) {
     return this.#update(input.hostThreadId, (current) => {
-      if (current.state !== "ready" || !current.nativeSessionRef || input.turnMappings.length !== current.turnMappings.length - 1 || input.turnMappings.some(({ hostTurnId }, index) => hostTurnId !== current.turnMappings[index]?.hostTurnId)) {
-        throw new MappingStoreError("MAPPING_CONFLICT", "Last-Turn Session replacement must retain the exact shorter Host Turn prefix");
+      if (current.state !== "ready" || !current.nativeSessionRef || current.revision !== input.expectedRevision || !sameJson(current.nativeSessionRef, input.expectedNativeSessionRef) || input.turnMappings.length !== current.turnMappings.length - 1 || input.turnMappings.some(({ hostTurnId }, index) => hostTurnId !== current.turnMappings[index]?.hostTurnId)) {
+        throw new MappingStoreError("MAPPING_CONFLICT", "Last-Turn Session replacement must match the expected record and retain the exact shorter Host Turn prefix");
       }
       return {
         ...current,
@@ -21648,10 +21749,10 @@ var MappingStore = class {
       readdir2(this.#directory)
     ]);
     await Promise.all([
-      ...threadNames.filter((name) => name.includes(".tmp-")).map((name) => rm3(path5.join(this.#threadsDirectory, name), { force: true })),
-      ...delegationNames.filter((name) => name.includes(".tmp-")).map((name) => rm3(path5.join(this.#delegationsDirectory, name), { force: true })),
+      ...threadNames.filter((name) => name.includes(".tmp-")).map((name) => rm3(path6.join(this.#threadsDirectory, name), { force: true })),
+      ...delegationNames.filter((name) => name.includes(".tmp-")).map((name) => rm3(path6.join(this.#delegationsDirectory, name), { force: true })),
       // Renamed aside by #acquireLock; nothing reads them back, and they accumulate one per run.
-      ...rootNames.filter((name) => name.startsWith(`${path5.basename(this.#lockPath)}.stale-`)).map((name) => rm3(path5.join(this.#directory, name), { force: true }))
+      ...rootNames.filter((name) => name.startsWith(`${path6.basename(this.#lockPath)}.stale-`)).map((name) => rm3(path6.join(this.#directory, name), { force: true }))
     ]);
   }
   async #acquireLock() {
@@ -21752,13 +21853,13 @@ var MappingStore = class {
     await next;
   }
   #recordPath(hostThreadId) {
-    return path5.join(this.#threadsDirectory, `${hostThreadId}.json`);
+    return path6.join(this.#threadsDirectory, `${hostThreadId}.json`);
   }
   #delegationPath(delegationId) {
-    return path5.join(this.#delegationsDirectory, `${delegationId}.json`);
+    return path6.join(this.#delegationsDirectory, `${delegationId}.json`);
   }
   #backupPath(hostThreadId) {
-    return path5.join(this.#backupsDirectory, `${hostThreadId}.json`);
+    return path6.join(this.#backupsDirectory, `${hostThreadId}.json`);
   }
   #requireInitialized() {
     if (!this.#initialized) {
@@ -22519,8 +22620,8 @@ function projectFileChangeKind(kind) {
   return { type: kind };
 }
 function projectFileChanges(changes) {
-  return changes.map(({ path: path26, kind, unifiedDiff }) => ({
-    path: path26,
+  return changes.map(({ path: path27, kind, unifiedDiff }) => ({
+    path: path27,
     kind: projectFileChangeKind(kind),
     diff: unifiedDiff
   }));
@@ -22843,9 +22944,9 @@ function projectHistoricalTurn(input) {
             return [];
         }
         return item.type === "reasoning" ? [
-          projectItem(item, outcome, cwd, true, ""),
+          projectItem(item, outcome, cwd, true, input.threadId ?? ""),
           projectReasoningTranscriptItem(item, outcome, cwd, item.durationMs ?? null)
-        ] : [projectItem(item, outcome, cwd, true, "")];
+        ] : [projectItem(item, outcome, cwd, true, input.threadId ?? "")];
       })
     ],
     error: error51,
@@ -23478,13 +23579,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 path26 = optionalText(params, "path", { allowEmpty: true });
+  const path27 = optionalText(params, "path", { allowEmpty: true });
   const ephemeral = optionalBoolean(params, "ephemeral");
   return {
     threadId: threadId3,
     ...lastTurnText ? { lastTurnId: hostTurnIdSchema.parse(lastTurnText) } : {},
     ...beforeTurnText ? { beforeTurnId: hostTurnIdSchema.parse(beforeTurnText) } : {},
-    ...path26 ? { path: path26 } : {},
+    ...path27 ? { path: path27 } : {},
     ...optionalField(params, "model"),
     ...optionalField(params, "modelProvider"),
     ...optionalField(params, "cwd"),
@@ -24495,18 +24596,149 @@ async function inspectHarnessAccounts(adapters, descriptors, timeoutMs = 12e3) {
 }
 
 // packages/host-runtime/src/app-server-host.ts
-import { createHash as createHash5, randomUUID as randomUUID8 } from "node:crypto";
+import { createHash as createHash6, randomUUID as randomUUID9 } from "node:crypto";
 import { rm as rm4 } from "node:fs/promises";
 import os2 from "node:os";
-import path12 from "node:path";
+import path13 from "node:path";
 
 // packages/host-runtime/src/external-thread-fork.ts
 import nodePath from "node:path";
 
 // packages/host-runtime/src/external-thread-repository.ts
-import { randomUUID as randomUUID3 } from "node:crypto";
+import { randomUUID as randomUUID4 } from "node:crypto";
 import os from "node:os";
-import path6 from "node:path";
+import path7 from "node:path";
+
+// packages/host-runtime/src/external-subagent-threads.ts
+import { createHash as createHash3, randomUUID as randomUUID3 } from "node:crypto";
+function childCreateRequest(parent, nativeRef, id2) {
+  const key = createHash3("sha256").update(JSON.stringify([parent.hostThreadId, parent.harnessId, nativeRef.nativeSessionId, id2])).digest("hex");
+  return `subagent:${key}`;
+}
+function subagentMaterializer(store, parent, previousParent) {
+  if (previousParent && (previousParent.hostThreadId !== parent.hostThreadId || previousParent.harnessId !== parent.harnessId)) {
+    throw new Error("Subagent Session replacement must stay in the same Host Thread");
+  }
+  const previousRef = previousParent?.nativeSessionRef;
+  let legacy;
+  const legacyRecords = () => legacy ??= store.listThreads().then((records) => {
+    const byRequest = /* @__PURE__ */ new Map();
+    const children = /* @__PURE__ */ new Map();
+    for (const record3 of records) {
+      if (!record3.subagent || record3.harnessId !== parent.harnessId || !record3.nativeSessionRef)
+        continue;
+      const owner = {
+        hostThreadId: record3.subagent.parentHostThreadId,
+        harnessId: record3.harnessId
+      };
+      const key = childCreateRequest(
+        owner,
+        record3.nativeSessionRef,
+        record3.subagent.nativeSubagentId
+      );
+      if (!byRequest.has(key) || record3.state === "ready") byRequest.set(key, record3);
+      const siblings = children.get(owner.hostThreadId) ?? [];
+      siblings.push(record3);
+      children.set(owner.hostThreadId, siblings);
+    }
+    return { byRequest, children };
+  });
+  const rebind = async (existing, owner, visited = /* @__PURE__ */ new Set()) => {
+    if (!previousRef || !owner.nativeSessionRef || !existing.subagent || visited.has(existing.hostThreadId)) {
+      throw new Error("Invalid retained Subagent Session tree");
+    }
+    visited.add(existing.hostThreadId);
+    const rebound = await store.rebindSubagentSession({
+      hostThreadId: existing.hostThreadId,
+      parentHostThreadId: owner.hostThreadId,
+      previousNativeSessionRef: previousRef,
+      nativeSessionRef: owner.nativeSessionRef,
+      createRequestId: childCreateRequest(
+        owner,
+        owner.nativeSessionRef,
+        existing.subagent.nativeSubagentId
+      )
+    });
+    for (const descendant of (await legacyRecords()).children.get(existing.hostThreadId) ?? []) {
+      if (descendant.state === "ready" && descendant.nativeSessionRef?.nativeSessionId === previousRef.nativeSessionId) {
+        await rebind(descendant, rebound, visited);
+      }
+    }
+    return rebound;
+  };
+  return async (child) => {
+    if (!child.nativeSubagentId || !parent.nativeSessionRef || parent.state !== "ready")
+      return null;
+    const nativeRef = parent.nativeSessionRef;
+    const createRequestId = childCreateRequest(parent, nativeRef, child.nativeSubagentId);
+    const previousRequest = previousRef && previousRef.nativeSessionId !== nativeRef.nativeSessionId ? childCreateRequest(parent, previousRef, child.nativeSubagentId) : void 0;
+    let existing = await store.getThreadByCreateRequest(createRequestId);
+    if (!existing && previousRequest)
+      existing = await store.getThreadByCreateRequest(previousRequest);
+    if (!existing) {
+      const { byRequest } = await legacyRecords();
+      existing = byRequest.get(createRequestId) ?? (previousRequest ? byRequest.get(previousRequest) : void 0) ?? null;
+    }
+    if (existing?.state === "ready") {
+      if (existing.nativeSessionRef?.nativeSessionId === nativeRef.nativeSessionId) return existing;
+      if (!previousRef) throw new Error("Subagent belongs to a different Native Session");
+      return rebind(existing, parent);
+    }
+    const provisional = existing ?? await store.createProvisional({
+      hostThreadId: hostThreadIdSchema.parse(randomUUID3()),
+      createRequestId,
+      harnessId: parent.harnessId,
+      cwd: parent.cwd,
+      title: child.description,
+      transportModelId: parent.transportModelId,
+      ephemeral: parent.ephemeral,
+      historyMode: "paginated",
+      subagent: {
+        parentHostThreadId: parent.hostThreadId,
+        nativeSubagentId: child.nativeSubagentId,
+        ...child.role ? { role: child.role } : {}
+      }
+    });
+    return provisional.state === "ready" ? provisional : store.commitReady({
+      hostThreadId: provisional.hostThreadId,
+      nativeSessionRef: nativeRef
+    });
+  };
+}
+async function materializeExternalSubagent(store, parent, child) {
+  return subagentMaterializer(store, parent)(child);
+}
+async function projectExternalSnapshot(store, record3, snapshot, previousParent) {
+  const materialize = subagentMaterializer(store, record3, previousParent);
+  const turns = [];
+  for (const [index, turn] of snapshot.turns.entries()) {
+    const mapping = record3.turnMappings[index];
+    if (!mapping) throw new Error("External Snapshot mapping is incomplete");
+    const items = await Promise.all(
+      turn.items.map(async (entry) => {
+        if (entry.item.type !== "subagentDelegation") return entry;
+        const subagents = await Promise.all(
+          entry.item.subagents.map(async (child) => {
+            const stored = await materialize(child);
+            return stored ? { ...child, subagentId: stored.hostThreadId } : child;
+          })
+        );
+        return { ...entry, item: { ...entry.item, subagents } };
+      })
+    );
+    turns.push(
+      projectHistoricalTurn({
+        threadId: record3.hostThreadId,
+        turnId: mapping.hostTurnId,
+        cwd: record3.cwd,
+        snapshot: { ...turn, items }
+      })
+    );
+  }
+  return turns;
+}
+
+// packages/host-runtime/src/external-thread-repository.ts
 function nativeTurnKey2(ref) {
   return `${ref.harnessId}\0${ref.nativeSessionId}\0${ref.nativeTurnKey}\0${ref.formatVersion}`;
 }
@@ -24515,8 +24747,8 @@ function sameMapping(left, right) {
 }
 function defaultMappingStoreDirectory(environment) {
   const dataDirectory = environment.CODEXHOST_DATA_DIR;
-  return path6.join(
-    dataDirectory ? path6.resolve(dataDirectory) : path6.join(os.homedir(), ".codexhost"),
+  return path7.join(
+    dataDirectory ? path7.resolve(dataDirectory) : path7.join(os.homedir(), ".codexhost"),
     "mapping-store"
   );
 }
@@ -24541,6 +24773,9 @@ var ExternalThreadRepository = class {
   list() {
     return this.store.listThreads();
   }
+  materializeSubagent(parent, child) {
+    return materializeExternalSubagent(this.store, parent, child);
+  }
   findByCreateRequest(createRequestId) {
     return this.store.getThreadByCreateRequest(createRequestId);
   }
@@ -24617,7 +24852,7 @@ var ExternalThreadRepository = class {
         throw new Error("Derived Snapshot identity does not belong to its Native Session");
       }
       return {
-        hostTurnId: hostTurnIdSchema.parse(randomUUID3()),
+        hostTurnId: hostTurnIdSchema.parse(randomUUID4()),
         nativeTurnRef: turn.nativeTurnRef,
         ...turn.checkpoint ? { nativeCheckpointRef: turn.checkpoint } : {}
       };
@@ -24629,15 +24864,7 @@ var ExternalThreadRepository = class {
     });
     return {
       record: nextRecord,
-      turns: snapshot.turns.map((turn, index) => {
-        const mapping = mappings[index];
-        if (!mapping) throw new Error("Derived Snapshot mapping is incomplete");
-        return projectHistoricalTurn({
-          turnId: mapping.hostTurnId,
-          cwd: record3.cwd,
-          snapshot: turn
-        });
-      })
+      turns: await projectExternalSnapshot(this.store, nextRecord, snapshot)
     };
   }
   async commitForkRollback(derived, source, nativeSessionRef, snapshot) {
@@ -24671,6 +24898,8 @@ var ExternalThreadRepository = class {
     });
     const nextRecord = await this.store.replaceReadySession({
       hostThreadId: derived.hostThreadId,
+      expectedRevision: derived.revision,
+      expectedNativeSessionRef: derived.nativeSessionRef,
       nativeSessionRef,
       turnMappings: mappings,
       forkSource: {
@@ -24680,15 +24909,7 @@ var ExternalThreadRepository = class {
     });
     return {
       record: nextRecord,
-      turns: snapshot.turns.map((turn, index) => {
-        const mapping = mappings[index];
-        if (!mapping) throw new Error("External rollback Snapshot mapping is incomplete");
-        return projectHistoricalTurn({
-          turnId: mapping.hostTurnId,
-          cwd: derived.cwd,
-          snapshot: turn
-        });
-      })
+      turns: await projectExternalSnapshot(this.store, nextRecord, snapshot, derived)
     };
   }
   async commitLastTurnRollback(current, nativeSessionRef, snapshot) {
@@ -24708,30 +24929,26 @@ var ExternalThreadRepository = class {
     });
     const nextRecord = await this.store.replaceReadySessionAfterLastTurn({
       hostThreadId: current.hostThreadId,
+      expectedRevision: current.revision,
+      expectedNativeSessionRef: current.nativeSessionRef,
       nativeSessionRef,
       turnMappings: mappings
     });
     return {
       record: nextRecord,
-      turns: snapshot.turns.map((turn, index) => {
-        const mapping = mappings[index];
-        if (!mapping) throw new Error("Last-Turn rollback Snapshot mapping is incomplete");
-        return projectHistoricalTurn({
-          turnId: mapping.hostTurnId,
-          cwd: current.cwd,
-          snapshot: turn
-        });
-      })
+      turns: await projectExternalSnapshot(this.store, nextRecord, snapshot, current)
     };
   }
   async sessionTreeId(record3) {
     let current = record3;
     const visited = /* @__PURE__ */ new Set();
-    while (current.forkSource) {
+    while (current.subagent || current.forkSource) {
       if (visited.has(current.hostThreadId))
         throw new Error("External Thread Fork tree contains a cycle");
       visited.add(current.hostThreadId);
-      const source = await this.find(current.forkSource.hostThreadId);
+      const parentId = current.subagent?.parentHostThreadId ?? current.forkSource?.hostThreadId;
+      if (!parentId) break;
+      const source = await this.find(parentId);
       if (!source) break;
       current = source;
     }
@@ -24755,7 +24972,7 @@ var ExternalThreadRepository = class {
     const aligned = snapshot.turns.map((turn) => {
       const existing = mappingsByNative.get(nativeTurnKey2(turn.nativeTurnRef));
       const mapping = existing ?? {
-        hostTurnId: hostTurnIdSchema.parse(randomUUID3()),
+        hostTurnId: hostTurnIdSchema.parse(randomUUID4()),
         nativeTurnRef: turn.nativeTurnRef,
         ...turn.checkpoint ? { nativeCheckpointRef: turn.checkpoint } : {}
       };
@@ -24776,16 +24993,14 @@ var ExternalThreadRepository = class {
     const nextRecord = mappingsChanged ? await this.store.reconcileTurnMappings(record3.hostThreadId, orderedMappings) : record3;
     return {
       record: nextRecord,
-      turns: aligned.map(
-        ({ mapping, snapshot: turn }) => projectHistoricalTurn({ turnId: mapping.hostTurnId, cwd: record3.cwd, snapshot: turn })
-      )
+      turns: await projectExternalSnapshot(this.store, nextRecord, snapshot)
     };
   }
 };
 function createExternalThreadRecordInput(input) {
   return {
-    hostThreadId: input.hostThreadId ?? hostThreadIdSchema.parse(randomUUID3()),
-    createRequestId: input.createRequestId ?? randomUUID3(),
+    hostThreadId: input.hostThreadId ?? hostThreadIdSchema.parse(randomUUID4()),
+    createRequestId: input.createRequestId ?? randomUUID4(),
     harnessId: input.harnessId,
     cwd: input.cwd,
     ...input.title ? { title: input.title } : {},
@@ -25463,13 +25678,14 @@ async function restoreCurrentConfiguration(session, configuration) {
 }
 async function executeCurrentLastTurnRollback(input) {
   const { current, adapters, repository, runtime } = input;
-  if (current.record.turnMappings.length === 0) {
+  const currentRecord = current.record;
+  if (currentRecord.turnMappings.length === 0) {
     return {
       ok: false,
       error: { code: -32076, message: "External Thread has no Turn to roll back" }
     };
   }
-  const currentNativeRef = current.record.nativeSessionRef;
+  const currentNativeRef = currentRecord.nativeSessionRef;
   const adapter = adapters.get(current.harnessId);
   if (!currentNativeRef || !adapter) {
     return {
@@ -25517,7 +25733,7 @@ async function executeCurrentLastTurnRollback(input) {
     await session.close().catch(() => void 0);
     return { ok: false, error: mapExternalThreadHarnessError(snapshot.error, "read") };
   }
-  if (snapshot.value.turns.length !== current.record.turnMappings.length - 1) {
+  if (snapshot.value.turns.length !== currentRecord.turnMappings.length - 1) {
     await session.close().catch(() => void 0);
     return {
       ok: false,
@@ -25535,7 +25751,7 @@ async function executeCurrentLastTurnRollback(input) {
   let aligned;
   try {
     aligned = await repository.commitLastTurnRollback(
-      current.record,
+      currentRecord,
       finalNativeRef,
       snapshot.value
     );
@@ -25583,7 +25799,8 @@ async function executeExternalThreadRollback(input) {
       ...input.environment ? { environment: input.environment } : {}
     });
   }
-  const forkSource = derived.record.forkSource;
+  const derivedRecord = derived.record;
+  const forkSource = derivedRecord.forkSource;
   if (!forkSource) {
     return {
       ok: false,
@@ -25614,10 +25831,11 @@ async function executeExternalThreadRollback(input) {
     const sourceRefreshError = await runtime.refresh(source);
     if (sourceRefreshError) return { ok: false, error: sourceRefreshError };
   }
-  const sourceBoundaryIndex = source.record.turnMappings.findIndex(
+  const sourceRecord = source.record;
+  const sourceBoundaryIndex = sourceRecord.turnMappings.findIndex(
     ({ hostTurnId }) => hostTurnId === forkSource.hostTurnId
   );
-  if (sourceBoundaryIndex < 0 || derived.record.turnMappings.length !== sourceBoundaryIndex + 1) {
+  if (sourceBoundaryIndex < 0 || derivedRecord.turnMappings.length !== sourceBoundaryIndex + 1) {
     return {
       ok: false,
       error: {
@@ -25626,19 +25844,19 @@ async function executeExternalThreadRollback(input) {
       }
     };
   }
-  const excludedActiveTurnCount = source.running || source.record.turnMappings.length > derived.record.turnMappings.length ? 1 : 0;
-  const retainedCount = derived.record.turnMappings.length - rollback.numTurns + excludedActiveTurnCount;
-  if (retainedCount === derived.record.turnMappings.length) {
+  const excludedActiveTurnCount = source.running || sourceRecord.turnMappings.length > derivedRecord.turnMappings.length ? 1 : 0;
+  const retainedCount = derivedRecord.turnMappings.length - rollback.numTurns + excludedActiveTurnCount;
+  if (retainedCount === derivedRecord.turnMappings.length) {
     return { ok: true, thread: derived.thread };
   }
-  const boundary = source.record.turnMappings[retainedCount - 1];
+  const boundary = sourceRecord.turnMappings[retainedCount - 1];
   if (retainedCount < 1 || !boundary?.nativeCheckpointRef) {
     return {
       ok: false,
       error: { code: -32080, message: "External Fork Checkpoint is unavailable" }
     };
   }
-  const sourceNativeRef = source.record.nativeSessionRef;
+  const sourceNativeRef = sourceRecord.nativeSessionRef;
   const adapter = adapters.get(source.harnessId);
   if (!sourceNativeRef || !adapter) {
     return {
@@ -25666,7 +25884,7 @@ async function executeExternalThreadRollback(input) {
   }
   const session = opened.value;
   const finalNativeRef = session.initialState.nativeRef;
-  if (!finalNativeRef || finalNativeRef.nativeSessionId === sourceNativeRef.nativeSessionId || finalNativeRef.nativeSessionId === derived.record.nativeSessionRef?.nativeSessionId) {
+  if (!finalNativeRef || finalNativeRef.nativeSessionId === sourceNativeRef.nativeSessionId || finalNativeRef.nativeSessionId === derivedRecord.nativeSessionRef?.nativeSessionId) {
     await session.close().catch(() => void 0);
     return {
       ok: false,
@@ -25688,8 +25906,8 @@ async function executeExternalThreadRollback(input) {
   let aligned;
   try {
     aligned = await repository.commitForkRollback(
-      derived.record,
-      source.record,
+      derivedRecord,
+      sourceRecord,
       finalNativeRef,
       snapshot.value
     );
@@ -25934,9 +26152,43 @@ var ExternalThreadRuntime = class {
     } catch (error51) {
       this.#diagnose(error51);
     }
+    await this.#retireSubagents(current.id);
     this.#threads.delete(current.id);
     return this.register(input);
   }
+  async #retireSubagents(parentId) {
+    const ancestors = /* @__PURE__ */ new Map();
+    const descendant = async (record3) => {
+      const visited = /* @__PURE__ */ new Set();
+      let ownerId = record3?.subagent?.parentHostThreadId;
+      while (ownerId && !visited.has(ownerId)) {
+        if (ownerId === parentId) return true;
+        visited.add(ownerId);
+        let ancestor = ancestors.get(ownerId);
+        if (!ancestor) {
+          ancestor = this.#repository.find(ownerId);
+          ancestors.set(ownerId, ancestor);
+        }
+        ownerId = (await ancestor)?.subagent?.parentHostThreadId;
+      }
+      return false;
+    };
+    for (const [id2, restoring] of [...this.#restores]) {
+      if (await descendant(await this.#repository.find(id2))) {
+        await restoring.catch(this.#diagnose);
+      }
+    }
+    for (const child of this.#threads.values()) {
+      if (!await descendant(child.record)) continue;
+      this.#threads.delete(child.id);
+      try {
+        await child.session.close();
+        await child.outputTask;
+      } catch (error51) {
+        this.#diagnose(error51);
+      }
+    }
+  }
   async locate(threadId3) {
     const loaded = this.#threads.get(threadId3);
     if (loaded) return { kind: "external", record: loaded.record, thread: loaded };
@@ -26047,6 +26299,10 @@ var ExternalThreadRuntime = class {
         nativeSubagentId: subagent.nativeSubagentId,
         cwd: record3.cwd
       });
+      const latest = await this.#repository.find(record3.hostThreadId);
+      if (latest?.state === "ready" && latest.nativeSessionRef && JSON.stringify(latest.nativeSessionRef) !== JSON.stringify(parent)) {
+        return this.#restore(latest);
+      }
       if (!snapshot.ok) {
         throw new ExternalThreadOpenError(mapExternalThreadHarnessError(snapshot.error, "read"));
       }
@@ -26323,11 +26579,11 @@ var ExternalTurnSteering = class {
 };
 
 // packages/host-runtime/src/harness-delegation-coordinator.ts
-import { createHash as createHash4, randomUUID as randomUUID4 } from "node:crypto";
-import path7 from "node:path";
+import { createHash as createHash5, randomUUID as randomUUID5 } from "node:crypto";
+import path8 from "node:path";
 
 // packages/host-runtime/src/delegation-snapshot.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 var CURSOR_PREFIX = "codexhost:thread-messages:v1:";
 var DEFAULT_MESSAGE_LIMIT = 25;
 var MAX_MESSAGE_LIMIT = 100;
@@ -26381,7 +26637,7 @@ function allVisibleMessages(turns) {
   return messages;
 }
 function cursorFingerprint(threadId3) {
-  return createHash3("sha256").update(threadId3).digest("hex");
+  return createHash4("sha256").update(threadId3).digest("hex");
 }
 function encodeCursor(threadId3, offset) {
   const payload = JSON.stringify({ version: 1, fingerprint: cursorFingerprint(threadId3), offset });
@@ -26492,10 +26748,10 @@ function terminal(status) {
   return status === "completed" || status === "failed" || status === "interrupted";
 }
 function taskDigest(input) {
-  return createHash4("sha256").update(
+  return createHash5("sha256").update(
     JSON.stringify({
       task: input.task,
-      cwd: path7.resolve(input.cwd),
+      cwd: path8.resolve(input.cwd),
       modelId: input.model?.id ?? null,
       thinkingOptionId: input.thinkingOptionId ?? null
     })
@@ -26566,7 +26822,7 @@ var HarnessDelegationCoordinator = class {
     return {
       harnessId: input.harnessId,
       inspection: await adapter.inspect({
-        ...input.cwd ? { cwd: path7.resolve(input.cwd) } : {},
+        ...input.cwd ? { cwd: path8.resolve(input.cwd) } : {},
         ...input.refresh !== void 0 ? { refresh: input.refresh } : {}
       })
     };
@@ -26580,7 +26836,7 @@ var HarnessDelegationCoordinator = class {
       const result = await this.#startOfficial({ ...input, parentThreadId, cwd: selectedCwd });
       return { ...result, parentThreadId, cwd: result.cwd ?? selectedCwd };
     }
-    const startInput = { ...input, parentThreadId, cwd: path7.resolve(selectedCwd) };
+    const startInput = { ...input, parentThreadId, cwd: path8.resolve(selectedCwd) };
     if (!this.#adapters.has(input.harnessId)) {
       throw new DelegationControlError(
         "HARNESS_NOT_FOUND",
@@ -26620,10 +26876,10 @@ var HarnessDelegationCoordinator = class {
       });
       this.#validateConfiguration(inspected.inspection, input.model, input.thinkingOptionId);
     }
-    const delegationId = hostThreadIdSchema.parse(randomUUID4());
-    const childThreadId = hostThreadIdSchema.parse(randomUUID4());
-    const turnId = hostTurnIdSchema.parse(randomUUID4());
-    const createRequestId = input.requestId ? `delegation:${input.requestId}` : randomUUID4();
+    const delegationId = hostThreadIdSchema.parse(randomUUID5());
+    const childThreadId = hostThreadIdSchema.parse(randomUUID5());
+    const turnId = hostTurnIdSchema.parse(randomUUID5());
+    const createRequestId = input.requestId ? `delegation:${input.requestId}` : randomUUID5();
     let record3 = await this.#repository.createProvisional(
       createExternalThreadRecordInput({
         hostThreadId: childThreadId,
@@ -26748,7 +27004,7 @@ var HarnessDelegationCoordinator = class {
     if (thread.running || thread.activeTurnId) {
       throw new DelegationControlError("THREAD_BUSY", "Thread already has an active Turn");
     }
-    const turnId = hostTurnIdSchema.parse(randomUUID4());
+    const turnId = hostTurnIdSchema.parse(randomUUID5());
     try {
       await this.#startExternalTurn(thread, input.message, turnId);
     } catch (error51) {
@@ -26993,7 +27249,7 @@ var HarnessDelegationCoordinator = class {
 
 // packages/host-runtime/src/harness-plugin-loader.ts
 import { readdir as readdir3, realpath as realpath2 } from "node:fs/promises";
-import path9 from "node:path";
+import path10 from "node:path";
 import { pathToFileURL } from "node:url";
 
 // packages/host-runtime/src/harness-plugin-registry.ts
@@ -27031,16 +27287,16 @@ var HarnessPluginRegistry = class {
 
 // packages/host-runtime/src/plugin-files.ts
 import { open as open4, realpath, stat as stat2 } from "node:fs/promises";
-import path8 from "node:path";
+import path9 from "node:path";
 function inside(root, candidate) {
-  const relative = path8.relative(root, candidate);
-  return relative !== "" && !path8.isAbsolute(relative) && relative !== ".." && !relative.startsWith(`..${path8.sep}`);
+  const relative = path9.relative(root, candidate);
+  return relative !== "" && !path9.isAbsolute(relative) && relative !== ".." && !relative.startsWith(`..${path9.sep}`);
 }
 async function pluginResourcePath(root, relative) {
-  if (path8.isAbsolute(relative) || !inside(root, path8.resolve(root, relative))) {
+  if (path9.isAbsolute(relative) || !inside(root, path9.resolve(root, relative))) {
     throw new Error("Plugin resource escapes its root");
   }
-  const resolved = await realpath(path8.resolve(root, relative));
+  const resolved = await realpath(path9.resolve(root, relative));
   if (!inside(root, resolved) || !(await stat2(resolved)).isFile()) {
     throw new Error("Plugin resource must be a regular file inside its root");
   }
@@ -27185,7 +27441,7 @@ async function loadHarnessPlugins(options2) {
   const enabledIds = /* @__PURE__ */ new Set();
   const roots = /* @__PURE__ */ new Set();
   for (const configuredRoot of options2.roots) {
-    if (!path9.isAbsolute(configuredRoot)) {
+    if (!path10.isAbsolute(configuredRoot)) {
       diagnose({ code: "invalidRoot" });
       continue;
     }
@@ -27215,7 +27471,7 @@ async function loadHarnessPlugins(options2) {
       for (const directory of directories) {
         try {
           const file2 = await pluginResourcePath(root, `${directory.name}/manifest.json`);
-          const pluginRoot = await realpath2(path9.join(root, directory.name));
+          const pluginRoot = await realpath2(path10.join(root, directory.name));
           await pluginResourcePath(pluginRoot, "manifest.json");
           const manifest = harnessPluginManifestSchema.parse(
             JSON.parse(
@@ -27362,8 +27618,8 @@ function spawnOfficialAppServerConnection(input) {
 
 // packages/host-runtime/src/account/account-repository.ts
 import { mkdir as mkdir4, readFile as readFile6, rename as rename3, writeFile as writeFile3 } from "node:fs/promises";
-import path10 from "node:path";
-import { randomUUID as randomUUID5 } from "node:crypto";
+import path11 from "node:path";
+import { randomUUID as randomUUID6 } from "node:crypto";
 function validateAccountId(accountId) {
   if (!/^[A-Za-z0-9._~-]+$/u.test(accountId)) {
     throw new Error("Codex Account ID must be non-empty and filename-safe");
@@ -27381,19 +27637,19 @@ var AccountRepository = class {
   #mutationTail = Promise.resolve();
   #writeTail = Promise.resolve();
   constructor(input) {
-    this.#file = path10.join(path10.resolve(input.directory), "accounts.json");
+    this.#file = path11.join(path11.resolve(input.directory), "accounts.json");
     this.#defaultAccount = {
       ...input.defaultAccount,
       label: input.defaultAccount.label ?? input.defaultAccount.accountId
     };
     validateAccountId(this.#defaultAccount.accountId);
-    if (!path10.isAbsolute(this.#defaultAccount.codexHome)) {
+    if (!path11.isAbsolute(this.#defaultAccount.codexHome)) {
       throw new Error("Codex Account CODEX_HOME must be absolute");
     }
   }
   async initialize() {
     if (this.#initialized) return;
-    await mkdir4(path10.dirname(this.#file), { recursive: true });
+    await mkdir4(path11.dirname(this.#file), { recursive: true });
     let stored = null;
     try {
       stored = JSON.parse(await readFile6(this.#file, "utf8"));
@@ -27461,7 +27717,7 @@ var AccountRepository = class {
   async upsert(input) {
     this.#requireInitialized();
     validateAccountId(input.accountId);
-    if (!path10.isAbsolute(input.codexHome))
+    if (!path11.isAbsolute(input.codexHome))
       throw new Error("Codex Account CODEX_HOME must be absolute");
     return this.#mutate(async () => {
       const previous = this.#accounts.get(input.accountId);
@@ -27470,7 +27726,7 @@ var AccountRepository = class {
       const planType = input.planType === null ? void 0 : input.planType ?? previous?.planType;
       const account = {
         accountId: input.accountId,
-        codexHome: path10.normalize(input.codexHome),
+        codexHome: path11.normalize(input.codexHome),
         ...email3 ? { email: email3 } : {},
         ...planType ? { planType } : {},
         label: input.label ?? previous?.label ?? input.accountId,
@@ -27484,7 +27740,7 @@ var AccountRepository = class {
   }
   #validateAccount(account) {
     validateAccountId(account.accountId);
-    if (!path10.isAbsolute(account.codexHome)) throw new Error("Stored CODEX_HOME must be absolute");
+    if (!path11.isAbsolute(account.codexHome)) throw new Error("Stored CODEX_HOME must be absolute");
     if (account.email && (!account.email.includes("@") || account.email.length > 320)) {
       throw new Error("Stored Codex Account email is invalid");
     }
@@ -27505,7 +27761,7 @@ var AccountRepository = class {
       accounts: [...this.#accounts.values()]
     };
     const operation = this.#writeTail.then(async () => {
-      const temporary = `${this.#file}.${process.pid}.${randomUUID5()}.tmp`;
+      const temporary = `${this.#file}.${process.pid}.${randomUUID6()}.tmp`;
       await writeFile3(temporary, `${JSON.stringify(value2, null, 2)}
 `, { mode: 384 });
       await rename3(temporary, this.#file);
@@ -27528,19 +27784,19 @@ function isMissingFile(error51) {
 
 // packages/host-runtime/src/account/thread-account-store.ts
 import { mkdir as mkdir5, readFile as readFile7, rename as rename4, writeFile as writeFile4 } from "node:fs/promises";
-import { randomUUID as randomUUID6 } from "node:crypto";
-import path11 from "node:path";
+import { randomUUID as randomUUID7 } from "node:crypto";
+import path12 from "node:path";
 var ThreadAccountStore = class {
   #file;
   #bindings = /* @__PURE__ */ new Map();
   #initialized = false;
   #writeTail = Promise.resolve();
   constructor(input) {
-    this.#file = path11.join(path11.resolve(input.directory), "thread-accounts.json");
+    this.#file = path12.join(path12.resolve(input.directory), "thread-accounts.json");
   }
   async initialize() {
     if (this.#initialized) return;
-    await mkdir5(path11.dirname(this.#file), { recursive: true });
+    await mkdir5(path12.dirname(this.#file), { recursive: true });
     try {
       const stored = JSON.parse(await readFile7(this.#file, "utf8"));
       if (stored.formatVersion !== 1 || !stored.bindings || typeof stored.bindings !== "object") {
@@ -27599,7 +27855,7 @@ var ThreadAccountStore = class {
       bindings: Object.fromEntries(this.#bindings)
     };
     const operation = this.#writeTail.then(async () => {
-      const temporary = `${this.#file}.${process.pid}.${randomUUID6()}.tmp`;
+      const temporary = `${this.#file}.${process.pid}.${randomUUID7()}.tmp`;
       await writeFile4(temporary, `${JSON.stringify(value2, null, 2)}
 `, { mode: 384 });
       await rename4(temporary, this.#file);
@@ -27616,7 +27872,7 @@ function isMissingFile2(error51) {
 import { mkdir as mkdir6 } from "node:fs/promises";
 
 // packages/host-runtime/src/official-request-broker.ts
-import { randomUUID as randomUUID7 } from "node:crypto";
+import { randomUUID as randomUUID8 } from "node:crypto";
 var INTERNAL_REQUEST_PREFIX = "codexhost:official:";
 var MAX_RETIRED_IDS = 1024;
 function isRecord10(value2) {
@@ -27632,7 +27888,7 @@ var OfficialRequestBroker = class {
   constructor(input) {
     this.#send = input.send;
     this.#timeoutMs = input.timeoutMs ?? 3e4;
-    this.#nextId = input.nextId ?? (() => `${INTERNAL_REQUEST_PREFIX}${randomUUID7()}`);
+    this.#nextId = input.nextId ?? (() => `${INTERNAL_REQUEST_PREFIX}${randomUUID8()}`);
   }
   get pendingCount() {
     return this.#pending.size;
@@ -27996,21 +28252,45 @@ function externalAnchor(entry) {
   if (entry.source !== "external") throw new Error("Expected an External Thread list entry");
   return { timestamp: entry.timestamp, threadId: threadId(entry.thread) };
 }
-function includesExternalRecord(record3, query) {
+function includesExternalRecord(record3, query, byId) {
   if (record3.state !== "ready" || !record3.nativeSessionRef) return false;
-  if (record3.subagent) return false;
+  let current = record3;
+  const owners = /* @__PURE__ */ new Set();
+  while (current.subagent) {
+    if (owners.has(current.hostThreadId)) return false;
+    owners.add(current.hostThreadId);
+    const parent = byId.get(current.subagent.parentHostThreadId);
+    if (!parent || parent.state !== "ready" || parent.harnessId !== current.harnessId || parent.nativeSessionRef?.nativeSessionId !== current.nativeSessionRef?.nativeSessionId)
+      return false;
+    current = parent;
+  }
+  const sourceKind = record3.subagent ? "subAgentThreadSpawn" : "vscode";
+  const scoped = query.parentThreadId !== null || query.ancestorThreadId !== null;
+  if (record3.subagent && !scoped && !query.sourceKinds?.some((kind) => kind === "subAgent" || kind === "subAgentThreadSpawn"))
+    return false;
+  if (query.parentThreadId !== null && record3.subagent?.parentHostThreadId !== query.parentThreadId)
+    return false;
+  if (query.ancestorThreadId !== null) {
+    let parentId = record3.subagent?.parentHostThreadId;
+    const visited = /* @__PURE__ */ new Set([record3.hostThreadId]);
+    while (parentId && parentId !== query.ancestorThreadId && !visited.has(parentId)) {
+      visited.add(parentId);
+      parentId = byId.get(parentId)?.subagent?.parentHostThreadId;
+    }
+    if (record3.hostThreadId === query.ancestorThreadId || parentId !== query.ancestorThreadId)
+      return false;
+  }
   if (record3.archived !== query.archived) return false;
   if (query.cwd !== null && !query.cwd.includes(record3.cwd)) return false;
   if (query.modelProviders !== null && query.modelProviders.length > 0 && !query.modelProviders.includes("codexhost")) {
     return false;
   }
-  if (query.sourceKinds !== null && query.sourceKinds.length > 0 && !query.sourceKinds.includes("vscode")) {
+  if (query.sourceKinds !== null && query.sourceKinds.length > 0 && !query.sourceKinds.includes(sourceKind) && !(record3.subagent && query.sourceKinds.includes("subAgent"))) {
     return false;
   }
   if (query.searchTerm !== null && !record3.title.toLowerCase().includes(query.searchTerm.toLowerCase())) {
     return false;
   }
-  if (query.parentThreadId !== null || query.ancestorThreadId !== null) return false;
   if (query.isPinned !== null && record3.isPinned !== query.isPinned) return false;
   return true;
 }
@@ -28020,25 +28300,25 @@ function resolveExternalSessionTreeIds(records) {
   const resolve = (start) => {
     const cached2 = resolved.get(start.hostThreadId);
     if (cached2) return cached2;
-    const path26 = [];
+    const path27 = [];
     const visited = /* @__PURE__ */ new Set();
     let current = start;
     while (true) {
       const known = resolved.get(current.hostThreadId);
       if (known) {
-        for (const record3 of path26) resolved.set(record3.hostThreadId, known);
+        for (const record3 of path27) 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);
-      path26.push(current);
-      const sourceId = current.forkSource?.hostThreadId;
+      path27.push(current);
+      const sourceId = current.subagent?.parentHostThreadId ?? current.forkSource?.hostThreadId;
       const source = sourceId ? byId.get(sourceId) : void 0;
       if (!source) {
         const root = current.hostThreadId;
-        for (const record3 of path26) resolved.set(record3.hostThreadId, root);
+        for (const record3 of path27) resolved.set(record3.hostThreadId, root);
         return root;
       }
       current = source;
@@ -28050,7 +28330,8 @@ function resolveExternalSessionTreeIds(records) {
 function listExternalThreadMetadata(input) {
   if (!input.query.supportsExternal) return { data: [], hasMore: false };
   const sessionIds = resolveExternalSessionTreeIds(input.records);
-  const entries = input.records.filter((record3) => includesExternalRecord(record3, input.query)).map((record3) => {
+  const byId = new Map(input.records.map((record3) => [record3.hostThreadId, record3]));
+  const entries = input.records.filter((record3) => includesExternalRecord(record3, input.query, byId)).map((record3) => {
     const runtime = input.runtimeFor(record3.hostThreadId);
     const sessionId = sessionIds.get(record3.hostThreadId);
     if (!sessionId) throw new Error("External Thread Session tree could not be resolved");
@@ -28132,6 +28413,7 @@ function threadId2(entry) {
   return entry.thread.id;
 }
 async function aggregateOfficialAccountThreadListPage(input) {
+  const pageLimit = typeof input.params.limit === "number" ? input.params.limit : input.query.limit;
   const cursorValue2 = typeof input.params.cursor === "string" ? input.params.cursor : null;
   const cursor = cursorValue2 ? decodeCursor2(cursorValue2) : { accounts: initialAccounts(input.accountIds) };
   const sources = Object.entries(cursor.accounts).map(([accountId, state]) => ({
@@ -28168,7 +28450,7 @@ async function aggregateOfficialAccountThreadListPage(input) {
         if (source.done) return null;
       }
       source.batchStart = source.cursor;
-      const page = await request(source, source.cursor, Math.max(1, input.query.limit));
+      const page = await request(source, source.cursor, Math.max(1, pageLimit));
       if (!source.requestedThisPage) {
         source.backwardsCursor = page.backwardsCursor;
         source.requestedThisPage = true;
@@ -28190,7 +28472,7 @@ async function aggregateOfficialAccountThreadListPage(input) {
   };
   const output = [];
   const emitted = /* @__PURE__ */ new Set();
-  while (output.length < input.query.limit) {
+  while (output.length < pageLimit) {
     const candidates = await Promise.all(
       sources.map(async (source) => ({ source, entry: await ensure(source) }))
     );
@@ -28728,18 +29010,18 @@ var AppServerHost = class {
     };
     this.#writer = new OrderedWriter(this.#options.desktopOutput);
     const environment = this.#options.environment ?? process.env;
-    const dataDirectory = path12.resolve(
-      environment.CODEXHOST_DATA_DIR ?? path12.join(os2.homedir(), ".codexhost")
+    const dataDirectory = path13.resolve(
+      environment.CODEXHOST_DATA_DIR ?? path13.join(os2.homedir(), ".codexhost")
     );
     const accountRepository = options2.accountRepository ?? new AccountRepository({
-      directory: path12.join(dataDirectory, "codex-accounts"),
+      directory: path13.join(dataDirectory, "codex-accounts"),
       defaultAccount: {
         accountId: "default",
-        codexHome: path12.resolve(environment.CODEX_HOME ?? path12.join(os2.homedir(), ".codex")),
+        codexHome: path13.resolve(environment.CODEX_HOME ?? path13.join(os2.homedir(), ".codex")),
         label: "Default Codex Account"
       }
     });
-    const threadAccountStore = options2.threadAccountStore ?? new ThreadAccountStore({ directory: path12.join(dataDirectory, "codex-accounts") });
+    const threadAccountStore = options2.threadAccountStore ?? new ThreadAccountStore({ directory: path13.join(dataDirectory, "codex-accounts") });
     this.#accountRepository = accountRepository;
     this.#threadAccountStore = threadAccountStore;
     this.#accountDataDirectory = dataDirectory;
@@ -29572,7 +29854,7 @@ var AppServerHost = class {
           throw new Error("Unknown Codex Account");
         const runtime = await this.#codexRuntimePool.get(params2.accountId);
         const response2 = await runtime.request("account/rateLimitResetCredit/consume", {
-          idempotencyKey: params2.idempotencyKey ?? randomUUID8()
+          idempotencyKey: params2.idempotencyKey ?? randomUUID9()
         });
         if (isRecord13(response2.error)) {
           await this.#writer.json(rpcEnvelope(request, { error: response2.error }));
@@ -29613,10 +29895,10 @@ var AppServerHost = class {
       }
       if (request.method === "codexhost/account/create") {
         const params2 = codexAccountCreateParamsSchema.parse(requestObject(request));
-        const accountId = randomUUID8();
+        const accountId = randomUUID9();
         const account = await this.#accountRepository.upsert({
           accountId,
-          codexHome: path12.join(this.#accountDataDirectory, "codex-homes", accountId),
+          codexHome: path13.join(this.#accountDataDirectory, "codex-homes", accountId),
           label: params2.label ?? `Codex Account ${accountId.slice(0, 8)}`
         });
         const activeAccountId = await this.#accountRepository.getActiveAccountId();
@@ -29656,12 +29938,12 @@ var AppServerHost = class {
         for (const [key, session2] of this.#officialLoginSessions) {
           if (session2.accountId === params2.accountId) this.#officialLoginSessions.delete(key);
         }
-        const managedCodexHome = path12.join(
+        const managedCodexHome = path13.join(
           this.#accountDataDirectory,
           "codex-homes",
           params2.accountId
         );
-        if (path12.resolve(account.codexHome) === path12.resolve(managedCodexHome)) {
+        if (path13.resolve(account.codexHome) === path13.resolve(managedCodexHome)) {
           try {
             await rm4(managedCodexHome, { recursive: true, force: true });
           } catch (error51) {
@@ -29900,7 +30182,7 @@ var AppServerHost = class {
       throw new DelegationControlError("INVALID_ARGUMENT", "Official Model Ref is invalid");
     }
     const nativeModelId = requestedModel ? decodeOfficialCodexModelRef(requestedModel) : void 0;
-    const digest2 = createHash5("sha256").update(
+    const digest2 = createHash6("sha256").update(
       JSON.stringify({
         task: input.task,
         cwd: input.cwd,
@@ -30003,7 +30285,7 @@ var AppServerHost = class {
       throw error51;
     }
     this.#activeOfficialTurns.set(threadId3, turnId);
-    const delegationId = hostThreadIdSchema.parse(randomUUID8());
+    const delegationId = hostThreadIdSchema.parse(randomUUID9());
     try {
       const source = await this.#repository.find(input.parentThreadId);
       const pendingTerminal = this.#pendingOfficialTerminalStatuses.get(threadId3);
@@ -30167,7 +30449,7 @@ var AppServerHost = class {
   async #listDelegationThreads(input) {
     const [sortKey, sortDirection2] = input.sort.split("-");
     const request = {
-      id: `codexhost:delegation-list:${randomUUID8()}`,
+      id: `codexhost:delegation-list:${randomUUID9()}`,
       method: "thread/list",
       params: {
         cwd: input.cwd ? [input.cwd] : null,
@@ -30230,6 +30512,8 @@ var AppServerHost = class {
         records,
         runtimeFor: (threadId3) => {
           const thread = this.#externalRuntime.get(threadId3);
+          const subagentStatus = this.#subagentThreadStatuses.get(threadId3);
+          if (subagentStatus) return { running: subagentStatus === "active" };
           return thread ? { running: thread.running } : null;
         },
         requestOfficialPage: (params) => aggregateOfficialAccountThreadListPage({
@@ -30681,7 +30965,7 @@ var AppServerHost = class {
       );
       return;
     }
-    const turnId = requestedTurnId ?? hostTurnIdSchema.parse(randomUUID8());
+    const turnId = requestedTurnId ?? hostTurnIdSchema.parse(randomUUID9());
     const projection = {
       projector: new CodexTurnProjector({
         threadId: thread.id,
@@ -31540,7 +31824,7 @@ var AppServerHost = class {
     if (thread.running || thread.activeTurnId || this.#pendingExternalCommandRequests.has(thread.id)) {
       throw new ExternalSteerError(-32072, "External Thread already has an active Turn");
     }
-    const turnId = hostTurnIdSchema.parse(randomUUID8());
+    const turnId = hostTurnIdSchema.parse(randomUUID9());
     const startedAtMs = Date.now();
     const projection = {
       projector: new CodexTurnProjector({
@@ -31800,7 +32084,7 @@ var AppServerHost = class {
     if (event.type === "subagent.transcript.changed") {
       const nativeSubagentId = event.nativeSubagentId;
       const record3 = (await this.#repository.list()).find(
-        (candidate) => candidate.subagent?.parentHostThreadId === thread.id && candidate.subagent.nativeSubagentId === nativeSubagentId
+        (candidate) => candidate.subagent?.parentHostThreadId === thread.id && candidate.subagent.nativeSubagentId === nativeSubagentId && candidate.nativeSessionRef?.nativeSessionId === thread.record.nativeSessionRef?.nativeSessionId
       );
       if (record3) await this.#refreshOpenSubagentThread(record3.hostThreadId, false);
       return;
@@ -31808,7 +32092,7 @@ var AppServerHost = class {
     if (event.type === "subagent.state.changed") {
       const nativeSubagentId = event.nativeSubagentId;
       const record3 = (await this.#repository.list()).find(
-        (candidate) => candidate.subagent?.parentHostThreadId === thread.id && candidate.subagent.nativeSubagentId === nativeSubagentId
+        (candidate) => candidate.subagent?.parentHostThreadId === thread.id && candidate.subagent.nativeSubagentId === nativeSubagentId && candidate.nativeSessionRef?.nativeSessionId === thread.record.nativeSessionRef?.nativeSessionId
       );
       if (!record3) return;
       const status = event.status === "pending" || event.status === "running" ? "active" : "idle";
@@ -31914,33 +32198,13 @@ var AppServerHost = class {
   async #materializeSubagent(parent, subagent) {
     if (!subagent.nativeSubagentId || !parent.record.nativeSessionRef) return subagent;
     const status = subagent.status === "pending" || subagent.status === "running" ? "active" : "idle";
-    const records = await this.#repository.list();
-    const existing = records.find(
-      (record4) => record4.subagent?.parentHostThreadId === parent.id && record4.subagent.nativeSubagentId === subagent.nativeSubagentId
-    );
-    if (existing) {
-      this.#trackRunningSubagent(parent.id, existing.hostThreadId, status);
-      await this.#setSubagentThreadStatus(existing.hostThreadId, status);
-      return { ...subagent, subagentId: existing.hostThreadId };
+    const record3 = await this.#repository.materializeSubagent(parent.record, subagent);
+    if (!record3) return subagent;
+    if (this.#subagentThreadStatuses.has(record3.hostThreadId)) {
+      this.#trackRunningSubagent(parent.id, record3.hostThreadId, status);
+      await this.#setSubagentThreadStatus(record3.hostThreadId, status);
+      return { ...subagent, subagentId: record3.hostThreadId };
     }
-    const recordInput = createExternalThreadRecordInput({
-      harnessId: parent.record.harnessId,
-      cwd: parent.cwd,
-      title: subagent.description,
-      transportModelId: parent.transportModelId,
-      ephemeral: false,
-      historyMode: "paginated",
-      subagent: {
-        parentHostThreadId: parent.id,
-        nativeSubagentId: subagent.nativeSubagentId,
-        ...subagent.role ? { role: subagent.role } : {}
-      }
-    });
-    let record3 = await this.#repository.createProvisional(recordInput);
-    record3 = await this.#repository.commitNative(
-      record3.hostThreadId,
-      parent.record.nativeSessionRef
-    );
     const thread = externalThreadValue({
       record: record3,
       turns: [],
@@ -32186,7 +32450,7 @@ var AppServerHost = class {
     try {
       result = projection.projector.projectQuestion(
         interaction,
-        hostItemIdSchema.parse(randomUUID8())
+        hostItemIdSchema.parse(randomUUID9())
       );
     } catch (error51) {
       this.#diagnose(error51);
@@ -32342,7 +32606,7 @@ var AppServerHost = class {
 };
 
 // packages/host-runtime/src/codex-runtime/account-official-listeners.ts
-import path13 from "node:path";
+import path14 from "node:path";
 var AccountOfficialListeners = class {
   constructor(createListener) {
     this.createListener = createListener;
@@ -32353,7 +32617,7 @@ var AccountOfficialListeners = class {
   #closed = false;
   async endpoint(account) {
     if (this.#closed) throw new Error("Account official listeners are closed");
-    const key = path13.resolve(account.codexHome);
+    const key = path14.resolve(account.codexHome);
     const existing = this.#starting.get(key);
     if (existing) return existing;
     const listener = this.createListener(account);
@@ -32489,17 +32753,17 @@ var DelegationControlRegistry = class {
 
 // packages/host-runtime/src/installed-harness-plugins.ts
 import os3 from "node:os";
-import path15 from "node:path";
+import path16 from "node:path";
 import { fileURLToPath } from "node:url";
 
 // packages/host-runtime/src/launcher-url-opener.ts
 import { spawn as spawn3 } from "node:child_process";
-import path14 from "node:path";
+import path15 from "node:path";
 var LOOPBACK_HOSTS = /* @__PURE__ */ new Set(["127.0.0.1", "localhost", "[::1]"]);
 var OPEN_TIMEOUT_MS = 1e4;
 function createLauncherUrlOpener(environment, spawnLauncher = (command, arguments_2, options2) => spawn3(command, arguments_2, options2)) {
   const launcher = environment.CODEXHOST_LAUNCHER_EXECUTABLE;
-  if (!launcher || !path14.isAbsolute(launcher)) return void 0;
+  if (!launcher || !path15.isAbsolute(launcher)) return void 0;
   const launcherEnvironment = Object.fromEntries(
     Object.entries(environment).filter(([name]) => {
       const normalized = name.toUpperCase();
@@ -32557,9 +32821,9 @@ function installedHarnessPluginOptions(environment, managedRemoteHost = false, h
   const opener = managedRemoteHost ? void 0 : createLauncherUrlOpener(environment);
   return {
     pluginRoots: [
-      path15.join(path15.dirname(fileURLToPath(hostRuntimeUrl)), "plugins"),
-      environment[HARNESS_PLUGIN_DIRECTORY_ENV] ?? path15.join(
-        environment.CODEXHOST_DATA_DIR ? path15.resolve(environment.CODEXHOST_DATA_DIR) : path15.join(os3.homedir(), ".codexhost"),
+      path16.join(path16.dirname(fileURLToPath(hostRuntimeUrl)), "plugins"),
+      environment[HARNESS_PLUGIN_DIRECTORY_ENV] ?? path16.join(
+        environment.CODEXHOST_DATA_DIR ? path16.resolve(environment.CODEXHOST_DATA_DIR) : path16.join(os3.homedir(), ".codexhost"),
         "plugins"
       )
     ],
@@ -32684,12 +32948,12 @@ async function startDelegationControlServer(input) {
 }
 
 // packages/host-runtime/src/delegation-skill.ts
-import { createHash as createHash6, randomUUID as randomUUID9 } from "node:crypto";
+import { createHash as createHash7, randomUUID as randomUUID10 } from "node:crypto";
 import { mkdir as mkdir7, open as open5, readFile as readFile8, rename as rename5, rm as rm5, stat as stat3 } from "node:fs/promises";
 import os4 from "node:os";
-import path16 from "node:path";
+import path17 from "node:path";
 var SKILL_VERSION = 7;
-var SKILL_RELATIVE_PATH = path16.join("skills", "codexhost-delegation", "SKILL.md");
+var SKILL_RELATIVE_PATH = path17.join("skills", "codexhost-delegation", "SKILL.md");
 var PREVIOUS_MANAGED_DIGESTS = [
   "9d2f491850fb0b4084a31ba9b5e4a550b5e833747af322090d8ed0ff80b88c30",
   "2bb0aebb9b06febbc6c0c0bcdb0b32506c7cdbf8dc3b734cc6b2a86621270e4e",
@@ -32745,9 +33009,9 @@ user’s request and the task:
 Report the result returned by read or a completed wait, together with the target
 agent, status, and a labeled task link. Keep internal tracking IDs in tool calls.
 `;
-var CURRENT_DIGEST = createHash6("sha256").update(CODEXHOST_DELEGATION_SKILL).digest("hex");
+var CURRENT_DIGEST = createHash7("sha256").update(CODEXHOST_DELEGATION_SKILL).digest("hex");
 function digest(value2) {
-  return createHash6("sha256").update(value2).digest("hex");
+  return createHash7("sha256").update(value2).digest("hex");
 }
 function managedVersion(value2) {
   const match = /^version:\s*(\d+)\s*$/mu.exec(value2);
@@ -32762,8 +33026,8 @@ async function readOptional(filePath) {
   }
 }
 async function atomicWrite(filePath, content) {
-  await mkdir7(path16.dirname(filePath), { recursive: true, mode: 448 });
-  const temporaryPath = path16.join(path16.dirname(filePath), `.SKILL.md.${randomUUID9()}.tmp`);
+  await mkdir7(path17.dirname(filePath), { recursive: true, mode: 448 });
+  const temporaryPath = path17.join(path17.dirname(filePath), `.SKILL.md.${randomUUID10()}.tmp`);
   const handle = await open5(temporaryPath, "wx", 384);
   try {
     await handle.writeFile(content, "utf8");
@@ -32780,8 +33044,8 @@ async function atomicWrite(filePath, content) {
 async function installDelegationSkills(input = {}) {
   const home = input.homeDirectory ?? os4.homedir();
   const destinations = [
-    path16.join(home, ".agents", SKILL_RELATIVE_PATH),
-    path16.join(home, ".claude", SKILL_RELATIVE_PATH)
+    path17.join(home, ".agents", SKILL_RELATIVE_PATH),
+    path17.join(home, ".claude", SKILL_RELATIVE_PATH)
   ];
   const knownDigests = /* @__PURE__ */ new Set([
     CURRENT_DIGEST,
@@ -32846,9 +33110,9 @@ async function installDelegationSkills(input = {}) {
 }
 
 // packages/host-runtime/src/remote-control-app-server.ts
-import { randomUUID as randomUUID10 } from "node:crypto";
+import { randomUUID as randomUUID11 } from "node:crypto";
 import { mkdir as mkdir8, open as open6, rename as rename6, rm as rm6 } from "node:fs/promises";
-import path17 from "node:path";
+import path18 from "node:path";
 
 // packages/host-runtime/src/remote-official-connection.ts
 import net from "node:net";
@@ -33038,30 +33302,30 @@ var BRIDGE_READY_METHOD = "codexhost/remote-control-bridge/ready";
 function absoluteEnvironmentPath2(environment, name, fallback, platform = process.platform) {
   const value2 = environment[name] ?? fallback;
   if (!value2) return null;
-  if (path17.isAbsolute(value2)) return path17.normalize(value2);
-  return platform === "win32" && path17.win32.isAbsolute(value2) ? path17.win32.normalize(value2) : null;
+  if (path18.isAbsolute(value2)) return path18.normalize(value2);
+  return platform === "win32" && path18.win32.isAbsolute(value2) ? path18.win32.normalize(value2) : null;
 }
 function nodeCompatibleWindowsPath(value2) {
   if (value2.startsWith("\\\\?\\UNC\\")) return `\\\\${value2.slice(8)}`;
   if (value2.startsWith("\\\\?\\")) return value2.slice(4);
   return value2;
 }
-function remoteControlBridgePipePath(processId = process.pid, instanceId = randomUUID10()) {
+function remoteControlBridgePipePath(processId = process.pid, instanceId = randomUUID11()) {
   const safeInstance = instanceId.replaceAll(/[^a-zA-Z0-9-]/gu, "");
   if (!safeInstance) throw new Error("Remote Control bridge instance ID is invalid");
   return `\\\\.\\pipe\\codexhost-remote-control-${processId}-${safeInstance}`;
 }
 function remoteControlBridgeDescriptorPath(environment) {
   const root = environment.LOCALAPPDATA;
-  if (!root || !path17.isAbsolute(root)) return null;
-  return path17.join(path17.normalize(root), "codexhost", REMOTE_CONTROL_BRIDGE_DESCRIPTOR_FILE);
+  if (!root || !path18.isAbsolute(root)) return null;
+  return path18.join(path18.normalize(root), "codexhost", REMOTE_CONTROL_BRIDGE_DESCRIPTOR_FILE);
 }
 async function publishRemoteControlAppServerDescriptor(plan) {
-  const directory = path17.dirname(plan.descriptorPath);
+  const directory = path18.dirname(plan.descriptorPath);
   await mkdir8(directory, { recursive: true, mode: 448 });
-  const temporaryPath = path17.join(
+  const temporaryPath = path18.join(
     directory,
-    `.${REMOTE_CONTROL_BRIDGE_DESCRIPTOR_FILE}.${plan.descriptor.ownerPid}.${randomUUID10()}.tmp`
+    `.${REMOTE_CONTROL_BRIDGE_DESCRIPTOR_FILE}.${plan.descriptor.ownerPid}.${randomUUID11()}.tmp`
   );
   const handle = await open6(temporaryPath, "wx", 384);
   try {
@@ -33152,14 +33416,14 @@ async function runRemoteControlAppServerBridge(input = {}) {
 import { createServer as createServer2 } from "node:http";
 import net2 from "node:net";
 import { chmod as chmod3, lstat as lstat6, mkdir as mkdir10, rm as rm8 } from "node:fs/promises";
-import path19 from "node:path";
+import path20 from "node:path";
 import { PassThrough as PassThrough2 } from "node:stream";
 
 // packages/host-runtime/src/remote-socket-lock.ts
-import { randomUUID as randomUUID11 } from "node:crypto";
+import { randomUUID as randomUUID12 } from "node:crypto";
 import { chmod as chmod2, lstat as lstat5, mkdir as mkdir9, open as open7, readFile as readFile9, readdir as readdir4, rename as rename7, rm as rm7 } from "node:fs/promises";
 import { uptime } from "node:os";
-import path18 from "node:path";
+import path19 from "node:path";
 import { setTimeout as delay4 } from "node:timers/promises";
 var LOCK_RETRY_COUNT = 200;
 var LOCK_RETRY_DELAY_MS = 25;
@@ -33233,7 +33497,7 @@ async function readLockEntrySnapshot(filePath) {
     source,
     identity: { dev: metadata.dev, ino: metadata.ino },
     mtimeMs: metadata.mtimeMs,
-    record: record3 && path18.basename(filePath) === lockEntryName(record3.ownerToken) ? record3 : null
+    record: record3 && path19.basename(filePath) === lockEntryName(record3.ownerToken) ? record3 : null
   };
 }
 function lockEntryIsAbandoned(snapshot) {
@@ -33254,7 +33518,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(path18.join(lockDirectory, name));
+    const snapshot = await readLockEntrySnapshot(path19.join(lockDirectory, name));
     if (snapshot === null) continue;
     if (lockEntryIsAbandoned(snapshot)) {
       if (!await removeAbandonedLockEntry(snapshot)) unsettled = true;
@@ -33282,7 +33546,7 @@ async function preparePrivateLockDirectory(lockDirectory) {
   await chmod2(lockDirectory, 448);
 }
 async function writeLockRecordAtomic(lockDirectory, entryPath, record3) {
-  const temporary = path18.join(lockDirectory, `.tmp-${record3.ownerToken}-${randomUUID11()}`);
+  const temporary = path19.join(lockDirectory, `.tmp-${record3.ownerToken}-${randomUUID12()}`);
   const handle = await open7(temporary, "wx", 384);
   try {
     await handle.writeFile(`${JSON.stringify(record3)}
@@ -33357,8 +33621,8 @@ async function withRemoteAppServerSocketInitializationLock(socketPath, action) {
   const legacyPath = `${socketPath}.initializing`;
   const lockDirectory = `${socketPath}.initializers`;
   await preparePrivateLockDirectory(lockDirectory);
-  const ownerToken = randomUUID11();
-  const entryPath = path18.join(lockDirectory, lockEntryName(ownerToken));
+  const ownerToken = randomUUID12();
+  const entryPath = path19.join(lockDirectory, lockEntryName(ownerToken));
   const baseRecord = {
     version: 2,
     ownerToken,
@@ -33532,14 +33796,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 path19.posix.resolve(decodeURIComponent(explicit));
-  const codexHome = environment.CODEX_HOME ?? (environment.HOME ? path19.posix.join(environment.HOME, ".codex") : void 0);
+  if (explicit.length > 0) return path20.posix.resolve(decodeURIComponent(explicit));
+  const codexHome = environment.CODEX_HOME ?? (environment.HOME ? path20.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 path19.posix.join(codexHome, "app-server-control", "app-server-control.sock");
+  return path20.posix.join(codexHome, "app-server-control", "app-server-control.sock");
 }
 function officialListenerArgumentsForRemoteListener(arguments_2, socketPath) {
-  if (!path19.posix.isAbsolute(socketPath)) {
+  if (!path20.posix.isAbsolute(socketPath)) {
     throw new Error("Shared official app-server socket path must be absolute");
   }
   if (remoteUnixListenerUrl(arguments_2) === null) {
@@ -33650,7 +33914,7 @@ async function removeStaleSocket(socketPath) {
   await rm8(socketPath, { force: true });
 }
 async function prepareRemoteAppServerSocketDirectory(socketPath) {
-  const socketDirectory = path19.dirname(socketPath);
+  const socketDirectory = path20.dirname(socketPath);
   const existing = await lstat6(socketDirectory).catch((error51) => {
     if (error51.code === "ENOENT") return null;
     throw error51;
@@ -33855,20 +34119,20 @@ function createRemoteAppServerWebSocketListener(input) {
 
 // packages/host-runtime/src/remote-official-app-server.ts
 import { spawn as spawn4 } from "node:child_process";
-import { randomUUID as randomUUID12 } from "node:crypto";
+import { randomUUID as randomUUID13 } from "node:crypto";
 import { lstat as lstat7, rm as rm9 } from "node:fs/promises";
-import path20 from "node:path";
+import path21 from "node:path";
 var DEFAULT_CLOSE_TIMEOUT_MS = 2e3;
 var DEFAULT_LISTEN_TIMEOUT_MS = 1e4;
-function remoteOfficialAppServerSocketPath(desktopControlSocketPath, token = randomUUID12()) {
-  if (!path20.posix.isAbsolute(desktopControlSocketPath)) {
+function remoteOfficialAppServerSocketPath(desktopControlSocketPath, token = randomUUID13()) {
+  if (!path21.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 path20.posix.join(path20.posix.dirname(desktopControlSocketPath), `.c-${compactToken}.sock`);
+  return path21.posix.join(path21.posix.dirname(desktopControlSocketPath), `.c-${compactToken}.sock`);
 }
 function errorMessage5(error51) {
   return error51 instanceof Error ? error51.message : String(error51);
@@ -34159,7 +34423,16 @@ function createHostUpdateCoordinator(options2) {
     });
     return contextPromise;
   };
-  const fetchLatest = options2.fetchLatest ?? ((signal) => fetchLatestGitHubRelease({ signal: signal ?? AbortSignal.timeout(15e3) }));
+  const fetchLatest = options2.fetchLatest ?? (async (signal) => {
+    const timeoutSignal = AbortSignal.timeout(15e3);
+    const requestSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
+    const authenticated = await fetchLatestGitHubReleaseWithGitHubCli({
+      ...options2.environment ? { environment: options2.environment } : {},
+      platform,
+      signal: requestSignal
+    });
+    return authenticated ?? fetchLatestGitHubRelease({ signal: requestSignal });
+  });
   let candidate = null;
   async function latestStatus(context) {
     const discovered = await discoverLatestUpdateStatus(context.common.stateDirectory);
@@ -34335,9 +34608,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 (!path21.isAbsolute(npmPackageRoot) || !path21.isAbsolute(hostRuntimePath)) return false;
-  const runtimePackageRoot = path21.dirname(path21.dirname(path21.normalize(hostRuntimePath)));
-  return path21.relative(path21.normalize(npmPackageRoot), runtimePackageRoot) === "";
+  if (!path22.isAbsolute(npmPackageRoot) || !path22.isAbsolute(hostRuntimePath)) return false;
+  const runtimePackageRoot = path22.dirname(path22.dirname(path22.normalize(hostRuntimePath)));
+  return path22.relative(path22.normalize(npmPackageRoot), runtimePackageRoot) === "";
 }
 function requiredRuntimeConfiguration(environment) {
   const stockCodexPath = environment[STOCK_CODEX_PATH_ENV];
@@ -34464,8 +34737,8 @@ async function runHostRuntime(input) {
         });
         try {
           await officialListeners.endpoint({
-            codexHome: path21.resolve(
-              delegationEnvironment.CODEX_HOME ?? path21.join(homedir(), ".codex")
+            codexHome: path22.resolve(
+              delegationEnvironment.CODEX_HOME ?? path22.join(homedir(), ".codex")
             )
           });
           await listener.listen();
@@ -34566,7 +34839,7 @@ async function runHostRuntime(input) {
 }
 
 // packages/host-runtime/src/remote-host-install.ts
-import { createHash as createHash7, randomUUID as randomUUID13 } from "node:crypto";
+import { createHash as createHash8, randomUUID as randomUUID14 } from "node:crypto";
 import { constants as fsConstants } from "node:fs";
 import {
   access,
@@ -34581,7 +34854,7 @@ import {
   stat as stat4,
   writeFile as writeFile5
 } from "node:fs/promises";
-import path22 from "node:path";
+import path23 from "node:path";
 var MANIFEST_FORMAT = 1;
 var WRAPPER_MARKER = "# codexhost remote SSH wrapper v1";
 var PROFILE_START = "# >>> codexhost remote SSH >>>";
@@ -34592,25 +34865,25 @@ function resolvePaths(options2) {
   if (!configuredHome) {
     throw new Error("A non-root HOME is required for remote Host installation");
   }
-  const home = path22.resolve(configuredHome);
-  if (!home || home === path22.parse(home).root) {
+  const home = path23.resolve(configuredHome);
+  if (!home || home === path23.parse(home).root) {
     throw new Error("A non-root HOME is required for remote Host installation");
   }
-  const installRoot = path22.resolve(options2.installRoot ?? path22.join(home, ".codexhost", "remote"));
-  const profilePath = path22.resolve(
-    options2.profilePath ?? path22.join(
+  const installRoot = path23.resolve(options2.installRoot ?? path23.join(home, ".codexhost", "remote"));
+  const profilePath = path23.resolve(
+    options2.profilePath ?? path23.join(
       home,
-      path22.basename(environment.SHELL ?? "") === "zsh" ? ".zshenv" : path22.basename(environment.SHELL ?? "") === "bash" ? ".bashrc" : ".profile"
+      path23.basename(environment.SHELL ?? "") === "zsh" ? ".zshenv" : path23.basename(environment.SHELL ?? "") === "bash" ? ".bashrc" : ".profile"
     )
   );
-  const binDirectory = path22.join(installRoot, "bin");
+  const binDirectory = path23.join(installRoot, "bin");
   return {
     home,
     installRoot,
     binDirectory,
-    wrapperPath: path22.join(binDirectory, "codex"),
-    manifestPath: path22.join(installRoot, "manifest.json"),
-    dataDirectory: path22.join(installRoot, "data"),
+    wrapperPath: path23.join(binDirectory, "codex"),
+    manifestPath: path23.join(installRoot, "manifest.json"),
+    dataDirectory: path23.join(installRoot, "data"),
     profilePath
   };
 }
@@ -34626,10 +34899,10 @@ async function existingText(filePath) {
   }
 }
 async function fileSha256(filePath) {
-  return createHash7("sha256").update(await readFile10(filePath)).digest("hex");
+  return createHash8("sha256").update(await readFile10(filePath)).digest("hex");
 }
 async function executable(filePath, label) {
-  const absolute = path22.resolve(filePath);
+  const absolute = path23.resolve(filePath);
   try {
     if (!(await stat4(absolute)).isFile()) throw new Error("not a regular file");
     await access(absolute, fsConstants.X_OK);
@@ -34639,7 +34912,7 @@ async function executable(filePath, label) {
   return absolute;
 }
 async function existingFile(filePath, label) {
-  const absolute = path22.resolve(filePath);
+  const absolute = path23.resolve(filePath);
   try {
     const metadata = await stat4(absolute);
     if (!metadata.isFile()) throw new Error("not a regular file");
@@ -34649,9 +34922,9 @@ async function existingFile(filePath, label) {
   return absolute;
 }
 async function discoverExecutable(name, environment) {
-  for (const directory of (environment.PATH ?? "").split(path22.delimiter)) {
+  for (const directory of (environment.PATH ?? "").split(path23.delimiter)) {
     if (!directory) continue;
-    const candidate = path22.resolve(directory, name);
+    const candidate = path23.resolve(directory, name);
     try {
       await access(candidate, fsConstants.X_OK);
       return candidate;
@@ -34662,10 +34935,10 @@ async function discoverExecutable(name, environment) {
   return null;
 }
 async function writeAtomic(filePath, contents, mode) {
-  await mkdir11(path22.dirname(filePath), { recursive: true, mode: 448 });
-  const temporary = path22.join(
-    path22.dirname(filePath),
-    `.${path22.basename(filePath)}.${process.pid}.${randomUUID13()}.tmp`
+  await mkdir11(path23.dirname(filePath), { recursive: true, mode: 448 });
+  const temporary = path23.join(
+    path23.dirname(filePath),
+    `.${path23.basename(filePath)}.${process.pid}.${randomUUID14()}.tmp`
   );
   try {
     if (typeof contents === "string") {
@@ -34686,10 +34959,10 @@ async function writeAtomic(filePath, contents, mode) {
   }
 }
 async function writeAtomicExecutable(filePath, sourcePath) {
-  await mkdir11(path22.dirname(filePath), { recursive: true, mode: 448 });
-  const temporary = path22.join(
-    path22.dirname(filePath),
-    `.${path22.basename(filePath)}.${process.pid}.${randomUUID13()}.tmp`
+  await mkdir11(path23.dirname(filePath), { recursive: true, mode: 448 });
+  const temporary = path23.join(
+    path23.dirname(filePath),
+    `.${path23.basename(filePath)}.${process.pid}.${randomUUID14()}.tmp`
   );
   try {
     await copyFile3(sourcePath, temporary);
@@ -34730,8 +35003,8 @@ function removeManagedProfileBlock(contents) {
 function installManagedProfileBlock(contents, manifest) {
   const base = removeManagedProfileBlock(contents);
   const environment = [
-    `export CODEX_INSTALL_DIR=${shellQuote(path22.dirname(manifest.wrapperPath))}`,
-    `export PATH=${shellQuote(path22.dirname(manifest.wrapperPath))}:${shellQuote(path22.dirname(manifest.nodePath))}:${shellQuote(path22.dirname(manifest.stockCodexPath))}:"\${PATH:-/usr/local/bin:/usr/bin:/bin}"`,
+    `export CODEX_INSTALL_DIR=${shellQuote(path23.dirname(manifest.wrapperPath))}`,
+    `export PATH=${shellQuote(path23.dirname(manifest.wrapperPath))}:${shellQuote(path23.dirname(manifest.nodePath))}:${shellQuote(path23.dirname(manifest.stockCodexPath))}:"\${PATH:-/usr/local/bin:/usr/bin:/bin}"`,
     `export CODEXHOST_STOCK_CODEX_PATH=${shellQuote(manifest.stockCodexPath)}`,
     `export CODEXHOST_HOST_NODE_PATH=${shellQuote(manifest.nodePath)}`,
     `export CODEXHOST_HOST_RUNTIME_PATH=${shellQuote(manifest.hostRuntimePath)}`,
@@ -34748,7 +35021,7 @@ function installManagedProfileBlock(contents, manifest) {
     PROFILE_END,
     ""
   ].join("\n");
-  if (path22.basename(manifest.profilePath) === ".bashrc") return `${block}${base}`;
+  if (path23.basename(manifest.profilePath) === ".bashrc") return `${block}${base}`;
   const separator = base.length > 0 && !base.endsWith("\n") ? "\n" : "";
   return `${base}${separator}${block}`;
 }
@@ -34767,7 +35040,7 @@ ${WRAPPER_MARKER}
     return "legacy-wrapper";
   }
   if (manifest.entrypointSha256 !== void 0) {
-    return createHash7("sha256").update(entrypoint).digest("hex") === manifest.entrypointSha256 ? "native" : "modified";
+    return createHash8("sha256").update(entrypoint).digest("hex") === manifest.entrypointSha256 ? "native" : "modified";
   }
   const shim = await readFile10(manifest.shimPath).catch((error51) => {
     if (error51.code === "ENOENT") return null;
@@ -34813,9 +35086,9 @@ async function readManifest(filePath) {
   ];
   const optionalPaths = ["claudeCommand", "profileBackupPath"];
   if (manifest.format !== MANIFEST_FORMAT || Object.keys(manifest).some((key) => !allowed.has(key)) || requiredPaths.some(
-    (key) => typeof manifest[key] !== "string" || !path22.isAbsolute(manifest[key])
+    (key) => typeof manifest[key] !== "string" || !path23.isAbsolute(manifest[key])
   ) || optionalPaths.some(
-    (key) => manifest[key] !== void 0 && (typeof manifest[key] !== "string" || !path22.isAbsolute(manifest[key]))
+    (key) => manifest[key] !== void 0 && (typeof manifest[key] !== "string" || !path23.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");
   }
@@ -35044,7 +35317,7 @@ async function uninstallRemoteHost(options2) {
 import { spawn as spawn5 } from "node:child_process";
 import { stat as stat5 } from "node:fs/promises";
 import net3 from "node:net";
-import path23 from "node:path";
+import path24 from "node:path";
 import { Duplex } from "node:stream";
 var CODEXHOST_STATUS_METHOD = "codexhost/update/status";
 var DIRECT_PROBE_TIMEOUT_MS = 5e3;
@@ -35063,9 +35336,9 @@ function classifyRemoteHostProbeResponse(response, socketPath) {
 }
 var lifecycleDependencyOverrides = {};
 function socketPathFor(environment) {
-  const codexHome = environment.CODEX_HOME ?? (environment.HOME ? path23.join(environment.HOME, ".codex") : void 0);
+  const codexHome = environment.CODEX_HOME ?? (environment.HOME ? path24.join(environment.HOME, ".codex") : void 0);
   if (!codexHome) throw new Error("CODEX_HOME or HOME is required for remote Host lifecycle");
-  return path23.join(codexHome, "app-server-control", "app-server-control.sock");
+  return path24.join(codexHome, "app-server-control", "app-server-control.sock");
 }
 async function defaultSocketExists(socketPath) {
   const metadata = await stat5(socketPath).catch((error51) => {
@@ -35195,7 +35468,7 @@ function installedManifest(status) {
 function managedEnvironment(manifest, environment) {
   return {
     ...environment,
-    CODEX_INSTALL_DIR: path23.dirname(manifest.wrapperPath),
+    CODEX_INSTALL_DIR: path24.dirname(manifest.wrapperPath),
     CODEXHOST_STOCK_CODEX_PATH: manifest.stockCodexPath,
     CODEXHOST_HOST_NODE_PATH: manifest.nodePath,
     CODEXHOST_HOST_RUNTIME_PATH: manifest.hostRuntimePath,
@@ -35203,7 +35476,7 @@ function managedEnvironment(manifest, environment) {
     CODEXHOST_DEFAULT_AGENT: "codex",
     CODEXHOST_REMOTE_SSH_MANAGED: "1",
     ...manifest.claudeCommand ? { CODEXHOST_CLAUDE_COMMAND: manifest.claudeCommand } : {},
-    PATH: `${path23.dirname(manifest.wrapperPath)}${path23.delimiter}${path23.dirname(manifest.stockCodexPath)}${path23.delimiter}${environment.PATH ?? "/usr/bin:/bin"}`
+    PATH: `${path24.dirname(manifest.wrapperPath)}${path24.delimiter}${path24.dirname(manifest.stockCodexPath)}${path24.delimiter}${environment.PATH ?? "/usr/bin:/bin"}`
   };
 }
 async function defaultRunTerminator(manifest, socketPath, role, environment) {
@@ -35494,7 +35767,7 @@ var harnessBrokerServerFrameSchema = external_exports.union([
 var harnessBrokerDescriptorSchema = external_exports.object({
   schemaVersion: external_exports.literal(1),
   protocolVersion: external_exports.literal(HARNESS_BROKER_PROTOCOL_VERSION),
-  harnessId: external_exports.literal("claude-code"),
+  harnessId: harnessPluginIdSchema,
   generation: external_exports.string().uuid(),
   ownerPid: external_exports.number().int().positive(),
   socketPath: external_exports.string().min(1).max(512),
@@ -35545,33 +35818,48 @@ function consumeBrokerFrames(socket, onFrame, onError) {
 
 // packages/harness-broker/dist/paths.js
 import os5 from "node:os";
-import path24 from "node:path";
+import path25 from "node:path";
 var HARNESS_BROKER_DESCRIPTOR_ENV = "CODEXHOST_CLAUDE_BROKER_DESCRIPTOR";
 var HARNESS_BROKER_DESCRIPTOR_FILE = "claude-code-broker-v1.json";
 var HARNESS_BROKER_SOCKET_FILE = "claude-code-broker-v1.sock";
 function defaultHarnessBrokerDirectory(environment = process.env) {
   const home = environment.HOME || os5.homedir();
-  return path24.join(home, ".codexhost", "harness-broker");
+  return path25.join(home, ".codexhost", "harness-broker");
 }
-function defaultHarnessBrokerDescriptorPath(environment = process.env) {
-  return environment[HARNESS_BROKER_DESCRIPTOR_ENV] ?? path24.join(defaultHarnessBrokerDirectory(environment), HARNESS_BROKER_DESCRIPTOR_FILE);
+function defaultHarnessBrokerDescriptorPath(environment = process.env, harnessId = "claude-code") {
+  harnessPluginIdSchema.parse(harnessId);
+  if (harnessId !== "claude-code")
+    return path25.join(defaultHarnessBrokerDirectory(environment), `${harnessId}-broker-v1.json`);
+  return environment[HARNESS_BROKER_DESCRIPTOR_ENV] ?? path25.join(defaultHarnessBrokerDirectory(environment), HARNESS_BROKER_DESCRIPTOR_FILE);
 }
-function defaultHarnessBrokerSocketPath(environment = process.env) {
-  return path24.join(defaultHarnessBrokerDirectory(environment), HARNESS_BROKER_SOCKET_FILE);
+function defaultHarnessBrokerSocketPath(environment = process.env, harnessId = "claude-code") {
+  harnessPluginIdSchema.parse(harnessId);
+  if (harnessId !== "claude-code")
+    return path25.join(defaultHarnessBrokerDirectory(environment), `${harnessId}-broker-v1.sock`);
+  return path25.join(defaultHarnessBrokerDirectory(environment), HARNESS_BROKER_SOCKET_FILE);
 }
 
 // packages/harness-broker/dist/validation.js
 var cwdSchema = external_exports.string().min(1).max(16384);
+var brokerEnvironmentSchema = external_exports.object({
+  CODEXHOST_CLI_PATH: external_exports.string().max(16384).optional(),
+  CODEXHOST_RUNTIME_ENDPOINT: external_exports.string().max(16384).optional(),
+  CODEXHOST_RUNTIME_TOKEN: external_exports.string().max(16384).optional(),
+  CODEXHOST_THREAD_ID: external_exports.string().max(256).optional()
+}).strict();
 var createSchema = external_exports.object({
   kind: external_exports.literal("create"),
   cwd: cwdSchema,
   executionPolicy: external_exports.enum(["default", "unattended-full-access"]).optional(),
+  environment: brokerEnvironmentSchema.optional(),
   model: harnessModelRefSchema.optional(),
   thinkingOptionId: harnessThinkingOptionIdSchema.optional(),
   permissionModeId: harnessPermissionModeIdSchema.optional()
 }).strict();
 var resumeSchema = external_exports.object({
   kind: external_exports.literal("resume"),
+  environment: brokerEnvironmentSchema.optional(),
+  permissionModeId: harnessPermissionModeIdSchema.optional(),
   model: harnessModelRefSchema.optional(),
   thinkingOptionId: harnessThinkingOptionIdSchema.optional(),
   nativeRef: nativeSessionRefSchema,
@@ -35580,12 +35868,14 @@ var resumeSchema = external_exports.object({
 }).strict();
 var forkSchema = external_exports.object({
   kind: external_exports.literal("fork"),
+  environment: brokerEnvironmentSchema.optional(),
   sourceRef: nativeSessionRefSchema,
   checkpoint: nativeCheckpointRefSchema,
   cwd: cwdSchema
 }).strict();
 var rollbackSchema = external_exports.object({
   kind: external_exports.literal("rollbackLastTurn"),
+  environment: brokerEnvironmentSchema.optional(),
   model: harnessModelRefSchema.optional(),
   thinkingOptionId: harnessThinkingOptionIdSchema.optional(),
   permissionModeId: harnessPermissionModeIdSchema.optional(),
@@ -35780,10 +36070,10 @@ var harnessOutputSchema = external_exports.custom((value2) => {
 });
 
 // packages/harness-broker/dist/server.js
-import { randomBytes as randomBytes2, randomUUID as randomUUID14 } from "node:crypto";
+import { randomBytes as randomBytes2, randomUUID as randomUUID15 } from "node:crypto";
 import { chmod as chmod5, lstat as lstat9, mkdir as mkdir12, open as open8, readFile as readFile11, rename as rename9, rm as rm11 } from "node:fs/promises";
 import net4, {} from "node:net";
-import path25 from "node:path";
+import path26 from "node:path";
 function harnessError(message, retryable = true) {
   return { code: "unavailable", message, retryable, stage: "harnessBroker" };
 }
@@ -35839,7 +36129,7 @@ async function assertNoLiveDescriptor(descriptorPath) {
   }
 }
 async function publishDescriptor(descriptorPath, descriptor) {
-  const temporary = `${descriptorPath}.${process.pid}.${randomUUID14()}.tmp`;
+  const temporary = `${descriptorPath}.${process.pid}.${randomUUID15()}.tmp`;
   const handle = await open8(temporary, "wx", 384);
   try {
     await handle.writeFile(`${JSON.stringify(descriptor)}
@@ -35905,25 +36195,23 @@ async function prepareUnixSocketPath(socketPath) {
   }
 }
 async function startHarnessBrokerServer(input) {
-  if (input.adapter.harnessId !== "claude-code") {
-    throw new Error("Harness broker accepts only the claude-code adapter");
-  }
-  if (process.platform !== "win32" && path25.dirname(input.descriptorPath) !== path25.dirname(input.socketPath)) {
+  harnessPluginIdSchema.parse(input.adapter.harnessId);
+  if (process.platform !== "win32" && path26.dirname(input.descriptorPath) !== path26.dirname(input.socketPath)) {
     throw new Error("Harness broker descriptor and socket must share one private directory");
   }
   if (process.platform === "darwin" && Buffer.byteLength(input.socketPath) > 103) {
     throw new Error("Harness broker Unix socket path is too long for macOS");
   }
-  await privateDirectory(path25.dirname(input.descriptorPath));
+  await privateDirectory(path26.dirname(input.descriptorPath));
   await assertNoLiveDescriptor(input.descriptorPath);
   if (process.platform !== "win32")
     await prepareUnixSocketPath(input.socketPath);
-  const generation = input.generation ?? randomUUID14();
+  const generation = input.generation ?? randomUUID15();
   const token = input.token ?? randomBytes2(32).toString("hex");
   const descriptor = {
     schemaVersion: 1,
     protocolVersion: HARNESS_BROKER_PROTOCOL_VERSION,
-    harnessId: "claude-code",
+    harnessId: input.adapter.harnessId,
     generation,
     ownerPid: process.pid,
     socketPath: input.socketPath,
@@ -35936,7 +36224,7 @@ async function startHarnessBrokerServer(input) {
   let closed = false;
   const server = net4.createServer((socket) => {
     const state = {
-      id: randomUUID14(),
+      id: randomUUID15(),
       socket,
       authenticated: false,
       inputSequence: 0,
@@ -35979,8 +36267,9 @@ async function startHarnessBrokerServer(input) {
           if (output.kind === "event" && output.event.type === "session.state.changed") {
             const state2 = output.event.state;
             const observedNativeId = state2.nativeRef?.nativeSessionId;
-            if (state2.nativeRef && record3.nativeRef && (record3.nativeRef.harnessId !== state2.nativeRef.harnessId || record3.nativeRef.nativeSessionId !== state2.nativeRef.nativeSessionId || record3.nativeRef.formatVersion !== state2.nativeRef.formatVersion)) {
+            if (state2.nativeRef && (state2.nativeRef.harnessId !== input.adapter.harnessId || record3.nativeRef && (record3.nativeRef.harnessId !== state2.nativeRef.harnessId || record3.nativeRef.nativeSessionId !== state2.nativeRef.nativeSessionId || record3.nativeRef.formatVersion !== state2.nativeRef.formatVersion))) {
               record3.faulted = true;
+              releaseProvisionalWriter(record3);
               await send({
                 kind: "output",
                 sessionId: record3.id,
@@ -35991,7 +36280,7 @@ async function startHarnessBrokerServer(input) {
                     type: "session.faulted",
                     error: {
                       code: "protocolError",
-                      message: "Native Claude Session identity changed after open",
+                      message: "Native Harness Session identity changed after open",
                       retryable: false,
                       stage: "harnessBroker.identity"
                     }
@@ -36017,7 +36306,7 @@ async function startHarnessBrokerServer(input) {
                       type: "session.faulted",
                       error: {
                         code: "sessionBusy",
-                        message: "Native Claude Session already has an active writer",
+                        message: "Native Harness Session already has an active writer",
                         retryable: true,
                         stage: "harnessBroker.identity"
                       }
@@ -36115,8 +36404,11 @@ async function startHarnessBrokerServer(input) {
       if (request.method === "adapter.subagent.readSnapshot") {
         const subagents = input.adapter.subagents;
         if (!subagents)
-          return { ok: false, error: harnessError("Claude subagents are unavailable", false) };
-        return subagents.readSnapshot(subagentReadSnapshotSchema.parse(request.params));
+          return { ok: false, error: harnessError("Harness subagents are unavailable", false) };
+        const params = subagentReadSnapshotSchema.parse(request.params);
+        if (params.parent.harnessId !== input.adapter.harnessId)
+          return { ok: false, error: protocolError("Subagent parent belongs to another Harness") };
+        return subagents.readSnapshot(params);
       }
       if (request.method === "adapter.sessionImport.list") {
         const { limit, offset } = brokerSessionImportListParamsSchema.parse(request.params);
@@ -36166,13 +36458,15 @@ async function startHarnessBrokerServer(input) {
         const openInput = brokerOpenInputSchema.parse(request.params);
         const sourceRef = openInput.kind === "create" ? void 0 : openInput.kind === "resume" ? openInput.nativeRef : openInput.sourceRef;
         const sourceNativeId = sourceRef?.nativeSessionId;
+        if (sourceRef && sourceRef.harnessId !== input.adapter.harnessId)
+          return { ok: false, error: protocolError("Native Session belongs to another Harness") };
         const sourceKey = sourceNativeId ? nativeWriterKey(sourceNativeId) : void 0;
         if (sourceKey && nativeWriters.has(sourceKey)) {
           return {
             ok: false,
             error: {
               code: "sessionBusy",
-              message: "Native Claude Session already has an active writer",
+              message: "Native Harness Session already has an active writer",
               retryable: true,
               stage: "harnessBroker.open"
             }
@@ -36183,13 +36477,13 @@ async function startHarnessBrokerServer(input) {
             ok: false,
             error: {
               code: "sessionBusy",
-              message: "Native Claude Session identity claim is already pending",
+              message: "Native Harness Session identity claim is already pending",
               retryable: true,
               stage: "harnessBroker.open"
             }
           };
         }
-        const openReservation = randomUUID14();
+        const openReservation = randomUUID15();
         if (sourceKey)
           nativeWriters.set(sourceKey, openReservation);
         const provisionalReservation = openInput.kind === "create" ? openReservation : void 0;
@@ -36217,6 +36511,14 @@ async function startHarnessBrokerServer(input) {
           return { ok: false, error: harnessError("Harness broker connection closed") };
         }
         const openedRef = opened.value.initialState.nativeRef;
+        if (openedRef && openedRef.harnessId !== input.adapter.harnessId) {
+          releaseOpenReservations();
+          await opened.value.close().catch(() => void 0);
+          return {
+            ok: false,
+            error: protocolError("Adapter opened a Session for another Harness")
+          };
+        }
         if (sourceRef && (!openedRef || openedRef.harnessId !== sourceRef.harnessId || openedRef.formatVersion !== sourceRef.formatVersion || openInput.kind === "resume" && openedRef.nativeSessionId !== sourceRef.nativeSessionId)) {
           releaseOpenReservations();
           await opened.value.close().catch(() => void 0);
@@ -36224,7 +36526,7 @@ async function startHarnessBrokerServer(input) {
             ok: false,
             error: {
               code: "protocolError",
-              message: "Native Claude Session identity did not match the requested open",
+              message: "Native Harness Session identity did not match the requested open",
               retryable: false,
               stage: "harnessBroker.open"
             }
@@ -36240,7 +36542,7 @@ async function startHarnessBrokerServer(input) {
             ok: false,
             error: {
               code: "sessionBusy",
-              message: "Native Claude Session already has an active writer",
+              message: "Native Harness Session already has an active writer",
               retryable: true,
               stage: "harnessBroker.open"
             }
@@ -36252,6 +36554,7 @@ async function startHarnessBrokerServer(input) {
           generation: 1,
           owner: state.id,
           cwd: openInput.cwd,
+          ...openInput.environment ? { environment: openInput.environment } : {},
           ...nativeId ? { nativeId } : {},
           ...opened.value.initialState.nativeRef ? { nativeRef: opened.value.initialState.nativeRef } : {},
           ...nativeKey ? { writerKey: nativeKey } : {},
@@ -36292,7 +36595,7 @@ async function startHarnessBrokerServer(input) {
               ok: false,
               error: {
                 code: "sessionBusy",
-                message: "Native Claude Session identity has not been claimed yet",
+                message: "Native Harness Session identity has not been claimed yet",
                 retryable: true,
                 stage: "harnessBroker.identity"
               }
@@ -36369,7 +36672,7 @@ async function startHarnessBrokerServer(input) {
             ok: false,
             error: {
               code: "sessionBusy",
-              message: "Faulted Claude Session has no authoritative native identity",
+              message: "Faulted Harness Session has no authoritative native identity",
               retryable: false,
               stage: "harnessBroker.reopen"
             }
@@ -36381,7 +36684,12 @@ async function startHarnessBrokerServer(input) {
         record4.forwarderEpoch += 1;
         await oldSession.close().catch(() => void 0);
         await oldOutputTask.catch(() => void 0);
-        const reopened = await input.adapter.open({ kind: "resume", cwd: record4.cwd, nativeRef });
+        const reopened = await input.adapter.open({
+          kind: "resume",
+          cwd: record4.cwd,
+          nativeRef,
+          ...record4.environment ? { environment: record4.environment } : {}
+        });
         if (!reopened.ok)
           return reopened;
         const reopenedRef = reopened.value.initialState.nativeRef;
@@ -36391,7 +36699,7 @@ async function startHarnessBrokerServer(input) {
             ok: false,
             error: {
               code: "protocolError",
-              message: "Claude Aqua broker reopen changed the native Session identity",
+              message: "Aqua Harness broker reopen changed the native Session identity",
               retryable: false,
               stage: "harnessBroker.reopen"
             }
@@ -36455,7 +36763,7 @@ async function startHarnessBrokerServer(input) {
           }
           state.authenticated = true;
           state.inputSequence = 1;
-          await send({ kind: "response", id: randomUUID14(), ok: true, value: { ready: true } });
+          await send({ kind: "response", id: randomUUID15(), ok: true, value: { ready: true } });
           return;
         }
         const parsed = harnessBrokerRequestSchema.safeParse(raw);
@@ -36528,15 +36836,16 @@ async function startHarnessBrokerServer(input) {
 }
 
 // packages/host-runtime/src/aqua-harness-broker.ts
-async function runClaudeAquaHarnessBroker(environment = process.env) {
+async function runClaudeAquaHarnessBroker(environment = process.env, requestedHarnessId = "claude-code") {
+  const harnessId = harnessPluginIdSchema.parse(requestedHarnessId);
   if (process.platform !== "darwin") {
-    throw new Error("Claude Aqua Harness broker is available only on macOS");
+    throw new Error("Aqua Harness broker is available only on macOS");
   }
   const { pluginRoots, pluginContext } = installedHarnessPluginOptions(environment);
   const plugins = await loadHarnessPlugins({
     roots: pluginRoots,
     context: pluginContext,
-    onlyIds: /* @__PURE__ */ new Set(["claude-code"]),
+    onlyIds: /* @__PURE__ */ new Set([harnessId]),
     warmup: false,
     diagnose: (diagnostic) => process.stderr.write(`Harness plugin: ${JSON.stringify(diagnostic)}
 `)
@@ -36549,19 +36858,19 @@ async function runClaudeAquaHarnessBroker(environment = process.env) {
   let server;
   try {
     server = await startHarnessBrokerServer({
-      descriptorPath: defaultHarnessBrokerDescriptorPath(environment),
-      socketPath: defaultHarnessBrokerSocketPath(environment),
+      descriptorPath: defaultHarnessBrokerDescriptorPath(environment, harnessId),
+      socketPath: defaultHarnessBrokerSocketPath(environment, harnessId),
       adapter
     });
   } catch (error51) {
     await adapter.close().catch(() => void 0);
     throw error51;
   }
-  process.title = "codexhost claude-code Aqua harness broker";
+  process.title = `codexhost ${harnessId} Aqua harness broker`;
   process.stdout.write(
     `${JSON.stringify({
       method: "codexhost/harness-broker/ready",
-      params: { protocolVersion: 1, harnessId: "claude-code" }
+      params: { protocolVersion: 1, harnessId }
     })}
 `
   );
@@ -36584,7 +36893,7 @@ async function runClaudeAquaHarnessBroker(environment = process.env) {
 
 // packages/host-runtime/src/release-main.ts
 var arguments_ = process.argv.slice(2);
-process.exitCode = arguments_[0] === "--codexhost-delegation-cli" ? await runDelegationCli({ arguments: arguments_.slice(1), environment: process.env }) : arguments_[0] === "--codexhost-harness-broker" ? await runClaudeAquaHarnessBroker(process.env) : arguments_[0] === "--codexhost-remote" ? await runRemoteHostCli({ arguments: arguments_.slice(1), environment: process.env }) : arguments_[0] === "--codexhost-remote-control-bridge" ? await runRemoteControlAppServerBridge() : await runHostRuntime({
+process.exitCode = arguments_[0] === "--codexhost-delegation-cli" ? await runDelegationCli({ arguments: arguments_.slice(1), environment: process.env }) : arguments_[0] === "--codexhost-harness-broker" ? await runClaudeAquaHarnessBroker(process.env, arguments_[1] ?? "claude-code") : arguments_[0] === "--codexhost-remote" ? await runRemoteHostCli({ arguments: arguments_.slice(1), environment: process.env }) : arguments_[0] === "--codexhost-remote-control-bridge" ? await runRemoteControlAppServerBridge() : await runHostRuntime({
   arguments: arguments_,
   environment: process.env,
   hostRuntimeUrl: import.meta.url