@codexhost/cli-darwin-x64 0.12.0 → 0.12.2

package/app/renderer-extension.js

@@ -71,6 +71,15 @@
     get(composer) {
       return this.#state(composer);
     }
+    /** Release the DOM identity while retaining configuration owned by a target.
+     * A cloud composer may reuse this element before a different native draft.
+     * A successful replacement transfer retains the shared submission marker.
+     */
+    detach(composer, preservePendingSubmission = false) {
+      const state = this.#states.get(composer);
+      if (state && !preservePendingSubmission) this.#pendingSubmissions.delete(state);
+      this.#states.delete(composer);
+    }
     mount(composer, target, preferredNewThreadAgent) {
       const bound = this.#targetState(target);
       if (bound) {
@@ -581,11 +590,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 +638,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 +647,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));
@@ -660,6 +670,111 @@
     return control;
   }
 
+  // ../desktop-control/dist/renderer-react-ownership.js
+  var REACT_FIBER_WALK_LIMIT_EVENT = "codexhost:react-fiber-walk-limit";
+  function committedReactAncestors(value) {
+    const MAX_VISITED_FIBERS = 2e5;
+    const fiber = (value2) => typeof value2 === "object" && value2 !== null ? value2 : null;
+    const exhausted = () => {
+      const target = globalThis;
+      if (typeof target.dispatchEvent === "function" && typeof CustomEvent === "function")
+        target.dispatchEvent(new CustomEvent("codexhost:react-fiber-walk-limit", {
+          detail: { limit: MAX_VISITED_FIBERS }
+        }));
+      return [];
+    };
+    const first = fiber(value);
+    if (!first)
+      return [];
+    const previous = [];
+    const seen = /* @__PURE__ */ new Set();
+    for (let node2 = first; node2; node2 = fiber(node2.return)) {
+      if (seen.has(node2))
+        return [];
+      if (seen.size >= MAX_VISITED_FIBERS)
+        return exhausted();
+      seen.add(node2);
+      previous.push(node2);
+    }
+    const rootState = fiber(previous.at(-1)?.stateNode);
+    if (!rootState || !("current" in rootState))
+      return previous;
+    const current = fiber(rootState.current);
+    if (!current)
+      return [];
+    const alternate = fiber(first.alternate);
+    const path = [current];
+    seen.clear();
+    seen.add(current);
+    for (let index = previous.length - 2; index >= 0; index -= 1) {
+      const expected = previous[index];
+      const expectedAlternate = fiber(expected?.alternate);
+      let child = fiber(path.at(-1)?.child);
+      let matched = false;
+      while (child && !seen.has(child) && seen.size < MAX_VISITED_FIBERS) {
+        seen.add(child);
+        if (child === expected || child === expectedAlternate) {
+          matched = true;
+          break;
+        }
+        child = fiber(child.sibling);
+      }
+      if (!matched || !child)
+        break;
+      path.push(child);
+    }
+    if (path.length === previous.length && (path.at(-1) === first || path.at(-1) === alternate)) {
+      return path.reverse();
+    }
+    const stack = [{ node: current, parent: null }];
+    seen.clear();
+    while (stack.length > 0 && seen.size < MAX_VISITED_FIBERS) {
+      const entry = stack.pop();
+      if (!entry)
+        break;
+      if (seen.has(entry.node))
+        return [];
+      seen.add(entry.node);
+      if (entry.node === first || entry.node === alternate) {
+        const ancestors = [];
+        for (let cursor = entry; cursor; cursor = cursor.parent)
+          ancestors.push(cursor.node);
+        return ancestors;
+      }
+      const sibling = entry.parent && fiber(entry.node.sibling);
+      if (sibling)
+        stack.push({ node: sibling, parent: entry.parent });
+      const child = fiber(entry.node.child);
+      if (child)
+        stack.push({ node: child, parent: entry });
+    }
+    return stack.length > 0 ? exhausted() : [];
+  }
+
+  // src/renderer-composer-kind.ts
+  function isOrbitComposer(composer) {
+    let element = composer.querySelector('[contenteditable="true"], textarea, [role="textbox"]') ?? composer;
+    for (let depth = 0; element && depth < 12; depth += 1) {
+      const key = Object.getOwnPropertyNames(element).find(
+        (name) => name.startsWith("__reactFiber$")
+      );
+      if (key) {
+        for (const fiber of committedReactAncestors(
+          Object.getOwnPropertyDescriptor(element, key)?.value
+        )) {
+          const props = fiber.memoizedProps;
+          if (typeof props === "object" && props !== null && "isOrbit" in props) {
+            const value = props.isOrbit;
+            if (typeof value === "boolean") return value;
+          }
+        }
+        return false;
+      }
+      element = element.parentElement;
+    }
+    return false;
+  }
+
   // ../../node_modules/zod/v4/classic/external.js
   var external_exports = {};
   __export(external_exports, {
@@ -15247,6 +15362,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 +15389,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 +15460,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 +15830,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 +16438,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(
@@ -16733,6 +16921,35 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     ["path", { d: "M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6" }]
   ];
 
+  // ../../node_modules/lucide/dist/esm/icons/eye.mjs
+  var Eye = [
+    [
+      "path",
+      {
+        d: "M2.062 12.348a1 1 0 0 1 0-.696 10.75 10.75 0 0 1 19.876 0 1 1 0 0 1 0 .696 10.75 10.75 0 0 1-19.876 0"
+      }
+    ],
+    ["circle", { cx: "12", cy: "12", r: "3" }]
+  ];
+
+  // ../../node_modules/lucide/dist/esm/icons/eye-off.mjs
+  var EyeOff = [
+    [
+      "path",
+      {
+        d: "M10.733 5.076a10.744 10.744 0 0 1 11.205 6.575 1 1 0 0 1 0 .696 10.747 10.747 0 0 1-1.444 2.49"
+      }
+    ],
+    ["path", { d: "M14.084 14.158a3 3 0 0 1-4.242-4.242" }],
+    [
+      "path",
+      {
+        d: "M17.479 17.499a10.75 10.75 0 0 1-15.417-5.151 1 1 0 0 1 0-.696 10.75 10.75 0 0 1 4.446-5.143"
+      }
+    ],
+    ["path", { d: "m2 2 20 20" }]
+  ];
+
   // ../../node_modules/lucide/dist/esm/icons/ellipsis.mjs
   var Ellipsis = [
     ["circle", { cx: "12", cy: "12", r: "1" }],
@@ -16967,6 +17184,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     "info",
     "external-link",
     "refresh",
+    "eye",
+    "eye-off",
     "unavailable",
     "alert",
     "check",
@@ -17016,6 +17235,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     info: Info,
     "external-link": ExternalLink,
     refresh: RefreshCw,
+    eye: Eye,
+    "eye-off": EyeOff,
     unavailable: CircleOff,
     alert: TriangleAlert,
     check: CircleCheck,
@@ -17349,7 +17570,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 +17580,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);
@@ -17600,9 +17821,32 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       }
     };
     update.addEventListener("click", () => void run("update"));
-    signal.addEventListener("abort", render, { once: true });
+    const owner = document2.defaultView;
+    let checkFrame = null;
+    let checkTimer = null;
+    signal.addEventListener(
+      "abort",
+      () => {
+        if (checkFrame !== null) owner?.cancelAnimationFrame(checkFrame);
+        if (checkTimer !== null) owner?.clearTimeout(checkTimer);
+        render();
+      },
+      { once: true }
+    );
+    status.textContent = messages.harnessVersionChecking;
     render();
-    void run("check");
+    if (!signal.aborted && owner?.requestAnimationFrame) {
+      checkFrame = owner.requestAnimationFrame(() => {
+        checkFrame = null;
+        if (signal.aborted) return;
+        checkTimer = owner.setTimeout(() => {
+          checkTimer = null;
+          void run("check");
+        }, 0);
+      });
+    } else {
+      void run("check");
+    }
     return panel;
   }
 
@@ -17627,11 +17871,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 +17910,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 +18108,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 +18138,7 @@ ${error51.stderrTail}`] : []
         createHarnessInstallationPanel(
           document2,
           item.agentSnapshot.agent,
-          hostId,
+          hostId2,
           messages,
           (button, command, label) => copyDiagnosticsToClipboard(document2, button, command, messages, label),
           item.install ? {
@@ -17933,7 +18177,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 +18230,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 +18290,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,8 +18325,33 @@ ${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;
+        let disposed = false;
+        let renderQueued = false;
+        let renderFrame = null;
+        const scheduleRender = () => {
+          if (disposed || context.signal.aborted || renderQueued) return;
+          renderQueued = true;
+          const flush = () => {
+            renderFrame = null;
+            renderQueued = false;
+            if (!disposed && !context.signal.aborted) {
+              render(diagnostics?.snapshot() ?? latestSnapshot);
+            }
+          };
+          if (document2.defaultView?.requestAnimationFrame) {
+            renderFrame = document2.defaultView.requestAnimationFrame(flush);
+          } else {
+            queueMicrotask(flush);
+          }
+        };
+        const cancelRender = () => {
+          disposed = true;
+          if (renderFrame !== null) document2.defaultView?.cancelAnimationFrame(renderFrame);
+          renderFrame = null;
+        };
         const diagnostics = getDiagnostics();
         const installs = diagnostics ? harnessInstallStore(diagnostics) : null;
         const runRefresh = () => {
@@ -18172,7 +18441,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 +18535,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,20 +18734,31 @@ ${error51.stderrTail}`] : []
           }
         };
         render(diagnostics?.snapshot() ?? null);
-        const unsubscribeGroup = groupPreference.subscribe(
-          () => render(diagnostics?.snapshot() ?? latestSnapshot)
+        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(scheduleRender);
         if (!diagnostics) {
           refresh.disabled = true;
           return () => {
+            cancelRender();
             disposeHostScroller();
             unsubscribeGroup();
           };
         }
         refresh.addEventListener("click", runRefresh);
-        const unsubscribe = diagnostics.subscribe(() => render(diagnostics.snapshot()));
-        const unsubscribeInstalls = installs?.subscribe(() => render(diagnostics.snapshot()));
+        const unsubscribe = diagnostics.subscribe(scheduleRender);
+        const unsubscribeInstalls = installs?.subscribe(scheduleRender);
         return () => {
+          cancelRender();
           disposeHostScroller();
           unsubscribeInstalls?.();
           unsubscribe();
@@ -18490,9 +18770,10 @@ ${error51.stderrTail}`] : []
 
   // src/settings/credential-import-messages.ts
   var credentialImportEnglish = {
-    column: "Use in Harness",
     sectionTitle: "Accounts in Pi",
-    sectionEmpty: "No logins in Pi yet. Use the Pi mark on a Codex or Grok account above to import one.",
+    sectionHint: "Copy a local Codex or Grok login into a Pi model entry.",
+    sectionImport: "Import account",
+    sectionEmpty: "No logins in Pi yet. Use \u201CImport account\u201D, or \u201CImport into Pi\u201D on a Codex or Grok account above.",
     rowReimport: "Copy again",
     rowRemove: "Remove",
     othersTitle: "Pi's own logins",
@@ -18505,6 +18786,8 @@ ${error51.stderrTail}`] : []
     entry: "Entry in Pi",
     name: "Model entry name",
     source: "Source account",
+    sourceCurrent: "Current login",
+    sourceImported: "Already in Pi as {name}/\u2026; another entry can be added",
     preview: "Creates {name}/\u2026 in Pi. Existing Provider configurations remain unchanged.",
     warning: "Copies the current authorization once; it does not synchronize logins or add quota. Pi and the original app may refresh the same token, which can require signing in again. Usage follows this Provider's billing rules.",
     confirm: "Confirm import",
@@ -18520,9 +18803,10 @@ ${error51.stderrTail}`] : []
     close: "Done"
   };
   var credentialImportChinese = {
-    column: "\u7528\u4E8E Harness",
     sectionTitle: "Pi \u4E2D\u7684\u8D26\u53F7",
-    sectionEmpty: "Pi \u4E2D\u8FD8\u6CA1\u6709\u767B\u5F55\u3002\u70B9\u51FB\u4E0A\u65B9 Codex \u6216 Grok \u8D26\u53F7\u884C\u7684 Pi \u56FE\u6807\u5373\u53EF\u5BFC\u5165\u3002",
+    sectionHint: "\u628A Codex\u3001Grok \u7684\u672C\u5730\u767B\u5F55\u590D\u5236\u6210 Pi \u7684\u6A21\u578B\u5165\u53E3",
+    sectionImport: "\u5BFC\u5165\u8D26\u53F7",
+    sectionEmpty: "Pi \u4E2D\u8FD8\u6CA1\u6709\u767B\u5F55\u3002\u70B9\u51FB\u300C\u5BFC\u5165\u8D26\u53F7\u300D\uFF0C\u6216\u4E0A\u65B9 Codex\u3001Grok \u8D26\u53F7\u884C\u7684\u300C\u5BFC\u5165\u5230 Pi\u300D\u5373\u53EF\u5BFC\u5165\u3002",
     rowReimport: "\u91CD\u65B0\u5BFC\u5165",
     rowRemove: "\u79FB\u9664",
     othersTitle: "Pi \u81EA\u6709\u914D\u7F6E",
@@ -18535,6 +18819,8 @@ ${error51.stderrTail}`] : []
     entry: "Pi \u4E2D\u7684\u5165\u53E3",
     name: "\u6A21\u578B\u5165\u53E3\u540D\u79F0",
     source: "\u6765\u6E90\u8D26\u53F7",
+    sourceCurrent: "\u5F53\u524D\u767B\u5F55",
+    sourceImported: "\u5DF2\u5BFC\u5165\u4E3A {name}/\u2026\uFF0C\u53EF\u518D\u65B0\u589E\u4E00\u4E2A\u5165\u53E3",
     preview: "\u5C06\u5728 Pi \u4E2D\u65B0\u589E {name}/\u2026\uFF0C\u4FDD\u7559\u5168\u90E8\u5DF2\u6709 Provider \u914D\u7F6E\u3002",
     warning: "\u4EC5\u590D\u5236\u5F53\u524D\u6388\u6743\uFF0C\u4E0D\u6301\u7EED\u540C\u6B65\u767B\u5F55\uFF0C\u4E5F\u4E0D\u589E\u52A0\u989D\u5EA6\u3002Pi \u4E0E\u539F\u751F\u5DE5\u5177\u5206\u522B\u5237\u65B0\u540C\u4E00\u51ED\u8BC1\u65F6\uFF0C\u53EF\u80FD\u9700\u8981\u91CD\u65B0\u767B\u5F55\u3002\u5B9E\u9645\u7528\u91CF\u9075\u5FAA\u8BE5 Provider \u7684\u8BA1\u8D39\u89C4\u5219\u3002",
     confirm: "\u786E\u8BA4\u5BFC\u5165",
@@ -18660,6 +18946,8 @@ ${error51.stderrTail}`] : []
     accountCreditsFailed: "Could not load limits",
     accountCreditsRetry: "Retry",
     accountCreditsRefresh: "Refresh limits",
+    accountEmailsHide: "Hide emails",
+    accountEmailsShow: "Show emails",
     accountLoadFailed: "Could not load Codex Accounts.",
     accountCreditsUsed: "Used",
     accountCreditsResetAt: "Quota resets: {time}",
@@ -18930,6 +19218,8 @@ ${error51.stderrTail}`] : []
     accountCreditsFailed: "\u989D\u5EA6\u8BFB\u53D6\u5931\u8D25",
     accountCreditsRetry: "\u91CD\u8BD5",
     accountCreditsRefresh: "\u5237\u65B0\u989D\u5EA6",
+    accountEmailsHide: "\u9690\u85CF\u90AE\u7BB1",
+    accountEmailsShow: "\u663E\u793A\u90AE\u7BB1",
     accountLoadFailed: "\u65E0\u6CD5\u52A0\u8F7D Codex \u8D26\u53F7\u3002",
     accountCreditsUsed: "\u5DF2\u7528",
     accountCreditsResetAt: "\u989D\u5EA6\u91CD\u7F6E\u65F6\u95F4\uFF1A{time}",
@@ -22184,10 +22474,11 @@ Codex Fast mode prioritizes requests and may increase usage.`
     return event.key === "Enter" && !event.shiftKey && !event.isComposing;
   }
   function composerForEditor(editor) {
-    return editor.closest(CODEX_COMPOSER_SELECTOR);
+    return composerForElement(editor);
   }
   function composerForElement(element) {
-    return element.closest(CODEX_COMPOSER_SELECTOR);
+    const composer = element.closest(CODEX_COMPOSER_SELECTOR);
+    return composer && !isOrbitComposer(composer) ? composer : null;
   }
   function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -22673,87 +22964,6 @@ Codex Fast mode prioritizes requests and may increase usage.`
     }
   };
 
-  // ../desktop-control/dist/renderer-react-ownership.js
-  var REACT_FIBER_WALK_LIMIT_EVENT = "codexhost:react-fiber-walk-limit";
-  function committedReactAncestors(value) {
-    const MAX_VISITED_FIBERS = 2e5;
-    const fiber = (value2) => typeof value2 === "object" && value2 !== null ? value2 : null;
-    const exhausted = () => {
-      const target = globalThis;
-      if (typeof target.dispatchEvent === "function" && typeof CustomEvent === "function")
-        target.dispatchEvent(new CustomEvent("codexhost:react-fiber-walk-limit", {
-          detail: { limit: MAX_VISITED_FIBERS }
-        }));
-      return [];
-    };
-    const first = fiber(value);
-    if (!first)
-      return [];
-    const previous = [];
-    const seen = /* @__PURE__ */ new Set();
-    for (let node2 = first; node2; node2 = fiber(node2.return)) {
-      if (seen.has(node2))
-        return [];
-      if (seen.size >= MAX_VISITED_FIBERS)
-        return exhausted();
-      seen.add(node2);
-      previous.push(node2);
-    }
-    const rootState = fiber(previous.at(-1)?.stateNode);
-    if (!rootState || !("current" in rootState))
-      return previous;
-    const current = fiber(rootState.current);
-    if (!current)
-      return [];
-    const alternate = fiber(first.alternate);
-    const path = [current];
-    seen.clear();
-    seen.add(current);
-    for (let index = previous.length - 2; index >= 0; index -= 1) {
-      const expected = previous[index];
-      const expectedAlternate = fiber(expected?.alternate);
-      let child = fiber(path.at(-1)?.child);
-      let matched = false;
-      while (child && !seen.has(child) && seen.size < MAX_VISITED_FIBERS) {
-        seen.add(child);
-        if (child === expected || child === expectedAlternate) {
-          matched = true;
-          break;
-        }
-        child = fiber(child.sibling);
-      }
-      if (!matched || !child)
-        break;
-      path.push(child);
-    }
-    if (path.length === previous.length && (path.at(-1) === first || path.at(-1) === alternate)) {
-      return path.reverse();
-    }
-    const stack = [{ node: current, parent: null }];
-    seen.clear();
-    while (stack.length > 0 && seen.size < MAX_VISITED_FIBERS) {
-      const entry = stack.pop();
-      if (!entry)
-        break;
-      if (seen.has(entry.node))
-        return [];
-      seen.add(entry.node);
-      if (entry.node === first || entry.node === alternate) {
-        const ancestors = [];
-        for (let cursor = entry; cursor; cursor = cursor.parent)
-          ancestors.push(cursor.node);
-        return ancestors;
-      }
-      const sibling = entry.parent && fiber(entry.node.sibling);
-      if (sibling)
-        stack.push({ node: sibling, parent: entry.parent });
-      const child = fiber(entry.node.child);
-      if (child)
-        stack.push({ node: child, parent: entry });
-    }
-    return stack.length > 0 ? exhausted() : [];
-  }
-
   // src/renderer-codex-usage-gate.ts
   var EDITOR_SELECTOR2 = '[contenteditable="true"][role="textbox"]';
   var MAX_HOOKS = 4096;
@@ -23869,7 +24079,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 +24089,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 +24113,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 +24165,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 +24283,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 +24298,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 +24313,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 +24463,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 +24477,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 +24495,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 +24516,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 +24534,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 +24559,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 +24568,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
           );
@@ -24984,6 +25194,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
     return draftIds;
   }
   function findComposerModelTarget(composer) {
+    if (isOrbitComposer(composer)) return null;
     const draftIds = findComposerDraftIds(composer);
     const domIdentity = findComposerDomIdentity(composer);
     if (domIdentity.kind === "ambiguous") return null;
@@ -25064,7 +25275,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 +25303,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");
@@ -25175,7 +25386,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
     window.addEventListener("codexhost:draft-prewarm-policy-changed", handleRoutingPolicyChange);
     currentRequestRoute();
     const applyAgent = (agent, model, thinkingOptionId, permissionModeId, composer) => {
-      if (disposed) return false;
+      if (disposed || composer && isOrbitComposer(composer)) return false;
       const selection = modelSelectionForAgent(
         null,
         null,
@@ -25296,8 +25507,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 +25807,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 +25819,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 +26123,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 +26442,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 +26625,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 +26647,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 +26659,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 +26733,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 +26766,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 +26799,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 +26809,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 +26845,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 +26891,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 +26941,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 +27637,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)
@@ -27807,8 +28131,28 @@ Codex Fast mode prioritizes requests and may increase usage.`
     }
   }
 
+  // src/settings/account-privacy.ts
+  var EMAIL_PATTERN = /([^\s@]+)@([^\s@]+\.[^\s@]+)/gu;
+  var MASK = "****";
+  function maskEmailLocalPart(local) {
+    const chars = Array.from(local);
+    if (chars.length <= 1) return MASK;
+    if (chars.length <= 4) return `${chars[0]}${MASK}${chars.length > 2 ? chars.at(-1) : ""}`;
+    return `${chars.slice(0, 2).join("")}${MASK}${chars.slice(-2).join("")}`;
+  }
+  function maskEmails(text) {
+    return text.replace(
+      EMAIL_PATTERN,
+      (_match, local, domain2) => `${maskEmailLocalPart(local)}@${domain2}`
+    );
+  }
+  function accountDisplayText(text, hideEmails) {
+    return hideEmails ? maskEmails(text) : text;
+  }
+
   // src/settings/credential-imports.ts
   var TARGET_HARNESS_ID = "pi";
+  var SECTION_IMPORT_KEY = "section:import";
   var VENDOR_AGENTS = {
     "openai-codex": "codex",
     xai: "grok"
@@ -27843,9 +28187,17 @@ Codex Fast mode prioritizes requests and may increase usage.`
     let busy = false;
     let dialog;
     let othersExpanded = false;
+    let sectionExpanded = true;
+    let hideEmails = false;
+    const shown = (text) => accountDisplayText(text, hideEmails);
     const targetButtons = /* @__PURE__ */ new Map();
     const importedRecords = () => snapshot.targets.find((target) => target.harnessId === TARGET_HARNESS_ID)?.imports ?? [];
     const sourceOf = (record4) => snapshot.sources.find((source) => source.id === record4.source.id);
+    const piTarget = () => snapshot.targets.find((candidate) => candidate.harnessId === TARGET_HARNESS_ID);
+    const compatibleSources = () => {
+      const target = piTarget();
+      return target ? snapshot.sources.filter((source) => target.providers.includes(source.provider)) : [];
+    };
     const section = document2.createElement("section");
     section.className = "settings-pi-accounts";
     section.hidden = true;
@@ -27853,12 +28205,46 @@ Codex Fast mode prioritizes requests and may increase usage.`
     section.setAttribute("aria-label", messages.sectionTitle);
     const sectionHeader = document2.createElement("div");
     sectionHeader.className = "settings-pi-accounts__header";
+    const sectionToggle = document2.createElement("button");
+    sectionToggle.type = "button";
+    sectionToggle.className = "settings-pi-accounts__fold";
+    sectionToggle.setAttribute("aria-expanded", "true");
     const sectionTitle = document2.createElement("strong");
     sectionTitle.textContent = messages.sectionTitle;
     const sectionCount = document2.createElement("span");
-    sectionHeader.append(createRendererAgentIcon("pi", 16, document2), sectionTitle, sectionCount);
+    sectionCount.className = "settings-pi-accounts__count";
+    sectionToggle.append(
+      createRendererSettingsIcon("chevron-right", 14),
+      createRendererAgentIcon("pi", 16, document2),
+      sectionTitle,
+      sectionCount
+    );
+    const sectionHint = document2.createElement("span");
+    sectionHint.className = "settings-pi-accounts__hint";
+    sectionHint.textContent = messages.sectionHint;
+    const sectionImport = document2.createElement("button");
+    sectionImport.type = "button";
+    sectionImport.className = "settings-pi-accounts__import";
+    sectionImport.setAttribute("aria-haspopup", "dialog");
+    sectionImport.append(createRendererSettingsIcon("add", 14), messages.sectionImport);
+    sectionImport.addEventListener("click", () => {
+      const sources = compatibleSources();
+      const free = sources.find(
+        (source2) => !importedRecords().some((record4) => record4.source.id === source2.id)
+      );
+      const source = free ?? sources[0];
+      if (source) openDialog("add", { source, choose: true }, SECTION_IMPORT_KEY);
+    });
+    sectionHeader.append(sectionToggle, sectionHint, sectionImport);
     const card = document2.createElement("div");
     card.className = "settings-pi-accounts__card";
+    card.id = "settings-pi-accounts-card";
+    sectionToggle.setAttribute("aria-controls", card.id);
+    sectionToggle.addEventListener("click", () => {
+      sectionExpanded = !sectionExpanded;
+      card.hidden = !sectionExpanded;
+      sectionToggle.setAttribute("aria-expanded", String(sectionExpanded));
+    });
     const othersToggle = document2.createElement("button");
     othersToggle.type = "button";
     othersToggle.className = "settings-pi-accounts__toggle";
@@ -27899,15 +28285,15 @@ Codex Fast mode prioritizes requests and may increase usage.`
       row.className = "settings-pi-accounts__row";
       row.tabIndex = -1;
       row.dataset.importName = record4.name;
-      row.setAttribute("aria-label", record4.source.label);
+      row.setAttribute("aria-label", shown(record4.source.label));
       const agent = KNOWN_RENDERER_AGENTS.find((candidate) => candidate === record4.source.harnessId);
       const mark = createMark(agent);
       const identity = document2.createElement("div");
       identity.className = "settings-pi-accounts__identity";
       const label = document2.createElement("strong");
       label.className = "settings-account-email";
-      label.textContent = record4.source.label;
-      label.title = record4.source.label;
+      label.textContent = shown(record4.source.label);
+      label.title = label.textContent;
       label.translate = false;
       const meta3 = document2.createElement("div");
       meta3.className = "settings-account-metadata";
@@ -27937,7 +28323,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
       reimport.type = "button";
       reimport.className = "settings-account-action";
       reimport.textContent = messages.rowReimport;
-      reimport.setAttribute("aria-label", `${messages.reimport}: ${record4.source.label}`);
+      reimport.setAttribute("aria-label", `${messages.reimport}: ${shown(record4.source.label)}`);
       reimport.disabled = busy || !source;
       reimport.title = messages.reimport;
       reimport.addEventListener("click", () => {
@@ -27947,7 +28333,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
       remove.type = "button";
       remove.className = "settings-account-action settings-pi-accounts__remove";
       remove.textContent = messages.rowRemove;
-      remove.setAttribute("aria-label", `${messages.remove}: ${record4.source.label}`);
+      remove.setAttribute("aria-label", `${messages.remove}: ${shown(record4.source.label)}`);
       remove.disabled = busy;
       remove.addEventListener("click", () => openDialog("remove", { record: record4 }, `row:${record4.name}`));
       if (source) actions.append(reimport);
@@ -27963,14 +28349,14 @@ Codex Fast mode prioritizes requests and may increase usage.`
       const agent = login.vendor ? VENDOR_AGENTS[login.vendor] : void 0;
       row.setAttribute(
         "aria-label",
-        [login.label ?? login.provider, agent && RENDERER_AGENT_LABELS[agent]].filter(Boolean).join(" \xB7 ")
+        [shown(login.label ?? login.provider), agent && RENDERER_AGENT_LABELS[agent]].filter(Boolean).join(" \xB7 ")
       );
       const mark = createMark(agent);
       const identity = document2.createElement("div");
       identity.className = "settings-pi-accounts__identity";
       const title = document2.createElement("strong");
       title.className = "settings-account-email";
-      title.textContent = login.label ?? login.provider;
+      title.textContent = shown(login.label ?? login.provider);
       title.title = title.textContent;
       title.translate = false;
       const meta3 = document2.createElement("div");
@@ -27991,11 +28377,14 @@ Codex Fast mode prioritizes requests and may increase usage.`
       return row;
     };
     const renderSection = () => {
-      const target = snapshot.targets.find((candidate) => candidate.harnessId === TARGET_HARNESS_ID);
+      const target = piTarget();
       section.hidden = !target;
       const records = importedRecords();
       const others = target?.others ?? [];
       sectionCount.textContent = String(records.length + others.length);
+      card.hidden = !sectionExpanded;
+      sectionImport.hidden = compatibleSources().length === 0;
+      sectionImport.disabled = busy;
       rows.clear();
       if (records.length + others.length === 0) {
         const empty = document2.createElement("p");
@@ -28058,6 +28447,9 @@ Codex Fast mode prioritizes requests and may increase usage.`
       let state = initial;
       let mode = initialMode;
       let nameInput;
+      let nameEdited = false;
+      let sourceRadios = [];
+      let refreshPreview = () => void 0;
       const command = (text, onClick, variant = "secondary") => {
         const button = document2.createElement("button");
         button.type = "button";
@@ -28081,9 +28473,50 @@ Codex Fast mode prioritizes requests and may increase usage.`
         paragraph.textContent = text;
         return paragraph;
       };
+      const sourcePicker = (choices) => {
+        const group = document2.createElement("fieldset");
+        group.className = "settings-credential-dialog__sources";
+        const legend = document2.createElement("legend");
+        legend.textContent = messages.source;
+        group.append(legend);
+        for (const choice of choices) {
+          const option = document2.createElement("label");
+          option.className = "settings-credential-dialog__source";
+          const radio = document2.createElement("input");
+          radio.type = "radio";
+          radio.name = "settings-credential-source";
+          radio.value = choice.id;
+          radio.checked = choice.id === state.source?.id;
+          sourceRadios.push(radio);
+          const copy = document2.createElement("span");
+          const label = document2.createElement("strong");
+          label.textContent = shown(choice.label);
+          label.translate = false;
+          const existing = importedRecords().find((record4) => record4.source.id === choice.id);
+          const agent = KNOWN_RENDERER_AGENTS.find((candidate) => candidate === choice.harnessId);
+          const detail = document2.createElement("span");
+          detail.textContent = [
+            agent && RENDERER_AGENT_LABELS[agent] || choice.harnessId,
+            existing ? messages.sourceImported.replace("{name}", existing.name) : messages.sourceCurrent
+          ].join(" \xB7 ");
+          copy.append(label, detail);
+          radio.addEventListener("change", () => {
+            if (!radio.checked) return;
+            state = { ...state, source: choice };
+            if (nameInput && !nameEdited) {
+              nameInput.value = defaultImportName(choice, importedRecords());
+            }
+            refreshPreview();
+          });
+          option.append(radio, copy);
+          group.append(option);
+        }
+        return group;
+      };
       const setBusy = (value) => {
         for (const child of controls.children) child.disabled = value;
         if (nameInput) nameInput.disabled = value;
+        for (const radio of sourceRadios) radio.disabled = value;
       };
       const submit = async (request, next) => {
         error51.textContent = "";
@@ -28111,6 +28544,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
         mode = next;
         error51.textContent = "";
         nameInput = void 0;
+        sourceRadios = [];
         body.replaceChildren();
         controls.replaceChildren();
         const { source, record: record4 } = state;
@@ -28119,7 +28553,9 @@ Codex Fast mode prioritizes requests and may increase usage.`
           title.textContent = mode === "add" ? messages.add : messages.reimport;
           modal.setAttribute("aria-label", title.textContent);
           const active = source ?? record4?.source;
-          if (active) body.append(line(messages.source, active.label));
+          const choices = mode === "add" && state.choose ? compatibleSources() : [];
+          if (choices.length > 1) body.append(sourcePicker(choices));
+          else if (active) body.append(line(messages.source, shown(active.label)));
           const input = document2.createElement("input");
           input.type = "text";
           input.maxLength = 48;
@@ -28127,6 +28563,9 @@ Codex Fast mode prioritizes requests and may increase usage.`
           input.spellcheck = false;
           input.value = record4?.name ?? (source ? defaultImportName(source, importedRecords()) : "codex");
           input.readOnly = Boolean(record4);
+          input.addEventListener("input", () => {
+            nameEdited = true;
+          });
           nameInput = input;
           const label = document2.createElement("label");
           label.className = "settings-credential-dialog__field";
@@ -28138,6 +28577,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
             preview.textContent = (mode === "reimport" ? messages.reimportPreview : messages.preview).replace("{name}", input.value);
           };
           input.addEventListener("input", update);
+          refreshPreview = update;
           update();
           body.append(label, preview, note(messages.warning));
           controls.append(
@@ -28145,7 +28585,8 @@ Codex Fast mode prioritizes requests and may increase usage.`
             command(
               messages.confirm,
               async () => {
-                if (!source) return;
+                const source2 = state.source;
+                if (!source2) return;
                 if (!credentialImportNameSchema.safeParse(input.value).success) {
                   error51.textContent = messages.invalidName;
                   input.focus();
@@ -28154,7 +28595,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
                 await submit(
                   {
                     action: mode === "reimport" ? "reimport" : "import",
-                    sourceId: source.id,
+                    sourceId: source2.id,
                     name: record4?.name ?? input.value,
                     confirmed: true
                   },
@@ -28196,7 +28637,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
       modal.addEventListener("close", () => {
         modal.remove();
         dialog = void 0;
-        const target = returnKey ? targetButtons.get(returnKey) ?? rows.get(returnKey.replace(/^row:/, "")) : void 0;
+        const target = returnKey ? returnKey === SECTION_IMPORT_KEY ? sectionImport : targetButtons.get(returnKey) ?? rows.get(returnKey.replace(/^row:/, "")) : void 0;
         (target?.isConnected ? target : section).focus();
       });
       show(initialMode);
@@ -28206,6 +28647,12 @@ Codex Fast mode prioritizes requests and may increase usage.`
     signal.addEventListener("abort", () => dialog?.remove(), { once: true });
     renderSection();
     return {
+      /** Mask the middle of email addresses in the section and dialogs (screen sharing). */
+      setHideEmails(value) {
+        if (hideEmails === value) return;
+        hideEmails = value;
+        renderSection();
+      },
       /** Dedicated "imported into Pi" section, rendered below the account table. */
       section,
       refresh: async () => {
@@ -28227,20 +28674,33 @@ Codex Fast mode prioritizes requests and may increase usage.`
         const key = `${harnessId}:${accountLabel}:import`;
         const button = document2.createElement("button");
         button.type = "button";
-        button.className = "settings-icon-button settings-account-harness-target";
+        button.className = "settings-account-pi-import";
         button.dataset.accountFocus = key;
         button.disabled = busy;
-        if (record4) button.dataset.state = "imported";
         const hint = record4 ? messages.importedHint.replace("{name}", record4.name) : messages.add;
         button.title = hint;
         button.setAttribute("aria-label", hint);
-        button.setAttribute("aria-haspopup", "dialog");
-        button.append(createRendererAgentIcon("pi", 16, document2));
+        button.append(createRendererAgentIcon("pi", 12, document2));
+        if (record4) {
+          button.dataset.state = "imported";
+          const name = document2.createElement("code");
+          name.textContent = `${record4.name}/\u2026`;
+          name.translate = false;
+          button.append(name, createRendererSettingsIcon("check", 12));
+        } else {
+          button.setAttribute("aria-haspopup", "dialog");
+          button.append(messages.add);
+        }
         button.addEventListener("click", () => {
           if (!record4) {
             openDialog("add", { source }, key);
             return;
           }
+          if (!sectionExpanded) {
+            sectionExpanded = true;
+            renderSection();
+            sectionToggle.setAttribute("aria-expanded", "true");
+          }
           const row = rows.get(record4.name);
           row?.scrollIntoView({ block: "nearest", behavior: "smooth" });
           row?.focus();
@@ -28532,37 +28992,35 @@ Codex Fast mode prioritizes requests and may increase usage.`
       return { cells: [cell], continuationCells: [] };
     }
     const { rows, additional } = splitUsageWindows(state.credits, messages, filter);
-    const onlyRow = rows.length === 1 ? rows[0] : void 0;
-    if (additional.length && onlyRow && !Object.keys(onlyRow.columns).length) rows.pop();
-    for (let index = 0; index < additional.length; index += 2) {
-      const first = additional[index];
-      const second = additional[index + 1];
-      rows.push({
-        columns: {
-          ...first ? { five_hour: first } : {},
-          ...second ? { seven_day: second } : {}
-        }
-      });
+    const windows = [
+      ...rows.flatMap(
+        (row) => ["five_hour", "seven_day"].flatMap(
+          (period) => row.columns[period] ? [row.columns[period]] : []
+        )
+      ),
+      ...additional
+    ];
+    const packed = [];
+    for (let index = 0; index < windows.length; index += 2) {
+      const pair = windows.slice(index, index + 2);
+      packed.push(
+        pair.map((window2) => {
+          const cell = document2.createElement("td");
+          cell.className = "settings-account-usage-cell";
+          if (pair.length === 1) cell.colSpan = 2;
+          cell.append(renderUsageWindow(document2, window2, messages, display));
+          return cell;
+        })
+      );
     }
-    const renderCells = (row) => ["five_hour", "seven_day"].map((period) => {
+    if (packed.length === 0) {
       const cell = document2.createElement("td");
-      cell.className = "settings-account-usage-cell";
-      const window2 = row.columns[period];
-      if (window2) cell.append(renderUsageWindow(document2, window2, messages, display));
-      else {
-        const missing = document2.createElement("div");
-        missing.className = "settings-account-usage__missing";
-        const dash = document2.createElement("span");
-        dash.textContent = "\u2014";
-        dash.setAttribute("aria-hidden", "true");
-        missing.append(dash);
-        cell.append(missing);
-      }
-      return cell;
-    });
-    const [firstRow = { columns: {} }, ...continuations] = rows;
-    const cells = renderCells(firstRow);
-    const continuationCells = continuations.map(renderCells);
+      cell.colSpan = 2;
+      cell.className = "settings-account-usage-cell settings-account-usage-cell--message";
+      cell.textContent = messages.accountCreditsEmpty;
+      packed.push([cell]);
+    }
+    const [cells = [], ...continuationCells] = packed;
     return { cells, continuationCells };
   }
   function renderAccountResetCredits(document2, credits, messages) {
@@ -28656,14 +29114,14 @@ Codex Fast mode prioritizes requests and may increase usage.`
     table.className = "settings-account-table";
     table.setAttribute("aria-label", messages.pageLabels.accounts);
     const columns = document2.createElement("colgroup");
-    for (const width of [32, 24, 24, 20]) {
+    for (const width of [36, 32, 32]) {
       const column = document2.createElement("col");
       column.style.width = `${width}%`;
       columns.append(column);
     }
     const head = document2.createElement("thead");
     const row = document2.createElement("tr");
-    const headers = Array.from({ length: 3 }, (_, index) => {
+    const headers = Array.from({ length: 2 }, (_, index) => {
       const cell = document2.createElement("th");
       cell.scope = index === 1 ? "colgroup" : "col";
       if (index === 1) cell.colSpan = 2;
@@ -28671,11 +29129,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
       return cell;
     });
     const updateDisplay = (display) => {
-      const labels = [
-        messages.accountColumnAccount,
-        accountUsageColumnLabel(display, messages),
-        messages.credentialImports.column
-      ];
+      const labels = [messages.accountColumnAccount, accountUsageColumnLabel(display, messages)];
       headers.forEach((cell, index) => {
         cell.textContent = labels[index] ?? "";
       });
@@ -28727,11 +29181,13 @@ Codex Fast mode prioritizes requests and may increase usage.`
     person.append(input.mark, identity);
     return person;
   }
-  function createTargetCell(document2, action) {
-    const cell = document2.createElement("td");
-    cell.className = action ? "settings-account-management-cell" : "settings-account-management-cell settings-account-management-cell--empty";
-    if (action) cell.append(action);
-    return cell;
+  function appendAccountExtras(cell, items) {
+    const present = items.filter((item) => Boolean(item));
+    if (present.length === 0) return;
+    const extras = cell.ownerDocument.createElement("div");
+    extras.className = "settings-account-row__extras";
+    extras.append(...present);
+    cell.append(extras);
   }
   function renderAccountBalance(document2, messages, balance) {
     const cell = document2.createElement("td");
@@ -28756,8 +29212,8 @@ Codex Fast mode prioritizes requests and may increase usage.`
     row.dataset.accountId = account.accountId;
     row.dataset.accountFocus = `${account.accountId}:row`;
     row.tabIndex = -1;
-    const name = codexAccountDisplayName(account);
-    row.setAttribute("aria-label", name.full);
+    const name = accountDisplayText(codexAccountDisplayName(account).full, input.hideEmails === true);
+    row.setAttribute("aria-label", name);
     const personCell = document2.createElement("td");
     personCell.className = "settings-account-person-cell";
     const mark = document2.createElement("div");
@@ -28767,7 +29223,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
     mark.append(createRendererAgentIcon("codex", 26, document2));
     personCell.append(
       createAccountPerson(document2, messages, {
-        name: name.full,
+        name,
         agent: "Codex",
         plan: accountPlanLabel(account.planType),
         highlighted: account.planType === "pro" || account.planType === "prolite",
@@ -28783,8 +29239,6 @@ Codex Fast mode prioritizes requests and may increase usage.`
       input.onRetry,
       account.planType === "pro" ? "weekly-only" : "all"
     );
-    const actionsCell = createTargetCell(document2, input.importAction);
-    if (input.importAction) row.className += " settings-account-row--targets";
     const continuationRows = usage.continuationCells.map((cells) => {
       const continuation = document2.createElement("tr");
       continuation.className = "settings-account-row settings-account-quota-continuation-row";
@@ -28795,18 +29249,19 @@ Codex Fast mode prioritizes requests and may increase usage.`
     if (continuationRows.length > 0) {
       personCell.rowSpan = continuationRows.length + 1;
       personCell.className += " settings-account-spanning-cell";
-      actionsCell.rowSpan = continuationRows.length + 1;
-      actionsCell.className += " settings-account-spanning-cell";
     }
-    row.append(personCell, ...usage.cells, actionsCell);
+    row.append(personCell, ...usage.cells);
     const reset = input.usage?.status === "ready" ? renderAccountResetCredits(document2, input.usage.credits, messages) : null;
-    if (!reset) return [row, ...continuationRows];
+    if (!reset) {
+      appendAccountExtras(personCell, [input.importAction]);
+      return [row, ...continuationRows];
+    }
     const detailsRow = document2.createElement("tr");
     detailsRow.className = "settings-account-details-row";
     detailsRow.id = `settings-account-reset-${++resetDetailsSequence}`;
     detailsRow.hidden = !input.resetExpanded;
     const detailsCell = document2.createElement("td");
-    detailsCell.colSpan = 4;
+    detailsCell.colSpan = 3;
     detailsCell.append(reset.details);
     detailsRow.append(detailsCell);
     reset.summary.dataset.accountFocus = `${account.accountId}:reset`;
@@ -28817,15 +29272,18 @@ Codex Fast mode prioritizes requests and may increase usage.`
       reset.summary.setAttribute("aria-expanded", String(!detailsRow.hidden));
       input.onResetExpanded(!detailsRow.hidden);
     });
-    personCell.append(reset.summary);
+    appendAccountExtras(personCell, [reset.summary, input.importAction]);
     return [row, ...continuationRows, detailsRow];
   }
-  function renderHarnessAccountRows(document2, account, messages, display, importAction) {
+  function renderHarnessAccountRows(document2, account, messages, display, importAction, hideEmails = false) {
     const row = document2.createElement("tr");
     row.className = "settings-account-row";
     row.dataset.harnessId = account.harnessId;
     row.tabIndex = -1;
-    const name = account.email ?? account.label ?? account.harnessName;
+    const name = accountDisplayText(
+      account.email ?? account.label ?? account.harnessName,
+      hideEmails
+    );
     row.setAttribute("aria-label", name);
     const personCell = document2.createElement("td");
     personCell.className = "settings-account-person-cell";
@@ -28850,9 +29308,8 @@ Codex Fast mode prioritizes requests and may increase usage.`
       () => void 0,
       account.harnessId === "grok" ? "weekly-only" : "all"
     ) : renderAccountBalance(document2, messages, account.balance);
-    const managementCell = createTargetCell(document2, importAction);
-    if (importAction) row.className += " settings-account-row--targets";
     personCell.title = messages.accountNativeManagementHint.replace("{harness}", account.harnessName);
+    appendAccountExtras(personCell, [importAction]);
     const continuationRows = usage.continuationCells.map((cells) => {
       const continuation = document2.createElement("tr");
       continuation.className = "settings-account-row settings-account-quota-continuation-row";
@@ -28863,10 +29320,8 @@ Codex Fast mode prioritizes requests and may increase usage.`
     if (continuationRows.length > 0) {
       personCell.rowSpan = continuationRows.length + 1;
       personCell.className += " settings-account-spanning-cell";
-      managementCell.rowSpan = continuationRows.length + 1;
-      managementCell.className += " settings-account-spanning-cell";
     }
-    row.append(personCell, ...usage.cells, managementCell);
+    row.append(personCell, ...usage.cells);
     return [row, ...continuationRows];
   }
 
@@ -29026,6 +29481,26 @@ Codex Fast mode prioritizes requests and may increase usage.`
         refreshUsage.title = messages.accountCreditsRefresh;
         refreshUsage.setAttribute("aria-label", messages.accountCreditsRefresh);
         refreshUsage.append(createRendererSettingsIcon("refresh", 16));
+        let hideEmails = false;
+        const privacyToggle = document2.createElement("button");
+        privacyToggle.type = "button";
+        privacyToggle.className = "settings-icon-button settings-account-privacy-toggle";
+        const updatePrivacyToggle = () => {
+          const label = hideEmails ? messages.accountEmailsShow : messages.accountEmailsHide;
+          privacyToggle.title = label;
+          privacyToggle.setAttribute("aria-label", label);
+          privacyToggle.setAttribute("aria-pressed", String(hideEmails));
+          privacyToggle.replaceChildren(
+            createRendererSettingsIcon(hideEmails ? "eye-off" : "eye", 16)
+          );
+        };
+        updatePrivacyToggle();
+        privacyToggle.addEventListener("click", () => {
+          hideEmails = !hideEmails;
+          updatePrivacyToggle();
+          credentialImports.setHideEmails(hideEmails);
+          render();
+        });
         refreshUsage.addEventListener("click", () => {
           usageByAccountId.clear();
           loadUsage(accounts);
@@ -29033,7 +29508,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
           void credentialImports.refresh();
         });
         search.addEventListener("input", () => render());
-        toolbar.append(connected, searchWrapper, displayControls, refreshUsage);
+        toolbar.append(connected, privacyToggle, searchWrapper, displayControls, refreshUsage);
         const list = document2.createElement("div");
         list.className = "settings-account-list";
         const { table, body, updateDisplay } = createAccountsTable(document2, messages);
@@ -29078,7 +29553,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
           if (visibleAccounts.length + visibleHarnessAccounts.length === 0) {
             const emptyRow = document2.createElement("tr");
             const emptyCell = document2.createElement("td");
-            emptyCell.colSpan = 4;
+            emptyCell.colSpan = 3;
             emptyCell.className = "settings-account-empty";
             emptyCell.textContent = query ? messages.accountNoMatches : messages.accountEmpty;
             emptyRow.append(emptyCell);
@@ -29088,10 +29563,6 @@ Codex Fast mode prioritizes requests and may increase usage.`
             body.append(
               ...renderAccountRows(document2, account, messages, {
                 current: accountPhase === "ready" && account.accountId === currentAccountId,
-                importAction: credentialImports.button(
-                  "codex",
-                  codexAccountDisplayName(account).full
-                ),
                 usage: usageByAccountId.get(account.accountId),
                 display: usageDisplay,
                 resetExpanded: expandedResetAccounts.has(account.accountId),
@@ -29102,7 +29573,12 @@ Codex Fast mode prioritizes requests and may increase usage.`
                 onResetExpanded: (open) => {
                   if (open) expandedResetAccounts.add(account.accountId);
                   else expandedResetAccounts.delete(account.accountId);
-                }
+                },
+                importAction: credentialImports.button(
+                  "codex",
+                  codexAccountDisplayName(account).full
+                ),
+                hideEmails
               })
             );
           }
@@ -29116,7 +29592,8 @@ Codex Fast mode prioritizes requests and may increase usage.`
                 credentialImports.button(
                   account.harnessId,
                   account.email ?? account.label ?? account.harnessName
-                )
+                ),
+                hideEmails
               )
             );
           }
@@ -29223,8 +29700,8 @@ Codex Fast mode prioritizes requests and may increase usage.`
         } catch {
         }
         const harnessAccounts = createHarnessAccounts(context.signal, getClient, render);
-        void credentialImports.refresh();
         void harnessAccounts.refresh();
+        void credentialImports.refresh();
         load();
         return () => {
           stopCountdowns();
@@ -29786,7 +30263,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 +32779,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);
@@ -32406,6 +32900,15 @@ Codex Fast mode prioritizes requests and may increase usage.`
   color: var(--settings-muted);
   font-variant-numeric: tabular-nums;
 }
+/* Email privacy belongs to the identity column, so it sits beside the account count on the
+   left; quota controls (used/remaining, refresh) stay together on the right. */
+.settings-account-privacy-toggle {
+  margin-left: -8px;
+}
+.settings-account-privacy-toggle[aria-pressed="true"] {
+  color: var(--settings-text);
+  background: var(--settings-active);
+}
 .settings-account-search {
   display: flex;
   align-items: center;
@@ -32475,10 +32978,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
   background: light-dark(#f8f8fa, #202024);
   font-size: 11px;
   font-weight: 500;
-  text-align: left;
-}
-.settings-account-table th:last-child {
-  text-align: right;
+  text-align: center;
 }
 .settings-account-table td {
   padding: 17px 16px;
@@ -32798,26 +33298,11 @@ Codex Fast mode prioritizes requests and may increase usage.`
     border: 0;
   }
   .settings-account-person-cell,
-  .settings-account-management-cell,
+  .settings-account-usage-cell[colspan="2"],
   .settings-account-usage-cell--message,
   .settings-account-balance-cell {
     grid-column: 1 / -1;
   }
-  .settings-account-table .settings-account-row > td.settings-account-management-cell--empty {
-    display: none;
-  }
-  .settings-account-row--targets {
-    position: relative;
-  }
-  .settings-account-row--targets .settings-account-person-cell {
-    padding-right: 32px;
-  }
-  .settings-account-table .settings-account-row--targets > td.settings-account-management-cell {
-    position: absolute;
-    top: 14px;
-    right: 12px;
-    width: auto;
-  }
   .settings-account-email {
     font-size: 13px;
   }
@@ -32835,32 +33320,57 @@ Codex Fast mode prioritizes requests and may increase usage.`
   }
 }
 
-/* Small Harness target mark: muted when nothing is copied, full-strength with a dot when it is. */
-.settings-account-harness-target {
-  position: relative;
-  width: 26px;
-  height: 28px;
-  color: var(--settings-subtle);
+/* Identity extras: reset cards and the Pi import chip share one wrapping line. */
+.settings-account-row__extras {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 4px 10px;
+  margin-top: 6px;
+}
+/* Pi import chip: dashed "Import into Pi" until copied, then the entry name with a check. */
+.settings-account-pi-import {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  min-height: 24px;
+  padding: 2px 8px;
+  color: var(--settings-muted);
+  font: inherit;
+  font-size: 11px;
+  white-space: nowrap;
+  background: transparent;
+  border: 1px dashed var(--settings-border);
+  border-radius: 6px;
+  cursor: pointer;
 }
-.settings-account-harness-target:hover:not(:disabled) {
+.settings-account-pi-import:hover:not(:disabled) {
   color: var(--settings-text);
+  border-style: solid;
+  background: var(--settings-hover);
 }
-.settings-account-harness-target:disabled {
-  opacity: 0.4;
+.settings-account-pi-import:disabled {
+  opacity: 0.45;
   cursor: default;
 }
-.settings-account-harness-target[data-state] {
+.settings-account-pi-import[data-state="imported"] {
   color: var(--settings-text);
+  background: var(--settings-inset);
+  border-style: solid;
 }
-.settings-account-harness-target[data-state]::after {
-  content: "";
-  position: absolute;
-  top: 5px;
-  right: 3px;
-  width: 6px;
-  height: 6px;
-  border-radius: 50%;
-  background: var(--settings-text);
+.settings-account-pi-import code {
+  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+  font-size: 11px;
+}
+.settings-account-pi-import > svg {
+  flex: none;
+}
+.settings-account-pi-import[data-state="imported"] > svg:last-child {
+  color: light-dark(#2f7d4f, #7fd19b);
+}
+.settings-account-pi-import:focus-visible {
+  outline: 2px solid var(--settings-focus);
+  outline-offset: 1px;
 }
 /* Dedicated "imported into Pi" section: same card language as the account table, lighter header. */
 .settings-pi-accounts {
@@ -32871,18 +33381,67 @@ Codex Fast mode prioritizes requests and may increase usage.`
 }
 .settings-pi-accounts__header {
   display: flex;
+  flex-wrap: wrap;
   align-items: center;
-  gap: 8px;
+  gap: 8px 12px;
   padding: 0 2px 12px;
   font-size: 13px;
 }
-.settings-pi-accounts__header > svg {
+.settings-pi-accounts__fold {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  padding: 4px 0;
+  color: var(--settings-text);
+  font: inherit;
+  background: transparent;
+  border: 0;
+  cursor: pointer;
+}
+.settings-pi-accounts__fold > svg {
   flex: none;
 }
-.settings-pi-accounts__header > :last-child {
+.settings-pi-accounts__fold > svg:first-child {
+  color: var(--settings-muted);
+  transition: transform 120ms ease;
+}
+.settings-pi-accounts__fold[aria-expanded="true"] > svg:first-child {
+  transform: rotate(90deg);
+}
+.settings-pi-accounts__count {
   color: var(--settings-muted);
   font-variant-numeric: tabular-nums;
 }
+.settings-pi-accounts__hint {
+  margin-right: auto;
+  color: var(--settings-muted);
+  font-size: 12px;
+}
+.settings-pi-accounts__import {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  min-height: 30px;
+  padding: 4px 10px;
+  color: var(--settings-text);
+  font: inherit;
+  font-size: 12px;
+  background: light-dark(#ffffff, #232326);
+  border: 1px solid var(--settings-border);
+  border-radius: 7px;
+  cursor: pointer;
+}
+.settings-pi-accounts__import:hover:not(:disabled) {
+  background: var(--settings-hover);
+}
+.settings-pi-accounts__import:disabled {
+  opacity: 0.45;
+  cursor: default;
+}
+.settings-pi-accounts__import[hidden],
+.settings-pi-accounts__card[hidden] {
+  display: none;
+}
 .settings-pi-accounts__card {
   container-type: inline-size;
   overflow: hidden;
@@ -33019,6 +33578,54 @@ Codex Fast mode prioritizes requests and may increase usage.`
   color: var(--settings-muted);
   font-size: 12px;
 }
+.settings-credential-dialog__sources {
+  display: grid;
+  gap: 8px;
+  margin: 0;
+  padding: 0;
+  border: 0;
+}
+.settings-credential-dialog__sources > legend {
+  margin-bottom: 6px;
+  padding: 0;
+  color: var(--settings-muted);
+  font-size: 12px;
+}
+.settings-credential-dialog__source {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 9px 12px;
+  border: 1px solid var(--settings-border);
+  border-radius: 8px;
+  cursor: pointer;
+}
+.settings-credential-dialog__source:has(input:checked) {
+  border-color: var(--settings-focus);
+  background: var(--settings-hover);
+}
+.settings-credential-dialog__source > span {
+  display: grid;
+  gap: 2px;
+  min-width: 0;
+}
+.settings-credential-dialog__source strong {
+  font-size: 13px;
+  font-weight: 500;
+  overflow-wrap: anywhere;
+}
+.settings-credential-dialog__source > span > span {
+  color: var(--settings-muted);
+  font-size: 12px;
+}
+.settings-credential-dialog .settings-credential-dialog__source input {
+  flex: none;
+  width: auto;
+  min-height: 0;
+  margin: 0;
+  padding: 0;
+  accent-color: var(--settings-focus);
+}
 .settings-credential-dialog input {
   width: 100%;
   box-sizing: border-box;
@@ -33065,9 +33672,6 @@ Codex Fast mode prioritizes requests and may increase usage.`
 }
 
 @media (forced-colors: active) {
-  .settings-account-harness-target[data-state]::after {
-    background: Highlight;
-  }
   .settings-account-usage__bar {
     border: 1px solid CanvasText;
   }
@@ -34421,9 +35025,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 +35252,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 +35327,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 +35346,7 @@ ${accounts_default}`;
       return null;
     };
     const sidebarAgentIcons = installRendererSidebarAgentIcons({
-      getClient: (hostId) => modelClientForHost(hostId),
+      getClient: (hostId2) => modelClientForHost(hostId2),
       getLocalAgent: localAgentForSidebarThread
     });
     let connectionDiagnostics = null;
@@ -34808,27 +35412,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);
             }
@@ -34847,9 +35451,9 @@ ${accounts_default}`;
     const availabilityRetryDelays = [500, 1e3, 2e3, 4e3, 8e3];
     const usageRefreshTimers = /* @__PURE__ */ new Map();
     const usageRefreshAttempts = /* @__PURE__ */ new Map();
-    const isMountedComposer = (composer) => composer.isConnected && composer.matches(CODEX_COMPOSER_SELECTOR) && mountedByComposer.has(composer);
+    const isMountedComposer = (composer) => composer.isConnected && composer.matches(CODEX_COMPOSER_SELECTOR) && !isOrbitComposer(composer) && mountedByComposer.has(composer);
     const isCurrentModelRequest = (mounted, generation) => isMountedComposer(mounted.composer) && mountedByComposer.get(mounted.composer) === mounted && controller.isCurrentModelRequest(mounted.composer, generation);
-    const isCurrentOwnershipRequest = (mounted, generation) => mounted.composer.isConnected && mountedByComposer.get(mounted.composer) === mounted && controller.isCurrentOwnershipRequest(mounted.composer, generation);
+    const isCurrentOwnershipRequest = (mounted, generation) => isMountedComposer(mounted.composer) && mountedByComposer.get(mounted.composer) === mounted && controller.isCurrentOwnershipRequest(mounted.composer, generation);
     const notifySubmission = (composer, trigger) => {
       const state = controller.recordSubmission(composer);
       writeNewThreadAgentPreference(state.agent);
@@ -34882,6 +35486,7 @@ ${accounts_default}`;
     const composerAvailability = (mounted) => mounted.hostId ? hostHarnessAvailabilityState(mounted.hostId).availability : {};
     const composerAdapterState = (mounted) => composerClient(mounted) ? "ready" : "installing";
     const renderMounted = (mounted) => {
+      if (!isMountedComposer(mounted.composer)) return;
       const accounts = composerCodexAccounts(mounted.composer);
       const currentCodexAccount = accounts?.accounts.find(
         ({ accountId }) => accountId === accounts.readyAccountId
@@ -34915,8 +35520,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 +35529,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 +35579,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 +35597,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 +35605,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 +35626,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 +35635,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;
@@ -35076,6 +35681,7 @@ ${accounts_default}`;
       await policy.clear();
     };
     const applyDraftAgentCarrier = (composer, agent) => {
+      if (isOrbitComposer(composer)) return false;
       const model = controller.modelForAgent(composer, agent);
       const hasConcreteModel = model !== void 0;
       return applyAdapterAgent?.(
@@ -35093,6 +35699,7 @@ ${accounts_default}`;
       );
     };
     const loadThreadOwnership = async (mounted) => {
+      if (!isMountedComposer(mounted.composer)) return;
       const threadId = threadIdFromComposerModelTarget(mounted.modelTarget);
       if (!threadId) {
         mounted.ownershipStatus = "not-required";
@@ -35836,13 +36443,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 +36460,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 +36477,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 +36528,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 +36545,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 +36573,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 +36599,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 +36618,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 +36636,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 +36663,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 +36685,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 +36701,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 +36727,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 +36741,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 +36768,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;
         }
       },
@@ -36171,19 +36778,19 @@ ${accounts_default}`;
       }
     };
     const mount = (composer) => {
-      if (mountedByComposer.has(composer) || !composer.isConnected || !composer.matches(CODEX_COMPOSER_SELECTOR)) {
+      if (mountedByComposer.has(composer) || !composer.isConnected || isOrbitComposer(composer) || !composer.matches(CODEX_COMPOSER_SELECTOR)) {
         return;
       }
       const allButtons = [...composer.querySelectorAll("button")];
       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 +36840,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
       };
@@ -36259,11 +36866,12 @@ ${accounts_default}`;
       refreshTargetsOnNextScan = false;
       if (disposed) return;
       settingsLifecycle.refresh();
+      const transferredComposers = /* @__PURE__ */ new Set();
       for (const [target, replacement] of pendingReplacements) {
         const sourceState = controller.get(replacement.source.composer);
         const replacementTarget = findComposerModelTarget(target);
         const replacementHostId = activeModelHostId(target);
-        if (!shouldTransferComposerState(
+        if (isOrbitComposer(target) || !shouldTransferComposerState(
           replacement.sourceModelTarget,
           replacementTarget,
           sourceState.phase,
@@ -36274,10 +36882,12 @@ ${accounts_default}`;
           controllerTarget(replacementTarget, replacementHostId)
         )) {
           pendingReplacements.delete(target);
+        } else {
+          transferredComposers.add(replacement.source.composer);
         }
       }
       for (const [composer, mounted] of mountedByComposer) {
-        if (!composer.isConnected || !composer.matches(CODEX_COMPOSER_SELECTOR) || !mounted.control.root.isConnected) {
+        if (!composer.isConnected || isOrbitComposer(composer) || !composer.matches(CODEX_COMPOSER_SELECTOR) || !mounted.control.root.isConnected) {
           mounted.usageRequestGeneration += 1;
           usageRefreshAttempts.delete(composer);
           const timer = usageRefreshTimers.get(composer);
@@ -36288,6 +36898,7 @@ ${accounts_default}`;
           mounted.codexUsageGate.dispose();
           disposeComposerAgentControl(mounted.control);
           mountedByComposer.delete(composer);
+          controller.detach(composer, transferredComposers.has(composer));
           continue;
         }
         const state = controller.get(composer);
@@ -36359,6 +36970,7 @@ ${accounts_default}`;
       }
     };
     const applyComposerAgent = (composer) => {
+      if (!isMountedComposer(composer)) return false;
       const state = controller.get(composer);
       const mounted = mountedByComposer.get(composer);
       if (mounted?.modelTarget?.[0] === "conversation") {
@@ -36459,8 +37071,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 +37135,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 });
         }
       }
@@ -36552,7 +37164,7 @@ ${accounts_default}`;
       },
       isComposerEditor: (editor) => {
         const composer = composerForElement(editor);
-        return composer !== null && mountedByComposer.has(composer);
+        return composer !== null && isMountedComposer(composer);
       },
       readLocale: () => settingsLifecycle.locale,
       // Desktop's own suggestion menu hugs the input card and covers the
@@ -36580,9 +37192,10 @@ ${accounts_default}`;
       }
     });
     const connectedComposers = () => [...mountedByComposer.values()].filter(
-      (mounted) => mounted.composer.isConnected && mounted.control.root.isConnected
+      (mounted) => isMountedComposer(mounted.composer) && 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 +37330,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 +37352,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();
@@ -36765,6 +37376,8 @@ lucide/dist/esm/icons/circle-off.mjs:
 lucide/dist/esm/icons/copy.mjs:
 lucide/dist/esm/icons/download.mjs:
 lucide/dist/esm/icons/external-link.mjs:
+lucide/dist/esm/icons/eye.mjs:
+lucide/dist/esm/icons/eye-off.mjs:
 lucide/dist/esm/icons/ellipsis.mjs:
 lucide/dist/esm/icons/folder-input.mjs:
 lucide/dist/esm/icons/grip-vertical.mjs: