codex-overleaf-link 2.5.1 → 2.6.0

package/extension/src/content/sensitivePreflight.js

@@ -7,6 +7,10 @@
 })(typeof window !== 'undefined' ? window : globalThis, function sensitivePreflightFactory() {
   'use strict';
 
+  // Report evidence admits detector identities only, never matched text or previews.
+  const REPORT_DETECTOR_IDS = new Set(['private-key', 'bearer-token', 'api-token', 'aws-access-key',
+    'google-api-key', 'huggingface-token', 'gitlab-token', 'stripe-live-secret', 'jwt-token', 'secret-assignment']);
+
   function create({
     SensitiveScan, normalizeGovernanceRules, isTextSnapshotFile, sendBackgroundNative,
     getCurrentProjectId, appendRunEvent, appendCompletionReport, showPluginConfirm, tr, tx
@@ -62,12 +66,21 @@
       }
       // Blocking an extra message must not finish the task already in progress.
       if (guidance) return { blocked: true, findings };
-      appendCompletionReport({
+      const detectorIds = [...new Set(findings.map(finding => finding?.detectorId))];
+      appendCompletionReport({ conclusionKey: 'sensitive_blocked',
         conclusion: tx(
           'This run was blocked before Codex received project context because sensitive content was detected.',
           '检测到敏感内容，本轮已在向 Codex 发送项目上下文前阻止。'
         ),
         status: 'blocked',
+        unchangedReason: tx('Sensitive content was found before sending.', '发送前发现了敏感内容。'),
+        failure: { code: 'sensitive_content_blocked', stage: 'preflight', severity: 'blocked',
+          retryable: false, changedDocument: false,
+          evidence: {
+            // An unknown type makes the cause generic, even alongside one known type.
+            detectorIds: detectorIds.every(id => REPORT_DETECTOR_IDS.has(id)) ? detectorIds.slice(0, 5) : [],
+            findingCount: findings.length
+          } },
         operations: [],
         applyResults: [],
         nextStep: tx(

package/extension/src/content/sessionManager.js

@@ -11,7 +11,8 @@
     const {
       SessionPanel,
       SessionState,
-      SessionMenuView
+      SessionMenuView,
+      PanelIcons
     } = deps;
     const {
       createSession,
@@ -30,6 +31,9 @@
       saveState,
       saveStateSoon,
       readPanelInputs,
+      flushComposerDraft,
+      setSessionTransition,
+      getDraftScope,
       applyStateToPanel,
       syncSessionProvider,
       getPanel,
@@ -47,6 +51,7 @@
       getActiveSession,
       getPanel,
       getSessionDisplayTitle,
+      icons: PanelIcons,
       getState,
       isDisplayableSession,
       isSessionRunning,
@@ -60,7 +65,31 @@
       closeSessionMenu
     } = sessionMenuView;
 
-  async function startNewSession() {
+  let transitionToken = null;
+
+  async function withSessionTransition(change) {
+    if (transitionToken) return;
+    const token = {};
+    transitionToken = token;
+    const scope = getDraftScope?.();
+    try {
+      // Lock before the first wait, including an outstanding IME commit.
+      await setSessionTransition?.(true);
+      if (getDraftScope?.() !== scope) return;
+      return await change(scope);
+    } finally {
+      if (transitionToken === token) {
+        transitionToken = null;
+        setSessionTransition?.(false);
+      }
+    }
+  }
+
+  function startNewSession() {
+    return withSessionTransition(createNewSession);
+  }
+
+  async function createNewSession(draftScope) {
     // Leaving a still-running session is allowed but never silent: the run
     // keeps going in the background and lands in its own session.
     const runningActive = getActiveSession(getState());
@@ -74,7 +103,10 @@
         return;
       }
     }
+    if (getDraftScope?.() !== draftScope) return;
     readPanelInputs();
+    await flushComposerDraft?.();
+    if (getDraftScope?.() !== draftScope) return;
     // Reuse an already-empty, idle active session instead of minting a ghost.
     // Empty sessions are invisible in the list yet still consume the storage cap
     // (slice(-20) / maxSessions), so spamming "New Session" could silently evict
@@ -99,6 +131,7 @@
       if (!evictionApproved) {
         return;
       }
+      if (getDraftScope?.() !== draftScope) return;
     }
     const session = createSession({
       mode: getState().mode,
@@ -114,15 +147,22 @@
       activeSessionId: session.id
     }));
     applyStateToPanel();
+    const destinationScope = getDraftScope?.();
     await syncSessionProvider?.();
+    if (getDraftScope?.() !== destinationScope) return;
     await saveState();
+    if (getDraftScope?.() !== destinationScope) return;
     getPanel().querySelector('[data-task]')?.focus();
   }
 
-  async function switchSession(sessionId) {
+  function switchSession(sessionId) {
     if (sessionId === getState().activeSessionId) {
       return;
     }
+    return withSessionTransition(scope => switchToSession(sessionId, scope));
+  }
+
+  async function switchToSession(sessionId, draftScope) {
     const runningActive = getActiveSession(getState());
     if (runningActive && isSessionRunning(runningActive)) {
       const approved = await showPluginConfirm({
@@ -134,10 +174,15 @@
         return;
       }
     }
+    if (getDraftScope?.() !== draftScope) return;
     readPanelInputs();
+    await flushComposerDraft?.();
+    if (getDraftScope?.() !== draftScope) return;
     setState(setActiveSession(getState(), sessionId));
     applyStateToPanel();
+    const destinationScope = getDraftScope?.();
     await syncSessionProvider?.();
+    if (getDraftScope?.() !== destinationScope) return;
     await saveState();
   }
 
@@ -295,6 +340,7 @@
       bindActiveSessionHeader,
       startNewSession,
       switchSession,
+      isTransitioning: () => transitionToken !== null,
       deleteSessionWithConfirm,
       renderSessionList,
       commitSessionRename,

package/extension/src/content/sessionMenuView.js

@@ -11,6 +11,7 @@
       getPanel,
       getSessionDisplayTitle,
       getState,
+      icons = null,
       isDisplayableSession,
       isSessionRunning,
       startNewSession,
@@ -20,19 +21,20 @@
 
     function applySessionLabel() {
       const trigger = getPanel().querySelector('[data-session-menu-trigger]');
-      if (trigger) {
-        trigger.title = tr('sessionMenuOpen');
-        trigger.setAttribute('aria-label', tr('sessionMenuOpen'));
-      }
       const textNode = getPanel().querySelector('[data-session-label-text]');
       const deleteButton = getPanel().querySelector('[data-session-delete]');
       const renameButton = getPanel().querySelector('[data-session-rename]');
       const renameInput = getPanel().querySelector('[data-session-rename-input]');
       const active = getActiveSession(getState());
+      const label = active && isDisplayableSession(active)
+        ? getSessionDisplayTitle(active)
+        : tr('newSessionFallback');
       if (textNode) {
-        textNode.textContent = active && isDisplayableSession(active)
-          ? getSessionDisplayTitle(active)
-          : tr('newSessionFallback');
+        textNode.textContent = label;
+      }
+      if (trigger) {
+        trigger.title = `${label} · ${tr('sessionMenuOpen')}`;
+        trigger.setAttribute('aria-label', `${tr('sessionMenuOpen')}: ${label}`);
       }
       if (deleteButton) {
         const running = active ? isSessionRunning(active) : false;
@@ -111,11 +113,15 @@
         .slice()
         .sort((a, b) => String(b.updatedAt || b.createdAt || '').localeCompare(String(a.updatedAt || a.createdAt || '')));
       for (const session of sessions) {
-        const row = document.createElement('button');
-        row.type = 'button';
+        const row = document.createElement('div');
         row.className = 'codex-session-menu-item';
+        row.setAttribute('role', 'none');
         row.dataset.active = session.id === state?.activeSessionId ? 'true' : 'false';
         row.dataset.running = isSessionRunning(session) ? 'true' : 'false';
+        const switchButton = document.createElement('button');
+        switchButton.type = 'button';
+        switchButton.className = 'codex-session-menu-switch';
+        switchButton.setAttribute('role', 'menuitem');
         const title = document.createElement('span');
         title.className = 'codex-session-menu-item-title';
         title.textContent = getSessionDisplayTitle(session);
@@ -127,26 +133,56 @@
         if (absoluteTs) {
           time.title = new Date(absoluteTs).toLocaleString();
         }
-        row.append(title, time);
-        row.addEventListener('click', event => {
+        switchButton.append(title, time);
+        switchButton.addEventListener('click', event => {
           event.stopPropagation();
           closeSessionMenu();
           if (session.id !== getState()?.activeSessionId) {
             switchSession(session.id);
           }
         });
+        const deleteButton = menuAction('codex-session-menu-item-delete', 'close', '',
+          row.dataset.running === 'true' ? tr('deleteRunningSession') : tr('deleteSession'),
+          () => deleteSessionWithConfirm(session.id));
+        deleteButton.setAttribute('role', 'menuitem');
+        deleteButton.disabled = row.dataset.running === 'true';
+        row.append(switchButton, deleteButton);
         menu.append(row);
       }
-      const createButton = document.createElement('button');
-      createButton.type = 'button';
-      createButton.className = 'codex-session-menu-new';
-      createButton.textContent = `+ ${tr('newSession')}`;
-      createButton.addEventListener('click', event => {
+      const footer = document.createElement('div');
+      footer.className = 'codex-session-menu-footer';
+      const active = getActiveSession(state);
+      const running = active ? isSessionRunning(active) : false;
+      const soleEmpty = Boolean(active) && !isDisplayableSession(active) && (state?.sessions || []).length <= 1;
+      const createButton = menuAction('codex-session-menu-new', 'plus', tr('sessionMenuNewShort'), tr('newSession'), () => startNewSession());
+      const renameButton = menuAction('codex-session-menu-rename', 'pencil', tr('sessionMenuRenameShort'), tr('renameSession'), () => beginActiveSessionRename());
+      renameButton.disabled = !active;
+      const deleteButton = menuAction('codex-session-menu-delete', 'close', tr('sessionMenuDeleteShort'),
+        running ? tr('deleteRunningSession') : tr('deleteSession'), () => {
+          if (getState()?.activeSessionId) deleteSessionWithConfirm(getState().activeSessionId);
+        });
+      deleteButton.disabled = !active || running || soleEmpty;
+      footer.append(createButton, renameButton, deleteButton);
+      menu.append(footer);
+    }
+
+    function menuAction(className, iconName, label, description, onSelect) {
+      const button = document.createElement('button');
+      button.type = 'button';
+      button.className = className;
+      button.title = description;
+      button.setAttribute('aria-label', description);
+      const glyph = icons?.svg?.(iconName);
+      if (glyph) button.insertAdjacentHTML('beforeend', glyph);
+      const text = document.createElement('span');
+      text.textContent = label;
+      button.append(text);
+      button.addEventListener('click', event => {
         event.stopPropagation();
         closeSessionMenu();
-        startNewSession();
+        onSelect();
       });
-      menu.append(createButton);
+      return button;
     }
 
     function beginActiveSessionRename() {

package/extension/src/content/sessionPersistence.js

@@ -74,20 +74,40 @@
       .filter(record => !deleted.has(record.id))
       .map(record => [record.id, record]));
     const mergedRecords = sessionRecords.map(record => StorageDb.mergeSessionReviewState?.(
-      record, existingById.get(record.id), options.reviewRunIds
+      record, existingById.get(record.id), options.reviewRunIds, { shared: StorageDb.sharedSessionsEnabled?.() === true }
     ) || record);
+    const reviewRunIds = new Set(options.reviewRunIds || []);
+    // Shared storage merges local edits and explicitly requested Undo markers
+    // against the page baseline. Legacy and ordinary stale saves keep the age guard.
     const writable = mergedRecords.filter(record => {
       const existing = existingById.get(record.id);
       if (!existing) return true;
-      return (Date.parse(record.updatedAt || '') || 0) >= (Date.parse(existing.updatedAt || '') || 0);
+      return (Date.parse(record.updatedAt || '') || 0) >= (Date.parse(existing.updatedAt || '') || 0)
+        || (StorageDb.sharedSessionsEnabled?.() === true
+          && (StorageDb.hasUnpersistedSharedSession?.(record) === true
+            || (record.runs || []).some(run => reviewRunIds.has(run.id) && run.undoOwnerProtocol === 1)));
     });
     const cleanedExisting = existingSessions.filter((record, index) =>
       record !== rawExistingSessions[index] && !writable.some(item => item.id === record.id)
     );
     if (cleanedExisting.length || writable.length) {
-      const written = await StorageDb.putRecords('sessions', [...cleanedExisting, ...writable], {
-        reviewRunIds: options.reviewRunIds
-      });
+      const reviewReceipts = [];
+      if (StorageDb.sharedSessionsEnabled?.() === true && reviewRunIds.size) {
+        for (const record of writable) {
+          const ids = (record.runs || []).filter(run => reviewRunIds.has(run.id)).map(run => run.id);
+          if (ids.length) reviewReceipts.push(await StorageDb.putSessionReviewState(record, ids));
+        }
+      }
+      let written;
+      try {
+        written = await StorageDb.putRecords('sessions', [...cleanedExisting, ...writable], {
+          reviewRunIds: options.reviewRunIds, reviewReceipts
+        });
+      } catch (error) {
+        if (error.code === 'shared_session_conflict' && reviewReceipts.length)
+          Object.defineProperty(error, 'reviewReceipts', { value: reviewReceipts, configurable: true });
+        throw error;
+      }
       // Check the actual durable result, including a decision already saved
       // from another origin, instead of acknowledging only the proposed view.
       return written.filter(record => writable.some(candidate => candidate.id === record.id));

package/extension/src/content/settingsPanel.js

@@ -9,8 +9,10 @@
 
   function codexIcon(name) {
     const icons = {
+      archive: '<rect x="2.5" y="3" width="11" height="3.2" rx=".8"/><path d="M3.5 6.2v6.3a1 1 0 0 0 1 1h7a1 1 0 0 0 1-1V6.2"/><path d="M6.5 9h3"/>',
       appearance: '<path d="M8 2.2v1.1"/><path d="M8 12.7v1.1"/><path d="M2.2 8h1.1"/><path d="M12.7 8h1.1"/><path d="m3.9 3.9.8.8"/><path d="m11.3 11.3.8.8"/><path d="m12.1 3.9-.8.8"/><path d="m4.7 11.3-.8.8"/><circle cx="8" cy="8" r="2.4"/>',
       bolt: '<path d="M8.9 1.8 3.8 8.8h3.3l-.5 5.4 5.5-7.5H8.8z"/>',
+      close: '<path d="m4.6 4.6 6.8 6.8M11.4 4.6l-6.8 6.8"/>',
       database: '<ellipse cx="8" cy="4" rx="4.5" ry="1.9"/><path d="M3.5 4v4c0 1 2 1.9 4.5 1.9s4.5-.9 4.5-1.9V4"/><path d="M3.5 8v4c0 1 2 1.9 4.5 1.9s4.5-.9 4.5-1.9V8"/>',
       flask: '<path d="M6 2.5h4"/><path d="M7 2.5v4.1l-3.4 5.3A1.4 1.4 0 0 0 4.8 14h6.4a1.4 1.4 0 0 0 1.2-2.1L9 6.6V2.5"/><path d="M5.3 10.5h5.4"/>',
       history: '<path d="M4.2 3.4h7.6"/><path d="M4.2 8h7.6"/><path d="M4.2 12.6h4.6"/><path d="M2.2 3.4h.1"/><path d="M2.2 8h.1"/><path d="M2.2 12.6h.1"/>',
@@ -36,7 +38,9 @@
       container,
       callbacks: options.callbacks || {},
       i18n: options.i18n || null,
-      button: options.button || null
+      button: options.button || null,
+      // Names the open project in project-page scope lines; may return ''.
+      getProjectName: typeof options.getProjectName === 'function' ? options.getProjectName : null
     };
 
     container.innerHTML = `
@@ -211,6 +215,7 @@
                 <p class="codex-set-row-help" data-update-settings-summary data-i18n="softwareUpdatesHelp">Automatically checks signed stable releases for the Extension and Native Host.</p>
                 <p class="codex-set-note" data-update-settings-state aria-live="polite" hidden></p>
                 <button type="button" class="codex-set-btn" data-check-updates data-i18n="checkForUpdates">Check for updates</button>
+                <button type="button" class="codex-set-btn" data-restore-previous-version hidden>Restore previous version</button>
               </div>
             </div>
           </details>
@@ -334,6 +339,7 @@
         return host || null;
       },
       setProviderCloseGuard: guard => instance.workbench?.setProviderCloseGuard(guard),
+      revealGroup: key => instance.workbench?.revealGroup(key) || null,
       loadState: state => loadState(instance, state),
       readState: () => readState(instance),
       setStatus: (text, status) => setStatus(instance, text, status),
@@ -464,7 +470,9 @@
     };
   }
 
-  function setStatus(target, text, status = 'info') {
+  // options.page names the workbench page a message belongs to; the workbench
+  // shows it only while that page is active. Untagged messages show everywhere.
+  function setStatus(target, text, status = 'info', options = {}) {
     const instance = target?._instance || target;
     const element = instance?.container?.querySelector('[data-project-settings-status]');
     if (!element) {
@@ -472,6 +480,9 @@
     }
     element.textContent = text || '';
     element.dataset.status = status;
+    if (options.page) element.dataset.statusPage = options.page;
+    else delete element.dataset.statusPage;
+    instance.workbench?.refresh();
   }
 
   function clearStatus(target) {
@@ -482,6 +493,8 @@
     }
     element.textContent = '';
     delete element.dataset.status;
+    delete element.dataset.statusPage;
+    instance.workbench?.refresh();
   }
 
   function setSkillsSummary(target, text) {