@codexhost/cli-darwin-x64 0.11.0 → 0.12.1

package/app/plugins/workbuddy/plugin.mjs

@@ -6,6 +6,7 @@ var __export = (target, all) => {
 };
 
 // ../../harness-broker/dist/client.js
+import { execFile } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { lstat, readFile } from "node:fs/promises";
 import net, {} from "node:net";
@@ -776,10 +777,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path9) {
-  if (!path9)
+function getElementAtPath(obj, path10) {
+  if (!path10)
     return obj;
-  return path9.reduce((acc, key) => acc?.[key], obj);
+  return path10.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -1188,11 +1189,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path9, issues) {
+function prefixIssues(path10, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path9);
+    iss.path.unshift(path10);
     return iss;
   });
 }
@@ -1339,16 +1340,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path9 = []) => {
+  const processError = (error52, path10 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path9, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path10, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path9, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path10, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path9, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path10, ...issue2.path]);
       } else {
-        const fullpath = [...path9, ...issue2.path];
+        const fullpath = [...path10, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -1375,17 +1376,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path9 = []) => {
+  const processError = (error52, path10 = []) => {
     var _a3, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path9, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path10, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path9, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path10, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path9, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path10, ...issue2.path]);
       } else {
-        const fullpath = [...path9, ...issue2.path];
+        const fullpath = [...path10, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -1417,8 +1418,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path9 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path9) {
+  const path10 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path10) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -14110,13 +14111,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path9 = ref.slice(1).split("/").filter(Boolean);
-  if (path9.length === 0) {
+  const path10 = ref.slice(1).split("/").filter(Boolean);
+  if (path10.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path9[0] === defsKey) {
-    const key = path9[1];
+  if (path10[0] === defsKey) {
+    const key = path10[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -14594,6 +14595,20 @@ var harnessDisplaySetSchema = external_exports.strictObject({
   initializeOnly: external_exports.boolean().optional()
 });
 
+// ../../shared-contracts/dist/ids.js
+var opaqueIdSchema = external_exports.string().refine((value) => value.trim().length > 0, {
+  message: "Identifier must not be empty or whitespace"
+});
+var harnessIdSchema = opaqueIdSchema.brand();
+var hostThreadIdSchema = opaqueIdSchema.brand();
+var hostTurnIdSchema = opaqueIdSchema.brand();
+var hostItemIdSchema = opaqueIdSchema.brand();
+var hostInteractionIdSchema = opaqueIdSchema.brand();
+
+// ../../shared-contracts/dist/thread-prewarm.js
+var threadPrewarmDiscardParamsSchema = external_exports.object({ threadId: hostThreadIdSchema });
+var threadPrewarmDiscardResultSchema = external_exports.object({ discarded: external_exports.boolean() });
+
 // ../../shared-contracts/dist/console.js
 var consoleAnnouncementSchema = external_exports.strictObject({
   title: external_exports.string().trim().min(1).max(200),
@@ -14606,10 +14621,14 @@ var consoleOpenResultSchema = external_exports.strictObject({
   url: external_exports.string().max(2048).regex(/^http:\/\/(?:127\.0\.0\.1|localhost):\d{1,5}\/(?:\?.*)?$/u)
 });
 var CONSOLE_HOST_METHODS = Object.freeze([
+  "codexhost/console/remote-connections",
+  "codexhost/runtime/status",
+  "codexhost/remote/ssh-setup",
   "codexhost/harness/plugins/list",
   "codexhost/harness/display-settings/get",
   "codexhost/harness/display-settings/set",
   "codexhost/harness/inspect",
+  "codexhost/harness/installation",
   "codexhost/harness/launch-settings/get",
   "codexhost/harness/launch-settings/set",
   "codexhost/harness/web-ui/open",
@@ -14671,16 +14690,6 @@ var loadedSessionsSchema = external_exports.array(external_exports.strictObject(
   inactiveMs: external_exports.number().nonnegative()
 }));
 
-// ../../shared-contracts/dist/ids.js
-var opaqueIdSchema = external_exports.string().refine((value) => value.trim().length > 0, {
-  message: "Identifier must not be empty or whitespace"
-});
-var harnessIdSchema = opaqueIdSchema.brand();
-var hostThreadIdSchema = opaqueIdSchema.brand();
-var hostTurnIdSchema = opaqueIdSchema.brand();
-var hostItemIdSchema = opaqueIdSchema.brand();
-var hostInteractionIdSchema = opaqueIdSchema.brand();
-
 // ../../shared-contracts/dist/manual-compaction.js
 var threadManualCompactionStartedSchema = external_exports.strictObject({
   threadId: hostThreadIdSchema,
@@ -15256,14 +15265,17 @@ var harnessLaunchSettingsSchema = external_exports.object({
 // ../../shared-contracts/dist/harness-installation.js
 var harnessInstallationParamsSchema = external_exports.object({
   harnessId: harnessIdSchema,
-  action: external_exports.enum(["check", "update"])
+  action: external_exports.enum(["check", "update", "install"])
 }).strict();
 var harnessInstallationStateSchema = external_exports.object({
   currentVersion: external_exports.string().min(1).max(128),
   latestVersion: external_exports.string().min(1).max(128),
   updateAvailable: external_exports.boolean(),
   canUpdate: external_exports.boolean(),
-  message: external_exports.string().max(2048).optional()
+  // Adapter-owned diagnostic text; UI uses messageCode rather than displaying it verbatim.
+  message: external_exports.string().max(2048).optional(),
+  messageCode: external_exports.string().min(1).max(128).optional(),
+  latestVersionKind: external_exports.enum(["unknown", "tracking-branch"]).optional()
 }).strict();
 
 // ../../shared-contracts/dist/codex-accounts.js
@@ -15565,6 +15577,80 @@ var updateStatusResultSchema = external_exports.strictObject({
   status: updateStatusSchema.nullable()
 });
 
+// ../../shared-contracts/dist/remote-runtime.js
+var remoteUpdatePhaseSchema = external_exports.enum([
+  "idle",
+  "installing",
+  "restarting",
+  "succeeded",
+  "failed"
+]);
+var runtimeStatusSchema = external_exports.object({
+  runningVersion: external_exports.string().nullable(),
+  installedVersion: external_exports.string().nullable(),
+  restartRequired: external_exports.boolean(),
+  remote: external_exports.boolean(),
+  updateSupported: external_exports.boolean(),
+  update: external_exports.object({
+    phase: remoteUpdatePhaseSchema,
+    targetVersion: external_exports.string().nullable(),
+    error: external_exports.string().nullable()
+  })
+});
+var remoteUpdateParamsSchema = external_exports.object({
+  version: external_exports.string().regex(/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/u)
+}).strict();
+var remoteSshSetupParamsSchema = external_exports.object({
+  hostname: external_exports.string().min(1).max(1024).refine((value) => !value.startsWith("-") && !/\s/u.test(value)),
+  port: external_exports.number().int().min(1).max(65535).nullable(),
+  identity: external_exports.string().max(4096).nullable(),
+  action: external_exports.enum(["inspect", "install", "update", "repair", "uninstall"]),
+  uninstallPackage: external_exports.boolean().optional(),
+  version: external_exports.string().regex(/^\d+\.\d+\.\d+$/u).nullable()
+}).strict();
+var remoteSshSetupResultSchema = external_exports.object({ state: external_exports.enum(["installed", "not-installed"]) }).strict();
+
+// ../../shared-contracts/dist/remote-connections.js
+var hostId = external_exports.string().min(1).max(1024);
+var codexSshConnectionSchema = external_exports.object({
+  hostId,
+  displayName: external_exports.string().min(1).max(1024),
+  source: external_exports.enum(["codex-managed", "discovered"]),
+  sshAlias: external_exports.string().max(1024).nullable(),
+  sshHost: external_exports.string().min(1).max(1024),
+  sshPort: external_exports.number().int().min(1).max(65535).nullable(),
+  identity: external_exports.string().max(4096).nullable(),
+  autoConnect: external_exports.boolean(),
+  connectionAnalyticsId: external_exports.string().max(1024).optional()
+});
+var codexSshDraftSchema = external_exports.strictObject({
+  displayName: external_exports.string().min(1).max(1024),
+  hostname: external_exports.string().min(1).max(1024),
+  sshPort: external_exports.number().int().min(1).max(65535).nullable(),
+  identity: external_exports.string().max(4096).nullable()
+});
+var remoteConnectionsRequestSchema = external_exports.discriminatedUnion("action", [
+  external_exports.strictObject({ action: external_exports.literal("list") }),
+  external_exports.strictObject({
+    action: external_exports.literal("save"),
+    draft: codexSshDraftSchema,
+    previous: codexSshConnectionSchema.nullable()
+  }),
+  external_exports.strictObject({ action: external_exports.literal("remove"), previous: codexSshConnectionSchema }),
+  external_exports.strictObject({ action: external_exports.literal("connect"), hostId, enabled: external_exports.boolean() }),
+  external_exports.strictObject({ action: external_exports.literal("state"), hostId }),
+  external_exports.strictObject({ action: external_exports.literal("runtime"), hostId }),
+  external_exports.strictObject({
+    action: external_exports.literal("update"),
+    hostId: hostId.refine((id) => id !== "local"),
+    version: remoteUpdateParamsSchema.shape.version
+  })
+]);
+var remoteConnectionsReplySchema = external_exports.union([
+  external_exports.strictObject({ result: jsonValueSchema }),
+  external_exports.strictObject({ error: external_exports.strictObject({ code: external_exports.number().int(), message: external_exports.string() }) })
+]);
+
 // ../../shared-contracts/dist/index.js
 var workspaceContractVersionSchema = external_exports.literal(WORKSPACE_CONTRACT_VERSION);
 
@@ -15858,9 +15944,12 @@ var HARNESS_BROKER_PROTOCOL_VERSION = 1;
 var HARNESS_BROKER_MAX_FRAME_BYTES = 8 * 1024 * 1024;
 var HARNESS_BROKER_MAX_PENDING_REQUESTS = 32;
 var HARNESS_BROKER_REQUEST_TIMEOUT_MS = 15e3;
+var HARNESS_BROKER_IDLE_TIMEOUT_MS = 60 * 60 * 1e3;
+var HARNESS_BROKER_RETIRING_ERROR_CODE = "brokerRetiring";
 var harnessBrokerMethodSchema = external_exports.enum([
   "adapter.inspect",
   "adapter.inspectAccount",
+  "adapter.credits",
   "adapter.open",
   "adapter.subagent.readSnapshot",
   "session.readSnapshot",
@@ -15978,6 +16067,14 @@ function defaultHarnessBrokerDescriptorPath(environment = process.env, harnessId
     return path.join(defaultHarnessBrokerDirectory(environment), `${harnessId}-broker-v1.json`);
   return environment[HARNESS_BROKER_DESCRIPTOR_ENV] ?? path.join(defaultHarnessBrokerDirectory(environment), HARNESS_BROKER_DESCRIPTOR_FILE);
 }
+function harnessBrokerLaunchAgentLabel(harnessId = "claude-code") {
+  harnessPluginIdSchema.parse(harnessId);
+  return harnessId === "claude-code" ? "ai.bytepioneer.codexhost.native-harness-broker" : `ai.bytepioneer.codexhost.${harnessId}-broker`;
+}
+function harnessBrokerLaunchAgentPlistPath(environment = process.env, harnessId = "claude-code") {
+  const home = environment.HOME || os.homedir();
+  return path.join(home, "Library", "LaunchAgents", `${harnessBrokerLaunchAgentLabel(harnessId)}.plist`);
+}
 
 // ../../harness-broker/dist/validation.js
 var cwdSchema = external_exports.string().min(1).max(16384);
@@ -16283,10 +16380,55 @@ async function readDescriptor(descriptorPath) {
   try {
     process.kill(descriptor.ownerPid, 0);
   } catch {
-    throw new Error("Aqua Harness broker owner process is unavailable");
+    throw new BrokerNotRunningError("its owner process has exited");
   }
   return descriptor;
 }
+var BrokerNotRunningError = class extends Error {
+};
+var BrokerRetiringError = class extends Error {
+};
+var BrokerRequestNotDeliveredError = class extends Error {
+};
+var HarnessNotInstalledError = class extends Error {
+};
+var BROKER_NOT_RUNNING_CODES = /* @__PURE__ */ new Set(["ENOENT", "ECONNREFUSED"]);
+var BROKER_START_TIMEOUT_MS = 15e3;
+var BROKER_START_POLL_MS = 250;
+function classifyConnectFailure(error51) {
+  if (error51 instanceof BrokerNotRunningError)
+    return error51;
+  const code = error51?.code;
+  if (code && BROKER_NOT_RUNNING_CODES.has(code)) {
+    return new BrokerNotRunningError(code === "ENOENT" ? "its descriptor or socket is missing" : "its socket refused the connection");
+  }
+  return error51 instanceof Error ? error51 : new Error(String(error51));
+}
+function describeBrokerFailure(error51, harnessId) {
+  if (error51 instanceof BrokerNotRunningError) {
+    return `The ${harnessId} Aqua Harness broker on this Mac could not be started (${error51.message}). Keep the desktop user logged in, then repair the remote service or run on this Mac: codexhost broker install --harness ${harnessId}`;
+  }
+  return error51 instanceof Error ? error51.message : String(error51);
+}
+function runLaunchctl(arguments_) {
+  return new Promise((resolve) => {
+    execFile("/bin/launchctl", arguments_, { timeout: 1e4 }, (error51) => resolve(!error51));
+  });
+}
+async function startBrokerLaunchAgent(harnessId, environment) {
+  const uid = process.getuid?.();
+  if (uid === void 0)
+    return;
+  const target = `gui/${uid}/${harnessBrokerLaunchAgentLabel(harnessId)}`;
+  if (await runLaunchctl(["kickstart", target]))
+    return;
+  await runLaunchctl([
+    "bootstrap",
+    `gui/${uid}`,
+    harnessBrokerLaunchAgentPlistPath(environment, harnessId)
+  ]);
+  await runLaunchctl(["kickstart", target]);
+}
 var BrokerConnection = class _BrokerConnection {
   #onClose;
   onClose(callback) {
@@ -16310,21 +16452,31 @@ var BrokerConnection = class _BrokerConnection {
     socket.once("error", (error51) => this.#fail(error51));
   }
   static async connect(descriptorPath, harnessId) {
-    const descriptor = await readDescriptor(descriptorPath);
-    if (descriptor.harnessId !== harnessId)
-      throw new Error("Aqua broker belongs to another Harness");
-    const socket = net.createConnection(descriptor.socketPath);
-    await new Promise((resolve, reject) => {
-      const timeout = setTimeout(() => reject(new Error("Timed out connecting to Aqua Harness broker")), HARNESS_BROKER_REQUEST_TIMEOUT_MS);
-      socket.once("connect", () => {
-        clearTimeout(timeout);
-        resolve();
-      });
-      socket.once("error", (error51) => {
-        clearTimeout(timeout);
-        reject(error51);
+    let descriptor;
+    let socket;
+    let connecting;
+    try {
+      descriptor = await readDescriptor(descriptorPath);
+      if (descriptor.harnessId !== harnessId)
+        throw new Error("Aqua broker belongs to another Harness");
+      connecting = net.createConnection(descriptor.socketPath);
+      const pending = connecting;
+      await new Promise((resolve, reject) => {
+        const timeout = setTimeout(() => reject(new Error("Timed out connecting to Aqua Harness broker")), HARNESS_BROKER_REQUEST_TIMEOUT_MS);
+        pending.once("connect", () => {
+          clearTimeout(timeout);
+          resolve();
+        });
+        pending.once("error", (error51) => {
+          clearTimeout(timeout);
+          reject(error51);
+        });
       });
-    });
+      socket = pending;
+    } catch (error51) {
+      connecting?.destroy();
+      throw classifyConnectFailure(error51);
+    }
     const connection = new _BrokerConnection(descriptor, socket);
     const hello = connection.#waitForHello();
     await writeBrokerFrame(socket, {
@@ -16377,15 +16529,24 @@ var BrokerConnection = class _BrokerConnection {
       }, HARNESS_BROKER_REQUEST_TIMEOUT_MS);
       this.#pending.set(id, { resolve, reject, timeout });
     });
-    await writeBrokerFrame(this.#socket, {
-      version: HARNESS_BROKER_PROTOCOL_VERSION,
-      generation: this.#descriptor.generation,
-      sequence: this.#inputSequence,
-      kind: "request",
-      id,
-      method,
-      params
-    });
+    try {
+      await writeBrokerFrame(this.#socket, {
+        version: HARNESS_BROKER_PROTOCOL_VERSION,
+        generation: this.#descriptor.generation,
+        sequence: this.#inputSequence,
+        kind: "request",
+        id,
+        method,
+        params
+      });
+    } catch (error51) {
+      const pending = this.#pending.get(id);
+      if (pending)
+        clearTimeout(pending.timeout);
+      this.#pending.delete(id);
+      response.catch(() => void 0);
+      throw new BrokerRequestNotDeliveredError(error51 instanceof Error ? error51.message : String(error51));
+    }
     return response;
   }
   close() {
@@ -16429,6 +16590,8 @@ var BrokerConnection = class _BrokerConnection {
     this.#pending.delete(frame.id);
     if (frame.ok)
       pending.resolve(frame.value);
+    else if (frame.error?.code === HARNESS_BROKER_RETIRING_ERROR_CODE)
+      pending.reject(new BrokerRetiringError(frame.error.message));
     else
       pending.reject(new Error(frame.error?.message ?? "Broker request failed"));
   }
@@ -16654,17 +16817,19 @@ var BrokeredHarnessAdapter = class {
   harnessId;
   #descriptorPath;
   #forwardEnvironment;
+  #isInstalled;
+  #startBroker;
+  #startTimeoutMs;
   #connection = null;
   #closed = false;
+  #credits = null;
+  #creditsRefresh = null;
   subagents = {
     readSnapshot: async (input) => {
       try {
-        return parseHarnessResult(await (await this.#connect()).request("adapter.subagent.readSnapshot", input));
+        return parseHarnessResult(await this.#request("adapter.subagent.readSnapshot", input));
       } catch (error51) {
-        return {
-          ok: false,
-          error: unavailable(error51 instanceof Error ? error51.message : String(error51))
-        };
+        return { ok: false, error: this.#error(error51) };
       }
     }
   };
@@ -16676,12 +16841,39 @@ var BrokeredHarnessAdapter = class {
     if (input.liveCommandCatalog)
       this.liveCommandCatalog = true;
     this.#descriptorPath = input.descriptorPath ?? defaultHarnessBrokerDescriptorPath(input.environment, this.harnessId);
+    this.#isInstalled = input.isInstalled;
+    const environment = input.environment ?? process.env;
+    this.#startBroker = input.startBroker === false ? void 0 : input.startBroker ?? (process.platform === "darwin" && !input.descriptorPath ? () => startBrokerLaunchAgent(this.harnessId, environment) : void 0);
+    this.#startTimeoutMs = input.startTimeoutMs ?? BROKER_START_TIMEOUT_MS;
+  }
+  credits() {
+    return this.#credits;
+  }
+  refreshCredits() {
+    if (this.#closed)
+      return Promise.resolve(null);
+    if (this.#creditsRefresh)
+      return this.#creditsRefresh;
+    this.#creditsRefresh = this.#readCredits().finally(() => {
+      this.#creditsRefresh = null;
+    });
+    return this.#creditsRefresh;
+  }
+  async #readCredits() {
+    try {
+      const value = await this.#request("adapter.credits", {}, true);
+      const credits = accountCreditsSnapshotSchema.nullable().parse(value);
+      if (!this.#closed)
+        this.#credits = credits;
+    } catch {
+    }
+    return this.#credits;
   }
   async inspectAccount() {
     if (this.#closed)
       return null;
     try {
-      const value = await (await this.#connect()).request("adapter.inspectAccount", {});
+      const value = await this.#request("adapter.inspectAccount", {}, true);
       return harnessAccountSnapshotSchema.nullable().parse(value);
     } catch {
       return null;
@@ -16691,33 +16883,46 @@ var BrokeredHarnessAdapter = class {
     if (this.#closed)
       return failedInspection("Aqua Harness broker adapter is closed");
     try {
-      return harnessInspectionSchema.parse(await (await this.#connect()).request("adapter.inspect", input));
+      return harnessInspectionSchema.parse(await this.#request("adapter.inspect", input, true));
     } catch (error51) {
       this.#connection = null;
-      return failedInspection(error51 instanceof Error ? error51.message : String(error51));
+      if (error51 instanceof HarnessNotInstalledError)
+        return { status: "notInstalled", error: this.#error(error51) };
+      return failedInspection(describeBrokerFailure(error51, this.harnessId));
     }
   }
   async open(input) {
     if (this.#closed)
       return { ok: false, error: unavailable("Aqua Harness broker adapter is closed", false) };
+    const safeInput = { ...input };
+    delete safeInput.environment;
+    if (this.#forwardEnvironment && input.environment) {
+      const allowed = [
+        "CODEXHOST_CLI_PATH",
+        "CODEXHOST_CLI_NODE_PATH",
+        "CODEXHOST_RUNTIME_ENDPOINT",
+        "CODEXHOST_RUNTIME_TOKEN",
+        "CODEXHOST_THREAD_ID"
+      ];
+      const environment = Object.fromEntries(Object.entries(input.environment).filter(([key, value]) => allowed.includes(key) && value !== void 0));
+      if (Object.keys(environment).length)
+        safeInput.environment = environment;
+    }
     let connection;
     try {
-      const safeInput = { ...input };
-      delete safeInput.environment;
-      if (this.#forwardEnvironment && input.environment) {
-        const allowed = [
-          "CODEXHOST_CLI_PATH",
-          "CODEXHOST_CLI_NODE_PATH",
-          "CODEXHOST_RUNTIME_ENDPOINT",
-          "CODEXHOST_RUNTIME_TOKEN",
-          "CODEXHOST_THREAD_ID"
-        ];
-        const environment = Object.fromEntries(Object.entries(input.environment).filter(([key, value]) => allowed.includes(key) && value !== void 0));
-        if (Object.keys(environment).length)
-          safeInput.environment = environment;
-      }
-      connection = await this.#connect();
-      const result = parseHarnessResult(await connection.request("adapter.open", safeInput));
+      let value;
+      for (let attempt = 0; ; attempt += 1) {
+        connection = await this.#connect();
+        try {
+          value = await connection.request("adapter.open", safeInput);
+          break;
+        } catch (error51) {
+          if (attempt > 0 || !(error51 instanceof BrokerRetiringError || error51 instanceof BrokerRequestNotDeliveredError))
+            throw error51;
+          this.#connection = null;
+        }
+      }
+      const result = parseHarnessResult(value);
       if (!result.ok)
         return result;
       const session = new BrokeredHarnessSession(connection, parseSessionMetadata(result.value), this.harnessId, safeInput, () => this.#connect(), () => {
@@ -16728,25 +16933,51 @@ var BrokeredHarnessAdapter = class {
     } catch (error51) {
       connection?.close();
       this.#connection = null;
-      return {
-        ok: false,
-        error: unavailable(error51 instanceof Error ? error51.message : String(error51))
-      };
+      return { ok: false, error: this.#error(error51) };
     }
   }
   async close() {
     this.#closed = true;
+    this.#credits = null;
     await Promise.allSettled([...this.#sessions].map((session) => session.close()));
     this.#sessions.clear();
     const connection = await this.#connection?.catch(() => null);
     await connection?.dispose();
     this.#connection = null;
   }
+  #error(error51) {
+    if (error51 instanceof HarnessNotInstalledError)
+      return {
+        code: "notInstalled",
+        message: error51.message,
+        retryable: false,
+        stage: "harnessBroker"
+      };
+    return unavailable(describeBrokerFailure(error51, this.harnessId));
+  }
+  /**
+   * Sends one adapter-level request. A broker that retired between requests refuses it
+   * unprocessed, so it is retried once on a fresh broker. Idempotent reads also retry
+   * once after a plain disconnect.
+   */
+  async #request(method, params, idempotent = false) {
+    for (let attempt = 0; ; attempt += 1) {
+      const connection = await this.#connect();
+      try {
+        return await connection.request(method, params);
+      } catch (error51) {
+        const retryable = error51 instanceof BrokerRetiringError || error51 instanceof BrokerRequestNotDeliveredError || idempotent && connection.closed;
+        if (attempt > 0 || !retryable)
+          throw error51;
+        this.#connection = null;
+      }
+    }
+  }
   #connect() {
     if (this.#closed)
       return Promise.reject(new Error("Aqua Harness broker adapter is closed"));
     if (!this.#connection) {
-      const pending = BrokerConnection.connect(this.#descriptorPath, this.harnessId).then((connection) => {
+      const pending = this.#establish().then((connection) => {
         connection.onClose(() => {
           if (this.#connection === pending)
             this.#connection = null;
@@ -16761,13 +16992,35 @@ var BrokeredHarnessAdapter = class {
     }
     return this.#connection;
   }
+  async #establish() {
+    try {
+      return await BrokerConnection.connect(this.#descriptorPath, this.harnessId);
+    } catch (error51) {
+      if (!(error51 instanceof BrokerNotRunningError) || !this.#startBroker)
+        throw error51;
+    }
+    if (this.#isInstalled && !this.#isInstalled()) {
+      throw new HarnessNotInstalledError(`${this.harnessId} is not installed on this Mac`);
+    }
+    const deadline = Date.now() + this.#startTimeoutMs;
+    for (; ; ) {
+      await this.#startBroker();
+      try {
+        return await BrokerConnection.connect(this.#descriptorPath, this.harnessId);
+      } catch (error51) {
+        if (!(error51 instanceof BrokerNotRunningError) || Date.now() >= deadline)
+          throw error51;
+      }
+      await new Promise((resolve) => setTimeout(resolve, BROKER_START_POLL_MS));
+    }
+  }
 };
 
 // ../codebuddy/dist/codebuddy-adapter.js
-import { stat as stat2 } from "node:fs/promises";
+import { stat as stat3 } from "node:fs/promises";
 
 // ../codebuddy/dist/acp-client.js
-import { execFile, spawn } from "node:child_process";
+import { execFile as execFile2, spawn } from "node:child_process";
 import { Readable as Readable2, Writable } from "node:stream";
 
 // ../../../node_modules/@agentclientprotocol/sdk/dist/schema/index.js
@@ -21487,7 +21740,7 @@ var CodeBuddyAcpClient = class {
     }
     const pid = this.#child.pid;
     if (pid && process.platform === "win32") {
-      await new Promise((resolve) => execFile("taskkill", ["/PID", String(pid), "/T", "/F"], { windowsHide: true, timeout: 3e3 }, () => resolve()));
+      await new Promise((resolve) => execFile2("taskkill", ["/PID", String(pid), "/T", "/F"], { windowsHide: true, timeout: 3e3 }, () => resolve()));
     } else if (pid) {
       try {
         process.kill(-pid, "SIGKILL");
@@ -21579,7 +21832,7 @@ function confirmedConfiguration(response, id, value, profile = CODEBUDDY_RUNTIME
 
 // ../codebuddy/dist/derivation.js
 import { randomUUID as randomUUID2 } from "node:crypto";
-import { execFile as execFile2, spawn as spawn2 } from "node:child_process";
+import { execFile as execFile3, spawn as spawn2 } from "node:child_process";
 import { lstat as lstat2, mkdir, readFile as readFile3, realpath as realpath4, unlink, writeFile } from "node:fs/promises";
 import path6 from "node:path";
 import { isDeepStrictEqual as isDeepStrictEqual3 } from "node:util";
@@ -21692,16 +21945,16 @@ var Diff = class {
       }
     }
   }
-  addToPath(path9, added, removed, oldPosInc, options) {
-    const last = path9.lastComponent;
+  addToPath(path10, added, removed, oldPosInc, options) {
+    const last = path10.lastComponent;
     if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
       return {
-        oldPos: path9.oldPos + oldPosInc,
+        oldPos: path10.oldPos + oldPosInc,
         lastComponent: { count: last.count + 1, added, removed, previousComponent: last.previousComponent }
       };
     } else {
       return {
-        oldPos: path9.oldPos + oldPosInc,
+        oldPos: path10.oldPos + oldPosInc,
         lastComponent: { count: 1, added, removed, previousComponent: last }
       };
     }
@@ -23042,7 +23295,7 @@ async function copyCodeBuddySession(cwd, sourceId, targetId, environment, signal
         child.stderr.destroy();
       } else if (process.platform === "win32" && child.pid) {
         termination = new Promise((done) => {
-          execFile2("taskkill", ["/PID", String(child.pid), "/T", "/F"], { windowsHide: true, timeout: 3e3 }, () => {
+          execFile3("taskkill", ["/PID", String(child.pid), "/T", "/F"], { windowsHide: true, timeout: 3e3 }, () => {
             child.kill();
             done();
           });
@@ -23584,6 +23837,345 @@ async function deriveCodeBuddySession(options) {
   }
 }
 
+// ../codebuddy/dist/session-import.js
+import { createReadStream } from "node:fs";
+import { opendir, readFile as readFile4, stat as stat2 } from "node:fs/promises";
+import path7 from "node:path";
+import { createInterface as createInterface2 } from "node:readline";
+
+// ../../harness-adapter/dist/session-import.js
+import { lstat as lstat3 } from "node:fs/promises";
+var SessionImportChangedError = class extends Error {
+  constructor(message = "Native Session changed during discovery; refresh and retry") {
+    super(message);
+    this.name = "SessionImportChangedError";
+  }
+};
+function isMissingFileError(error51) {
+  return typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "ENOENT";
+}
+function sameFileFingerprint(left, right) {
+  return left === null || right === null ? left === right : left.dev === right.dev && left.ino === right.ino && left.size === right.size && left.mtimeMs === right.mtimeMs && left.ctimeMs === right.ctimeMs;
+}
+var STORAGE_ACCESS_ERRORS = /* @__PURE__ */ new Set(["EACCES", "EPERM", "EIO", "EMFILE", "ENFILE"]);
+function isStorageAccessError(error51) {
+  return typeof error51 === "object" && error51 !== null && "code" in error51 && typeof error51.code === "string" && STORAGE_ACCESS_ERRORS.has(error51.code);
+}
+async function optionalLstat(file2) {
+  try {
+    return await lstat3(file2);
+  } catch (error51) {
+    if (isMissingFileError(error51))
+      return null;
+    throw error51;
+  }
+}
+async function readStableFiles(files, read) {
+  const before = await Promise.all(files.map(optionalLstat));
+  const value = await read(before);
+  const after = await Promise.all(files.map(optionalLstat));
+  if (before.some((info, index) => !sameFileFingerprint(info, after[index] ?? null)))
+    throw new SessionImportChangedError();
+  return value;
+}
+function sessionImportTitle(value, maxLength = HARNESS_SESSION_IMPORT_TITLE_MAX_LENGTH) {
+  if (typeof value !== "string")
+    return null;
+  const normalized = value.replaceAll("\0", "").replaceAll(/\s+/gu, " ").trim();
+  if (!normalized)
+    return null;
+  if (normalized.length <= maxLength)
+    return normalized;
+  const characters = [...normalized];
+  if (characters.length <= maxLength)
+    return normalized;
+  return `${characters.slice(0, maxLength - 1).join("").trimEnd()}…`;
+}
+function sessionImportCandidate(input) {
+  const time3 = typeof input.updatedAt === "number" ? input.updatedAt : typeof input.updatedAt === "string" ? Date.parse(input.updatedAt) : Number.NaN;
+  const parsed = harnessSessionImportCandidateSchema.safeParse({
+    nativeSessionId: input.nativeSessionId,
+    cwd: input.cwd,
+    title: typeof input.title === "string" && input.title.trim().length > 0 ? input.title : null,
+    updatedAt: Math.floor(time3),
+    // Unknown must stay unknown; only an explicit boolean is a native statement.
+    running: typeof input.running === "boolean" ? input.running : null
+  });
+  return parsed.success ? parsed.data : null;
+}
+var SessionImportScope = class {
+  #abort = new AbortController();
+  #options;
+  #pending = /* @__PURE__ */ new Set();
+  constructor(options) {
+    this.#options = options;
+  }
+  #closed() {
+    return {
+      ok: false,
+      error: { code: "invalidState", message: this.#options.closedMessage, retryable: false }
+    };
+  }
+  read(operation) {
+    const signal = this.#abort.signal;
+    if (signal.aborted)
+      return Promise.resolve(this.#closed());
+    let started;
+    try {
+      started = operation(signal);
+    } catch (error51) {
+      started = Promise.reject(error51 instanceof Error ? error51 : new Error("Session read failed"));
+    }
+    const request = started.then((value) => signal.aborted ? this.#closed() : { ok: true, value }).catch(() => signal.aborted ? this.#closed() : {
+      ok: false,
+      error: {
+        code: "unavailable",
+        message: this.#options.unavailableMessage,
+        retryable: true
+      }
+    }).finally(() => this.#pending.delete(request));
+    this.#pending.add(request);
+    return request;
+  }
+  /** `read` for `resolveCandidate`: a null source is the selected Session having disappeared. */
+  async resolve(operation) {
+    const result = await this.read(operation);
+    if (!result.ok)
+      return result;
+    return result.value ? { ok: true, value: result.value } : {
+      ok: false,
+      error: {
+        code: "sessionNotFound",
+        message: this.#options.notFoundMessage,
+        retryable: false
+      }
+    };
+  }
+  /** Idempotent. Resolves after every started read has settled. */
+  async close() {
+    this.#abort.abort();
+    await Promise.allSettled(this.#pending);
+  }
+};
+
+// ../codebuddy/dist/session-import.js
+var SESSION_FILE = /^([A-Za-z0-9][A-Za-z0-9_-]{0,199})\.jsonl$/u;
+var MAX_HISTORY_BYTES = 64e6;
+var MAX_MARKER_BYTES = 64 * 1024;
+function processAlive(pid) {
+  if (typeof pid !== "number" || !Number.isSafeInteger(pid) || pid <= 0)
+    return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error51) {
+    return record2(error51).code === "EPERM";
+  }
+}
+function userText(row) {
+  if (row.type !== "message" || row.role !== "user")
+    return null;
+  const { content } = row;
+  if (typeof content === "string")
+    return content;
+  if (!Array.isArray(content))
+    return "";
+  return content.map((part) => record2(part)).filter((part) => typeof part.text === "string").map((part) => String(part.text)).join(" ");
+}
+async function readFacts(file2, signal) {
+  const stream = createReadStream(file2, { encoding: "utf8", signal });
+  const lines = createInterface2({ input: stream, crlfDelay: Infinity });
+  let cwd = null;
+  let customTitle = null;
+  let generatedTitle = null;
+  let firstPrompt = null;
+  let hasUser = false;
+  let updatedAt = null;
+  try {
+    for await (const line of lines) {
+      signal.throwIfAborted();
+      if (!line.trim())
+        continue;
+      let parsed;
+      try {
+        parsed = JSON.parse(line);
+      } catch {
+        return null;
+      }
+      const row = record2(parsed);
+      if (typeof row.cwd === "string" && path7.isAbsolute(row.cwd))
+        cwd ??= row.cwd;
+      if (typeof row.timestamp === "number" && Number.isFinite(row.timestamp))
+        updatedAt = row.timestamp;
+      if (row.type === "custom-title")
+        customTitle = sessionImportTitle(row.customTitle);
+      else if (row.type === "ai-title")
+        generatedTitle = sessionImportTitle(row.aiTitle);
+      else {
+        const text2 = userText(row);
+        if (text2 !== null) {
+          hasUser = true;
+          firstPrompt ??= sessionImportTitle(text2);
+        }
+      }
+    }
+  } finally {
+    lines.close();
+    stream.destroy();
+  }
+  if (!hasUser || !cwd)
+    return null;
+  return { cwd, title: customTitle ?? generatedTitle ?? firstPrompt, updatedAt };
+}
+var CodeBuddySessionImport = class {
+  #environment;
+  #profile;
+  #scope;
+  constructor(environment, profile = CODEBUDDY_RUNTIME_PROFILE) {
+    this.#environment = { ...environment };
+    this.#profile = profile;
+    this.#scope = new SessionImportScope({
+      closedMessage: `${profile.displayName} Session import is closed`,
+      unavailableMessage: `${profile.displayName} sessions could not be read; close native clients, check storage access and retry`,
+      notFoundMessage: `${profile.displayName} Session is no longer importable`
+    });
+  }
+  listCandidates() {
+    return this.#scope.read(async (signal) => {
+      const active = await this.#activeSessions(signal);
+      const candidates = [];
+      for (const [nativeSessionId, files] of await this.#sessionFiles(signal)) {
+        if (files.length !== 1 || !files[0])
+          continue;
+        try {
+          const source = await this.#source(nativeSessionId, files[0], active, signal);
+          if (source)
+            candidates.push(source.candidate);
+        } catch (error51) {
+          if (!(error51 instanceof SessionImportChangedError))
+            throw error51;
+        }
+      }
+      return candidates;
+    });
+  }
+  resolveCandidate(nativeSessionId) {
+    return this.#scope.resolve(async (signal) => {
+      const files = (await this.#sessionFiles(signal)).get(nativeSessionId);
+      if (files?.length !== 1 || !files[0])
+        return null;
+      return this.#source(nativeSessionId, files[0], await this.#activeSessions(signal), signal);
+    });
+  }
+  close() {
+    return this.#scope.close();
+  }
+  #root() {
+    return codeBuddyConfigRoot(this.#environment, this.#profile);
+  }
+  /** IDs a live native process registered in `<config>/sessions/<pid>.json`. */
+  async #activeSessions(signal) {
+    const active = /* @__PURE__ */ new Set();
+    const directory = path7.join(this.#root(), "sessions");
+    const markers = await opendir(directory).catch((error51) => {
+      if (isMissingFileError(error51) || record2(error51).code === "ENOTDIR")
+        return null;
+      throw error51;
+    });
+    if (!markers)
+      return active;
+    for await (const marker of markers) {
+      signal.throwIfAborted();
+      if (!marker.isFile() || !marker.name.endsWith(".json"))
+        continue;
+      try {
+        const file2 = path7.join(directory, marker.name);
+        if ((await stat2(file2)).size > MAX_MARKER_BYTES)
+          continue;
+        const entry = record2(JSON.parse(await readFile4(file2, { encoding: "utf8", signal })));
+        if (typeof entry.sessionId === "string" && processAlive(entry.pid))
+          active.add(entry.sessionId);
+      } catch (error51) {
+        signal.throwIfAborted();
+        if (isStorageAccessError(error51))
+          throw error51;
+      }
+    }
+    return active;
+  }
+  /** Session ID to every project file claiming it. Enumerated links are not followed. */
+  async #sessionFiles(signal) {
+    const root = path7.join(this.#root(), "projects");
+    const found = /* @__PURE__ */ new Map();
+    const info = await optionalLstat(root);
+    if (!info)
+      return found;
+    if (!info.isDirectory())
+      throw new Error(`${this.#profile.displayName} Session store is not a directory`);
+    for await (const project of await opendir(root)) {
+      signal.throwIfAborted();
+      if (!project.isDirectory())
+        continue;
+      const projectDirectory = path7.join(root, project.name);
+      const entries = await opendir(projectDirectory).catch((error51) => {
+        if (isMissingFileError(error51))
+          return null;
+        throw error51;
+      });
+      if (!entries)
+        continue;
+      for await (const entry of entries) {
+        signal.throwIfAborted();
+        const nativeSessionId = entry.isFile() ? SESSION_FILE.exec(entry.name)?.[1] : void 0;
+        if (!nativeSessionId)
+          continue;
+        const files = found.get(nativeSessionId) ?? [];
+        files.push(path7.join(projectDirectory, entry.name));
+        found.set(nativeSessionId, files);
+      }
+    }
+    return found;
+  }
+  async #source(nativeSessionId, file2, active, signal) {
+    signal.throwIfAborted();
+    return readStableFiles([file2], async ([info]) => {
+      if (!info?.isFile() || info.size === 0 || info.size > MAX_HISTORY_BYTES)
+        return null;
+      try {
+        const facts = await readFacts(file2, signal);
+        if (!facts)
+          return null;
+        const cwd = path7.resolve(facts.cwd);
+        if (!(await stat2(cwd)).isDirectory())
+          return null;
+        const nativeRef = nativeSessionRefSchema.parse({
+          harnessId: this.#profile.harnessId,
+          nativeSessionId,
+          formatVersion: 1
+        });
+        signal.throwIfAborted();
+        const history = await codeBuddyNativeHistory(cwd, nativeRef, this.#environment, this.#profile);
+        if (path7.resolve(history.file) !== path7.resolve(file2))
+          return null;
+        const candidate = sessionImportCandidate({
+          nativeSessionId,
+          cwd,
+          title: facts.title,
+          updatedAt: facts.updatedAt ?? info.mtimeMs,
+          // A registered live process holds the Session. Absence is not proof of idleness.
+          running: active.has(nativeSessionId) ? true : null
+        });
+        return candidate ? { candidate, nativeRef } : null;
+      } catch (error51) {
+        signal.throwIfAborted();
+        if (isStorageAccessError(error51))
+          throw error51;
+        return null;
+      }
+    });
+  }
+};
+
 // ../codebuddy/dist/interactions.js
 var CodeBuddyInteractions = class {
   emit;
@@ -23727,7 +24319,7 @@ var CodeBuddyInteractions = class {
 
 // ../codebuddy/dist/subagent-history.js
 import { readdir as readdir2, realpath as realpath5 } from "node:fs/promises";
-import path7 from "node:path";
+import path8 from "node:path";
 var equalPath2 = (a, b) => process.platform === "win32" ? a.toLowerCase() === b.toLowerCase() : a === b;
 var MAX_CACHED_CHILDREN = 16;
 var CodeBuddyChildObserver = class {
@@ -23791,8 +24383,8 @@ var CodeBuddyChildObserver = class {
   }
   async #directory() {
     const history = await this.#parentHistory();
-    const project = path7.dirname(await realpath5(history.file));
-    const expected = path7.join(project, this.parent.nativeSessionId, "subagents");
+    const project = path8.dirname(await realpath5(history.file));
+    const expected = path8.join(project, this.parent.nativeSessionId, "subagents");
     const actual = await realpath5(expected);
     this.#assertOpen();
     if (!equalPath2(actual, expected))
@@ -23802,7 +24394,7 @@ var CodeBuddyChildObserver = class {
   async #child(directory, childId) {
     if (!validCodeBuddyChildId(childId))
       throw new CodeBuddyError("invalidRequest", "Invalid native Subagent ID");
-    const file2 = path7.join(directory, `${childId}.jsonl`);
+    const file2 = path8.join(directory, `${childId}.jsonl`);
     const before = await codeBuddyFileVersion(file2);
     if (!equalPath2(before.realFile, file2))
       throw new CodeBuddyError("invalidRequest", "Redirected Subagent transcript");
@@ -24514,6 +25106,7 @@ var CodeBuddyAdapter = class {
   harnessId;
   commandCatalog;
   liveCommandCatalog = true;
+  sessionImport;
   subagents = {
     readSnapshot: async ({ parent, nativeSubagentId, cwd }) => {
       try {
@@ -24547,6 +25140,7 @@ var CodeBuddyAdapter = class {
         this.commandCatalog = commandCatalog2;
     }
     this.#environment = { ...options.environment ?? process.env };
+    this.sessionImport = new CodeBuddySessionImport(this.#environment, this.#profile);
     this.#invocation = options.invocationFactory ?? codeBuddyInvocation;
     this.#factory = options.clientFactory ?? ((clientOptions) => new CodeBuddyAcpClient(clientOptions, void 0, this.#invocation));
   }
@@ -24566,7 +25160,7 @@ var CodeBuddyAdapter = class {
     try {
       if (this.#closed)
         throw new CodeBuddyError("invalidState", "Adapter is closed");
-      if (!(await stat2(cwd)).isDirectory())
+      if (!(await stat3(cwd)).isDirectory())
         throw new CodeBuddyError("invalidRequest", "Working directory is not a directory");
       client2 = this.#factory({
         cwd,
@@ -24612,7 +25206,7 @@ var CodeBuddyAdapter = class {
       return failure("invalidRequest", "Unattended execution requires native fullAccess permissions", this.#profile);
     let session;
     try {
-      if (!(await stat2(input.cwd)).isDirectory())
+      if (!(await stat3(input.cwd)).isDirectory())
         throw new CodeBuddyError("invalidRequest", "Working directory is not a directory");
       if (this.#closed)
         throw new CodeBuddyError("invalidState", "Adapter closed while opening Session");
@@ -24675,7 +25269,7 @@ var CodeBuddyAdapter = class {
   async close() {
     this.#closed = true;
     this.#abort.abort();
-    await Promise.allSettled([...this.#derivations]);
+    await Promise.allSettled([this.sessionImport.close(), ...this.#derivations]);
     const results = await Promise.allSettled([...this.#sessions, ...this.#inspections].map((resource) => resource.close()));
     this.#sessions.clear();
     this.#inspections.clear();
@@ -24894,8 +25488,8 @@ var WORKBUDDY_RUNTIME_PROFILE = {
 };
 
 // dist/product-models.js
-import { readFile as readFile4, stat as stat3 } from "node:fs/promises";
-import path8 from "node:path";
+import { readFile as readFile5, stat as stat4 } from "node:fs/promises";
+import path9 from "node:path";
 var MAX_PRODUCT_SNAPSHOT_BYTES = 8 * 1024 * 1024;
 var PRODUCT_CONFIG_PATH_ENV = "ACC_PRODUCT_CONFIG_PATH";
 var PRODUCT_CONFIG_INLINE_ENVS = [
@@ -24948,16 +25542,16 @@ function parseWorkBuddyProductModels(value) {
   return parsed;
 }
 async function readProductJson(file2) {
-  const metadata = await stat3(file2);
+  const metadata = await stat4(file2);
   if (!metadata.isFile() || metadata.size <= 0 || metadata.size > MAX_PRODUCT_SNAPSHOT_BYTES)
     return;
-  return JSON.parse(await readFile4(file2, "utf8"));
+  return JSON.parse(await readFile5(file2, "utf8"));
 }
 function bundledFallbackProductPath(invocation) {
   const cli = invocation.arguments[0];
   if (!cli || cli.startsWith("-"))
     return;
-  return path8.join(path8.dirname(path8.dirname(cli)), "product.json");
+  return path9.join(path9.dirname(path9.dirname(cli)), "product.json");
 }
 async function loadWorkBuddyProductModels(environment) {
   const invocation = workBuddyInvocation(environment, true);
@@ -25060,14 +25654,27 @@ var WorkBuddyAdapter = class extends CodeBuddyAdapter {
 
 // dist/plugin.js
 function createHarnessAdapter(context) {
-  if (context.platform === "darwin" && context.managedRemoteHost)
+  if (context.platform === "darwin" && context.managedRemoteHost) {
+    const environment = {
+      ...context.environment,
+      ...context.launchCommand ? { CODEXHOST_WORKBUDDY_COMMAND: context.launchCommand } : {}
+    };
     return new BrokeredHarnessAdapter({
       harnessId: "workbuddy",
       commandCatalog: WORKBUDDY_COMMAND_CATALOG,
       forwardDelegationEnvironment: true,
       environment: { ...context.environment },
+      isInstalled: () => {
+        try {
+          workBuddyInvocation(environment, true);
+          return true;
+        } catch (error51) {
+          return !(error51 instanceof CodeBuddyError && error51.code === "notInstalled");
+        }
+      },
       ...context.brokerDescriptorPath ? { descriptorPath: context.brokerDescriptorPath } : {}
     });
+  }
   return new WorkBuddyAdapter({
     environment: {
       ...context.environment,