codex-overleaf-link 2.4.1 → 2.5.1

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

@@ -140,9 +140,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);
     }
 
@@ -296,6 +300,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');
+          });
+        } catch (_error) {
+          renderLocalSkillList();
+          setProjectSettingsStatus(tx('Could not save the local skill selection. Try again.', '无法保存本地技能选择，请重试。'), 'failed');
+        }
+      } else {
+        setState({ ...getState(), codexLocalSkillEnabled: { ...getCodexLocalSkillEnabled(), [skillId]: Boolean(enabled) } });
+        saveStateSoon();
+        renderLocalSkillList();
+      }
+      deps.onSkillsChange?.();
+    }
+
     function readSkillLoadingSettingsFromSettings() {
       return SettingsPanel.readState(getSettingsPanelInstance()).skillToggles;
     }
@@ -337,6 +371,9 @@
       closeCustomInstructionsSettings,
       closeSkillsView,
       getCodexOverleafSkillEnabled,
+      getCodexLocalSkillEnabled,
+      isCodexLocalSkillEnabled,
+      setCodexLocalSkillEnabled,
       getCustomInstructionsForCurrentProject,
       getGovernanceRulesForCurrentProject,
       getSkillLoadingSettings,

package/extension/src/content/providerSettingsCoordinator.js

@@ -7,16 +7,23 @@
     if (!Profiles || !Dialog?.create) {
       throw new Error('Provider settings require explicit profile and dialog dependencies.');
     }
+    const statusTranslations = new Map();
+    const translate = options.tx || (english => english);
     const instance = {
       Profiles,
-      tx: options.tx || ((english) => english),
+      tx: (english, chinese) => {
+        statusTranslations.set(english, [english, chinese]); statusTranslations.set(chinese, [english, chinese]);
+        return translate(english, chinese);
+      },
       sendBackgroundNative: options.sendBackgroundNative,
       getSettingsPanelInstance: options.getSettingsPanelInstance || (() => null),
       getSelectedModel: options.getSelectedModel || (() => ''),
       getSelectedProviderId: options.getSelectedProviderId || (() => 'builtin'),
+      getSelectedProviderRevision: options.getSelectedProviderRevision || (() => undefined),
       hasCurrentProject: options.hasCurrentProject || (() => true),
       setSelectedProviderId: options.setSelectedProviderId || (() => {}),
       confirmProviderSwitch: options.confirmProviderSwitch || (() => true),
+      assertProviderSwitchAllowed: options.assertProviderSwitchAllowed || (() => {}),
       clearSelectedModel: options.clearSelectedModel || (() => {}),
       refreshModelOptions: options.refreshModelOptions || (() => {}),
       persistInputs: options.persistInputs || (() => {}),
@@ -42,6 +49,7 @@
     instance.dialog = Dialog.create({
       document: options.document || document,
       tx: instance.tx,
+      translateStatusText: text => statusTranslations.has(text) ? translate(...statusTranslations.get(text)) : text,
       ProviderProfiles: Profiles,
       callbacks: {
         hasCurrentProject: instance.hasCurrentProject,
@@ -52,7 +60,8 @@
         onActivate: context => activateProvider(instance, context),
         onClearSecret: context => clearProviderSecret(instance, context),
         onDelete: context => deleteProvider(instance, context),
-        onActivateBuiltin: () => activateBuiltin(instance)
+        onActivateBuiltin: () => activateBuiltin(instance),
+        onReload: () => open(instance, { refresh: true })
       }
     });
     setupCrossTabRefresh(instance, options.window || window);
@@ -60,6 +69,7 @@
       open: () => open(instance),
       refreshSummary: () => refreshSummary(instance),
       renderSummary: () => updateSettingsSummary(instance),
+      refreshLocale: () => instance.dialog.refreshLocale?.(),
       ensureLoaded: () => ensureLoaded(instance),
       getRunSelection: providerId => instance.loaded
         ? Profiles.buildRunSelection(instance.catalog, providerId || instance.getSelectedProviderId())
@@ -73,15 +83,25 @@
     };
   }
 
-  async function open(instance) {
-    instance.dialog.open(instance.catalog);
+  async function open(instance, options = {}) {
+    const settings = instance.getSettingsPanelInstance();
+    const host = settings?.openProviderPage?.() || null;
+    const preserveDraft = Boolean(host && instance.dialog.isOpen());
+    if (host) settings.setProviderCloseGuard?.(async () => {
+      if (!instance.dialog.isOpen()) return true;
+      // A native confirmation must be opened from a visible provider section,
+      // even when the user has since navigated to another settings category.
+      if (instance.dialog.hasUnsavedChanges()) settings.openProviderPage();
+      return instance.dialog.close();
+    });
+    instance.dialog.open(instance.catalog, { container: host, preserveDraft });
+    if (preserveDraft && !options.refresh) return;
     instance.dialog.setBusy('loading', instance.tx('Loading providers…', '正在加载模型服务…'));
     try {
-      await refresh(instance, { updateDialog: true });
+      await refresh(instance, { updateDialog: true, source: preserveDraft ? 'cross-tab' : 'open' });
       instance.dialog.setBusy('', '');
     } catch (_error) {
-      // refresh() already projected the actionable failure into the dialog.
-      // Keep the modal open so the user can close it or retry from Settings.
+      // Keep the embedded editor available, with its original error projection.
     }
   }
 
@@ -184,15 +204,20 @@
       }
     }
     const changedProviderIds = Array.isArray(change.changedProviderIds) ? change.changedProviderIds : [];
-    const providerConfigurationChanged = changedProviderIds.includes(requestedProviderId);
+    const selectedRevision = instance.getSelectedProviderRevision();
+    const providerConfigurationChanged = changedProviderIds.includes(requestedProviderId)
+      || (requestedProviderId === previousProviderId && selectedRevision !== undefined
+        && Number(selectedRevision) !== Number(instance.Profiles.getProviderById(catalog, requestedProviderId)?.revision || 0));
     if (!change.forceSessionRefresh && !projectProviderChanged && !providerConfigurationChanged) {
       return;
     }
+    if (projectProviderChanged || providerConfigurationChanged) instance.assertProviderSwitchAllowed();
     const loadResult = change.modelsPreloaded === true
       ? { stale: false, selectedModel: change.preloadedModelId || '' }
       : await instance.refreshModelOptions(
         instance.Profiles.buildRunSelection(catalog, requestedProviderId),
-        { persist: false }
+        { persist: false, ...(projectProviderChanged || providerConfigurationChanged
+          ? { assertCurrent: instance.assertProviderSwitchAllowed } : {}) }
       );
     if (loadResult?.stale || loadResult?.error) {
       const error = createClientError(
@@ -212,6 +237,7 @@
 
   async function prepareProviderActivation(instance, providerId) {
     requireCurrentProject(instance);
+    instance.assertProviderSwitchAllowed();
     const previousProviderId = instance.getSelectedProviderId() || 'builtin';
     const provider = instance.Profiles.getProviderById(instance.catalog, providerId);
     if (providerId !== previousProviderId) {
@@ -223,9 +249,10 @@
         return { cancelled: true, previousProviderId };
       }
     }
+    instance.assertProviderSwitchAllowed();
     const result = await instance.refreshModelOptions(
       instance.Profiles.buildRunSelection(instance.catalog, providerId),
-      { persist: false }
+      { persist: false, assertCurrent: instance.assertProviderSwitchAllowed }
     );
     if (result?.stale || result?.error) {
       if (providerId !== previousProviderId) {
@@ -241,6 +268,7 @@
       error.details = result?.error || {};
       throw error;
     }
+    instance.assertProviderSwitchAllowed();
     return {
       cancelled: false,
       previousProviderId,
@@ -305,7 +333,10 @@
   async function saveProvider(instance, context, action = {}) {
     instance.dialog.setBusy('saving', instance.tx('Saving provider…', '正在保存模型服务…'));
     try {
-      if (action.activate === true) requireCurrentProject(instance);
+      if (action.activate === true) {
+        requireCurrentProject(instance);
+        instance.assertProviderSwitchAllowed();
+      }
       const result = await request(instance, 'codex.providers.upsert', {
         profileId: context.profileId,
         expectedRevision: context.expectedRevision,
@@ -336,8 +367,8 @@
         tone: fellBackToBuiltin ? 'warning' : 'success',
         title: fellBackToBuiltin
           ? instance.tx(
-              'Provider saved. Its endpoint changed, so Built-in Codex is active until the new endpoint is approved.',
-              '模型服务已保存。由于端点发生变化，确认新端点前将使用内置 Codex。'
+              'Provider saved. Its endpoint changed, so the Native Host default is Built-in Codex. The project provider is unchanged; approve the new endpoint before using it.',
+              '模型服务已保存。端点变更使 Native Host 默认项回退到内置 Codex，当前项目的服务选择保持不变；使用新端点前仍需确认披露。'
             )
           : action.activate
           ? instance.tx('Provider saved and activated.', '模型服务已保存并启用。')
@@ -365,7 +396,7 @@
       instance.dialog.setStatus({
         tone: 'success',
         title: result.activeProviderId === 'builtin'
-          ? instance.tx('API key removed. Built-in Codex is now active.', 'API 密钥已删除，当前已切换到内置 Codex。')
+          ? instance.tx('API key removed. The Native Host default is Built-in Codex; the project provider is unchanged.', 'API 密钥已删除。Native Host 默认项为内置 Codex，当前项目的服务选择保持不变。')
           : instance.tx('Stored API key removed.', '已删除存储的 API 密钥。')
       });
     } catch (error) {
@@ -376,6 +407,7 @@
   async function deleteProvider(instance, context) {
     instance.dialog.setBusy('deleting', instance.tx('Deleting provider…', '正在删除模型服务…'));
     try {
+      if (context.profileId === instance.getSelectedProviderId()) instance.assertProviderSwitchAllowed();
       const result = await request(instance, 'codex.providers.delete', {
         providerId: context.profileId,
         expectedRevision: context.expectedRevision
@@ -654,6 +686,23 @@
       provider_revision_conflict: instance.tx('This provider changed in another tab. Reload it and retry.', '此模型服务已在其他标签页发生变化，请刷新后重试。'),
       provider_protocol_negotiation_required: instance.tx('The Auto protocol could not be negotiated for this model.', '无法为此模型自动协商 API 协议。')
     };
+    Object.assign(messages, {
+      provider_store_busy: instance.tx('Provider settings are being updated by another Native Host. Retry shortly.', '其他 Native Host 正在更新模型服务设置，请稍后重试。'),
+      provider_store_too_large: instance.tx('Provider settings exceed the storage limit. Reduce the configuration and retry.', '模型服务设置超过存储上限，请精简配置后重试。'),
+      provider_store_unavailable: instance.tx('Provider settings could not be read or saved. Check the local service and retry.', '无法读取或保存模型服务设置，请检查本机服务后重试。'),
+      provider_store_corrupt: instance.tx('Stored provider settings are inconsistent or invalid. Repair the local configuration before retrying.', '已存储的模型服务设置不一致或无效，请修复本机配置后重试。'),
+      provider_not_found: instance.tx('The selected provider no longer exists. Refresh the provider list.', '所选模型服务已不存在，请刷新服务列表。'),
+      provider_dns_failed: instance.tx('The provider hostname could not be resolved. Check the endpoint and network.', '无法解析模型服务域名，请检查端点和网络。'),
+      provider_tls_failed: instance.tx('A secure connection to the provider could not be established. Check the endpoint certificate.', '无法与模型服务建立安全连接，请检查端点证书。'),
+      provider_rate_limited: instance.tx('The provider is rate limiting requests. Retry later.', '模型服务已限制请求频率，请稍后重试。'),
+      provider_model_not_configured: instance.tx('The selected model is not configured for this provider.', '当前模型服务未配置所选模型。'),
+      provider_selection_unavailable: instance.tx('The selected provider or model is unavailable. Review the project selection.', '所选模型服务或模型不可用，请检查当前项目的选择。'),
+      provider_disclosure_required: instance.tx('Confirm the provider endpoint before activation.', '启用前请确认模型服务端点。'),
+      provider_secret_invalid: instance.tx('The API key change could not be accepted. Review the key settings.', '无法接受此次 API 密钥变更，请检查密钥设置。'),
+      provider_model_catalog_unavailable: instance.tx('The provider model catalog could not be loaded. Retry shortly.', '无法加载模型服务的模型目录，请稍后重试。'),
+      native_unavailable: instance.tx('The local service is unavailable. Check the Native Host connection.', '本机服务不可用，请检查 Native Host 连接。'),
+      provider_request_failed: instance.tx('The provider operation failed. Review the settings and retry.', '模型服务操作失败，请检查设置后重试。')
+    });
     return messages[code] || error?.message || instance.tx('Provider operation failed.', '模型服务操作失败。');
   }