codex-overleaf-link 2.5.1 → 2.6.5

package/extension/src/pageBridge.js

@@ -58,6 +58,8 @@
     document,
     getActiveFilePathFromEditorStore,
     getActiveEditorIdentity,
+    getCodeMirrorEditorView,
+    getCodeMirrorEditorViews: () => codeMirrorEditorViewCandidates().map(([, view]) => view).filter(isCodeMirrorEditorView),
     normalizePath: normalizeSafeProjectPath,
     readActiveEditorText,
     window
@@ -73,6 +75,7 @@
   const textFileCreator = requirePageModule('CodexOverleafTextFileCreator').create({
     window, document, treeOperations, snapshotRouter,
     collectElements, ensureEditing, ensureReviewing, readActiveEditorText, readWriteCancellationSequence,
+    findUpgradeModal: () => window.CodexOverleafReviewing.findUpgradeModal(document),
     uploadHelpers: requirePageModule('CodexOverleafBinaryAssetUploader')
   });
   binaryAssetUploader = requirePageModule('CodexOverleafBinaryAssetUploader').create({
@@ -96,6 +99,11 @@
   projectSnapshotBridge = window.CodexOverleafProjectSnapshot.create({
     buildProjectFileList: snapshotRouter.buildProjectFileList,
     buildProjectSnapshot: snapshotRouter.buildProjectSnapshot,
+    getSnapshotEditorCaptures: snapshotRouter.getSnapshotEditorCaptures,
+    captureEditorDocument: treeOperations.captureEditorDocument,
+    isCaptureCurrent: treeOperations.isCaptureCurrent,
+    getActiveFilePath,
+    getActiveEditorIdentity,
     getProjectId,
     normalizePath: normalizeSafeProjectPath,
     window
@@ -399,6 +407,11 @@
       fallbackUserMessage: 'Target file is active but the editor was not ready before timeout.',
       fallbackNextAction: 'Wait for Overleaf to finish loading, then retry.'
     },
+    reviewing_unavailable: {
+      stage: 'reviewing', severity: 'blocked', defaultRetryable: false,
+      fallbackUserMessage: "Track Changes is unavailable for this project. It depends on the project owner's Overleaf plan.",
+      fallbackNextAction: 'Turn off Track in the composer to write without tracked changes. Codex still records each change so you can undo it.'
+    },
     reviewing_state_unknown: {
       stage: 'reviewing', severity: 'blocked', defaultRetryable: true,
       fallbackUserMessage: 'Codex could not determine whether Reviewing/Track Changes is enabled.',
@@ -488,6 +501,8 @@
       findFileTreeManager,
       findHistoryObject,
       findReviewingActivationControl,
+      findUpgradeModal: () => window.CodexOverleafReviewing.findUpgradeModal(document),
+      reviewingConfirmed: isReviewingConfirmedForWrite(getReviewingState()),
       getCodeMirrorEditorView,
       getDeepActiveElement,
       isInsideCodexPanel,
@@ -497,7 +512,7 @@
 
   async function ensureReviewing(params = {}) {
     const initial = getReviewingState(params);
-    if (isReviewingConfirmedForWrite(initial)) {
+    if (isReviewingConfirmedForWrite(initial) && !window.CodexOverleafReviewing.findUpgradeModal(document)) {
       return {
         ok: true,
         activated: false,
@@ -506,6 +521,7 @@
     }
 
     const switched = await toggleReviewingMode(true, params);
+    if (switched.code === 'reviewing_unavailable') return { ...switched, reason: switched.failure.userMessage };
     if (switched.ok) {
       return {
         ok: true,
@@ -553,6 +569,7 @@
     }
 
     const switched = await toggleReviewingMode(false, params);
+    if (switched.code === 'reviewing_unavailable') return { ...switched, reason: switched.failure.userMessage };
     if (switched.ok) {
       return {
         ok: true,
@@ -743,9 +760,16 @@
       const activeFileMatches = getActiveFilePath() === filePath;
       const text = readActiveEditorText();
       lastText = text;
+      const currentEditorIdentity = getActiveEditorIdentity();
+      // A file-tree click can reconfigure or blur the old editor before the
+      // target document loads. A new view/state alone does not prove a switch.
+      const documentChanged = currentEditorIdentity?.type === 'codemirror-view'
+        && previousEditorIdentity?.type === 'codemirror-view'
+        ? currentEditorIdentity.doc !== previousEditorIdentity.doc
+        : Boolean(currentEditorIdentity) && activeEditorIdentityChanged(previousEditorIdentity);
       if (activeFileMatches
         && window.CodexOverleafProjectFiles.isUsableProjectFileContent(text)
-        && activeEditorIdentityChanged(previousEditorIdentity)) {
+        && documentChanged) {
         return {
           ok: true,
           text
@@ -871,6 +895,7 @@
     }
 
     const switched = await toggleReviewingMode(enabled, params);
+    if (switched.code === 'reviewing_unavailable') return { ...switched, reason: switched.failure.userMessage };
     if (switched.ok) {
       return {
         ok: true,
@@ -917,67 +942,23 @@
   }
 
   async function toggleReviewingMode(enabled, params = {}) {
-    const attemptedNodes = uniqueNodes([
-      findReviewingActivationControl(),
-      findReviewingModeMenuControl()
-    ].filter(Boolean));
-
-    for (const control of attemptedNodes) {
-      clickNode(control);
-      let after = await waitForReviewingEnabled(enabled, {
-        ...params,
-        waitMs: Math.min(resolveWaitMs(params), 180)
-      });
-      if (isReviewingTargetStateConfirmed(enabled, after)) {
-        return {
-          ok: true,
-          attempted: true,
-          reviewing: after.reviewing
-        };
+    const sequence = readWriteCancellationSequence();
+    const assertCurrent = () => {
+      if (sequence !== readWriteCancellationSequence()) {
+        throw Object.assign(new Error('Writeback was cancelled.'), { code: 'codex_cancelled' });
       }
-
-      const modeOption = findReviewingModeOption(enabled, { requireMenuOption: true });
-      if (modeOption) {
-        clickNode(modeOption);
-        after = await waitForReviewingEnabled(enabled, params);
-        if (isReviewingTargetStateConfirmed(enabled, after)) {
-          return {
-            ok: true,
-            attempted: true,
-            reviewing: after.reviewing
-          };
-        }
+      if (params.runProjectId && writeGuard.getEditorProjectIdPageSide(params.runProjectId) !== params.runProjectId) {
+        throw Object.assign(new Error('The active project changed.'), { code: 'aborted_project_changed' });
       }
-    }
-
-    const visibleModeOption = findReviewingModeOption(enabled, { requireMenuOption: true });
-    if (visibleModeOption) {
-      clickNode(visibleModeOption);
-      const after = await waitForReviewingEnabled(enabled, params);
-      return {
-        ok: isReviewingTargetStateConfirmed(enabled, after),
-        attempted: true,
-        reviewing: after.reviewing
-      };
-    }
-
-    const after = getReviewingState(params);
-    return {
-      ok: false,
-      attempted: attemptedNodes.length > 0,
-      reviewing: after.reviewing
     };
-  }
-
-  async function waitForReviewingEnabled(enabled, params = {}) {
-    const waitMs = resolveWaitMs(params);
-    const deadline = Date.now() + Math.max(0, waitMs);
-    let current = getReviewingState(params);
-    while (!isReviewingTargetStateConfirmed(enabled, current) && Date.now() < deadline) {
-      await delay(120);
-      current = getReviewingState(params);
-    }
-    return current;
+    return window.CodexOverleafReviewing.toggleMode(enabled, params, {
+      document, assertCurrent, delay,
+      getState: () => getReviewingState(params), isConfirmed: isReviewingTargetStateConfirmed,
+      click: clickNode,
+      findControls: () => findReviewingModeControls(enabled),
+      findOption: value => findReviewingModeOption(value, { requireMenuOption: true }),
+      buildFailure: buildPageBridgeFailure
+    });
   }
 
   function resolveWaitMs(params = {}) {
@@ -1109,7 +1090,72 @@
     return String(value || '').replace(/\s+/g, ' ').trim();
   }
 
+  function isReviewingModeNodeAvailable(node) {
+    if (!node || node.ownerDocument !== document || !node.isConnected || node.disabled
+      || node.getAttribute?.('aria-disabled') === 'true' || !node.getClientRects?.().length) return false;
+    for (let ancestor = node; ancestor; ancestor = ancestor.parentElement || ancestor.getRootNode?.().host) {
+      if (isInsideCodexPanel(ancestor) || ancestor.closest?.(
+        '.review-panel, .review-panel-container, .review-panel-header-slot, .review-sidebar, #review-panel, [data-testid="review-panel"]'
+      ) || ancestor.hidden || ancestor.getAttribute?.('aria-hidden') === 'true' || ancestor.hasAttribute?.('inert')) return false;
+      const style = window.getComputedStyle?.(ancestor);
+      if (style?.display === 'none' || style?.visibility === 'hidden' || style?.visibility === 'collapse'
+        || style?.opacity === '0') return false;
+    }
+    return true;
+  }
+
+  function findReviewingToolbarControl() {
+    return Array.from(document.querySelectorAll(
+      '.toolbar-editor .review-mode-switcher > .review-mode-switcher-toggle-button'
+    )).find(isReviewingModeNodeAvailable) || null;
+  }
+
+  function findReviewingModeControls(enabled) {
+    const toolbarControl = findReviewingToolbarControl();
+    return toolbarControl ? [toolbarControl]
+      : [findReviewingActivationControl(enabled), findReviewingModeMenuControl()];
+  }
+
+  function findReviewingToolbarMenu(control) {
+    const controlledIds = (control.getAttribute('aria-controls') || '').split(/\s+/).filter(Boolean);
+    for (const id of controlledIds) {
+      const menu = document.getElementById(id);
+      if (isReviewingModeNodeAvailable(menu)) return menu;
+    }
+    if (control.getAttribute('aria-expanded') !== 'true') return null;
+    const selector = '[role="menu"], [role="listbox"], .dropdown-menu';
+    // Current Overleaf keeps the menu beside the toggle, inside this switcher.
+    const localMenu = Array.from(control.parentElement?.querySelectorAll(selector) || [])
+      .find(node => node.closest('.review-mode-switcher') === control.parentElement && isReviewingModeNodeAvailable(node));
+    if (localMenu) return localMenu;
+    // A portalled menu must still name this switch, rather than an unrelated dropdown.
+    return control.id ? Array.from(document.querySelectorAll(selector)).find(node =>
+      (node.getAttribute('aria-labelledby') || '').split(/\s+/).includes(control.id)
+      && isReviewingModeNodeAvailable(node)) || null : null;
+  }
+
+  function isReviewingToolbarModeOption(node, enabled) {
+    const mode = enabled ? 'reviewing' : 'editing';
+    const values = [node.value, node.getAttribute('value'), node.getAttribute('data-value'),
+      node.getAttribute('label'), node.getAttribute('aria-label'), ...String(node.className || '').split(/\s+/)];
+    if (values.some(value => normalizeReviewingSignalText(value).toLowerCase() === mode)) return true;
+    // Read a label separately from icon text and the option's explanatory subtitle.
+    return [node, ...node.querySelectorAll('*')].some(label => {
+      if (label.closest('[aria-hidden="true"]')) return false;
+      const directText = Array.from(label.childNodes).filter(child => child.nodeType === 3)
+        .map(child => child.textContent).join(' ');
+      return [label.textContent, directText].some(value => normalizeReviewingSignalText(value).toLowerCase() === mode);
+    });
+  }
+
   function findReviewingModeOption(enabled, options = {}) {
+    const toolbarControl = findReviewingToolbarControl();
+    if (toolbarControl) {
+      const menu = findReviewingToolbarMenu(toolbarControl);
+      return Array.from(menu?.querySelectorAll(
+        '[role="menuitem"], [role="menuitemradio"], [role="option"], .dropdown-item, button, a, option'
+      ) || []).find(node => isReviewingModeNodeAvailable(node) && isReviewingToolbarModeOption(node, enabled)) || null;
+    }
     const candidates = collectReviewingModeOptionNodes()
       .filter(node => isReviewingModeOptionCandidate(node, enabled, options))
       .sort((left, right) => scoreReviewingModeOption(right, enabled) - scoreReviewingModeOption(left, enabled));
@@ -1145,7 +1191,7 @@
   }
 
   function isReviewingModeMenuControlCandidate(node) {
-    if (!node || node.disabled || node.getAttribute?.('aria-disabled') === 'true') {
+    if (!isReviewingModeNodeAvailable(node) || isMenuLikeModeOption(node)) {
       return false;
     }
     const text = readNodeSignalText(node);
@@ -1198,7 +1244,7 @@
   }
 
   function isReviewingModeOptionCandidate(node, enabled, options = {}) {
-    if (!node || node.disabled || node.getAttribute?.('aria-disabled') === 'true') {
+    if (!isReviewingModeNodeAvailable(node)) {
       return false;
     }
     if (options.requireMenuOption && !isMenuLikeModeOption(node)) {
@@ -1244,10 +1290,10 @@
       && !/\bsyntax highlighting\b/i.test(text);
   }
 
-  function findReviewingActivationControl() {
+  function findReviewingActivationControl(enabled = true) {
     const nodes = collectReviewingControlNodes();
     const candidates = nodes
-      .filter(node => isReviewingActivationCandidate(node))
+      .filter(node => isReviewingActivationCandidate(node, enabled))
       .sort((left, right) => scoreReviewingControl(right) - scoreReviewingControl(left));
     return candidates[0] || null;
   }
@@ -1271,10 +1317,12 @@
     ]).slice(0, 1500);
   }
 
-  function isReviewingActivationCandidate(node) {
-    if (!node || node.disabled || node.getAttribute?.('aria-disabled') === 'true') {
+  function isReviewingActivationCandidate(node, enabled) {
+    if (!isReviewingModeNodeAvailable(node) || isMenuLikeModeOption(node)) {
       return false;
     }
+    // A standalone Reviewing command enables tracking; it cannot open Editing.
+    if (!enabled && !node.getAttribute?.('aria-haspopup') && !node.hasAttribute?.('aria-expanded')) return false;
     const text = readNodeSignalText(node);
     return /\breviewing\b|\btrack(?:ed)? changes?\b|\bsuggest(?:ing|ions?)\b/i.test(text)
       && !/\breview panel\b/i.test(text);
@@ -1634,21 +1682,21 @@
     return editorAdapter.readActiveEditorText();
   }
 
-  function replaceActiveEditorText(text) {
-    return editorAdapter.replaceActiveEditorText(text);
+  function replaceActiveEditorText(text, options) {
+    return editorAdapter.replaceActiveEditorText(text, options);
   }
 
-  function replaceActiveEditorPatches(patches, nextContent) {
-    return editorAdapter.replaceActiveEditorPatches(patches, nextContent);
+  function replaceActiveEditorPatches(patches, nextContent, options) {
+    return editorAdapter.replaceActiveEditorPatches(patches, nextContent, options);
   }
 
   function getCodeMirrorEditorView() {
     return findCodeMirrorEditorView()?.view || null;
   }
 
-  function findCodeMirrorEditorView() {
+  function codeMirrorEditorViewCandidates() {
     const store = getOverleafUnstableStore();
-    const candidates = [
+    return [
       ['store:editor.view', readStoreValue(store, 'editor.view')],
       ['store:editor.view.camel', readStoreValue(store, 'editor.view.camel')],
       ['store:editor', readStoreValue(store, 'editor').view],
@@ -1657,7 +1705,10 @@
       ['window._ide.editorView', window._ide?.editorView]
     ];
 
-    for (const [source, candidate] of candidates) {
+  }
+
+  function findCodeMirrorEditorView() {
+    for (const [source, candidate] of codeMirrorEditorViewCandidates()) {
       if (isCodeMirrorEditorView(candidate)) {
         return {
           view: candidate,

package/extension/src/popup.js

@@ -708,7 +708,7 @@ async function sendConsentAction(action) {
     const code = String(state.code || '');
     if (code === 'update_recovery_pending') return utx('The update result is being checked. Recovery has not been confirmed.', '正在确认更新结果，恢复状态尚未确认。');
     if (['update_bootstrap_health_timeout', 'update_bootstrap_reload_failed'].includes(code)) return utx('The updated startup components did not finish restarting and confirming. Check recovery before retrying.', '更新后的启动组件未能完成重启和确认，请先检查恢复状态。');
-    if (['update_bootstrap_source_mismatch', 'update_bootstrap_source_version_mismatch'].includes(code)) return utx('The installed startup files do not match a supported update source. Check recovery before retrying.', '已安装的启动文件与支持的升级来源不一致，请先检查恢复状态。');
+    if (['update_bootstrap_source_mismatch', 'update_bootstrap_source_version_mismatch'].includes(code)) return utx('The installed startup files do not match a supported update source. Restore the previous version in Settings, or reinstall once.', '已安装的启动文件与支持的升级来源不一致。请在设置中恢复到上一版本，或重新安装一次。');
     if (['update_bootstrap_record_missing', 'update_bootstrap_record_invalid', 'update_bootstrap_backup_mismatch', 'update_bootstrap_already_restoring'].includes(code)) return utx('The startup recovery material could not be confirmed. The update result remains unconfirmed.', '尚未确认启动组件的恢复材料有效，更新结果仍待确认。');
     if (['update_bootstrap_confirmation_pending', 'update_bootstrap_native_restart_required'].includes(code)) return utx('Waiting for the updated startup components and Native Host to finish restarting and confirming.', '正在等待更新后的启动组件和本机服务完成重启及确认。');
     if (code === 'update_bootstrap_monitor_unavailable') return utx('The update recovery monitor could not start. Check recovery before retrying.', '更新恢复监护程序未能启动，请先检查恢复状态。');