@codexhost/cli-darwin-x64 0.12.0 → 0.12.1

package/app/renderer-extension.js

@@ -581,11 +581,11 @@
       list,
       save: (draft, previous, signal) => mutate(previous, draft, signal),
       remove: (previous, signal) => mutate(previous, null, signal),
-      async connect(hostId, enabled, signal) {
-        await request("set-remote-connection-auto-connect", { hostId, autoConnect: enabled }, signal);
+      async connect(hostId2, enabled, signal) {
+        await request("set-remote-connection-auto-connect", { hostId: hostId2, autoConnect: enabled }, signal);
       },
-      async state(hostId, signal) {
-        const result = await request("app-server-connection-state", { hostId }, signal);
+      async state(hostId2, signal) {
+        const result = await request("app-server-connection-state", { hostId: hostId2 }, signal);
         if (!record(result) || typeof result.state !== "string")
           throw new Error("Invalid Codex connection state");
         return {
@@ -629,7 +629,7 @@
     }
     const control = {
       ssh: createCodexSshClient(ownerWindow),
-      async setup(connection, action, version2) {
+      async setup(connection, action, version2, uninstallPackage) {
         const client = getClient("local");
         if (!client?.setupSsh)
           throw new Error("SSH installation is unavailable; update local codexhost and restart");
@@ -638,20 +638,21 @@
           port: connection.sshPort,
           identity: connection.identity,
           action,
-          version: version2 ?? null
+          version: version2 ?? null,
+          ...action === "uninstall" ? { uninstallPackage: uninstallPackage ?? false } : {}
         });
       },
-      async runtime(hostId) {
-        const client = getClient(hostId);
+      async runtime(hostId2) {
+        const client = getClient(hostId2);
         if (!client?.runtimeStatus)
           throw new Error(
             "Version management is unavailable; update codexhost on this host and reconnect"
           );
         return bounded(client.runtimeStatus());
       },
-      async update(hostId, version2) {
-        if (hostId === "local") throw new Error("Choose a remote SSH connection");
-        const client = getClient(hostId);
+      async update(hostId2, version2) {
+        if (hostId2 === "local") throw new Error("Choose a remote SSH connection");
+        const client = getClient(hostId2);
         if (!client?.updateRemote)
           throw new Error("Remote update is unavailable; update this remote once and reconnect");
         return bounded(client.updateRemote(version2));
@@ -15247,6 +15248,20 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     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),
@@ -15260,6 +15275,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     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",
@@ -15328,16 +15346,6 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     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 THREAD_MANUAL_COMPACTION_STARTED_METHOD = "codexhost/thread/manual-compaction/started";
   var threadManualCompactionStartedSchema = external_exports.strictObject({
@@ -15708,8 +15716,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     message: "Cross-cwd Fork requires exact history Fork support"
   });
   var harnessPermissionModeScopeSchema = external_exports.enum(["live", "atCreate"]);
-  function permissionModeFixedAtCreate(configuration2) {
-    return configuration2.permissionModeScope === "atCreate";
+  function permissionModeFixedAtCreate(configuration) {
+    return configuration.permissionModeScope === "atCreate";
   }
   var harnessSessionCapabilitiesSchema = external_exports.object({
     configuration: external_exports.object({
@@ -16316,14 +16324,80 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     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"]),
+    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);
 
+  // src/remote-connections-request.ts
+  async function handleRemoteConnectionsRequest(control, input) {
+    const request = remoteConnectionsRequestSchema.parse(input);
+    switch (request.action) {
+      case "list":
+        return control.ssh.list();
+      case "save":
+        await control.ssh.save(request.draft, request.previous);
+        return null;
+      case "remove":
+        await control.ssh.remove(request.previous);
+        return null;
+      case "connect":
+        await control.ssh.connect(request.hostId, request.enabled);
+        return null;
+      case "state":
+        return control.ssh.state(request.hostId);
+      case "runtime":
+        return control.runtime(request.hostId);
+      case "update":
+        return control.update(request.hostId, request.version);
+    }
+  }
+
   // src/agent-group-preference.ts
   var AGENT_GROUP_PREFERENCE_STORAGE_KEY = "codexhost.agentGroupPreference.v1";
   var EXTERNAL_AGENTS = KNOWN_RENDERER_AGENTS.filter(
@@ -17349,7 +17423,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   }
 
   // src/settings/harness-installation-panel.ts
-  function createHarnessInstallationPanel(document2, agent, hostId, messages, copy, installation) {
+  function createHarnessInstallationPanel(document2, agent, hostId2, messages, copy, installation) {
     const zh = messages.locale === "zh-CN";
     const guide = harnessInstallationGuide(agent, messages.locale);
     const panel = document2.createElement("div");
@@ -17359,7 +17433,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       p.textContent = text;
       panel.append(p);
     };
-    if (hostId !== "local") {
+    if (hostId2 !== "local") {
       paragraph(zh ? "\u8BF7\u5728\u8FDC\u7A0B Host \u4E0A\u5B89\u88C5\u3002" : "Install on the remote Host.");
     }
     if (guide.before) paragraph(guide.before);
@@ -17627,11 +17701,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     if (availability === "notInstalled") return "setup";
     return "failed";
   }
-  function diagnosticText(hostId, item) {
+  function diagnosticText(hostId2, item) {
     const error51 = item.error;
     return [
       "codexhost connection diagnostics",
-      `host: ${hostId}`,
+      `host: ${hostId2}`,
       `agent: ${item.name}`,
       `status: ${item.availability}`,
       ...error51 ? [
@@ -17666,10 +17740,10 @@ ${error51.stderrTail}`] : []
       () => showCopyButtonFeedback(button, messages.connectionCopyFailed, restoreLabel)
     );
   }
-  function connectionHostName(hostId, messages) {
-    if (hostId === "local") return messages.connectionLocalHost;
-    const separator = hostId.lastIndexOf(":");
-    const encodedName = separator >= 0 ? hostId.slice(separator + 1) : hostId;
+  function connectionHostName(hostId2, messages) {
+    if (hostId2 === "local") return messages.connectionLocalHost;
+    const separator = hostId2.lastIndexOf(":");
+    const encodedName = separator >= 0 ? hostId2.slice(separator + 1) : hostId2;
     try {
       return decodeURIComponent(encodedName);
     } catch {
@@ -17864,7 +17938,7 @@ ${error51.stderrTail}`] : []
     header.append(identity, status);
     return header;
   }
-  function renderConnectionInspector(document2, inspector, item, hostId, messages, diagnostics, existingLaunchControls, refresh) {
+  function renderConnectionInspector(document2, inspector, item, hostId2, messages, diagnostics, existingLaunchControls, refresh) {
     inspector.replaceChildren(createInspectorHeader(document2, item, messages));
     const body = document2.createElement("div");
     body.className = "settings-connection-inspector__body";
@@ -17894,7 +17968,7 @@ ${error51.stderrTail}`] : []
         createHarnessInstallationPanel(
           document2,
           item.agentSnapshot.agent,
-          hostId,
+          hostId2,
           messages,
           (button, command, label) => copyDiagnosticsToClipboard(document2, button, command, messages, label),
           item.install ? {
@@ -17933,7 +18007,7 @@ ${error51.stderrTail}`] : []
       copy.type = "button";
       copy.className = "settings-command-button settings-command-button--secondary";
       setCopyButtonLabel(copy, messages.connectionCopyDetails);
-      const report = diagnosticText(hostId, item);
+      const report = diagnosticText(hostId2, item);
       copy.addEventListener("click", () => {
         copyDiagnosticsToClipboard(document2, copy, report, messages, messages.connectionCopyDetails);
       });
@@ -17986,10 +18060,10 @@ ${error51.stderrTail}`] : []
     const agent = item.agentSnapshot?.agent;
     const getLaunchSettings = diagnostics?.getLaunchSettings?.bind(diagnostics);
     const setLaunchSettings = diagnostics?.setLaunchSettings?.bind(diagnostics);
-    if (hostId === "local" && (agent === "zcode" || agent === "workbuddy") && getLaunchSettings && setLaunchSettings) {
+    if (hostId2 === "local" && (agent === "zcode" || agent === "workbuddy") && getLaunchSettings && setLaunchSettings) {
       launchControls = existingLaunchControls ?? createHarnessLaunchControls(document2, messages, agent, {
-        get: () => getLaunchSettings(hostId, agent),
-        set: (path) => setLaunchSettings(hostId, agent, path)
+        get: () => getLaunchSettings(hostId2, agent),
+        set: (path) => setLaunchSettings(hostId2, agent, path)
       });
       body.append(launchControls);
     }
@@ -18046,7 +18120,7 @@ ${error51.stderrTail}`] : []
     button.addEventListener("click", onReset);
     return button;
   }
-  function createConnectionsSettingsPage(messages, getDiagnostics, groupPreference = getSharedAgentGroupPreferenceStore()) {
+  function createConnectionsSettingsPage(messages, getDiagnostics, groupPreference = getSharedAgentGroupPreferenceStore(), getRemoteConnections = () => null) {
     return Object.freeze({
       id: "connections",
       label: messages.pageLabels.connections,
@@ -18081,6 +18155,7 @@ ${error51.stderrTail}`] : []
         let launchControls = null;
         const versionPanels = /* @__PURE__ */ new Map();
         const updatingVersions = /* @__PURE__ */ new Set();
+        const hostNames = /* @__PURE__ */ new Map();
         let latestSnapshot = null;
         let disposeHostScroller = () => void 0;
         const diagnostics = getDiagnostics();
@@ -18172,7 +18247,7 @@ ${error51.stderrTail}`] : []
             tab.setAttribute("aria-controls", panelId);
             tab.setAttribute("aria-selected", String(host.hostId === selectedHost.hostId));
             tab.tabIndex = host.hostId === selectedHost.hostId ? 0 : -1;
-            const hostName = connectionHostName(host.hostId, messages);
+            const hostName = hostNames.get(host.hostId) || connectionHostName(host.hostId, messages);
             tab.textContent = hostName;
             tab.title = host.active ? `${hostName} \xB7 ${messages.connectionActiveHost}` : hostName;
             tab.addEventListener("click", () => {
@@ -18266,14 +18341,14 @@ ${error51.stderrTail}`] : []
               const key = JSON.stringify([selectedHost.hostId, agent]);
               let panel = versionPanels.get(key);
               if (!panel) {
-                const hostId = selectedHost.hostId;
+                const hostId2 = selectedHost.hostId;
                 panel = createHarnessVersionPanel(document2, messages, context.signal, agent, {
                   async run(action) {
-                    if (action !== "update") return installation(hostId, agent, action);
+                    if (action !== "update") return installation(hostId2, agent, action);
                     updatingVersions.add(key);
                     if (diagnostics) render(diagnostics.snapshot());
                     try {
-                      return await installation(hostId, agent, action);
+                      return await installation(hostId2, agent, action);
                     } finally {
                       updatingVersions.delete(key);
                       if (!context.signal.aborted && diagnostics) render(diagnostics.snapshot());
@@ -18465,6 +18540,17 @@ ${error51.stderrTail}`] : []
           }
         };
         render(diagnostics?.snapshot() ?? null);
+        void getRemoteConnections()?.ssh.list(context.signal).then(
+          (connections) => {
+            if (context.signal.aborted) return;
+            for (const connection of connections) {
+              hostNames.set(connection.hostId, connection.displayName.trim());
+            }
+            render(diagnostics?.snapshot() ?? null);
+          },
+          () => {
+          }
+        );
         const unsubscribeGroup = groupPreference.subscribe(
           () => render(diagnostics?.snapshot() ?? latestSnapshot)
         );
@@ -23869,7 +23955,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
   function isRecord7(value) {
     return value !== null && typeof value === "object" && !Array.isArray(value);
   }
-  function installRendererManualCompaction(target, hostId, messages) {
+  function installRendererManualCompaction(target, hostId2, messages) {
     if (!messages || typeof messages.addEventListener !== "function" || typeof messages.removeEventListener !== "function" || !isRecord7(target) || typeof target.registerPendingManualContextCompaction !== "function" || typeof target.getConversation !== "function") {
       return null;
     }
@@ -23879,7 +23965,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
     const listener = (event) => {
       if (event.source != null && event.source !== messages) return;
       const message = event.data;
-      if (!isRecord7(message) || message.type !== "mcp-notification" || message.hostId !== hostId || message.method !== THREAD_MANUAL_COMPACTION_STARTED_METHOD) {
+      if (!isRecord7(message) || message.type !== "mcp-notification" || message.hostId !== hostId2 || message.method !== THREAD_MANUAL_COMPACTION_STARTED_METHOD) {
         return;
       }
       const params = threadManualCompactionStartedSchema.safeParse(message.params);
@@ -23903,9 +23989,9 @@ Codex Fast mode prioritizes requests and may increase usage.`
   function createRendererHostClients(readRouting, messages = null) {
     let disposed = false;
     const entries = /* @__PURE__ */ new Map();
-    const retire = (hostId) => {
-      const entry = entries.get(hostId);
-      entries.delete(hostId);
+    const retire = (hostId2) => {
+      const entry = entries.get(hostId2);
+      entries.delete(hostId2);
       for (const cleanup of entry?.cleanups ?? []) {
         try {
           cleanup();
@@ -23955,16 +24041,16 @@ Codex Fast mode prioritizes requests and may increase usage.`
     };
     return {
       forRoute,
-      forHost(hostId) {
+      forHost(hostId2) {
         if (disposed) return null;
-        const route = readRouting()?.forHost(hostId) ?? null;
-        if (!route) retire(hostId);
+        const route = readRouting()?.forHost(hostId2) ?? null;
+        if (!route) retire(hostId2);
         return forRoute(route);
       },
       dispose() {
         if (disposed) return;
         disposed = true;
-        for (const hostId of entries.keys()) retire(hostId);
+        for (const hostId2 of entries.keys()) retire(hostId2);
       }
     };
   }
@@ -24073,10 +24159,10 @@ Codex Fast mode prioritizes requests and may increase usage.`
   }
   function sidebarThreadAttributes(element) {
     const taskKey = element.getAttribute(SIDEBAR_THREAD_ID_ATTRIBUTE);
-    const hostId = element.getAttribute(SIDEBAR_THREAD_HOST_ID_ATTRIBUTE);
+    const hostId2 = element.getAttribute(SIDEBAR_THREAD_HOST_ID_ATTRIBUTE);
     const rowMarker = element.getAttribute(SIDEBAR_THREAD_ROW_ATTRIBUTE);
-    if (taskKey === null || hostId === null || rowMarker === null) return null;
-    return { taskKey, hostId, rowMarker };
+    if (taskKey === null || hostId2 === null || rowMarker === null) return null;
+    return { taskKey, hostId: hostId2, rowMarker };
   }
   function draftIdFromSidebarRowElement(element) {
     const attributes = sidebarThreadAttributes(element);
@@ -24088,7 +24174,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
   function threadIdFromSidebarRowElement(element) {
     const attributes = sidebarThreadAttributes(element);
     if (!attributes) return null;
-    const { taskKey, hostId, rowMarker } = attributes;
+    const { taskKey, hostId: hostId2, rowMarker } = attributes;
     const fiberNames = Object.getOwnPropertyNames(element).filter(
       (name) => name.startsWith("__reactFiber$")
     );
@@ -24103,7 +24189,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
       if (isRecord8(props) && isRecord8(props.dataAttributes)) {
         const dataAttributes = props.dataAttributes;
         const threadId = hostThreadIdSchema.safeParse(props.conversationId);
-        if (threadId.success && dataAttributes[SIDEBAR_THREAD_ROW_ATTRIBUTE] === rowMarker && dataAttributes[SIDEBAR_THREAD_ID_ATTRIBUTE] === taskKey && dataAttributes[SIDEBAR_THREAD_HOST_ID_ATTRIBUTE] === hostId) {
+        if (threadId.success && dataAttributes[SIDEBAR_THREAD_ROW_ATTRIBUTE] === rowMarker && dataAttributes[SIDEBAR_THREAD_ID_ATTRIBUTE] === taskKey && dataAttributes[SIDEBAR_THREAD_HOST_ID_ATTRIBUTE] === hostId2) {
           candidates.add(threadId.data);
         }
       }
@@ -24253,7 +24339,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
     const ownershipRetryTimers = /* @__PURE__ */ new Map();
     let disposed = false;
     let scanScheduled = false;
-    const ownershipKey = (hostId, threadId) => JSON.stringify([hostId, threadId]);
+    const ownershipKey = (hostId2, threadId) => JSON.stringify([hostId2, threadId]);
     const scheduleScan = () => {
       if (disposed || scanScheduled) return;
       scanScheduled = true;
@@ -24267,8 +24353,8 @@ Codex Fast mode prioritizes requests and may increase usage.`
       failed.delete(key);
       provisionalCodex.delete(key);
     };
-    const scheduleOwnershipRetry = (hostId, threadId) => {
-      const key = ownershipKey(hostId, threadId);
+    const scheduleOwnershipRetry = (hostId2, threadId) => {
+      const key = ownershipKey(hostId2, threadId);
       if (disposed || !failed.has(key) && !provisionalCodex.has(key) || pending.has(key) || ownershipRetryTimers.has(key)) {
         return;
       }
@@ -24285,19 +24371,19 @@ Codex Fast mode prioritizes requests and may increase usage.`
       }, delay);
       ownershipRetryTimers.set(key, timer);
     };
-    const requestOwnership = (hostId, threadIds, client) => {
-      for (const threadId of threadIds) pending.add(ownershipKey(hostId, threadId));
+    const requestOwnership = (hostId2, threadIds, client) => {
+      for (const threadId of threadIds) pending.add(ownershipKey(hostId2, threadId));
       let succeeded = false;
       let retryable = true;
       void Promise.resolve().then(() => client.listThreadOwnership({ threadIds })).then(({ threads }) => {
         if (disposed) return;
         for (const ownership of threads) {
-          const key = ownershipKey(hostId, ownership.threadId);
+          const key = ownershipKey(hostId2, ownership.threadId);
           ownershipByThread.set(key, rendererAgentForThreadOwnership(ownership));
           failed.delete(key);
           if (ownership.owner === "codex") {
             provisionalCodex.add(key);
-            scheduleOwnershipRetry(hostId, ownership.threadId);
+            scheduleOwnershipRetry(hostId2, ownership.threadId);
           } else {
             clearOwnershipRetry(key);
           }
@@ -24306,11 +24392,11 @@ Codex Fast mode prioritizes requests and may increase usage.`
       }).catch((error51) => {
         if (disposed) return;
         retryable = !(error51 instanceof RendererMethodUnavailableError);
-        for (const threadId of threadIds) failed.add(ownershipKey(hostId, threadId));
+        for (const threadId of threadIds) failed.add(ownershipKey(hostId2, threadId));
       }).finally(() => {
-        for (const threadId of threadIds) pending.delete(ownershipKey(hostId, threadId));
+        for (const threadId of threadIds) pending.delete(ownershipKey(hostId2, threadId));
         if (retryable) {
-          for (const threadId of threadIds) scheduleOwnershipRetry(hostId, threadId);
+          for (const threadId of threadIds) scheduleOwnershipRetry(hostId2, threadId);
         }
         if (succeeded) scheduleScan();
       });
@@ -24324,20 +24410,20 @@ Codex Fast mode prioritizes requests and may increase usage.`
           row.clear();
           continue;
         }
-        const hostId = row.hostId();
-        if (!hostId) {
+        const hostId2 = row.hostId();
+        if (!hostId2) {
           row.clear();
           continue;
         }
         const threadId = hostThreadIdSchema.safeParse(row.threadId());
         const localAgent = options.getLocalAgent?.({
-          hostId,
+          hostId: hostId2,
           threadId: threadId.success ? threadId.data : null,
           draftId: row.draftId()
         });
         if (localAgent !== null && localAgent !== void 0) {
           if (threadId.success) {
-            const key2 = ownershipKey(hostId, threadId.data);
+            const key2 = ownershipKey(hostId2, threadId.data);
             ownershipByThread.set(key2, localAgent === "codex" ? null : localAgent);
             clearOwnershipRetry(key2);
           }
@@ -24349,7 +24435,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
           row.clear();
           continue;
         }
-        const key = ownershipKey(hostId, threadId.data);
+        const key = ownershipKey(hostId2, threadId.data);
         if (ownershipByThread.has(key)) {
           const agent = ownershipByThread.get(key);
           if (agent) row.render(agent);
@@ -24358,28 +24444,28 @@ Codex Fast mode prioritizes requests and may increase usage.`
         }
         row.clear();
         if (!pending.has(key) && !failed.has(key)) {
-          let unresolved = unresolvedByHost.get(hostId);
+          let unresolved = unresolvedByHost.get(hostId2);
           if (!unresolved) {
             unresolved = /* @__PURE__ */ new Set();
-            unresolvedByHost.set(hostId, unresolved);
+            unresolvedByHost.set(hostId2, unresolved);
           }
           unresolved.add(threadId.data);
         }
       }
-      for (const [hostId, unresolved] of unresolvedByHost) {
-        const client = options.getClient(hostId);
+      for (const [hostId2, unresolved] of unresolvedByHost) {
+        const client = options.getClient(hostId2);
         if (!client) {
           for (const threadId of unresolved) {
-            const key = ownershipKey(hostId, threadId);
+            const key = ownershipKey(hostId2, threadId);
             failed.add(key);
-            scheduleOwnershipRetry(hostId, threadId);
+            scheduleOwnershipRetry(hostId2, threadId);
           }
           continue;
         }
         const threadIds = [...unresolved];
         for (let index = 0; index < threadIds.length; index += THREAD_OWNERSHIP_LIST_MAX_LENGTH) {
           requestOwnership(
-            hostId,
+            hostId2,
             threadIds.slice(index, index + THREAD_OWNERSHIP_LIST_MAX_LENGTH),
             client
           );
@@ -25064,7 +25150,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
       const localClient = disposed ? null : route?.hostId === "local" ? client : clients.forHost("local");
       idleReleaseSync.connect(localClient);
       const connected = !disposed && (client !== null || localClient !== null || (window.__codexhostHostRoutingV1?.knownHostIds?.() ?? []).some(
-        (hostId) => window.__codexhostHostRoutingV1?.forHost(hostId) != null
+        (hostId2) => window.__codexhostHostRoutingV1?.forHost(hostId2) != null
       ));
       updateStatus(
         connected ? "ready" : "installing",
@@ -25092,7 +25178,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
         return disposed ? null : route?.hostId ?? window.__codexhostHostRoutingV1?.hostIdForComposer() ?? null;
       },
       knownHostIds: () => disposed ? [] : window.__codexhostHostRoutingV1?.knownHostIds?.() ?? [],
-      clientForHost: (hostId) => disposed ? null : clients.forHost(hostId),
+      clientForHost: (hostId2) => disposed ? null : clients.forHost(hostId2),
       listHarnessPlugins: async () => {
         const client = settingsModelClient();
         if (!client.listHarnessPlugins) throw new Error("Harness plugin directory is unavailable");
@@ -25296,8 +25382,8 @@ Codex Fast mode prioritizes requests and may increase usage.`
         KNOWN_RENDERER_AGENTS.filter(
           (agent) => agent !== "codex"
         ).flatMap((agent) => {
-          const configuration2 = parseExternalConfiguration(externalByAgent[agent]);
-          return configuration2 ? [[agent, configuration2]] : [];
+          const configuration = parseExternalConfiguration(externalByAgent[agent]);
+          return configuration ? [[agent, configuration]] : [];
         })
       );
       return {
@@ -25596,6 +25682,9 @@ Codex Fast mode prioritizes requests and may increase usage.`
 
   // src/settings/remote-failure-messages.ts
   var REMOTE_FAILURE_CHINESE = Object.freeze({
+    "Remote connection management is unavailable. Restart Codex through codexhost": "\u8FDC\u7A0B\u8FDE\u63A5\u7BA1\u7406\u6682\u4E0D\u53EF\u7528\uFF0C\u8BF7\u901A\u8FC7 codexhost \u91CD\u65B0\u542F\u52A8 Codex",
+    "Remote connection request timed out. Refresh before retrying": "\u8FDC\u7A0B\u8FDE\u63A5\u8BF7\u6C42\u8D85\u65F6\uFF0C\u8BF7\u5237\u65B0\u540E\u518D\u8BD5",
+    "Invalid remote connection request": "\u8FDC\u7A0B\u8FDE\u63A5\u8BF7\u6C42\u65E0\u6548",
     // SSH helper: installing, updating and repairing over SSH.
     "Invalid SSH address or port": "SSH \u5730\u5740\u6216\u7AEF\u53E3\u65E0\u6548",
     "Install requires a published stable version": "\u53EA\u80FD\u5B89\u88C5\u5DF2\u53D1\u5E03\u7684\u6B63\u5F0F\u7248\u672C",
@@ -25605,7 +25694,13 @@ Codex Fast mode prioritizes requests and may increase usage.`
     "This release is not published on npm, or the remote computer cannot reach the registry": "\u8BE5\u7248\u672C\u5C1A\u672A\u53D1\u5E03\u5230 npm\uFF0C\u6216\u8FDC\u7A0B\u7535\u8111\u65E0\u6CD5\u8BBF\u95EE npm \u4ED3\u5E93",
     "codexhost was installed but is not on the remote PATH. Update this remote manually": "codexhost \u5DF2\u5B89\u88C5\uFF0C\u4F46\u4E0D\u5728\u8FDC\u7A0B\u7535\u8111\u7684 PATH \u4E2D\uFF0C\u8BF7\u5728\u8FDC\u7A0B\u7535\u8111\u4E0A\u624B\u52A8\u66F4\u65B0",
     "Only Mac and Linux remote computers are supported": "\u53EA\u652F\u6301 Mac \u548C Linux \u8FDC\u7A0B\u7535\u8111",
-    "Node.js, npm or Codex CLI was not found over SSH. Install them on the remote computer and make sure non-interactive SSH sessions have them on PATH": "\u901A\u8FC7 SSH \u627E\u4E0D\u5230 Node.js\u3001npm \u6216 Codex CLI\u3002\u8BF7\u5728\u8FDC\u7A0B\u7535\u8111\u4E0A\u5B89\u88C5\u5B83\u4EEC\uFF0C\u5E76\u786E\u4FDD\u975E\u4EA4\u4E92\u5F0F SSH \u4F1A\u8BDD\u7684 PATH \u4E2D\u5305\u542B\u5B83\u4EEC",
+    "Node.js was not detected over SSH. Install it on the remote computer or add it to the login shell PATH, then retry": "\u901A\u8FC7 SSH \u672A\u68C0\u6D4B\u5230 Node.js\u3002\u8BF7\u5728\u8FDC\u7A0B\u7535\u8111\u4E0A\u5B89\u88C5\uFF0C\u6216\u5C06\u5DF2\u5B89\u88C5\u7684 Node.js \u52A0\u5165\u767B\u5F55 shell \u7684 PATH \u540E\u91CD\u8BD5",
+    "npm was not detected over SSH. Install it on the remote computer or add it to the login shell PATH, then retry": "\u901A\u8FC7 SSH \u672A\u68C0\u6D4B\u5230 npm\u3002\u8BF7\u5728\u8FDC\u7A0B\u7535\u8111\u4E0A\u5B89\u88C5\uFF0C\u6216\u5C06\u5DF2\u5B89\u88C5\u7684 npm \u52A0\u5165\u767B\u5F55 shell \u7684 PATH \u540E\u91CD\u8BD5",
+    "Codex CLI was not detected over SSH. Install the command-line tool on the remote computer or add it to the login shell PATH, then retry. Codex Desktop is not required": "\u901A\u8FC7 SSH \u672A\u68C0\u6D4B\u5230 Codex CLI\uFF08\u547D\u4EE4\u884C\u5DE5\u5177\uFF09\u3002\u8BF7\u5728\u8FDC\u7A0B\u7535\u8111\u4E0A\u5B89\u88C5\uFF0C\u6216\u5C06\u5DF2\u5B89\u88C5\u7684 Codex CLI \u52A0\u5165\u767B\u5F55 shell \u7684 PATH \u540E\u91CD\u8BD5\u3002\u65E0\u9700\u5B89\u88C5 Codex \u684C\u9762\u7AEF",
+    "codexhost was not detected over SSH. Install it on the remote computer or add it to the login shell PATH, then retry": "\u901A\u8FC7 SSH \u672A\u68C0\u6D4B\u5230 codexhost\u3002\u8BF7\u5728\u8FDC\u7A0B\u7535\u8111\u4E0A\u5B89\u88C5\uFF0C\u6216\u5C06\u5DF2\u5B89\u88C5\u7684 codexhost \u52A0\u5165\u767B\u5F55 shell \u7684 PATH \u540E\u91CD\u8BD5",
+    "The active codexhost does not match the global npm installation. Uninstall only the remote service, or remove the package manually on the remote computer": "\u5F53\u524D codexhost \u4E0E npm \u5168\u5C40\u5B89\u88C5\u4F4D\u7F6E\u4E0D\u5339\u914D\u3002\u8BF7\u9009\u62E9\u4EC5\u5378\u8F7D\u8FDC\u7A0B\u670D\u52A1\uFF0C\u6216\u5728\u8FDC\u7A0B\u7535\u8111\u4E0A\u624B\u52A8\u5378\u8F7D\u8F6F\u4EF6\u5305",
+    "The remote service was uninstalled, but removing the codexhost package failed. Check npm permissions on the remote computer and retry": "\u8FDC\u7A0B\u670D\u52A1\u5DF2\u5378\u8F7D\uFF0C\u4F46 codexhost \u8F6F\u4EF6\u5305\u5378\u8F7D\u5931\u8D25\u3002\u8BF7\u68C0\u67E5\u8FDC\u7A0B\u7535\u8111\u4E0A\u7684 npm \u6743\u9650\u540E\u91CD\u8BD5",
+    "Remote Node.js is unsupported. Select Node.js 22.19 or later in the 22.x series, or Node.js 24.x": "\u8FDC\u7A0B Node.js \u7248\u672C\u4E0D\u53D7\u652F\u6301\uFF0C\u8BF7\u9009\u62E9 Node.js 22.19 \u53CA\u4EE5\u4E0A\u7684 22.x \u7248\u672C\uFF0C\u6216 Node.js 24.x",
     "npm installation failed. Check network access and global installation permissions": "npm \u5B89\u88C5\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u548C\u5168\u5C40\u5B89\u88C5\u6743\u9650",
     "Remote service configuration failed. Check Codex CLI and the remote desktop login": "\u8FDC\u7A0B\u670D\u52A1\u914D\u7F6E\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5 Codex CLI \u4EE5\u53CA\u8FDC\u7A0B\u7535\u8111\u7684\u684C\u9762\u767B\u5F55\u72B6\u6001",
     "Remote service could not stop. Check the remote service before retrying": "\u8FDC\u7A0B\u670D\u52A1\u65E0\u6CD5\u505C\u6B62\uFF0C\u8BF7\u68C0\u67E5\u8FDC\u7A0B\u670D\u52A1\u540E\u91CD\u8BD5",
@@ -25903,6 +25998,9 @@ Codex Fast mode prioritizes requests and may increase usage.`
     }
     const serviceActions = remoteElement(document2, "div", "settings-remote-card__actions");
     if (!row.probing) {
+      if (row.installation === "installed" && !remoteBusy(remote)) {
+        serviceActions.append(command("uninstall", t("\u5378\u8F7D\u8FDC\u7A0B\u670D\u52A1", "Uninstall remote service")));
+      }
       const outdated = !remote && !!row.remoteIssue?.outdated && row.installation !== "not-installed";
       if (outdated) {
         const upgrade = command("upgrade", t("\u66F4\u65B0\u8FDC\u7A0B\u670D\u52A1", "Update remote service"), true);
@@ -26219,6 +26317,61 @@ Codex Fast mode prioritizes requests and may increase usage.`
     });
     dialog.show(t("\u79FB\u9664", "Remove"), t("\u79FB\u9664\u4E2D\u2026", "Removing\u2026"), true);
   }
+  function openRemoteServiceUninstall(options) {
+    const { t, connection } = options;
+    const dialog = createRemoteDialog(
+      options,
+      t(
+        `\u5378\u8F7D\u201C${connection.displayName}\u201D\u7684\u8FDC\u7A0B\u670D\u52A1\uFF1F`,
+        `Uninstall remote service on "${connection.displayName}"?`
+      )
+    );
+    if (!dialog) return;
+    const document2 = options.container.ownerDocument;
+    dialog.body.append(
+      remoteElement(
+        document2,
+        "p",
+        "",
+        t(
+          "\u5378\u8F7D\u4F1A\u4E2D\u65AD codexhost \u542F\u52A8\u7684\u4F1A\u8BDD\u3002\u5982\u9700\u5728\u8BE5\u7535\u8111\u7EE7\u7EED\u4F7F\u7528\uFF0C\u8BF7\u624B\u52A8\u901A\u8FC7 codexhost \u91CD\u65B0\u542F\u52A8\u3002",
+          "Uninstalling interrupts sessions started through codexhost. To keep using it on that computer, manually relaunch through codexhost."
+        )
+      )
+    );
+    const label = remoteElement(document2, "label", "settings-remote-dialog__package-option");
+    const removePackage = remoteElement(document2, "input");
+    removePackage.type = "checkbox";
+    label.append(
+      removePackage,
+      t("\u540C\u65F6\u5378\u8F7D codexhost \u8F6F\u4EF6\u5305", "Also uninstall the codexhost package")
+    );
+    dialog.body.append(
+      label,
+      remoteElement(
+        document2,
+        "p",
+        "",
+        t(
+          "\u52FE\u9009\u540E\uFF0C\u518D\u6B21\u4F7F\u7528\u524D\u9700\u91CD\u65B0\u5B89\u88C5 codexhost\u3002",
+          "If selected, reinstall codexhost before using it again."
+        )
+      )
+    );
+    dialog.form.addEventListener("submit", (event) => {
+      event.preventDefault();
+      const selected = removePackage.checked;
+      dialog.submit(async () => {
+        removePackage.disabled = true;
+        try {
+          await options.uninstall(selected);
+        } finally {
+          removePackage.disabled = false;
+        }
+      });
+    });
+    dialog.show(t("\u5378\u8F7D", "Uninstall"), t("\u5378\u8F7D\u4E2D\u2026", "Uninstalling\u2026"), true);
+  }
 
   // src/settings/remote-connections-page.ts
   var POLL_INTERVAL_MS = 5e3;
@@ -26347,17 +26500,17 @@ Codex Fast mode prioritizes requests and may increase usage.`
           banner.hidden = !loadError;
           bannerText.textContent = loadError ? `${t("\u8BFB\u53D6\u8FDE\u63A5\u5931\u8D25", "Could not load connections")}: ${localizeRemoteFailure(loadError, t)}` : "";
           renderPlaceholder();
-          for (const [hostId, card] of cards) {
-            if (rows.has(hostId)) continue;
+          for (const [hostId2, card] of cards) {
+            if (rows.has(hostId2)) continue;
             card.element.remove();
-            cards.delete(hostId);
+            cards.delete(hostId2);
           }
           const active = focusedElement();
-          order.forEach((hostId, index) => {
-            const row = rows.get(hostId);
+          order.forEach((hostId2, index) => {
+            const row = rows.get(hostId2);
             if (!row) return;
             const signature = JSON.stringify([row, local]);
-            let card = cards.get(hostId);
+            let card = cards.get(hostId2);
             if (card?.signature !== signature) {
               const element = renderRemoteCard(
                 document2,
@@ -26369,7 +26522,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
               const focusedAction = active && card?.element.contains(active) ? active.dataset.action : void 0;
               if (card) card.element.replaceWith(element);
               card = { element, signature };
-              cards.set(hostId, card);
+              cards.set(hostId2, card);
               if (focusedAction) focusAction(element, focusedAction);
             }
             if (list.children[index] !== card.element)
@@ -26381,38 +26534,41 @@ Codex Fast mode prioritizes requests and may increase usage.`
           target?.focus();
         }
         async function probe(row) {
-          const { hostId } = row.connection;
-          const token = (probeTokens.get(hostId) ?? 0) + 1;
-          probeTokens.set(hostId, token);
-          const state = await control.ssh.state(hostId, signal).catch((error51) => ({ state: "unknown", error: remoteErrorMessage(error51) }));
+          const { hostId: hostId2 } = row.connection;
+          const token = (probeTokens.get(hostId2) ?? 0) + 1;
+          probeTokens.set(hostId2, token);
+          const state = await control.ssh.state(hostId2, signal).catch((error51) => ({ state: "unknown", error: remoteErrorMessage(error51) }));
           let remote = null;
           let remoteIssue = null;
           if (state.state === "connected")
-            remote = await control.runtime(hostId).catch((error51) => {
+            remote = await control.runtime(hostId2).catch((error51) => {
               remoteIssue = remoteVersionIssue(error51);
               return null;
             });
+          if (signal.aborted || rows.get(hostId2) !== row || probeTokens.get(hostId2) !== token) return;
           let expectedGap = false;
-          if (remote && remoteBusy(remote)) restarting.set(hostId, Date.now() + RESTART_GRACE_MS);
-          else if (remote || (restarting.get(hostId) ?? 0) <= Date.now()) restarting.delete(hostId);
+          if (remote && remoteBusy(remote)) restarting.set(hostId2, Date.now() + RESTART_GRACE_MS);
+          else if (remote || (restarting.get(hostId2) ?? 0) <= Date.now()) restarting.delete(hostId2);
           else if (row.remote) {
             expectedGap = true;
             remote = { ...row.remote, update: { ...row.remote.update, phase: "restarting" } };
             remoteIssue = null;
           }
-          if (remote) installations.set(hostId, "installed");
-          else if (!installations.has(hostId) && Date.now() - (inspectFailures.get(hostId) ?? -INSPECT_RETRY_MS) >= INSPECT_RETRY_MS) {
+          if (remote) installations.set(hostId2, "installed");
+          else if (!installations.has(hostId2) && Date.now() - (inspectFailures.get(hostId2) ?? -INSPECT_RETRY_MS) >= INSPECT_RETRY_MS) {
             const inspected = await control.setup(row.connection, "inspect").catch(() => null);
-            if (inspected) installations.set(hostId, inspected.state);
-            else inspectFailures.set(hostId, Date.now());
+            if (signal.aborted || rows.get(hostId2) !== row || probeTokens.get(hostId2) !== token)
+              return;
+            if (inspected) installations.set(hostId2, inspected.state);
+            else inspectFailures.set(hostId2, Date.now());
           }
-          if (signal.aborted || rows.get(hostId) !== row || probeTokens.get(hostId) !== token) return;
+          if (signal.aborted || rows.get(hostId2) !== row || probeTokens.get(hostId2) !== token) return;
           row.probing = false;
           row.state = expectedGap ? "connecting" : state.state;
           row.stateError = expectedGap ? null : state.error;
           row.remote = remote;
           row.remoteIssue = remoteIssue;
-          row.installation = installations.get(hostId) ?? "unknown";
+          row.installation = installations.get(hostId2) ?? "unknown";
           render();
         }
         async function refresh(actingHostId, wait = "acting") {
@@ -26452,27 +26608,28 @@ Codex Fast mode prioritizes requests and may increase usage.`
                 notice: null
               });
           }
-          for (const hostId of [...rows.keys()]) {
-            if (order.includes(hostId)) continue;
-            rows.delete(hostId);
-            installations.delete(hostId);
-            probeTokens.delete(hostId);
-            inspectFailures.delete(hostId);
-            restarting.delete(hostId);
+          for (const hostId2 of [...rows.keys()]) {
+            if (order.includes(hostId2)) continue;
+            rows.delete(hostId2);
+            installations.delete(hostId2);
+            probeTokens.delete(hostId2);
+            inspectFailures.delete(hostId2);
+            restarting.delete(hostId2);
           }
           render();
           const probes = [...rows.values()].filter((row) => !row.pending || row.connection.hostId === actingHostId).map((row) => ({ hostId: row.connection.hostId, done: probe(row) }));
           const awaited = wait === "all" ? probes : probes.filter((p) => p.hostId === actingHostId);
           await Promise.all([localTask, ...awaited.map((p) => p.done)]);
         }
-        async function act(row, action, label, operation) {
-          const { hostId } = row.connection;
+        async function act(row, action, label, operation, rethrow = false) {
+          const { hostId: hostId2 } = row.connection;
+          probeTokens.set(hostId2, (probeTokens.get(hostId2) ?? 0) + 1);
           row.pending = label;
           row.notice = null;
           render();
           try {
             const done = await operation();
-            await refresh(hostId);
+            await refresh(hostId2);
             if (typeof done === "string") {
               const notice = { tone: "success", text: done };
               row.notice = notice;
@@ -26484,14 +26641,15 @@ Codex Fast mode prioritizes requests and may increase usage.`
             }
           } catch (error51) {
             row.notice = { tone: "danger", text: remoteErrorMessage(error51) };
-            installations.delete(hostId);
-            inspectFailures.delete(hostId);
-            void refresh(hostId);
+            installations.delete(hostId2);
+            inspectFailures.delete(hostId2);
+            void refresh(hostId2);
+            if (rethrow) throw error51;
           } finally {
             row.pending = null;
             if (!signal.aborted) {
               render();
-              const card = cards.get(hostId)?.element;
+              const card = cards.get(hostId2)?.element;
               if (card && !focusedElement()) focusAction(card, action);
             }
           }
@@ -26516,9 +26674,9 @@ Codex Fast mode prioritizes requests and may increase usage.`
         function handle(row, action) {
           if (row.pending) return;
           const { connection } = row;
-          const { hostId } = connection;
+          const { hostId: hostId2 } = connection;
           const setConnected = async (enabled) => {
-            const request = control.ssh.connect(hostId, enabled, signal);
+            const request = control.ssh.connect(hostId2, enabled, signal);
             request.catch(() => void 0);
             await Promise.race([
               request,
@@ -26526,8 +26684,8 @@ Codex Fast mode prioritizes requests and may increase usage.`
             ]);
           };
           const reconnect = async () => {
-            installations.delete(hostId);
-            inspectFailures.delete(hostId);
+            installations.delete(hostId2);
+            inspectFailures.delete(hostId2);
             await setConnected(true);
           };
           switch (action) {
@@ -26562,8 +26720,8 @@ Codex Fast mode prioritizes requests and may increase usage.`
               break;
             case "recheck":
               void act(row, action, t("\u6B63\u5728\u91CD\u65B0\u68C0\u6D4B\u2026", "Checking again\u2026"), async () => {
-                installations.delete(hostId);
-                inspectFailures.delete(hostId);
+                installations.delete(hostId2);
+                inspectFailures.delete(hostId2);
               });
               break;
             case "install": {
@@ -26608,6 +26766,47 @@ Codex Fast mode prioritizes requests and may increase usage.`
                 }
               );
               break;
+            case "uninstall":
+              if (row.installation !== "installed" || remoteBusy(row.remote)) break;
+              openRemoteServiceUninstall({
+                container: root,
+                signal,
+                t,
+                connection,
+                async uninstall(removePackage) {
+                  if (row.pending || remoteBusy(row.remote))
+                    throw new Error(
+                      t(
+                        "\u8FDC\u7A0B\u670D\u52A1\u6B63\u5728\u6267\u884C\u5176\u4ED6\u64CD\u4F5C\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",
+                        "Another remote operation is active; retry shortly"
+                      )
+                    );
+                  await act(
+                    row,
+                    action,
+                    t("\u6B63\u5728\u5378\u8F7D\u8FDC\u7A0B\u670D\u52A1\u2026", "Uninstalling remote service\u2026"),
+                    async () => {
+                      await control.ssh.connect(hostId2, false, signal);
+                      await control.setup(connection, "uninstall", void 0, removePackage);
+                      installations.set(hostId2, "not-installed");
+                      inspectFailures.delete(hostId2);
+                      restarting.delete(hostId2);
+                      row.remote = null;
+                      row.remoteIssue = null;
+                      row.stateError = null;
+                      return removePackage ? t(
+                        "\u8FDC\u7A0B\u670D\u52A1\u548C codexhost \u8F6F\u4EF6\u5305\u5DF2\u5378\u8F7D",
+                        "Remote service and codexhost package uninstalled"
+                      ) : t(
+                        "\u8FDC\u7A0B\u670D\u52A1\u5DF2\u5378\u8F7D\uFF0Ccodexhost \u8F6F\u4EF6\u5305\u5DF2\u4FDD\u7559",
+                        "Remote service uninstalled; codexhost package kept"
+                      );
+                    },
+                    true
+                  );
+                }
+              });
+              break;
             case "update": {
               const target = row.remote ? remoteMaintenanceTarget(local, row.remote) : null;
               if (!target) break;
@@ -26617,7 +26816,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
                 action,
                 restart ? t("\u6B63\u5728\u91CD\u542F\u8FDC\u7A0B\u670D\u52A1\u2026", "Restarting remote service\u2026") : t("\u6B63\u5728\u63D0\u4EA4\u66F4\u65B0\u2026", "Starting update\u2026"),
                 async () => {
-                  await control.update(hostId, target);
+                  await control.update(hostId2, target);
                   await setConnected(true);
                 }
               );
@@ -27313,7 +27512,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
           void context.runLatest(
             async (signal) => {
               const missing = new Set(
-                getDiagnostics()?.snapshot().hosts.find(({ hostId }) => hostId === "local")?.agents.filter(({ availability }) => availability === "notInstalled").map(({ agent }) => agent)
+                getDiagnostics()?.snapshot().hosts.find(({ hostId: hostId2 }) => hostId2 === "local")?.agents.filter(({ availability }) => availability === "notInstalled").map(({ agent }) => agent)
               );
               const harnesses = (await client.listSessionImportSources()).harnesses.filter(
                 ({ harnessId }) => !missing.has(harnessId)
@@ -29786,7 +29985,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
   }
   function createDefaultRendererSettingsPages(messages = DEFAULT_RENDERER_SETTINGS_MESSAGES, getUpdateClient = () => null, getDiagnostics = () => null, getAccountClient = () => null, getSessionImportClient = () => null, openImportedThread = () => Promise.reject(new Error("Imported Thread navigation is unavailable")), getLoadedSessionsClient = () => null, getRemoteConnections = () => null) {
     return Object.freeze([
-      createConnectionsSettingsPage(messages, getDiagnostics),
+      createConnectionsSettingsPage(messages, getDiagnostics, void 0, getRemoteConnections),
       createRemoteConnectionsPage(messages, getRemoteConnections),
       createAccountsSettingsPage(messages, getAccountClient),
       createSessionImportSettingsPage(
@@ -32302,6 +32501,23 @@ Codex Fast mode prioritizes requests and may increase usage.`
   outline-offset: -1px;
 }
 
+.settings-remote-dialog__package-option {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  cursor: pointer;
+}
+
+.settings-remote-dialog .settings-remote-dialog__package-option input {
+  flex: none;
+  width: 16px;
+  height: 16px;
+  min-height: 16px;
+  margin: 0;
+  padding: 0;
+  accent-color: var(--settings-focus);
+}
+
 @keyframes settings-remote-spin {
   to {
     transform: rotate(360deg);
@@ -34421,9 +34637,9 @@ ${accounts_default}`;
   var rendererUsageRefreshDelays = [250, 500, 1e3, 2e3, 4e3, 8e3];
   function refreshConnectionHosts(hostIds, refreshHost, pendingHost) {
     return Promise.all(
-      [...hostIds].map(async (hostId) => {
-        if (pendingHost) await pendingHost(hostId)?.catch(() => void 0);
-        await refreshHost(hostId);
+      [...hostIds].map(async (hostId2) => {
+        if (pendingHost) await pendingHost(hostId2)?.catch(() => void 0);
+        await refreshHost(hostId2);
       })
     ).then(() => void 0);
   }
@@ -34648,9 +34864,9 @@ ${accounts_default}`;
     if (!isLateConversationTarget(mountedTarget, currentTarget)) return "none";
     return mountedTarget?.[0] === "default" && (sourcePhase === "locked" || submissionPending) ? "transfer" : "inspect";
   }
-  function scopedComposerTarget(target, hostId) {
-    if (target?.[0] !== "conversation" || !hostId) return target;
-    return ["conversation", target[1], hostId];
+  function scopedComposerTarget(target, hostId2) {
+    if (target?.[0] !== "conversation" || !hostId2) return target;
+    return ["conversation", target[1], hostId2];
   }
   function isComposerModelWriteAllowed(target) {
     return target?.[0] === "default";
@@ -34723,7 +34939,7 @@ ${accounts_default}`;
       if (!modelControl) return null;
       return modelControl.currentHostId ? modelControl.currentHostId(composer) : "local";
     };
-    const controllerTarget = (target, hostId) => scopedComposerTarget(target, hostId);
+    const controllerTarget = (target, hostId2) => scopedComposerTarget(target, hostId2);
     const usageSubscriptions = /* @__PURE__ */ new Map();
     const usageNotificationDispose = () => {
       for (const subscription of usageSubscriptions.values()) subscription.dispose();
@@ -34742,7 +34958,7 @@ ${accounts_default}`;
       return null;
     };
     const sidebarAgentIcons = installRendererSidebarAgentIcons({
-      getClient: (hostId) => modelClientForHost(hostId),
+      getClient: (hostId2) => modelClientForHost(hostId2),
       getLocalAgent: localAgentForSidebarThread
     });
     let connectionDiagnostics = null;
@@ -34808,27 +35024,27 @@ ${accounts_default}`;
       retryAttempt: 0
     });
     const harnessAvailabilityByHost = /* @__PURE__ */ new Map();
-    const hostHarnessAvailabilityState = (hostId) => {
-      let state = harnessAvailabilityByHost.get(hostId);
+    const hostHarnessAvailabilityState = (hostId2) => {
+      let state = harnessAvailabilityByHost.get(hostId2);
       if (!state) {
         state = createHostHarnessAvailabilityState();
-        harnessAvailabilityByHost.set(hostId, state);
+        harnessAvailabilityByHost.set(hostId2, state);
       }
       return state;
     };
-    const codexAccountsForHost = (hostId) => {
-      if (!hostId) return null;
-      const client = modelClientForHost(hostId);
+    const codexAccountsForHost = (hostId2) => {
+      if (!hostId2) return null;
+      const client = modelClientForHost(hostId2);
       if (!client) return null;
-      const state = hostHarnessAvailabilityState(hostId);
+      const state = hostHarnessAvailabilityState(hostId2);
       if (state.codexAccounts?.client !== client) {
         state.codexAccounts?.dispose();
         state.codexAccounts = new RendererCodexAccountState(client, () => {
           queueMicrotask(() => {
-            if (disposed || hostHarnessAvailabilityState(hostId).codexAccounts?.client !== client)
+            if (disposed || hostHarnessAvailabilityState(hostId2).codexAccounts?.client !== client)
               return;
             for (const mounted of mountedByComposer.values()) {
-              if (mounted.hostId !== hostId) continue;
+              if (mounted.hostId !== hostId2) continue;
               renderMounted(mounted);
               void refreshDraftCodexUsage(mounted);
             }
@@ -34915,8 +35131,8 @@ ${accounts_default}`;
     {
       const published = Reflect.get(window, "__codexhostDraftWorkspacesV1");
       if (typeof published === "object" && published !== null) {
-        for (const [hostId, cwd] of Object.entries(published)) {
-          if (typeof cwd === "string" && cwd.length > 0) draftWorkspaces.set(hostId, cwd);
+        for (const [hostId2, cwd] of Object.entries(published)) {
+          if (typeof cwd === "string" && cwd.length > 0) draftWorkspaces.set(hostId2, cwd);
         }
       }
     }
@@ -34924,17 +35140,17 @@ ${accounts_default}`;
       const generation = ++mounted.commandRequestGeneration;
       const agent = controller.get(mounted.composer).agent;
       const threadId = threadIdFromComposerModelTarget(mounted.modelTarget);
-      const hostId = threadId ? mounted.hostId : activeModelHostId(mounted.composer);
+      const hostId2 = threadId ? mounted.hostId : activeModelHostId(mounted.composer);
       const requestControl = modelControl;
-      const client = modelClientForHostFrom(requestControl, hostId);
+      const client = modelClientForHostFrom(requestControl, hostId2);
       if (!keepCurrent || agent === "codex") mounted.control.harnessCommands.setCommands([]);
       if (agent === "codex" || !client) return;
       try {
         const catalog = threadId ? await client.inspectThreadCommands({ threadId }) : await client.inspectHarnessCommands({
           harnessId: externalHarnessIds[agent],
-          ...hostId && draftWorkspaces.has(hostId) ? { cwd: draftWorkspaces.get(hostId) } : {}
+          ...hostId2 && draftWorkspaces.has(hostId2) ? { cwd: draftWorkspaces.get(hostId2) } : {}
         });
-        if (disposed || mountedByComposer.get(mounted.composer) !== mounted || mounted.commandRequestGeneration !== generation || requestControl !== modelControl || (threadIdFromComposerModelTarget(mounted.modelTarget) ? mounted.hostId : activeModelHostId(mounted.composer)) !== hostId || controller.get(mounted.composer).agent !== agent)
+        if (disposed || mountedByComposer.get(mounted.composer) !== mounted || mounted.commandRequestGeneration !== generation || requestControl !== modelControl || (threadIdFromComposerModelTarget(mounted.modelTarget) ? mounted.hostId : activeModelHostId(mounted.composer)) !== hostId2 || controller.get(mounted.composer).agent !== agent)
           return;
         mounted.control.harnessCommands.setCommands(
           catalog.commands,
@@ -34974,9 +35190,9 @@ ${accounts_default}`;
       }
       console.error("codexhost Harness command could not claim the current Composer editor");
     };
-    const applyThreadUsageUpdate = (hostId, update) => {
+    const applyThreadUsageUpdate = (hostId2, update) => {
       for (const mounted of mountedByComposer.values()) {
-        if (mounted.hostId !== hostId || threadIdFromComposerModelTarget(mounted.modelTarget) !== update.threadId)
+        if (mounted.hostId !== hostId2 || threadIdFromComposerModelTarget(mounted.modelTarget) !== update.threadId)
           continue;
         mounted.usageRequestGeneration += 1;
         mounted.usage = update.usage;
@@ -34992,7 +35208,7 @@ ${accounts_default}`;
       const accounts = composerCodexAccounts(mounted.composer);
       const client = accounts?.client;
       const accountId = accounts?.readyAccountId;
-      const hostId = mounted.hostId;
+      const hostId2 = mounted.hostId;
       const generation = ++mounted.usageRequestGeneration;
       mounted.usage = null;
       mounted.accountCredits = null;
@@ -35000,7 +35216,7 @@ ${accounts_default}`;
       if (!accountId || !client?.inspectCodexAccountUsage) return;
       try {
         const result = await client.inspectCodexAccountUsage({ accountId });
-        if (disposed || mounted.hostId !== hostId || composerCodexAccounts(mounted.composer) !== accounts || !mounted.composer.isConnected || mountedByComposer.get(mounted.composer) !== mounted || mounted.usageRequestGeneration !== generation || controller.get(mounted.composer).agent !== "codex" || controller.get(mounted.composer).phase !== "draft" || controller.isSubmissionPending(mounted.composer) || threadIdFromComposerModelTarget(mounted.modelTarget) || accounts.readyAccountId !== accountId || result.accountId !== accountId)
+        if (disposed || mounted.hostId !== hostId2 || composerCodexAccounts(mounted.composer) !== accounts || !mounted.composer.isConnected || mountedByComposer.get(mounted.composer) !== mounted || mounted.usageRequestGeneration !== generation || controller.get(mounted.composer).agent !== "codex" || controller.get(mounted.composer).phase !== "draft" || controller.isSubmissionPending(mounted.composer) || threadIdFromComposerModelTarget(mounted.modelTarget) || accounts.readyAccountId !== accountId || result.accountId !== accountId)
           return;
         mounted.usage = result.usage;
         mounted.accountCredits = result.accountCredits ?? null;
@@ -35021,7 +35237,7 @@ ${accounts_default}`;
         renderMounted(mounted);
         return;
       }
-      const hostId = mounted.hostId;
+      const hostId2 = mounted.hostId;
       const client = composerClient(mounted);
       if (!client) return;
       const generation = ++mounted.usageRequestGeneration;
@@ -35030,7 +35246,7 @@ ${accounts_default}`;
           threadId,
           ...refresh ? { refresh } : {}
         });
-        if (disposed || mountedByComposer.get(mounted.composer) !== mounted || !mounted.composer.isConnected || mounted.usageRequestGeneration !== generation || mounted.hostId !== hostId || composerClient(mounted) !== client || threadIdFromComposerModelTarget(mounted.modelTarget) !== threadId || result.threadId !== threadId) {
+        if (disposed || mountedByComposer.get(mounted.composer) !== mounted || !mounted.composer.isConnected || mounted.usageRequestGeneration !== generation || mounted.hostId !== hostId2 || composerClient(mounted) !== client || threadIdFromComposerModelTarget(mounted.modelTarget) !== threadId || result.threadId !== threadId) {
           return;
         }
         mounted.usage = result.usage;
@@ -35836,13 +36052,13 @@ ${accounts_default}`;
     const loadCodexAccounts = async () => {
       const hostIds = new Set([...mountedByComposer.values()].map((mounted) => mounted.hostId));
       await Promise.all(
-        [...hostIds].map(async (hostId) => {
-          const accounts = codexAccountsForHost(hostId);
+        [...hostIds].map(async (hostId2) => {
+          const accounts = codexAccountsForHost(hostId2);
           if (!accounts) return;
           await accounts.refresh();
-          if (disposed || codexAccountsForHost(hostId) !== accounts) return;
+          if (disposed || codexAccountsForHost(hostId2) !== accounts) return;
           for (const mounted of mountedByComposer.values()) {
-            if (mounted.hostId !== hostId) continue;
+            if (mounted.hostId !== hostId2) continue;
             renderMounted(mounted);
             void refreshDraftCodexUsage(mounted);
           }
@@ -35853,16 +36069,16 @@ ${accounts_default}`;
       const url2 = RENDERER_AGENT_INSTALL_URLS[agent];
       window.open(url2, "_blank", "noopener,noreferrer");
     };
-    function resetHarnessAvailabilityRetry(hostId) {
-      const state = hostHarnessAvailabilityState(hostId);
+    function resetHarnessAvailabilityRetry(hostId2) {
+      const state = hostHarnessAvailabilityState(hostId2);
       if (state.retryTimer !== null) {
         window.clearTimeout(state.retryTimer);
         state.retryTimer = null;
       }
       state.retryAttempt = 0;
     }
-    function scheduleHarnessAvailabilityRetry(hostId) {
-      const state = hostHarnessAvailabilityState(hostId);
+    function scheduleHarnessAvailabilityRetry(hostId2) {
+      const state = hostHarnessAvailabilityState(hostId2);
       if (disposed || state.retryTimer !== null || state.retryAttempt >= availabilityRetryDelays.length) {
         return;
       }
@@ -35870,50 +36086,50 @@ ${accounts_default}`;
       state.retryAttempt += 1;
       state.retryTimer = window.setTimeout(() => {
         state.retryTimer = null;
-        void refreshHarnessAvailabilityForHost(hostId, true, true);
+        void refreshHarnessAvailabilityForHost(hostId2, true, true);
       }, delay);
     }
-    function modelClientForHostFrom(control, hostId) {
-      if (!control || !hostId) return null;
-      if (control.clientForHost) return control.clientForHost(hostId);
-      if (!control.currentHostId) return hostId === "local" ? control : null;
-      return control.currentHostId() === hostId ? control : null;
+    function modelClientForHostFrom(control, hostId2) {
+      if (!control || !hostId2) return null;
+      if (control.clientForHost) return control.clientForHost(hostId2);
+      if (!control.currentHostId) return hostId2 === "local" ? control : null;
+      return control.currentHostId() === hostId2 ? control : null;
     }
-    function modelClientForHost(hostId) {
-      return modelClientForHostFrom(modelControl, hostId);
+    function modelClientForHost(hostId2) {
+      return modelClientForHostFrom(modelControl, hostId2);
     }
-    function refreshHarnessAvailabilityForHost(hostId, refresh = false, retry = false, force = false) {
-      const state = hostHarnessAvailabilityState(hostId);
-      if (!retry) resetHarnessAvailabilityRetry(hostId);
-      const client = modelClientForHost(hostId);
+    function refreshHarnessAvailabilityForHost(hostId2, refresh = false, retry = false, force = false) {
+      const state = hostHarnessAvailabilityState(hostId2);
+      if (!retry) resetHarnessAvailabilityRetry(hostId2);
+      const client = modelClientForHost(hostId2);
       if (!client) {
         if (state.request) {
           state.requestGeneration += 1;
           state.request = null;
         }
-        if (force || [...mountedByComposer.values()].some((mounted) => mounted.hostId === hostId)) {
+        if (force || [...mountedByComposer.values()].some((mounted) => mounted.hostId === hostId2)) {
           for (const agent of externalAgents) {
             state.availability[agent] = "error";
             state.errors[agent] = {
               code: "unavailable",
-              message: `Renderer connection is unavailable for Host ${hostId}`,
+              message: `Renderer connection is unavailable for Host ${hostId2}`,
               retryable: true,
               stage: "request"
             };
             state.webUi[agent] = false;
           }
           publishConnectionStatus();
-          if (hostId === activeAvailabilityHostId) {
+          if (hostId2 === activeAvailabilityHostId) {
             for (const mounted of mountedByComposer.values()) renderMounted(mounted);
           }
         }
-        scheduleHarnessAvailabilityRetry(hostId);
+        scheduleHarnessAvailabilityRetry(hostId2);
         return Promise.resolve();
       }
       if (state.request?.client === client) return state.request.promise;
       const agentsToInspect = force ? externalAgents : passiveHarnessAvailabilityAgents(state.availability, state.errors);
       if (agentsToInspect.length === 0) {
-        resetHarnessAvailabilityRetry(hostId);
+        resetHarnessAvailabilityRetry(hostId2);
         return Promise.resolve();
       }
       const nextAvailability = { ...state.availability };
@@ -35921,7 +36137,7 @@ ${accounts_default}`;
         nextAvailability[agent] = harnessAvailabilityDuringInspect(nextAvailability[agent]);
       }
       state.availability = nextAvailability;
-      if (hostId === activeAvailabilityHostId) {
+      if (hostId2 === activeAvailabilityHostId) {
         publishConnectionStatus();
         for (const mounted of mountedByComposer.values()) renderMounted(mounted);
       }
@@ -35938,7 +36154,7 @@ ${accounts_default}`;
                 { priority: "background" }
               );
               status = inspection.status === "ready" ? "ready" : inspection.status;
-              webUiAvailable = hostId === "local" && inspection.status === "ready" && inspection.webUi?.open === true;
+              webUiAvailable = hostId2 === "local" && inspection.status === "ready" && inspection.webUi?.open === true;
               if (inspection.status !== "ready") {
                 const error51 = inspection.error;
                 nextError = {
@@ -35966,17 +36182,17 @@ ${accounts_default}`;
             state.availability = { ...state.availability, [agent]: status };
             state.webUi = { ...state.webUi, [agent]: webUiAvailable };
             for (const mounted of mountedByComposer.values()) {
-              if (mounted.hostId !== hostId) continue;
+              if (mounted.hostId !== hostId2) continue;
               const composerState = controller.get(mounted.composer);
               if (composerAdapterState(mounted) === "ready" && composerState.phase === "draft" && composerState.agent === agent && status !== "ready") {
                 await switchComposerAgent(mounted, "codex");
               }
             }
             for (const mounted of mountedByComposer.values()) {
-              if (mounted.hostId !== hostId) continue;
+              if (mounted.hostId !== hostId2) continue;
               const composerState = controller.get(mounted.composer);
               const pendingCatalog = catalogRequests.get(mounted);
-              const loadingCurrentCatalog = pendingCatalog?.client === client && pendingCatalog.hostId === hostId && pendingCatalog.agent === agent && isCurrentModelRequest(mounted, pendingCatalog.generation);
+              const loadingCurrentCatalog = pendingCatalog?.client === client && pendingCatalog.hostId === hostId2 && pendingCatalog.agent === agent && isCurrentModelRequest(mounted, pendingCatalog.generation);
               if (composerState.agent === agent && (status !== "ready" || !loadingCurrentCatalog || refresh && force) && shouldReloadExternalCatalogAfterAvailabilityRefresh(
                 previousStatus,
                 status,
@@ -35992,9 +36208,9 @@ ${accounts_default}`;
         );
         if (generation !== state.requestGeneration || disposed) return;
         if (retryableHarnessAvailabilityAgents(state.availability, state.errors).length === 0) {
-          resetHarnessAvailabilityRetry(hostId);
+          resetHarnessAvailabilityRetry(hostId2);
         } else {
-          scheduleHarnessAvailabilityRetry(hostId);
+          scheduleHarnessAvailabilityRetry(hostId2);
         }
       })();
       const request = { client, promise: promise2 };
@@ -36011,12 +36227,12 @@ ${accounts_default}`;
     }
     const reloadMountedOwnershipForHost = () => {
       for (const mounted of mountedByComposer.values()) {
-        const hostId = activeModelHostId(mounted.composer);
-        if (!hostId || mounted.hostId === hostId) continue;
+        const hostId2 = activeModelHostId(mounted.composer);
+        if (!hostId2 || mounted.hostId === hostId2) continue;
         if (!threadIdFromComposerModelTarget(mounted.modelTarget)) {
           controller.clearPendingSubmission(mounted.composer);
           controller.beginModelRequest(mounted.composer);
-          mounted.hostId = hostId;
+          mounted.hostId = hostId2;
           mounted.modelView = { status: "idle" };
           mounted.permissionModeView = { status: "idle" };
           mounted.usage = null;
@@ -36029,13 +36245,13 @@ ${accounts_default}`;
           void loadExternalCatalog(mounted);
           continue;
         }
-        const target = controllerTarget(mounted.modelTarget, hostId);
+        const target = controllerTarget(mounted.modelTarget, hostId2);
         if (controller.rebindConversation(mounted.composer, target) === null) {
           mounted.ownershipStatus = "error";
           renderMounted(mounted);
           continue;
         }
-        mounted.hostId = hostId;
+        mounted.hostId = hostId2;
         mounted.composerId = controller.get(mounted.composer).composerId;
         mounted.modelView = { status: "idle" };
         mounted.permissionModeView = { status: "idle" };
@@ -36056,8 +36272,8 @@ ${accounts_default}`;
       sidebarAgentIcons.refresh();
     };
     function reconcileHarnessAvailabilityHost() {
-      for (const hostId2 of modelControl?.knownHostIds?.() ?? []) {
-        hostHarnessAvailabilityState(hostId2);
+      for (const hostId3 of modelControl?.knownHostIds?.() ?? []) {
+        hostHarnessAvailabilityState(hostId3);
       }
       reloadMountedOwnershipForHost();
       for (const target of new Set([...mountedByComposer.values()].map((m) => m.hostId))) {
@@ -36078,14 +36294,14 @@ ${accounts_default}`;
         } catch {
         }
       }
-      const hostId = activeModelHostId();
-      if (!hostId || hostId === activeAvailabilityHostId && [...mountedByComposer.values()].every((mounted) => mounted.hostId !== null))
+      const hostId2 = activeModelHostId();
+      if (!hostId2 || hostId2 === activeAvailabilityHostId && [...mountedByComposer.values()].every((mounted) => mounted.hostId !== null))
         return;
-      activeAvailabilityHostId = hostId;
-      hostHarnessAvailabilityState(hostId);
+      activeAvailabilityHostId = hostId2;
+      hostHarnessAvailabilityState(hostId2);
       publishConnectionStatus();
       for (const mounted of mountedByComposer.values()) renderMounted(mounted);
-      void refreshHarnessAvailabilityForHost(hostId);
+      void refreshHarnessAvailabilityForHost(hostId2);
     }
     const refreshHarnessAvailability = async (refresh = false) => {
       reconcileHarnessAvailabilityHost();
@@ -36094,22 +36310,22 @@ ${accounts_default}`;
         if (mounted.hostId) hostIds.add(mounted.hostId);
       }
       await Promise.all(
-        [...hostIds].map((hostId) => refreshHarnessAvailabilityForHost(hostId, refresh))
+        [...hostIds].map((hostId2) => refreshHarnessAvailabilityForHost(hostId2, refresh))
       );
     };
     connectionDiagnostics = {
       snapshot() {
         const hostIds = [
           "local",
-          ...[...harnessAvailabilityByHost.keys()].filter((hostId) => hostId !== "local").sort()
+          ...[...harnessAvailabilityByHost.keys()].filter((hostId2) => hostId2 !== "local").sort()
         ];
         return {
           adapter: { ...adapterStatus },
-          hosts: hostIds.map((hostId) => {
-            const state = hostHarnessAvailabilityState(hostId);
+          hosts: hostIds.map((hostId2) => {
+            const state = hostHarnessAvailabilityState(hostId2);
             return {
-              hostId,
-              active: hostId === activeAvailabilityHostId,
+              hostId: hostId2,
+              active: hostId2 === activeAvailabilityHostId,
               agents: externalAgents.map((agent) => ({
                 agent,
                 availability: state.availability[agent] ?? "checking",
@@ -36120,10 +36336,10 @@ ${accounts_default}`;
           })
         };
       },
-      refresh(hostId) {
-        if (hostId !== void 0) {
+      refresh(hostId2) {
+        if (hostId2 !== void 0) {
           return refreshConnectionHosts(
-            [hostId],
+            [hostId2],
             (target) => refreshHarnessAvailabilityForHost(target, true, false, true),
             (target) => hostHarnessAvailabilityState(target).request?.promise
           );
@@ -36134,25 +36350,25 @@ ${accounts_default}`;
           (target) => refreshHarnessAvailabilityForHost(target, true, false, true)
         );
       },
-      async installation(hostId, agent, action) {
-        const client = modelClientForHost(hostId);
+      async installation(hostId2, agent, action) {
+        const client = modelClientForHost(hostId2);
         if (!client?.installation)
           throw new Error("Harness version management is unavailable on this Host");
         return client.installation({ harnessId: externalHarnessIds[agent], action });
       },
-      async getLaunchSettings(hostId, agent) {
-        const client = hostId === "local" ? modelClientForHost(hostId) : null;
+      async getLaunchSettings(hostId2, agent) {
+        const client = hostId2 === "local" ? modelClientForHost(hostId2) : null;
         if (!client?.getHarnessLaunchSettings) throw new Error("Launch settings are unavailable");
         return client.getHarnessLaunchSettings({ harnessId: externalHarnessIds[agent] });
       },
-      async setLaunchSettings(hostId, agent, path) {
-        const client = hostId === "local" ? modelClientForHost(hostId) : null;
+      async setLaunchSettings(hostId2, agent, path) {
+        const client = hostId2 === "local" ? modelClientForHost(hostId2) : null;
         if (!client?.setHarnessLaunchSettings) throw new Error("Launch settings are unavailable");
         return client.setHarnessLaunchSettings({ harnessId: externalHarnessIds[agent], path });
       },
-      async openWebUi(hostId, agent) {
-        const state = hostHarnessAvailabilityState(hostId);
-        const client = hostId === "local" ? modelClientForHost(hostId) : null;
+      async openWebUi(hostId2, agent) {
+        const state = hostHarnessAvailabilityState(hostId2);
+        const client = hostId2 === "local" ? modelClientForHost(hostId2) : null;
         if (state.availability[agent] !== "ready" || state.webUi[agent] !== true || !client?.openHarnessWebUi) {
           throw new Error("Harness Web UI is unavailable");
         }
@@ -36161,7 +36377,7 @@ ${accounts_default}`;
         } catch (error51) {
           state.webUi = { ...state.webUi, [agent]: false };
           publishConnectionStatus();
-          void refreshHarnessAvailabilityForHost(hostId, true, false, true).catch(() => void 0);
+          void refreshHarnessAvailabilityForHost(hostId2, true, false, true).catch(() => void 0);
           throw error51;
         }
       },
@@ -36178,12 +36394,12 @@ ${accounts_default}`;
       const sendButton = sendButtonWithin(composer) ?? allButtons.at(-1) ?? null;
       if (!sendButton) return;
       const modelTarget = findComposerModelTarget(composer);
-      const hostId = activeModelHostId(composer);
+      const hostId2 = activeModelHostId(composer);
       const editor = composer.querySelector(EDITOR_SELECTOR);
       if (!editor) return;
       const state = controller.mount(
         composer,
-        controllerTarget(modelTarget, hostId),
+        controllerTarget(modelTarget, hostId2),
         modelTarget?.[0] === "default" ? readNewThreadAgentPreference(enabledAgentSet) : void 0
       );
       const inherited = pendingReplacements.get(composer)?.source;
@@ -36233,7 +36449,7 @@ ${accounts_default}`;
         threadConfiguration: inherited?.threadConfiguration,
         usage: inherited?.usage ?? null,
         accountCredits: inherited?.accountCredits ?? null,
-        hostId: inherited?.hostId ?? hostId,
+        hostId: inherited?.hostId ?? hostId2,
         usageRequestGeneration: 0,
         commandRequestGeneration: 0
       };
@@ -36459,8 +36675,8 @@ ${accounts_default}`;
     });
     const onHostRouteChange = () => {
       for (const mounted of mountedByComposer.values()) {
-        const hostId = activeModelHostId(mounted.composer);
-        if (hostId && mounted.hostId === hostId && !threadIdFromComposerModelTarget(mounted.modelTarget) && controller.get(mounted.composer).agent !== "codex" && !controller.isSwitching(mounted.composer) && isExternalConfigurationStable(mounted.modelView, mounted.permissionModeView)) {
+        const hostId2 = activeModelHostId(mounted.composer);
+        if (hostId2 && mounted.hostId === hostId2 && !threadIdFromComposerModelTarget(mounted.modelTarget) && controller.get(mounted.composer).agent !== "codex" && !controller.isSwitching(mounted.composer) && isExternalConfigurationStable(mounted.modelView, mounted.permissionModeView)) {
           applyComposerAgent(mounted.composer);
         }
       }
@@ -36523,11 +36739,11 @@ ${accounts_default}`;
     const onDraftWorkspace = (event) => {
       const detail = event.detail;
       if (typeof detail !== "object" || detail === null) return;
-      const { hostId, cwd } = detail;
-      if (typeof hostId !== "string" || typeof cwd !== "string" || cwd.length === 0) return;
-      draftWorkspaces.set(hostId, cwd);
+      const { hostId: hostId2, cwd } = detail;
+      if (typeof hostId2 !== "string" || typeof cwd !== "string" || cwd.length === 0) return;
+      draftWorkspaces.set(hostId2, cwd);
       for (const mounted of mountedByComposer.values()) {
-        if (!threadIdFromComposerModelTarget(mounted.modelTarget) && activeModelHostId(mounted.composer) === hostId && controller.get(mounted.composer).agent !== "codex") {
+        if (!threadIdFromComposerModelTarget(mounted.modelTarget) && activeModelHostId(mounted.composer) === hostId2 && controller.get(mounted.composer).agent !== "codex") {
           void refreshCommands(mounted, { keepCurrent: true });
         }
       }
@@ -36583,6 +36799,7 @@ ${accounts_default}`;
       (mounted) => mounted.composer.isConnected && mounted.control.root.isConnected
     );
     const api = {
+      remoteConnections: (request) => handleRemoteConnectionsRequest(remoteConnections, request),
       currentThreadId() {
         const mounted = connectedComposers();
         return mounted.length === 1 && mounted[0] ? threadIdFromComposerModelTarget(mounted[0].modelTarget) ?? null : null;
@@ -36717,9 +36934,9 @@ ${accounts_default}`;
   }
 
   // src/install-renderer-binding.ts
-  function installRendererBinding(enabledAgents = DEFAULT_RENDERER_AGENTS, defaultAgent = "codex") {
+  function installRendererBinding(enabledAgents = DEFAULT_RENDERER_AGENTS) {
     window.__codexhostRendererBindingProbeV1?.dispose();
-    const binding = installRendererBindingProbe({ enabledAgents, defaultAgent });
+    const binding = installRendererBindingProbe({ enabledAgents });
     try {
       const adapter = installCurrentRendererAdapter();
       binding.setAdapter(adapter.status, adapter.dispose, adapter.applyAgent, adapter.modelControl);
@@ -36739,10 +36956,8 @@ ${accounts_default}`;
   }
 
   // src/production-entry.ts
-  var configuration = window.__codexhostProductionConfigV1;
-  delete window.__codexhostProductionConfigV1;
   var install = () => {
-    installRendererBinding(DEFAULT_RENDERER_AGENTS, configuration?.defaultAgent ?? "codex");
+    installRendererBinding(DEFAULT_RENDERER_AGENTS);
   };
   if (document.documentElement && document.body) {
     install();