ci: auto build & obfuscate [2026-04-06 18:15:37] (Jenkins #9)

core/api/SybdApi.js

@@ -2,6 +2,8 @@ import { extension_settings, getContext } from "/scripts/extensions.js";
 import { characters, this_chid, getRequestHeaders, saveSettingsDebounced, eventSource, event_types } from "/script.js";
 import { extensionName } from "../../utils/settings.js";
 import { amilyHelper } from '../../core/tavern-helper/main.js';
+import { getSlotProfile, providerToApiMode } from './api-resolver.js';
+import { configManager } from '../../utils/config/ConfigManager.js';
 
 let ChatCompletionService = undefined;
 try {
@@ -42,15 +44,32 @@ function normalizeApiResponse(responseData) {
     return data;
 }
 
-export function getSybdApiSettings() {
+export async function getSybdApiSettings() {
+    const s = extension_settings[extensionName] || {};
+
+    // 优先读取 'sybd' 槽位分配的 Profile
+    const profile = await getSlotProfile('sybd');
+    if (profile) {
+        return {
+            apiMode:      providerToApiMode(profile.provider),
+            apiUrl:       profile.apiUrl,
+            apiKey:       profile.apiKey ?? '',
+            model:        profile.model,
+            maxTokens:    s.sybdMaxTokens    ?? profile.maxTokens   ?? 4000,
+            temperature:  s.sybdTemperature  ?? profile.temperature ?? 0.7,
+            tavernProfile: '',
+        };
+    }
+
+    // 降级：读旧 extension_settings 字段
     return {
-        apiMode: extension_settings[extensionName]?.sybdApiMode || 'openai_test',
-        apiUrl: extension_settings[extensionName]?.sybdApiUrl?.trim() || '',
-        apiKey: extension_settings[extensionName]?.sybdApiKey?.trim() || '',
-        model: extension_settings[extensionName]?.sybdModel || '',
-        maxTokens: extension_settings[extensionName]?.sybdMaxTokens || 4000,
-        temperature: extension_settings[extensionName]?.sybdTemperature || 0.7,
-        tavernProfile: extension_settings[extensionName]?.sybdTavernProfile || ''
+        apiMode:      s.sybdApiMode      || 'openai_test',
+        apiUrl:       s.sybdApiUrl?.trim() || '',
+        apiKey:       configManager.get('sybdApiKey') || '',
+        model:        s.sybdModel        || '',
+        maxTokens:    s.sybdMaxTokens    || 4000,
+        temperature:  s.sybdTemperature  || 0.7,
+        tavernProfile: s.sybdTavernProfile || '',
     };
 }
 
@@ -60,7 +79,7 @@ export async function callSybdAI(messages, options = {}) {
         return null;
     }
 
-    const apiSettings = getSybdApiSettings();
+    const apiSettings = await getSybdApiSettings();
 
     const finalOptions = {
         maxTokens: apiSettings.maxTokens,
@@ -257,8 +276,8 @@ async function callSybdSillyTavernPreset(messages, options) {
 
 export async function fetchSybdModels() {
     console.log('[Amily2号-Sybd外交部] 开始获取模型列表');
-    
-    const apiSettings = getSybdApiSettings();
+
+    const apiSettings = await getSybdApiSettings();
     
     try {
         if (apiSettings.apiMode === 'sillytavern_preset') {
@@ -340,8 +359,8 @@ export async function fetchSybdModels() {
 
 export async function testSybdApiConnection() {
     console.log('[Amily2号-Sybd外交部] 开始API连接测试');
-    
-    const apiSettings = getSybdApiSettings();
+
+    const apiSettings = await getSybdApiSettings();
 
     if (apiSettings.apiMode === 'sillytavern_preset') {
         if (!apiSettings.tavernProfile) {

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 } from '../api.js';
+import { callAI, generateRandomSeed, getApiSettings } from '../api.js';
 import { callNccsAI } from '../api/NccsApi.js';
 
 export async function reorganizeTableContent(selectedTableIndices) {
@@ -20,7 +20,8 @@ export async function reorganizeTableContent(selectedTableIndices) {
         return;
     }
 
-    const { apiUrl, apiKey, model, temperature, maxTokens, forceProxyForCustomApi } = settings;
+    const resolvedApi = await getApiSettings('main');
+    const { apiUrl, apiKey, model, temperature, maxTokens, forceProxyForCustomApi } = resolvedApi ?? settings;
     if (!apiUrl || !model) {
         toastr.error("主API的URL或模型未配置，重新整理功能无法启动。", "Amily2-重新整理");
         return;

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 } from '../api.js';
+import { callAI, generateRandomSeed, getApiSettings } 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,7 +92,8 @@ export async function fillWithSecondaryApi(latestMessage, forceRun = false) {
         return;
     }
 
-    const { apiUrl, apiKey, model, temperature, maxTokens, forceProxyForCustomApi } = settings;
+    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-分步填表");