codex-overleaf-link 2.5.0 → 2.6.0

package/extension/src/content/panelRenderer.js

@@ -12,6 +12,7 @@
       plus: '<path d="M8 3.2v9.6"/><path d="M3.2 8h9.6"/>',
       panel: '<rect x="2.3" y="2.3" width="11.4" height="11.4" rx="2"/><path d="M9.2 2.5v11"/><path d="M5.1 6.1h1.5M5.1 8h1.5M5.1 9.9h1.5"/>',
       collapse: '<path d="m6.1 3.3 4.7 4.7-4.7 4.7"/>',
+      chevronDown: '<path d="m4.4 6.4 3.6 3.6 3.6-3.6"/>',
       settings: '<path d="M3.4 5.2h5.9"/><path d="M11.7 5.2h.9"/><path d="M10.1 3.6v3.2"/><path d="M3.4 10.8h1"/><path d="M6.8 10.8h5.8"/><path d="M5.9 9.2v3.2"/>'
     };
     const safeName = Object.prototype.hasOwnProperty.call(icons, name) ? name : 'settings';
@@ -53,8 +54,15 @@
       <div class="codex-panel-resize-handle" data-panel-resize-handle title="Drag to resize the Codex panel. Double click to reset." aria-label="Drag to resize the Codex panel. Double click to reset." role="separator"></div>
       <div class="codex-vscode-head" data-panel-header>
         <div class="codex-vscode-title">CODEX</div>
+        <div class="codex-thread-title codex-head-session" data-session-label>
+          <button type="button" class="codex-thread-title-trigger" data-session-menu-trigger aria-haspopup="menu" aria-expanded="false">
+            <span class="codex-thread-title-text" data-session-label-text></span>
+            <span class="codex-thread-title-chevron">${codexIcon('chevronDown')}</span>
+          </button>
+          <input type="text" class="codex-thread-title-input" data-session-rename-input maxlength="80" hidden>
+          <div class="codex-session-menu" data-session-menu role="menu" hidden></div>
+        </div>
         <div class="codex-vscode-head-actions" aria-label="Codex actions">
-          <button type="button" data-refresh title="Refresh current file status. This will not sync or modify files." aria-label="Refresh current file status. This will not sync or modify files.">${codexIcon('refresh')}</button>
           <div data-diagnostics-slot></div>
           <button type="button" data-new-session title="New Session" aria-label="New Session">${codexIcon('plus')}</button>
           <button type="button" data-custom-instructions-settings title="Project Settings" aria-label="Project Settings" aria-expanded="false">${codexIcon('settings')}</button>
@@ -86,7 +94,6 @@
 
     bind(instance, panelEl, 'click', event => event.stopPropagation());
     bind(instance, panelEl, 'mousedown', event => event.stopPropagation());
-    bind(instance, panelEl.querySelector('[data-refresh]'), 'click', () => callbacks.onRefresh?.());
     bind(instance, panelEl.querySelector('[data-new-session]'), 'click', () => callbacks.onNewSession?.());
     bind(instance, panelEl.querySelector('[data-custom-instructions-settings]'), 'click', () => callbacks.onSettingsClick?.());
     bind(instance, panelEl.querySelector('[data-close-panel]'), 'click', () => callbacks.onClosePanel?.());
@@ -117,6 +124,12 @@
       sessionSlot: instance.sessionSlot,
       composerSlot: instance.composerSlot,
       setView: view => { panelEl.dataset.view = view; },
+      setLocale: labels => {
+        launcherEl.title = labels.launcher;
+        launcherEl.setAttribute('aria-label', labels.launcher);
+        const close = panelEl.querySelector('[data-close-panel]');
+        if (close) { close.title = labels.close; close.setAttribute('aria-label', labels.close); }
+      },
       destroy: () => destroy(instance),
       _instance: instance
     };
@@ -314,7 +327,7 @@
       }
       const panel = options.getPanel?.();
       if (!panel) {
-        return Promise.resolve(false);
+        return Promise.resolve(config.choices?.length ? 'cancel' : false);
       }
       dismiss(false);
       const tr = options.tr || (key => key);
@@ -323,6 +336,8 @@
       const confirmLabel = config.confirmLabel || tr('confirmDefaultConfirm');
       const cancelLabel = config.cancelLabel || tr('confirmDefaultCancel');
       const destructive = config.destructive === true;
+      const choices = Array.isArray(config.choices) && config.choices.length ? config.choices : null;
+      const cancelled = choices ? 'cancel' : false;
       const doc = panel.ownerDocument || document;
 
       return new Promise(resolve => {
@@ -363,54 +378,69 @@
         body.textContent = String(message);
         const actions = doc.createElement('div');
         actions.className = 'codex-plugin-confirm-actions';
-        const cancel = doc.createElement('button');
-        cancel.type = 'button';
-        cancel.className = 'codex-plugin-confirm-cancel';
-        cancel.textContent = cancelLabel;
-        const confirm = doc.createElement('button');
-        confirm.type = 'button';
-        confirm.className = 'codex-plugin-confirm-confirm';
-        if (destructive) confirm.dataset.destructive = 'true';
-        confirm.textContent = confirmLabel;
-        actions.append(cancel, confirm);
+        const buttons = (choices || [
+          { value: false, label: cancelLabel }, { value: true, label: confirmLabel }
+        ]).map(choice => {
+          const button = doc.createElement('button');
+          button.type = 'button';
+          const cancel = choice.value === false || choice.value === 'cancel';
+          // Only one primary action: other affirmative choices can ask for the secondary style.
+          button.className = cancel || choice.secondary === true ? 'codex-plugin-confirm-cancel' : 'codex-plugin-confirm-confirm';
+          if (destructive && !cancel) button.dataset.destructive = 'true';
+          button.textContent = choice.label;
+          button.addEventListener('click', () => cleanup(choice.value));
+          actions.append(button);
+          return button;
+        });
         card.append(head, body, actions);
         overlay.append(card);
         panel.append(overlay);
         overlay.showModal?.();
 
+        let timeout, ownerCheck, removalObserver;
+        const onAbort = () => cleanup(cancelled);
         const cleanup = value => {
           if (settled) return;
           settled = true;
           activeResolve = null;
           doc.removeEventListener('keydown', onKeydown, true);
+          config.signal?.removeEventListener('abort', onAbort);
+          clearTimeout(timeout);
+          clearInterval(ownerCheck);
+          removalObserver?.disconnect();
           overlay.close?.();
           overlay.remove();
           returnFocus?.focus?.();
-          resolve(value);
+          resolve(choices && !choices.some(choice => choice.value === value) ? cancelled : value);
         };
         activeResolve = cleanup;
         const onKeydown = event => {
           if (event.key === 'Escape') {
-            event.preventDefault();
-            cleanup(false);
+            event.preventDefault(); cleanup(cancelled);
           } else if (event.key === 'Enter') {
             event.preventDefault();
-            if (!destructive && event.target !== cancel) cleanup(true);
-            else if (event.target === cancel) cleanup(false);
-            else if (event.target === confirm) cleanup(true);
+            if (buttons.includes(event.target)) event.target.click();
+            else if (!choices && !destructive) cleanup(true);
           } else if (event.key === 'Tab') {
             event.preventDefault();
-            (event.target === cancel ? confirm : cancel).focus();
+            const index = buttons.indexOf(event.target);
+            buttons[(index + (event.shiftKey ? buttons.length - 1 : 1)) % buttons.length].focus();
           }
         };
-        overlay.addEventListener('click', event => {
-          if (event.target === overlay) cleanup(false);
-        });
-        overlay.addEventListener('cancel', event => { event.preventDefault(); cleanup(false); });
-        cancel.addEventListener('click', () => cleanup(false));
-        confirm.addEventListener('click', () => cleanup(true));
+        overlay.addEventListener('click', event => { if (event.target === overlay) cleanup(cancelled); });
+        overlay.addEventListener('cancel', event => { event.preventDefault(); cleanup(cancelled); });
+        overlay.addEventListener('close', () => cleanup(cancelled));
         doc.addEventListener('keydown', onKeydown, true);
-        (destructive ? cancel : confirm).focus();
+        config.signal?.addEventListener('abort', onAbort, { once: true });
+        if (config.timeoutMs > 0) timeout = setTimeout(onAbort, config.timeoutMs);
+        if (config.isCurrent) ownerCheck = setInterval(() => { if (!config.isCurrent()) onAbort(); }, 100);
+        const Observer = doc.defaultView?.MutationObserver;
+        if (choices && Observer) {
+          removalObserver = new Observer(() => { if (!overlay.isConnected) onAbort(); });
+          removalObserver.observe(panel, { childList: true });
+        }
+        (choices ? buttons[0] : buttons[destructive ? 0 : 1]).focus();
+        if (config.signal?.aborted || config.isCurrent?.() === false) onAbort();
       });
     }
 

package/extension/src/content/pendingInputView.js

@@ -115,7 +115,7 @@
     // Pull a queued message back into the composer. A typed draft is never overwritten.
     function pullBack(item) {
       const task = container?.parentElement?.querySelector('[data-task]');
-      if (!task || (item.status || 'queued') !== 'queued') return;
+      if (!task || task.readOnly || (item.status || 'queued') !== 'queued') return;
       if (String(task.value || '').trim()) { options.onToast?.(tr('queuedInputEditBlocked')); return; }
       options.onRemove?.(item.id);
       task.value = item.text;

package/extension/src/content/projectProviderSelection.js

@@ -2,12 +2,20 @@
   'use strict';
 
   function create(deps = {}) {
-    async function confirmSwitch({ providerName } = {}) {
+    function assertSwitchAllowed() {
       if ((deps.getRunningSessionIds?.() || []).length) {
-        deps.showToast?.(deps.tx(
+        throw Object.assign(new Error(deps.tx(
           'Wait for the running task to finish before switching providers.',
           '请等待正在运行的任务结束后再切换模型服务。'
-        ), { status: 'warning' });
+        )), { code: 'provider_switch_running' });
+      }
+    }
+
+    async function confirmSwitch({ providerName } = {}) {
+      try {
+        assertSwitchAllowed();
+      } catch (error) {
+        deps.showToast?.(error.message, { status: 'warning' });
         return false;
       }
       return deps.showConfirm?.({
@@ -33,6 +41,7 @@
       const providerConfigurationChanged = nextProviderId === (state.providerId || 'builtin')
         && nextProviderRevision !== Number(state.providerRevision || 0);
       const resetProviderThread = providerChanged || providerConfigurationChanged;
+      if (resetProviderThread) assertSwitchAllowed();
       const sessions = (state.sessions || []).map(session => ({
         ...session,
         providerId: nextProviderId,
@@ -53,7 +62,7 @@
       deps.applyStateToPanel?.();
     }
 
-    return { confirmSwitch, commit };
+    return { assertSwitchAllowed, confirmSwitch, commit };
   }
 
   window.CodexOverleafProjectProviderSelection = { create };

package/extension/src/content/projectSessionCleanup.js

@@ -6,6 +6,7 @@
   function create(deps = {}) {
     const {
       tr,
+      tx = en => en,
       getAccountScopeId,
       showPluginConfirm,
       showPluginToast,
@@ -22,79 +23,125 @@
       return !Number.isFinite(touched) || (Date.now() - touched) <= FRESH_RUNNING_WINDOW_MS;
     }
 
-    async function clearProjectSessions(projectId, projectName) {
+    async function clearProjectSessions(projectId, projectName, options = {}) {
       const StorageDb = deps.StorageDb;
       const SessionState = deps.SessionState;
       if (!StorageDb || !SessionState) {
         return;
       }
-      const scope = getAccountScopeId();
-      const records = (await StorageDb.getAllByIndex('sessions', 'projectId', projectId))
-        .filter(record => record && (!scope || record.accountScopeId === scope));
-      if (!records.length) {
-        await renderRecentProjectsVariant();
-        return;
-      }
-      if (records.some(record => isFreshRunningRecord(StorageDb, record))) {
-        showPluginToast(tr('recentProjects_clearProject_running'), { status: 'warning', sticky: true });
-        return;
-      }
-      const approved = await showPluginConfirm({
-        title: tr('recentProjects_clearProject_title', { project: projectName }),
-        message: tr('recentProjects_clearProject_message', { count: String(records.length), project: projectName }),
-        confirmLabel: tr('recentProjects_clearProject_confirm'),
-        cancelLabel: tr('confirmDefaultCancel'),
-        destructive: true
-      });
-      if (!approved) {
-        return;
-      }
-      const Migration = deps.StorageMigration;
-      if (Migration?.addSessionTombstones) {
-        await Migration.addSessionTombstones(projectId, records.map(record => record.id));
-      }
+      const scope = options.accountScopeId ?? getAccountScopeId();
+      const scopeChanged = error => error?.code === 'history_cleanup_scope_changed'
+        || error?.code === 'account_scope_unavailable';
+      const assertCurrent = () => {
+        if (!scope || getAccountScopeId() !== scope || options.isCurrent?.() === false
+          || options.generation !== undefined && deps.getViewGeneration?.() !== options.generation) {
+          throw Object.assign(new Error('History cleanup identity changed.'), { code: 'history_cleanup_scope_changed' });
+        }
+      };
+      const readRecords = async () => {
+        assertCurrent();
+        const records = await StorageDb.getAllByIndex('sessions', 'projectId', projectId);
+        assertCurrent();
+        return records.filter(record => record && record.accountScopeId === scope);
+      };
       try {
-        await mutateProjectPanelState(projectId, state => records.reduce(
-          (nextState, record) => SessionState.deleteSession(nextState, record.id),
-          state
-        ));
-      } catch (_error) { /* IndexedDB deletion remains authoritative for the dashboard. */ }
-
-      let removed = 0;
-      let historyFailures = 0;
-      for (const record of records) {
-        try {
-          await StorageDb.deleteRecord('sessions', record.id);
-          removed++;
-        } catch (_error) { /* The remaining record stays visible and can be retried. */ }
+        let records = await readRecords();
+        if (!records.length) {
+          await renderRecentProjectsVariant();
+          return;
+        }
+        if (records.some(record => isFreshRunningRecord(StorageDb, record))) {
+          showPluginToast(tr('recentProjects_clearProject_running'), { status: 'warning', sticky: true });
+          return;
+        }
+        const approved = await showPluginConfirm({
+          title: tr('recentProjects_clearProject_title', { project: projectName }),
+          message: tr('recentProjects_clearProject_message', { count: String(records.length), project: projectName }),
+          confirmLabel: tr('recentProjects_clearProject_confirm'),
+          cancelLabel: tr('confirmDefaultCancel'),
+          destructive: true
+        });
+        if (!approved) {
+          return;
+        }
+        // Re-read after the destructive dialog: another tab can have started a
+        // run or added a conversation while the original count was displayed.
+        const approvedIds = new Set(records.map(record => record.id));
+        const latest = await readRecords();
+        if (latest.some(record => isFreshRunningRecord(StorageDb, record))) {
+          showPluginToast(tr('recentProjects_clearProject_running'), { status: 'warning', sticky: true });
+          return;
+        }
+        records = latest.filter(record => approvedIds.has(record.id));
+        if (!records.length) { await renderRecentProjectsVariant(); return; }
+        const Migration = deps.StorageMigration;
+        if (Migration?.addSessionTombstones) {
+          assertCurrent();
+          await Migration.addSessionTombstones(projectId, records.map(record => record.id));
+          assertCurrent();
+        }
         try {
-          const response = await sendBackgroundNative({
-            method: 'codex.history.clearPlugin',
-            params: { sessionId: record.id, threadId: record.codexThreadId || '' }
-          });
-          if (!response || !response.ok) {
+          assertCurrent();
+          await mutateProjectPanelState(projectId, state => records.reduce(
+            (nextState, record) => SessionState.deleteSession(nextState, record.id),
+            state
+          ), { assertCurrent });
+          assertCurrent();
+        } catch (error) {
+          if (scopeChanged(error)) throw error;
+          assertCurrent(); // Other legacy-blob failures do not replace shared deletion.
+        }
+
+        let removed = 0;
+        let historyFailures = 0;
+        for (const record of records) {
+          try {
+            assertCurrent();
+            await StorageDb.deleteRecord('sessions', record.id, { accountScopeId: scope, projectId });
+            assertCurrent();
+            removed++;
+          } catch (error) {
+            if (scopeChanged(error)) throw error;
+            assertCurrent(); // The remaining record can be retried in the same scope.
+          }
+          try {
+            assertCurrent();
+            const response = await sendBackgroundNative({
+              method: 'codex.history.clearPlugin',
+              params: { sessionId: record.id, threadId: record.codexThreadId || '' }
+            });
+            assertCurrent();
+            if (!response || !response.ok) {
+              historyFailures++;
+            }
+          } catch (error) {
+            if (scopeChanged(error)) throw error;
+            assertCurrent();
             historyFailures++;
           }
-        } catch (_error) {
-          historyFailures++;
         }
+        if (removed < records.length) {
+          showPluginToast(tr('recentProjects_clearProject_partial', {
+            removed: String(removed),
+            count: String(records.length)
+          }), { status: 'warning', sticky: true });
+        } else if (historyFailures) {
+          showPluginToast(tr('recentProjects_clearProject_historyPartial', {
+            count: String(historyFailures)
+          }), { status: 'warning', sticky: true });
+        } else {
+          showPluginToast(tr('recentProjects_clearProject_done', {
+            count: String(removed),
+            project: projectName
+          }), { status: 'completed' });
+        }
+        await renderRecentProjectsVariant();
+      } catch (error) {
+        if (!scopeChanged(error)) throw error;
+        showPluginToast(tx('History view or account changed. Reopen the history list before deleting sessions.',
+          '历史视图或账号已变化，请重新打开历史列表后再清理会话。'), { status: 'warning', sticky: true });
+        return false;
       }
-      if (removed < records.length) {
-        showPluginToast(tr('recentProjects_clearProject_partial', {
-          removed: String(removed),
-          count: String(records.length)
-        }), { status: 'warning', sticky: true });
-      } else if (historyFailures) {
-        showPluginToast(tr('recentProjects_clearProject_historyPartial', {
-          count: String(historyFailures)
-        }), { status: 'warning', sticky: true });
-      } else {
-        showPluginToast(tr('recentProjects_clearProject_done', {
-          count: String(removed),
-          project: projectName
-        }), { status: 'completed' });
-      }
-      await renderRecentProjectsVariant();
     }
 
     return { clearProjectSessions };

package/extension/src/content/projectSettingsCoordinator.js

@@ -1,6 +1,9 @@
 (function initCodexOverleafProjectSettingsCoordinator() {
   'use strict';
 
+  // Skill messages belong to the settings workbench page that holds the Skills group.
+  const SKILLS_STATUS = Object.freeze({ page: 'context' });
+
   function create(deps = {}) {
     const {
       CodexOverleafTheme,
@@ -100,7 +103,7 @@
       refreshLocalSkills().catch(error => setProjectSettingsStatus(tx(
         `Could not list local skills: ${error.message}`,
         `无法列出本地技能：${error.message}`
-      ), 'failed'));
+      ), 'failed', SKILLS_STATUS));
     }
 
     function toggleCustomInstructionsSettings() {
@@ -128,7 +131,7 @@
       refreshLocalSkills().catch(error => setProjectSettingsStatus(tx(
         `Could not list local skills: ${error.message}`,
         `无法列出本地技能：${error.message}`
-      ), 'failed'));
+      ), 'failed', SKILLS_STATUS));
     }
 
     function closeSkillsView() {
@@ -140,9 +143,13 @@
       if (!settingsPanelInstance) {
         return;
       }
-      const summary = getSkillLoadingSettings().loadCodexOverleafSkills === false
+      const settings = getSkillLoadingSettings();
+      const localCount = settings.loadCodexLocalSkills === false ? 0
+        : (deps.getCodexLocalSkills?.() || []).filter(skill => isCodexLocalSkillEnabled(skill.id, skill)).length;
+      const overleafCount = settings.loadCodexOverleafSkills === false ? 0 : countEnabledCodexOverleafSkills();
+      const summary = settings.loadCodexLocalSkills === false && settings.loadCodexOverleafSkills === false
         ? tr('codexOverleafSkillsSummaryOff')
-        : tr('codexOverleafSkillsSummaryCount', { count: countEnabledCodexOverleafSkills() });
+        : tr('codexOverleafSkillsSummaryCount', { count: localCount + overleafCount });
       SettingsPanel.setSkillsSummary(settingsPanelInstance, summary);
     }
 
@@ -238,6 +245,25 @@
       });
     }
 
+    function getReviewingAvailability() {
+      return getState()?.reviewingAvailabilityByProject?.[getCurrentProjectId()] || null;
+    }
+
+    function observeReviewingAvailability(status, evidence) {
+      const projectId = getCurrentProjectId();
+      if (!projectId || !['available', 'unavailable', 'unknown'].includes(status)) return;
+      const previous = getReviewingAvailability();
+      // A remembered failure must not renew its own expiry.
+      if (previous?.status === status && previous.evidence === evidence && status === 'available') return;
+      // Preserve ordering even when a retry and its previous observation share a millisecond.
+      const observedAt = Math.max(Date.now(), Number.isFinite(previous?.observedAt) ? previous.observedAt + 1 : 0);
+      setState({ ...getState(), reviewingAvailabilityByProject: {
+        ...getState()?.reviewingAvailabilityByProject,
+        [projectId]: { status, evidence, observedAt }
+      } });
+      saveStateSoon(0);
+    }
+
     function getThemePreference() {
       return CodexOverleafTheme.normalizeThemePreference(getState()?.theme);
     }
@@ -296,6 +322,36 @@
       deps.updateGlobalPreferences?.({ codexOverleafSkillEnabled: { [skillId]: Boolean(enabled) } })?.catch(() => {});
     }
 
+    function getCodexLocalSkillEnabled() {
+      const map = getState()?.codexLocalSkillEnabled;
+      return map && typeof map === 'object' && !Array.isArray(map) ? map : {};
+    }
+
+    function isCodexLocalSkillEnabled(skillId, skill) {
+      const map = getCodexLocalSkillEnabled();
+      return Object.prototype.hasOwnProperty.call(map, skillId) ? map[skillId] !== false : skill?.enabled !== false;
+    }
+
+    function setCodexLocalSkillEnabled(skillId, enabled) {
+      if (deps.updateGlobalPreferences) {
+        try {
+          const pending = deps.updateGlobalPreferences({ codexLocalSkillEnabled: { [skillId]: Boolean(enabled) } });
+          Promise.resolve(pending).then(() => saveStateSoon()).catch(() => {
+            renderLocalSkillList();
+            setProjectSettingsStatus(tx('Could not save the local skill selection. Try again.', '无法保存本地技能选择，请重试。'), 'failed', SKILLS_STATUS);
+          });
+        } catch (_error) {
+          renderLocalSkillList();
+          setProjectSettingsStatus(tx('Could not save the local skill selection. Try again.', '无法保存本地技能选择，请重试。'), 'failed', SKILLS_STATUS);
+        }
+      } else {
+        setState({ ...getState(), codexLocalSkillEnabled: { ...getCodexLocalSkillEnabled(), [skillId]: Boolean(enabled) } });
+        saveStateSoon();
+        renderLocalSkillList();
+      }
+      deps.onSkillsChange?.();
+    }
+
     function readSkillLoadingSettingsFromSettings() {
       return SettingsPanel.readState(getSettingsPanelInstance()).skillToggles;
     }
@@ -314,8 +370,8 @@
       renderLocalSkillList();
     }
 
-    function setProjectSettingsStatus(text, status = 'info') {
-      SettingsPanel.setStatus(getSettingsPanelInstance(), text, status);
+    function setProjectSettingsStatus(text, status = 'info', options) {
+      SettingsPanel.setStatus(getSettingsPanelInstance(), text, status, options);
     }
 
     function clearProjectSettingsStatus() {
@@ -337,10 +393,15 @@
       closeCustomInstructionsSettings,
       closeSkillsView,
       getCodexOverleafSkillEnabled,
+      getCodexLocalSkillEnabled,
+      isCodexLocalSkillEnabled,
+      setCodexLocalSkillEnabled,
       getCustomInstructionsForCurrentProject,
       getGovernanceRulesForCurrentProject,
       getSkillLoadingSettings,
       getThemePreference,
+      getReviewingAvailability,
+      observeReviewingAvailability,
       isCodexOverleafSkillEnabled,
       normalizeCustomInstructionsByProject,
       normalizeGovernanceRules,