@codexhost/cli-win32-arm64 0.12.1 → 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) {
@@ -661,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, {
@@ -16807,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" }],
@@ -17041,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",
@@ -17090,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,
@@ -17674,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;
   }
 
@@ -18158,6 +18328,30 @@ ${error51.stderrTail}`] : []
         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 = () => {
@@ -18551,20 +18745,20 @@ ${error51.stderrTail}`] : []
           () => {
           }
         );
-        const unsubscribeGroup = groupPreference.subscribe(
-          () => render(diagnostics?.snapshot() ?? latestSnapshot)
-        );
+        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();
@@ -18576,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",
@@ -18591,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",
@@ -18606,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",
@@ -18621,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",
@@ -18746,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}",
@@ -19016,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}",
@@ -22270,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);
@@ -22759,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;
@@ -25070,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;
@@ -25261,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,
@@ -28006,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"
@@ -28042,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;
@@ -28052,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";
@@ -28098,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";
@@ -28136,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", () => {
@@ -28146,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);
@@ -28162,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");
@@ -28190,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");
@@ -28257,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";
@@ -28280,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 = "";
@@ -28310,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;
@@ -28318,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;
@@ -28326,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";
@@ -28337,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(
@@ -28344,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();
@@ -28353,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
                   },
@@ -28395,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);
@@ -28405,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 () => {
@@ -28426,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();
@@ -28731,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) {
@@ -28855,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;
@@ -28870,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] ?? "";
       });
@@ -28926,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");
@@ -28955,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");
@@ -28966,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",
@@ -28982,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";
@@ -28994,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`;
@@ -29016,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";
@@ -29049,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";
@@ -29062,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];
   }
 
@@ -29225,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);
@@ -29232,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);
@@ -29277,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);
@@ -29287,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),
@@ -29301,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
               })
             );
           }
@@ -29315,7 +29592,8 @@ Codex Fast mode prioritizes requests and may increase usage.`
                 credentialImports.button(
                   account.harnessId,
                   account.email ?? account.label ?? account.harnessName
-                )
+                ),
+                hideEmails
               )
             );
           }
@@ -29422,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();
@@ -32622,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;
@@ -32691,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;
@@ -33014,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;
   }
@@ -33051,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;
 }
-.settings-account-harness-target:hover:not(:disabled) {
+/* 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-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 {
@@ -33087,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;
@@ -33235,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;
@@ -33281,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;
   }
@@ -35063,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);
@@ -35098,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
@@ -35292,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?.(
@@ -35309,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";
@@ -36387,7 +36778,7 @@ ${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")];
@@ -36475,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,
@@ -36490,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);
@@ -36504,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);
@@ -36575,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") {
@@ -36768,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
@@ -36796,7 +37192,7 @@ ${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),
@@ -36980,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: