fix: preserve helper session menus

runtime/_test-settings.test.js

@@ -8,6 +8,7 @@
   join(import.meta.dir, "native-settings.js"),
   "utf8",
 );
+const zedOpenSource = readFileSync(join(import.meta.dir, "zed-open.js"), "utf8");
 
 function extractFunction(name) {
   const marker = `function ${name}(`;
@@ -186,18 +187,20 @@
   const descKeyBinding = templatePlaceholder("descKey");
   const toggleKeyBinding = templatePlaceholder("toggleKey");
   expect(source).toContain("Enable port forwarding");
-  expect(source).toContain('${helperSettingsSectionAttribute}="port-forwarding"');
+  expect(source).toContain('${helperSettingsSectionAttribute}="${sectionId}"');
+  expect(source).toContain('nativeSettingsGroupSection("Port forwarding"');
+  expect(source).toContain('"port-forwarding")');
   expect(source).toContain("function focusHelperSettingsSection(");
   expect(source).toContain(`data-codex-helper-setting-desc="${descKeyBinding}"`);
   expect(source).toContain(`${helperToggleBinding}="${toggleKeyBinding}"`);
   expect(source).toContain(
-    'switchRow("Enable port forwarding", "Detect and forward ports from agent sessions.", "portForwardingEnabled"',
+    'nativeSettingsSwitchRow("Enable port forwarding", "Detect and forward ports from agent sessions.", "portForwardingEnabled"',
   );
   expect(source).toContain(
-    'switchRow("Auto-forward detected web ports", "Open forwarded web URLs when a common dev port is detected.", "portAutoForwardWeb"',
+    'nativeSettingsSwitchRow("Auto-forward detected web ports", "Open forwarded web URLs when a common dev port is detected.", "portAutoForwardWeb"',
   );
   expect(source).toContain(
-    'switchRow("Use the same local port by default", "Bind forwarded ports to the same local port number when possible.", "portSameLocalPort"',
+    'nativeSettingsSwitchRow("Use the same local port by default", "Bind forwarded ports to the same local port number when possible.", "portSameLocalPort"',
   );
 });
 
@@ -217,24 +220,23 @@
 });
 
 test("settings page groups options by feature area", () => {
-  expect(source).toContain('codex-helper-settings-section-title text-sm font-medium text-token-text-primary">Basic</div>');
-  expect(source).toContain('codex-helper-settings-section-title text-sm font-medium text-token-text-primary">Auto naming</div>');
-  expect(source).toContain('codex-helper-settings-section-title text-sm font-medium text-token-text-primary">Sessions</div>');
-  expect(source).toContain('codex-helper-settings-section-title text-sm font-medium text-token-text-primary">Port forwarding</div>');
-  expect(source).toContain('sectionHeading("Loaded scripts"');
-  expect(source).toContain('sectionHeading("Log files"');
+  expect(source).toContain('nativeSettingsGroupSection("Integrations"');
+  expect(source).toContain('nativeSettingsGroupSection("Session actions"');
+  expect(source).toContain('nativeSettingsGroupSection("Chat titles"');
+  expect(source).toContain('nativeSettingsGroupSection("Port forwarding"');
+  expect(source).not.toContain('>Basic</div>');
+  expect(source).not.toContain('sectionHeading("Loaded scripts"');
+  expect(source).not.toContain('sectionHeading("Log files"');
   expect(source).toContain("https://github.com/loocor/codex-helper");
-  expect(source).toContain('externalLinkRow("Project repository"');
-  expect(source).toContain('actionRow("Open in Zed"');
-  expect(source).toContain("sectionHeading");
+  expect(source).toContain("function nativeSettingsAboutPageContent(");
+  expect(source).toContain('nativeSettingsActionRow("Open in Zed"');
   expect(source).toContain("open-scripts-dir");
   expect(source).toContain("open-logs-dir");
-  expect(source).toContain("codex-helper-settings-section-link");
   expect(source).not.toContain("Helper directory");
   expect(source).toContain("codex-helper-settings-scroll");
-  expect(source).toContain('forkRemoteProject: "Fork into Remote Project..."');
-  expect(source).toContain('forkLocalProject: "Fork into Local Project..."');
-  expect(source).toContain('forkAnotherProject: "Fork into Another Project..."');
+  expect(source).toContain('forkRemoteProject: "Fork into remote project..."');
+  expect(source).toContain('forkLocalProject: "Fork into local project..."');
+  expect(source).toContain('forkAnotherProject: "Fork into another project..."');
   expect(source).toContain('const order = ["autoRename", "export", "fork"]');
   expect(source).toContain('autoRename: "Regenerate chat title"');
   expect(source).toContain('bridge("/auto-rename-chat"');
@@ -490,19 +492,37 @@
 
 test("standalone helper settings dialog is not bundled", () => {
   expect(source).not.toContain("function showHelperSettingsDialog(");
+  expect(source).not.toContain("function renderHelperPage(");
+  expect(source).not.toContain("function clearHelperSettingsPage(");
+  expect(source).not.toContain("function stashHostContent(");
+  expect(source).not.toContain("function restoreStashedContent(");
+  expect(source).not.toContain("helperPageAttribute");
+  expect(source).not.toContain("helperEntryAttribute");
+  expect(source).not.toContain("helperContentHostAttribute");
+  expect(source).not.toContain("helperPageRoot");
+  expect(source).not.toContain("helperContentHost");
+  expect(source).not.toContain("helperContentStash");
   expect(source).not.toContain("helperDialogRoot = renderHelperPage(body,");
   expect(source).not.toContain("pageAttribute: helperDialogPageAttribute");
   expect(source).not.toContain("helperDialogRoot = renderNativeHelperSettingsPage");
+  expect(source).toContain("helperNativeSettingsPageAttribute");
+  expect(zedOpenSource).not.toContain("data-codex-helper-settings-page");
+  expect(zedOpenSource).toContain("data-codex-helper-native-settings-page");
 });
 
 test("startup does not eagerly mount inline General settings page", () => {
   expect(source).not.toContain("showHelperSettingsPage({ refresh: true })");
   expect(source).not.toContain("showHelperSettingsPage({ refresh: false })");
 });
 
-test("session context menu extends Codex native electronBridge menu", () => {
-  expect(source).toContain("showExtendedSessionContextMenu");
-  expect(source).toContain("buildCodexSessionNativeMenuItems");
+test("session context menu hooks Codex native menu model", () => {
+  expect(source).toContain("installSessionContextMenuBridge");
+  expect(source).toContain("sessionContextMenuMapRestore");
+  expect(source).toContain("Array.prototype.map");
+  expect(source).toContain("appendHelperSessionMenuItems");
+  expect(source).toContain("buildHelperSessionMenuModelItems");
+  expect(source).toContain("prepareSessionContextMenu");
+  expect(source).toContain("replaySessionContextMenu");
   expect(source).toContain("openProjectForkMenu");
   expect(source).toContain("navigateAfterFork(result, target)");
   expect(source).toContain("Regenerate chat title");
@@ -512,19 +532,22 @@
   expect(source).toContain("window.location.assign(path)");
   expect(source).toContain("nativeProjectTargets");
   expect(source).toContain("helperSessionMenuIcon");
-  expect(source).toContain("Fork into Another Project...");
+  expect(source).toContain("Fork into another project...");
   expect(source).not.toContain("Move Session");
-  expect(source).toContain("window.electronBridge");
   expect(source).toContain("open-thread-new-window");
   expect(source).toContain("loadRemoteProjectMetadataOrEmpty");
   expect(source).toContain('logDiagnostic("remote_project_metadata_unavailable"');
   expect(source).toContain("codex-helper-session-");
-  expect(source).toContain("stopImmediatePropagation");
-  expect(source).not.toContain('id: "mark-thread-unread"');
-  expect(source).not.toContain('id: "fork-into-local"');
-  expect(source).not.toContain('id: "fork-into-worktree"');
+  expect(source).toContain("trackSessionContextMenu(row)");
+  expect(source).not.toContain("showExtendedSessionContextMenu");
+  expect(source).not.toContain("buildCodexSessionNativeMenuItems");
+  expect(source).not.toContain("forwardSessionMenuAction");
+  expect(source).toContain('id === "mark-thread-unread"');
+  expect(source).toContain('id === "fork-into-local"');
+  expect(source).toContain('id === "fork-into-worktree"');
   expect(source).not.toContain("installSessionContextMenuItems");
   expect(source).not.toContain("installElectronContextMenuHook");
+  expect(source).not.toContain("showContextMenuWithHelperItems");
   expect(source).not.toContain("promptMoveTargetPath");
 });
 

runtime/bootstrap.js

@@ -13,9 +13,6 @@ function installObserver() {
   const observer = new MutationObserver(() => {
     maintainPortsPanel();
     installNativeHelperSettingsGroup();
-    if (helperPageRoot && !helperPageRoot.isConnected) {
-      clearHelperSettingsPage();
-    }
     if (helperNativeSettingsRoot && !helperNativeSettingsRoot.isConnected) {
       clearNativeHelperSettingsPage();
     }
@@ -103,6 +100,26 @@ function onHelperRuntimeClick(event) {
   });
 }
 
+function replaySessionContextMenu(event, target) {
+  target.dispatchEvent(
+    new MouseEvent("contextmenu", {
+      bubbles: true,
+      cancelable: true,
+      view: window,
+      clientX: event.clientX,
+      clientY: event.clientY,
+      screenX: event.screenX,
+      screenY: event.screenY,
+      button: event.button,
+      buttons: event.buttons,
+      ctrlKey: event.ctrlKey,
+      shiftKey: event.shiftKey,
+      altKey: event.altKey,
+      metaKey: event.metaKey,
+    }),
+  );
+}
+
 function onHelperRuntimeContextMenu(event) {
   const target = event.target;
   if (!(target instanceof Element)) return;
@@ -115,18 +132,26 @@ function onHelperRuntimeContextMenu(event) {
   }
   const row = sessionRowFromTarget(target);
   if (!(row instanceof HTMLElement)) return;
+  if (!sessionContextMenuReady() && !sessionContextMenuReplayInFlight) {
+    event.preventDefault();
+    event.stopImmediatePropagation();
+    sessionContextMenuReplayInFlight = true;
+    prepareSessionContextMenu()
+      .catch((error) => {
+        logDiagnostic("session_menu_prepare_failed", {
+          error: error?.message || String(error),
+        });
+      })
+      .finally(() => {
+        try {
+          if (target.isConnected) replaySessionContextMenu(event, target);
+        } finally {
+          sessionContextMenuReplayInFlight = false;
+        }
+      });
+    return;
+  }
   trackSessionContextMenu(row);
-  if (enabledSessionActions().length === 0) return;
-  event.preventDefault();
-  event.stopImmediatePropagation();
-  const ref = sessionRefFromRow(row);
-  if (!ref.session_id) return;
-  showExtendedSessionContextMenu(row, ref).catch((error) => {
-    showHelperToast(error?.message || String(error));
-    logDiagnostic("session_menu_open_failed", {
-      error: error?.message || String(error),
-    });
-  });
 }
 
 function onHelperRuntimeKeydown(event) {
@@ -202,6 +227,7 @@ window.__codexHelperRuntimeCleanup = () => {
   closePortForwardRowMenu();
   closePortForwardDialog();
   clearNativeHelperSettingsPage();
+  if (sessionContextMenuMapRestore) sessionContextMenuMapRestore();
   removeHelperRuntimeEventListeners();
   pendingPortScan = 0;
   maintainPortsPanelTimer = 0;

runtime/constants.js

@@ -1,7 +1,4 @@
 // Constants and mutable runtime state
-const helperEntryAttribute = "data-codex-helper-settings-entry";
-const helperContentHostAttribute = "data-codex-helper-content-host";
-const helperPageAttribute = "data-codex-helper-settings-page";
 const helperCommandAttribute = "data-codex-helper-command";
 const helperToggleAttribute = "data-codex-helper-setting-toggle";
 const helperNumberAttribute = "data-codex-helper-setting-number";
@@ -28,13 +25,13 @@ const helperPanelClass =
   "codex-helper-panel flex flex-col divide-y-[0.5px] divide-token-border overflow-hidden rounded-lg border border-token-border";
 let observerInstalled = false;
 let helperRuntimeObserver = null;
-let helperPageRoot = null;
+let sessionContextMenuMapRestore = null;
+let sessionContextMenuReplayInFlight = false;
+const SESSION_CONTEXT_MENU_MAX_AGE_MS = 2500;
 let helperNativeSettingsRoot = null;
 let helperNativeSettingsContentHost = null;
 let helperNativeSettingsContentStash = null;
 let helperNativeSettingsActivePage = "";
-let helperContentHost = null;
-let helperContentStash = null;
 let pendingSessionMenuContext = null;
 let pendingPortScan = 0;
 let maintainPortsPanelTimer = 0;
@@ -57,7 +54,7 @@ const suppressedPortMappings = new Set();
 let featureSettings = {
   markdownExportEnabled: false,
   sessionMoveEnabled: false,
-  autoRenameMenuEnabled: false,
+  autoRenameMenuEnabled: true,
   markdownFriendlyFilenameEnabled: true,
   autoNamingMinChars: 4,
   autoNamingMaxChars: 10,
@@ -66,3 +63,5 @@ let featureSettings = {
   portSameLocalPort: true,
 };
 let featureSettingsLoaded = false;
+let cachedRemoteProjectMetadata = [];
+let cachedRemoteProjectMetadataLoaded = false;

runtime/native-settings.js

@@ -396,6 +396,21 @@ function nativeSettingsPanel(rows, extraClass = "") {
   return `<div class="${classes}" style="background-color: var(--color-background-panel, var(--color-token-bg-fog));">${rows}</div>`;
 }
 
+function nativeSettingsGroupTitle(title) {
+  return `<div class="codex-helper-settings-section-title text-sm font-medium text-token-text-primary">${title}</div>`;
+}
+
+function nativeSettingsGroupSection(title, rows, sectionId = "") {
+  const sectionAttr = sectionId
+    ? ` ${helperSettingsSectionAttribute}="${sectionId}"`
+    : "";
+  return `
+    <section class="codex-helper-settings-section flex flex-col gap-1.5"${sectionAttr}>
+      ${nativeSettingsGroupTitle(title)}
+      ${nativeSettingsPanel(rows)}
+    </section>`;
+}
+
 function nativeSettingsIconSvg(name) {
   if (name === "refresh") {
     return nativeSettingsStandardIconSvg("refresh-cw");
@@ -531,26 +546,26 @@ function nativeSettingsPageContent(pageId) {
     return nativeSettingsAboutPageContent();
   }
   return `
-    ${nativeSettingsPanel(`
+    ${nativeSettingsGroupSection("Integrations", `
       ${nativeSettingsActionRow("Backend", "Loading", "refresh", "Refresh", "data-codex-helper-backend")}
       ${nativeSettingsActionRow("Open in Zed", "Loading", "refresh", "Refresh", "data-codex-helper-zed-status")}
       ${nativeSettingsActionRow("DevTools", "Open Chrome DevTools for this Codex window.", "open-devtools", "Open")}
     `)}
-    ${nativeSettingsPanel(`
+    ${nativeSettingsGroupSection("Session actions", `
       ${nativeSettingsSwitchRow("Markdown export", "Export conversations as Markdown from the session menu.", "markdownExportEnabled", "markdownExportEnabled", "Markdown export")}
       ${nativeSettingsSwitchRow("Fork sessions", "Fork sessions into local, remote, or another project from the sidebar context menu.", "sessionMoveEnabled", "sessionMoveEnabled", "Fork sessions")}
     `)}
-    ${nativeSettingsPanel(`
+    ${nativeSettingsGroupSection("Chat titles", `
       ${nativeSettingsSwitchRow("Regenerate chat title", "Show Regenerate chat title in the session context menu.", "autoRenameMenuEnabled", "autoRenameMenuEnabled", "Regenerate chat title")}
       ${nativeSettingsSwitchRow("Friendly Markdown filenames", "Use Codex auto naming for exported Markdown filenames.", "markdownFriendlyFilenameEnabled", "markdownFriendlyFilenameEnabled", "Friendly Markdown filenames")}
       ${nativeSettingsNumberRow("Minimum characters", "Smallest expected auto name length.", "autoNamingMinChars", "Minimum auto naming characters")}
       ${nativeSettingsNumberRow("Maximum characters", "Largest expected auto name length; 10 works well for Chinese names.", "autoNamingMaxChars", "Maximum auto naming characters")}
     `)}
-    ${nativeSettingsPanel(`
+    ${nativeSettingsGroupSection("Port forwarding", `
       ${nativeSettingsSwitchRow("Enable port forwarding", "Detect and forward ports from agent sessions.", "portForwardingEnabled", "portForwardingEnabled", "Enable port forwarding")}
       ${nativeSettingsSwitchRow("Auto-forward detected web ports", "Open forwarded web URLs when a common dev port is detected.", "portAutoForwardWeb", "portAutoForwardWeb", "Auto-forward detected web ports")}
       ${nativeSettingsSwitchRow("Use the same local port by default", "Bind forwarded ports to the same local port number when possible.", "portSameLocalPort", "portSameLocalPort", "Use the same local port by default")}
-    `)}
+    `, "port-forwarding")}
   `;
 }