重构“枚举”类型状态属性

Author: AtmoOmen

Assets/CHANGELOG.md

@@ -3,9 +3,13 @@
 * 修复了知识检索配置未生效的问题
 * 为项目编辑界面新增通用提示文本, 以帮助确定哪些字段会否进入/不进入生成检索流程
 * 修正了知识系统
-   * 知识条目“标题” → “备注”
-   * 知识条目“标签” → “关键字”
+    * 知识条目“标题” → “备注”
+    * 知识条目“标签” → “关键词”
 * 简化了状态栏更新逻辑, 现在仅发送 AI 确实可以修改的条目, 避免分散注意力
 * 极大简化了配置读取逻辑
 * 移除了状态值“复合”类型
 * 使部分遗漏的枚举也进入了本地化体系
+* 重构了状态系统中“枚举”类型的配置方式
+    * 移除了与该类型不相关的界面元素
+    * 可以单独指定每个枚举如何触发, 包含“随机”与“表达式两种方式”, “随机”方式下可以为枚举单独指定概率,
+      “表达式”方式下可以为该枚举关联其他“数值”类型的状态属性, 并在满足表达式时切换至该枚举

Assets/Langs/zh-CN.json

@@ -214,7 +214,15 @@
     "State.Driver.System.Help": "按规则自动变换",
     "State.Trigger.SceneChange": "场景切换时",
     "State.Trigger.RoundEnd": "每轮结束时",
-    "State.Trigger.Custom": "自定义",
+    "State.TransitionMethod.Method": "变更方式",
+    "State.TransitionMethod.Random": "随机",
+    "State.TransitionMethod.Expression": "表达式",
+    "State.TransitionMethod.Probability": "概率",
+    "State.TransitionMethod.Attribute": "关联属性",
+    "State.TransitionMethod.ExpressionPlaceholder": "如: {val} >= 1000",
+    "State.TransitionMethod.SwitchMode": "切换方式",
+    "State.SwitchMode.Always": "始终切换",
+    "State.SwitchMode.Once": "切换一次",
     "State.Panel.NotStarted": "未开始",
     "State.Panel.Scene": "场景",
     "State.Panel.Timeline": "时间线",

DirectorPrompt.Agents/AttributeConfigSerializer.cs

@@ -8,7 +8,7 @@ public static class AttributeConfigSerializer
     public static JsonSerializerOptions Options { get; } = new()
     {
         PropertyNameCaseInsensitive = true,
-        Converters = { new JsonStringEnumConverter() }
+        Converters                  = { new JsonStringEnumConverter() }
     };
 
     public static T? Deserialize<T>(string json) where T : class

DirectorPrompt.Agents/Pipeline/PostProcessingStage.cs

@@ -94,7 +94,7 @@ private async Task<string> BuildAgentContextAsync(ToolExecutionContext context,
         }
 
         var attributes = (await stateRepository.GetAttributesAsync(context.ProjectID, StateScope.Global, cancellationToken))
-                         .Where(a => a.Driver == Driver.Narrative)
+                         .Where(a => a.Driver == Driver.Narrative && a.ValueType != StateValueType.Enum)
                          .ToList();
 
         if (attributes.Count > 0)
@@ -105,7 +105,7 @@ private async Task<string> BuildAgentContextAsync(ToolExecutionContext context,
 
             foreach (var attr in attributes)
             {
-                var value = await stateRepository.GetStateValueAsync(attr.ID, context.SessionID, cancellationToken);
+                var value      = await stateRepository.GetStateValueAsync(attr.ID, context.SessionID, cancellationToken);
                 var type       = FormatType(attr);
                 var constraint = FormatConstraint(attr);
                 var rules      = FormatRules(attr);
@@ -147,7 +147,7 @@ private async Task<string> BuildAgentContextAsync(ToolExecutionContext context,
         }
 
         var categoryAttrs = (await stateRepository.GetAttributesAsync(context.ProjectID, StateScope.Category, cancellationToken))
-                            .Where(a => a.Driver == Driver.Narrative)
+                            .Where(a => a.Driver == Driver.Narrative && a.ValueType != StateValueType.Enum)
                             .ToList();
 
         if (categoryAttrs.Count > 0)

DirectorPrompt.Agents/Prompts/MemorySubAgentPrompt.cs

@@ -23,7 +23,7 @@ public static class MemorySubAgentPrompt
         """
         你是记忆更新系统。分析 `---` 后的叙事文本, 结合上下文调用工具更新记忆、状态与人物。
 
-        状态更新: 叙事中出现影响状态属性的变化时, 根据上下文表格中 narrative 驱动的属性调用工具更新。全局数值属性用 update_state 传入变化量, 枚举属性用 set_state 传入新值; 人物数值属性用 update_character_state, 枚举属性用 set_character_state。system 驱动属性不可修改。无相关变化时跳过。
+        状态更新: 叙事中出现影响状态属性的变化时, 根据上下文表格中的属性调用工具更新。全局数值属性用 update_state 传入变化量; 人物数值属性用 update_character_state。枚举属性由系统自动变换, 不可通过工具修改。无相关变化时跳过。
 
         人物建档: 仅对有具体姓名或固定称谓、与已有角色产生直接互动、或导演指令明确引入的角色建档。无名群众只在 create_memory 中记录。
 

DirectorPrompt.Agents/SystemStateTransformer.cs

@@ -1,3 +1,5 @@
+using System.Collections.Concurrent;
+using System.Globalization;
 using DirectorPrompt.Domain.Configurations;
 using DirectorPrompt.Domain.Enums;
 using DirectorPrompt.Domain.Models;
@@ -14,6 +16,8 @@ public sealed class SystemStateTransformer
     IConditionEngine     conditionEngine
 ) : ISystemStateTransformer
 {
+    private readonly ConcurrentDictionary<(long SessionID, long AttributeID, long? CharacterID, string Option), bool> onceTriggered = new();
+
     public async Task ExecuteAsync
     (
         long              projectID,
@@ -33,11 +37,11 @@ public async Task ExecuteAsync
         );
 
         var attributes  = await stateRepository.GetAttributesAsync(projectID, null, cancellationToken);
-        var systemAttrs = attributes.Where(a => a.Driver == Driver.System).ToList();
+        var systemAttrs = attributes.Where(a => a.Driver == Driver.System || a.ValueType == StateValueType.Enum).ToList();
 
         if (systemAttrs.Count == 0)
         {
-            Log.Debug("无 system 驱动的状态属性, 跳过");
+            Log.Debug("无系统驱动的状态属性, 跳过");
             return;
         }
 
@@ -78,24 +82,24 @@ private async Task TransformGlobalAttributeAsync
         CancellationToken          cancellationToken
     )
     {
-        if (attr.ValueType == StateValueType.Enum)
-        {
-            var value        = await stateRepository.GetStateValueAsync(attr.ID, sessionID, cancellationToken);
-            var currentValue = value?.Value ?? string.Empty;
+        if (attr.ValueType != StateValueType.Enum)
+            return;
 
-            await TransformEnumAttributeAsync
-            (
-                attr,
-                sessionID,
-                sceneID,
-                roundID,
-                trigger,
-                currentValue,
-                globalStateValues,
-                null,
-                cancellationToken
-            );
-        }
+        var value        = await stateRepository.GetStateValueAsync(attr.ID, sessionID, cancellationToken);
+        var currentValue = value?.Value ?? string.Empty;
+
+        await TransformEnumAttributeAsync
+        (
+            attr,
+            sessionID,
+            sceneID,
+            roundID,
+            trigger,
+            currentValue,
+            globalStateValues,
+            null,
+            cancellationToken
+        );
     }
 
     private async Task TransformCategoryAttributeAsync
@@ -111,6 +115,9 @@ private async Task TransformCategoryAttributeAsync
         CancellationToken          cancellationToken
     )
     {
+        if (attr.ValueType != StateValueType.Enum)
+            return;
+
         foreach (var character in characters)
         {
             var charValues = await characterRepository.GetCharacterStateValuesAsync(character.ID, cancellationToken);
@@ -122,23 +129,20 @@ CancellationToken          cancellationToken
                 v => v.Value
             );
 
-            if (attr.ValueType == StateValueType.Enum)
-            {
-                var currentValue = charValues.FirstOrDefault(v => v.AttributeID == attr.ID)?.Value ?? string.Empty;
-
-                await TransformEnumAttributeAsync
-                (
-                    attr,
-                    sessionID,
-                    sceneID,
-                    roundID,
-                    trigger,
-                    currentValue,
-                    charContext,
-                    character.ID,
-                    cancellationToken
-                );
-            }
+            var currentValue = charValues.FirstOrDefault(v => v.AttributeID == attr.ID)?.Value ?? string.Empty;
+
+            await TransformEnumAttributeAsync
+            (
+                attr,
+                sessionID,
+                sceneID,
+                roundID,
+                trigger,
+                currentValue,
+                charContext,
+                character.ID,
+                cancellationToken
+            );
         }
     }
 
@@ -166,7 +170,7 @@ CancellationToken          cancellationToken
         if (string.IsNullOrEmpty(currentValue))
             currentValue = config.Options.FirstOrDefault() ?? string.Empty;
 
-        var newValue = ResolveEnumTransition(currentValue, config, stateValues);
+        var newValue = ResolveEnumTransition(attr, sessionID, characterID, currentValue, config, stateValues);
 
         if (newValue == currentValue)
             return;
@@ -200,47 +204,142 @@ await stateRepository.SetStateValueAsync
 
     private string ResolveEnumTransition
     (
+        StateAttribute             attr,
+        long                       sessionID,
+        long?                      characterID,
         string                     currentValue,
         EnumAttributeConfig        config,
         Dictionary<string, string> stateValues
     )
     {
-        if (config.Conditions.Count > 0)
+        if (config.Transitions.Count == 0)
+            return currentValue;
+
+        var alwaysMet = new List<(string Option, float Weight)>();
+
+        foreach (var t in config.Transitions)
         {
-            var context = new ConditionContext(stateValues);
+            if (t.Method != EnumTransitionMethod.Expression || t.SwitchMode != EnumSwitchMode.Always)
+                continue;
 
-            foreach (var cond in config.Conditions)
+            if (EvaluateTransitionExpression(t, stateValues))
+                alwaysMet.Add((t.Option, t.Weight));
+        }
+
+        if (alwaysMet.Count > 0)
+        {
+            var best = alwaysMet.MaxBy(x => x.Weight);
+            return best.Option;
+        }
+
+        var onceFirstTime = new List<(string Option, float Weight)>();
+
+        foreach (var t in config.Transitions)
+        {
+            if (t.Method != EnumTransitionMethod.Expression || t.SwitchMode != EnumSwitchMode.Once)
+                continue;
+
+            var key   = (sessionID, attr.ID, characterID, t.Option);
+            var isMet = EvaluateTransitionExpression(t, stateValues);
+
+            if (!isMet)
             {
-                if (conditionEngine.Evaluate(cond.When, context))
-                    return PickWeighted(cond.Transition);
+                onceTriggered[key] = false;
+                continue;
             }
+
+            if (onceTriggered.TryGetValue(key, out var triggered) && triggered)
+                continue;
+
+            onceTriggered[key] = true;
+            onceFirstTime.Add((t.Option, t.Weight));
         }
 
-        if (config.TransitionRules.TryGetValue(currentValue, out var rules))
-            return PickWeighted(rules);
+        if (onceFirstTime.Count > 0)
+        {
+            var best = onceFirstTime.MaxBy(x => x.Weight);
+            return best.Option;
+        }
+
+        var pool = new List<(string Option, float Weight)>();
+
+        foreach (var t in config.Transitions)
+        {
+            switch (t.Method)
+            {
+                case EnumTransitionMethod.Random:
+                    pool.Add((t.Option, t.Weight));
+                    break;
+
+                case EnumTransitionMethod.Expression when t.SwitchMode == EnumSwitchMode.Once:
+                {
+                    var key   = (sessionID, attr.ID, characterID, t.Option);
+                    var isMet = EvaluateTransitionExpression(t, stateValues);
+
+                    if (isMet && onceTriggered.TryGetValue(key, out var triggered) && triggered)
+                        pool.Add((t.Option, t.Weight));
+
+                    break;
+                }
+            }
+        }
+
+        if (pool.Count > 0)
+            return PickWeighted(pool);
 
         return currentValue;
     }
 
-    private static string PickWeighted(Dictionary<string, float> weights)
+    private bool EvaluateTransitionExpression
+    (
+        EnumTransitionConfig       transition,
+        Dictionary<string, string> stateValues
+    )
     {
-        var total = weights.Values.Sum();
+        if (string.IsNullOrWhiteSpace(transition.Expression) || string.IsNullOrWhiteSpace(transition.AttributeName))
+            return false;
+
+        if (!stateValues.TryGetValue(transition.AttributeName, out var value))
+            return false;
+
+        var isNumeric = float.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out _);
+        var valReplacement = isNumeric ?
+                                 value :
+                                 $"\"{value}\"";
+
+        var expr = transition.Expression.Replace("{val}", valReplacement);
+        expr = expr.Replace(" AND ", " && ").Replace(" OR ", " || ");
+
+        try
+        {
+            return conditionEngine.Evaluate(expr, new ConditionContext(new Dictionary<string, string>()));
+        }
+        catch (Exception ex)
+        {
+            Log.Warning(ex, "表达式求值失败: {Expression}", transition.Expression);
+            return false;
+        }
+    }
+
+    private static string PickWeighted(List<(string Option, float Weight)> pool)
+    {
+        var total = pool.Sum(x => x.Weight);
 
         if (total <= 0)
-            return weights.Keys.FirstOrDefault() ?? string.Empty;
+            return pool[0].Option;
 
         var roll       = (float)Random.Shared.NextDouble() * total;
         var cumulative = 0f;
 
-        foreach (var (key, weight) in weights)
+        foreach (var (option, weight) in pool)
         {
             cumulative += weight;
 
             if (roll <= cumulative)
-                return key;
+                return option;
         }
 
-        return weights.Keys.Last();
+        return pool[^1].Option;
     }
 
     private async Task<Dictionary<string, string>> BuildGlobalStateContextAsync
@@ -265,11 +364,7 @@ private static bool IsTriggerMatch(SystemTrigger configTrigger, SystemTrigger ac
         configTrigger == actualTrigger;
 
     private static SystemTrigger ParseTrigger(string? value) =>
-        value switch
-        {
-            "scene_change" => SystemTrigger.SceneChange,
-            "round_end"    => SystemTrigger.RoundEnd,
-            "custom"       => SystemTrigger.Custom,
-            _              => SystemTrigger.RoundEnd
-        };
+        Enum.TryParse(value, true, out SystemTrigger trigger) ?
+            trigger :
+            SystemTrigger.RoundEnd;
 }

DirectorPrompt.Agents/Tools/CharacterTools.cs

@@ -620,8 +620,8 @@ string               reason
         if (attr is null)
             return error;
 
-        if (attr.Driver == Driver.System)
-            return JsonSerializer.Serialize(new { error = $"状态属性 {attribute} 为 system 驱动, AI 不可直接修改" });
+        if (attr.Driver == Driver.System || attr.ValueType == StateValueType.Enum)
+            return JsonSerializer.Serialize(new { error = $"状态属性 {attribute} 为系统驱动或枚举类型, AI 不可直接修改" });
 
         var values       = await characterRepository.GetCharacterStateValuesAsync(character.ID);
         var currentValue = values.FirstOrDefault(v => v.AttributeID == attr.ID);
@@ -661,8 +661,8 @@ string               reason
         if (attr is null)
             return error;
 
-        if (attr.Driver == Driver.System)
-            return JsonSerializer.Serialize(new { error = $"状态属性 {attribute} 为 system 驱动, AI 不可直接修改" });
+        if (attr.Driver == Driver.System || attr.ValueType == StateValueType.Enum)
+            return JsonSerializer.Serialize(new { error = $"状态属性 {attribute} 为系统驱动或枚举类型, AI 不可直接修改" });
 
         await characterRepository.SetCharacterStateValueAsync(character.ID, attr.ID, value);