ci: auto build & obfuscate [2026-04-08 17:38:16] (Jenkins #11)

core/api.js

@@ -1,6 +1,7 @@
 import { extension_settings, getContext } from "/scripts/extensions.js";
 import { characters } from "/script.js";
 import { getSlotProfile } from './api/api-resolver.js';
+import { configManager } from '../utils/config/ConfigManager.js';
 import { world_names } from "/scripts/world-info.js";
 import { extensionName } from "../utils/settings.js";
 import { extractContentByTag, replaceContentByTag, extractFullTagBlock } from '../utils/tagProcessor.js';
@@ -449,12 +450,44 @@ export async function getApiSettings(slot = 'main') {
             // 温度 / MaxTokens 读面板值（profile-sync 保留了这些输入框）
             maxTokens:    s.maxTokens    ?? profile.maxTokens   ?? 65500,
             temperature:  s.temperature  ?? profile.temperature ?? 1.0,
+            fakeStream:   profile.fakeStream ?? false,
             tavernProfile: '',
         };
     }
 
-    // 降级：读旧 DOM 面板配置
+    // 降级：按槽位读取各自的独立配置
     const settings = extension_settings[extensionName] || {};
+
+    // plotOpt 槽有独立 API 面板（剧情优化），优先读其专属设置
+    if (slot === 'plotOpt') {
+        const apiMode = settings.plotOpt_apiMode || 'openai_test';
+        if (apiMode === 'sillytavern_preset') {
+            const context = getContext();
+            const profileId = settings.plotOpt_tavernProfile || '';
+            const stProfile = context.extensionSettings?.connectionManager?.profiles?.find(p => p.id === profileId);
+            return {
+                apiProvider:  'sillytavern_preset',
+                apiUrl:       '',
+                apiKey:       '',
+                model:        stProfile?.openai_model || 'Preset Model',
+                maxTokens:    settings.plotOpt_max_tokens   ?? 65500,
+                temperature:  settings.plotOpt_temperature  ?? 1.0,
+                tavernProfile: profileId,
+            };
+        }
+        return {
+            apiProvider:  apiMode,
+            apiUrl:       settings.plotOpt_apiUrl?.trim() || '',
+            apiKey:       configManager.get('plotOpt_apiKey') || '',
+            model:        document.getElementById('amily2_opt_model')?.value?.trim()
+                          || settings.plotOpt_model || '',
+            maxTokens:    settings.plotOpt_max_tokens   ?? 65500,
+            temperature:  settings.plotOpt_temperature  ?? 1.0,
+            tavernProfile: '',
+        };
+    }
+
+    // main 槽（及其余未明确处理的槽）：读主面板 DOM 配置
     const apiProvider = document.getElementById('amily2_api_provider')?.value || 'openai';
 
     let model;

core/table-system/reorganizer.js

@@ -4,7 +4,7 @@ import { renderTables } from '../../ui/table-bindings.js';
 import { extensionName } from "../../utils/settings.js";
 import { convertTablesToCsvString, convertSelectedTablesToCsvString, saveStateToMessage, getMemoryState, updateTableFromText, getBatchFillerRuleTemplate, getBatchFillerFlowTemplate } from './manager.js';
 import { getPresetPrompts, getMixedOrder } from '../../PresetSettings/index.js';
-import { callAI, generateRandomSeed, getApiSettings } from '../api.js';
+import { callAI, generateRandomSeed } from '../api.js';
 import { callNccsAI } from '../api/NccsApi.js';
 
 export async function reorganizeTableContent(selectedTableIndices) {
@@ -20,13 +20,6 @@ export async function reorganizeTableContent(selectedTableIndices) {
         return;
     }
 
-    const resolvedApi = await getApiSettings('main');
-    const { apiUrl, apiKey, model, temperature, maxTokens, forceProxyForCustomApi } = resolvedApi ?? settings;
-    if (!apiUrl || !model) {
-        toastr.error("主API的URL或模型未配置，重新整理功能无法启动。", "Amily2-重新整理");
-        return;
-    }
-
     try {
         toastr.info('正在重新整理表格内容...', 'Amily2-重新整理');
         

core/table-system/secondary-filler.js

@@ -6,7 +6,7 @@ import { updateOrInsertTableInChat } from '../../ui/message-table-renderer.js';
 import { extensionName } from "../../utils/settings.js";
 import { updateTableFromText, getBatchFillerRuleTemplate, getBatchFillerFlowTemplate, convertTablesToCsvString, saveStateToMessage, getMemoryState, clearHighlights } from './manager.js';
 import { getPresetPrompts, getMixedOrder } from '../../PresetSettings/index.js';
-import { callAI, generateRandomSeed, getApiSettings } from '../api.js';
+import { callAI, generateRandomSeed } from '../api.js';
 import { callNccsAI } from '../api/NccsApi.js';
 import { extractBlocksByTags, applyExclusionRules } from '../utils/rag-tag-extractor.js';
 import { safeLorebookEntries } from '../tavernhelper-compatibility.js';
@@ -92,15 +92,6 @@ export async function fillWithSecondaryApi(latestMessage, forceRun = false) {
         return;
     }
 
-    const resolvedApi = await getApiSettings('main');
-    const { apiUrl, apiKey, model, temperature, maxTokens, forceProxyForCustomApi } = resolvedApi ?? settings;
-    if (!apiUrl || !model) {
-        if (!window.secondaryApiUrlWarned) {
-            toastr.error("主API的URL或模型未配置，分步填表功能无法启动。", "Amily2-分步填表");
-            window.secondaryApiUrlWarned = true;
-        }
-        return;
-    }
 
     try {
         const bufferSize = parseInt(settings.secondary_filler_buffer || 0, 10);