@musnows/scriverse 0.6.4 → 0.6.5

package/dist/ai.js

@@ -1006,10 +1006,8 @@ export class ContextBuilder {
         const includeAutomaticContext = scope.type !== "none" && scope.suppressAutomaticContext !== true;
         const settingsOnly = scope.type === "settings";
         const isProseScope = PROSE_CONTEXT_SCOPE_TYPES.has(scope.type);
-        const includeSettingInfo = includeAutomaticContext
-            && isProseScope
-            && !settingsOnly
-            && scope.includeSettingInfo !== false;
+        const includeSettingInfo = !settingsOnly && scope.suppressAutomaticContext !== true && (scope.includeSettingInfo === true
+            || (includeAutomaticContext && isProseScope && scope.includeSettingInfo !== false));
         const constraints = includeAutomaticContext
             ? [wrapAiContextRegion("work", `作品：${String(work.title)}\n作者：${String(work.author) || "未填写"}`)]
             : [];
@@ -3233,9 +3231,14 @@ export class AiManager {
     buildContextPlan(input, model, existingBudget, persistKeywordInjections = false) {
         const budget = existingBudget ?? this.contextBudget(input, model);
         const roleplayCharacterId = this.roleplayCharacterId(input.workId, input.conversationId);
+        const settings = this.store.getWorkAiSettings(input.workId);
+        const configuredScope = {
+            ...input.scope,
+            includeSettingInfo: settings.alwaysIncludeSettingInfo === true ? true : input.scope.includeSettingInfo
+        };
         const baseScope = roleplayCharacterId
             ? {
-                ...input.scope,
+                ...configuredScope,
                 type: "none",
                 suppressAutomaticContext: true,
                 includeBookSummary: false,
@@ -3243,9 +3246,8 @@ export class AiManager {
                 volumeId: undefined,
                 selection: undefined
             }
-            : input.scope;
+            : configuredScope;
         const contextWindow = numberValue(model, "context_window") || DEFAULT_CONTEXT_WINDOW;
-        const settings = this.store.getWorkAiSettings(input.workId);
         const percentage = Math.min(90, Math.max(1, Number(settings.bookSummaryContextPercent) || 50));
         const workContextBudgetTokens = Number(budget.workContextBudgetTokens) || 256;
         const bookSummaryMaximumTokens = baseScope.includeBookSummary || baseScope.type === "book" || baseScope.type === "volume"
@@ -3260,9 +3262,8 @@ export class AiManager {
         const injected = conversationId
             ? this.store.getAiConversationInjectedEntities(conversationId, workId)
             : { characters: [], races: [], organizations: [] };
-        const proseSettingInfoOn = PROSE_CONTEXT_SCOPE_TYPES.has(scope.type)
-            && scope.suppressAutomaticContext !== true
-            && scope.includeSettingInfo !== false;
+        const proseSettingInfoOn = scope.suppressAutomaticContext !== true && (scope.includeSettingInfo === true || (PROSE_CONTEXT_SCOPE_TYPES.has(scope.type)
+            && scope.includeSettingInfo !== false));
         const matches = matchKeywordEntities(this.store, workId, instruction, {
             excludeCharacterIds: [
                 ...(scope.characterIds ?? []),