codex-overleaf-link 2.5.1 → 2.6.0

package/extension/src/page/writebackRouter.js

@@ -367,12 +367,12 @@
     const trackReviewingChanges = options.requireReviewing === true && hasOperations;
     let reviewingPolicy = null;
     if (options.requireReviewing === true && hasOperations) {
-      const reviewing = await ensureReviewing({ waitMs: 1800 });
+      const reviewing = await ensureReviewing({ waitMs: 1800, runProjectId: options.runProjectId });
       if (!reviewing.ok) {
         return buildReviewingRequiredBlockedResult(operations, reviewing);
       }
     } else if (options.requireEditing === true && hasOperations) {
-      const editing = await ensureEditing({ waitMs: 1800 });
+      const editing = await ensureEditing({ waitMs: 1800, runProjectId: options.runProjectId });
       if (!editing.ok) {
         return buildEditingRequiredBlockedResult(operations, editing);
       }
@@ -676,13 +676,13 @@
         return decorated;
       }
       current = ready.text;
-      freshness = { ok: true };
+      freshness = ready.freshness;
     }
 
     let nextContent = null;
     let preparedPatches;
     if (Array.isArray(operation.patches) && operation.patches.length) {
-      preparedPatches = window.CodexOverleafStaleGuard?.prepareOperationPatches(operation, current, options.baseFileLookup)
+      preparedPatches = freshness.preparedPatches || window.CodexOverleafStaleGuard?.prepareOperationPatches(operation, current, options.baseFileLookup)
         || { ok: true, patches: operation.patches };
       const patched = preparedPatches.ok ? applyTextPatches(current, preparedPatches.patches) : preparedPatches;
       if (!patched.ok) {
@@ -736,12 +736,6 @@
             operationType: 'undo', changedDocument: false,
             userMessage: 'The project identity guard is unavailable; the undo write was not applied.' }) };
       if (blocked) return blocked.skipped?.[0]?.result || blocked;
-      if (getActiveFilePath() !== operation.path || readActiveEditorText() !== current) {
-        const reason = 'The editor changed while confirming Editing mode; the undo write was not applied.';
-        return { ok: false, code: 'stale_source_changed', reason,
-          failure: buildPageFailure('stale_source_changed', { file: operation.path,
-            operationType: 'undo', changedDocument: false, userMessage: reason }) };
-      }
       if (!isEditingConfirmedForNoTraceUndo(getReviewingState({})))
         return buildNoTraceUndoBlockedResult([operation], { ok: false, code: 'editing_not_confirmed',
           reason: 'Overleaf left Editing mode before the undo write.' }).skipped[0].result;
@@ -749,6 +743,14 @@
 
     const finalReviewBlock = options.reviewGuard?.();
     if (finalReviewBlock) return finalReviewBlock;
+    // Read and dispatch synchronously against the same document. Navigation,
+    // freshness polling and Undo mode/project checks can all have awaited.
+    if (getActiveFilePath() !== operation.path || readActiveEditorText() !== current) {
+      const reason = 'The editor changed before the edit could be applied; the document was not overwritten.';
+      return { ok: false, code: 'stale_source_changed', reason,
+        failure: buildPageFailure('stale_source_changed', { file: operation.path,
+          operationType: options.noTraceUndo ? 'undo' : 'edit', changedDocument: false, userMessage: reason }) };
+    }
     const result = Array.isArray(operation.patches) && operation.patches.length
       ? replaceActiveEditorPatches(preparedPatches.patches, nextContent)
       : replaceActiveEditorText(nextContent);
@@ -827,6 +829,7 @@
           }),
           verified: true,
           verifiedContent: nextContent,
+          ...(preparedPatches ? { appliedPatches: preparedPatches.patches } : {}),
           trackedChanges: mergeTrackedChangeRefs(trackedChanges)
         };
       }
@@ -840,6 +843,7 @@
       ...result,
       verified: true,
       verifiedContent: nextContent,
+      ...(preparedPatches ? { appliedPatches: preparedPatches.patches } : {}),
       trackedChangeCapture,
       trackedChanges: mergeTrackedChangeRefs(trackedChanges)
     };
@@ -970,35 +974,17 @@
       lastText = readActiveEditorText();
       const activeFileMatches = lastActivePath === filePath;
       const identityChanged = Boolean(previousEditorIdentity) && activeEditorIdentityChanged(previousEditorIdentity);
-      const baseComparison = compareEditorTextToBase(filePath, lastText, baseFileLookup);
-      const baseMatches = baseComparison.matches;
       const settledLongEnough = Date.now() - startedAt >= minSettleMs;
       const contentChangedFromPrevious = !options.previousSignature
         || contentSignature(lastText) !== options.previousSignature;
-      // Switch confirmation must not depend on any single fragile signal
-      // (v1.6: identity comparison proved unreliable against newer Overleaf
-      // view lifecycles, which made every write to a non-active file time
-      // out as target_editor_not_ready). Acceptors, strongest first:
-      //   1. editor identity visibly changed (fast path when it works);
-      //   2. the editor shows EXACTLY the target file's expected base —
-      //      the strongest possible proof the right document is loaded;
-      //   3. same-file reopen settled with unchanged content;
-      //   4. base UNKNOWN only: the content moved off the previous document
-      //      and the settle window elapsed. When the base IS known, content
-      //      must match it (acceptor 2) — a weakly-anchored patch (e.g. an
-      //      insert into an empty file, expected:'') would otherwise anchor
-      //      trivially into a wrong-but-different document.
+      // Confirm navigation independently of source freshness. A stale target
+      // can be correctly open; identical baseline bytes alone cannot prove a
+      // switch. Content movement remains the fallback for editor lifecycles
+      // whose document identity cannot be observed reliably.
       const switchConfirmed = identityChanged
-        || baseMatches
-        || (options.initialActivePath === filePath
-          && options.previousSignature
-          && contentSignature(lastText) === options.previousSignature
-          && settledLongEnough)
-        || (!baseComparison.known && contentChangedFromPrevious && settledLongEnough);
-      const contentNoLongerLooksLikePreviousDocument = contentChangedFromPrevious
-        || baseMatches
-        || options.initialActivePath === filePath;
-      if (activeFileMatches && switchConfirmed && settledLongEnough && contentNoLongerLooksLikePreviousDocument) {
+        || options.initialActivePath === filePath
+        || (contentChangedFromPrevious && settledLongEnough);
+      if (activeFileMatches && switchConfirmed && settledLongEnough) {
         return {
           ok: true,
           text: lastText
@@ -1074,47 +1060,6 @@
     };
   }
 
-  function editorContentMatchesBase(filePath, content, baseFileLookup) {
-    return compareEditorTextToBase(filePath, content, baseFileLookup).matches;
-  }
-
-  function compareEditorTextToBase(filePath, content, baseFileLookup) {
-    const normalizedPath = normalizeSafeProjectPath(filePath);
-    const current = normalizeEditorTextForComparison(content);
-    if (!baseFileLookup || !normalizedPath || !baseFileLookup.has(normalizedPath)) {
-      return {
-        known: false,
-        hasContent: false,
-        matches: false,
-        baseLength: null,
-        currentLength: current.length
-      };
-    }
-    const base = normalizeEditorTextForComparison(baseFileLookup.get(normalizedPath));
-    const matches = current === base;
-    if (!matches && base.trim().length > 0) {
-      console.warn('[codex-overleaf] editorContentMatchesBase MISMATCH', filePath,
-        'base.length:', base.length, 'current.length:', current.length,
-        'base[0..80]:', JSON.stringify(base.slice(0, 80)),
-        'current[0..80]:', JSON.stringify(current.slice(0, 80)));
-    }
-    return {
-      known: true,
-      hasContent: base.trim().length > 0,
-      matches,
-      baseLength: base.length,
-      currentLength: current.length
-    };
-  }
-
-  function hasBaseFileContent(filePath, baseFileLookup) {
-    if (!baseFileLookup || !filePath || !baseFileLookup.has(filePath)) {
-      return false;
-    }
-    const content = baseFileLookup.get(filePath);
-    return typeof content === 'string' && content.trim().length > 0;
-  }
-
   function normalizeEditorTextForComparison(value) {
     const normalized = String(value ?? '').replace(/\r\n/g, '\n');
     return normalized.trim().length === 0 ? '' : normalized;
@@ -1136,7 +1081,8 @@
       if (freshness.ok) {
         return {
           ok: true,
-          text
+          text,
+          freshness
         };
       }
       await delay(60);
@@ -1895,6 +1841,7 @@
           ok: false,
           code: reviewing?.code || 'reviewing_not_enabled',
           reason: reviewing?.reason || 'Overleaf Reviewing/Track Changes was not confirmed before writing. Codex did not change this file.',
+          evidence: reviewing?.evidence, failure: reviewing?.failure,
           reviewing: reviewing?.reviewing || null
         }
       })),

package/extension/src/pageBridge.js

@@ -73,6 +73,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({
@@ -399,6 +400,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 +494,8 @@
       findFileTreeManager,
       findHistoryObject,
       findReviewingActivationControl,
+      findUpgradeModal: () => window.CodexOverleafReviewing.findUpgradeModal(document),
+      reviewingConfirmed: isReviewingConfirmedForWrite(getReviewingState()),
       getCodeMirrorEditorView,
       getDeepActiveElement,
       isInsideCodexPanel,
@@ -497,7 +505,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 +514,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 +562,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 +753,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 +888,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 +935,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 +1083,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 +1184,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 +1237,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 +1283,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 +1310,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);

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.', '更新恢复监护程序未能启动，请先检查恢复状态。');