🧩 Refactor(Workflow): 更新触发器类型处理逻辑，移除冗余代码

Author: StardustSeemsInk

KitX Clients/KitX Dashboard

@@ -60,7 +60,7 @@ public static void RunKcsCompileTest(string kcsPath, bool withRoundTrip = false)
 
         Console.WriteLine($"Name: {kcs.Name}");
         Console.WriteLine($"Id: {kcs.Id}");
-        Console.WriteLine($"Trigger: {kcs.TriggerType}");
+        Console.WriteLine($"Trigger: {kcs.TriggerConfig?.TriggerType ?? "Manual"}");
         Console.WriteLine($"UseBlockMode: {kcs.UseBlockMode}");
         Console.WriteLine($"Helpers: {(kcs.HelperFunctions?.Count ?? 0)}");
         Console.WriteLine();

KitX Clients/KitX Workflow/KitX.Workflow.Test/KcsCompileTest.cs

@@ -16,40 +16,26 @@ namespace KitX.Workflow.BlockScripting;
 internal class BlockScriptServiceImpl : IBlockScriptService
 {
     private readonly WorkflowRuntimeState _state;
-    private RealPluginManager? _realPluginManager;
+    private readonly BlockScriptExecutor _executor;
 
     /// <summary>
     /// Initializes a new instance of BlockScriptServiceImpl.
     /// </summary>
     /// <param name="state">Shared runtime state.</param>
-    /// <param name="realPluginManager">RealPluginManager instance from DI container (optional).</param>
-    internal BlockScriptServiceImpl(WorkflowRuntimeState state, RealPluginManager? realPluginManager = null)
+    /// <param name="executor">
+    /// The DI-registered, plugin-manager-wired <see cref="IBlockScriptExecutor"/> singleton.
+    /// Must be the same instance registered in <c>AddKitXWorkflow</c> (where its
+    /// <c>SetPluginManager</c> is called with the <see cref="RealPluginManager"/>), so that
+    /// <c>G.PluginCall(...)</c> dispatches to live plugins during execution. Injecting it here
+    /// (instead of lazily constructing a bare <c>new BlockScriptExecutor()</c>) eliminates the
+    /// prior dual-instance bug where the trigger execution path ran on an unwired executor.
+    /// </param>
+    internal BlockScriptServiceImpl(WorkflowRuntimeState state, IBlockScriptExecutor executor)
     {
         _state = state;
-        _realPluginManager = realPluginManager;
-        TrySetPluginManager();
-    }
-
-    /// <summary>
-    /// Sets the RealPluginManager after initialization.
-    /// This is needed when RealPluginManager is resolved after BlockScriptServiceImpl is created.
-    /// </summary>
-    internal void SetRealPluginManager(RealPluginManager? realPluginManager)
-    {
-        _realPluginManager = realPluginManager;
-        TrySetPluginManager();
-    }
-
-    /// <summary>
-    /// Try to set the plugin manager on the BlockScriptExecutor if conditions are met.
-    /// </summary>
-    private void TrySetPluginManager()
-    {
-        if (_state.BlockScriptExecutor != null && _state.IsParserInitialized && _realPluginManager != null)
-        {
-            Log.Information("[BlockScriptServiceImpl] Setting RealPluginManager. HashCode: {HashCode}", _realPluginManager.GetHashCode());
-            _state.BlockScriptExecutor.SetPluginManager(_realPluginManager);
-        }
+        // The contract guarantees a wired executor; cast once to the concrete type the
+        // pipeline (ExecuteAsync / CompileForPersistence / PreloadFromDisk / Validate) needs.
+        _executor = (BlockScriptExecutor)executor;
     }
 
     /// <summary>
@@ -60,23 +46,9 @@ private void TrySetPluginManager()
             BuiltinFunctionRegistry.Discover(typeof(BuiltinFunctionRegistry).Assembly));
 
     /// <summary>
-    /// Gets the BlockScript executor, creating it if necessary.
-    /// The executor is initialized with the plugin manager if the parser is initialized.
+    /// Gets the DI-injected BlockScript executor (single, plugin-manager-wired instance).
     /// </summary>
-    private BlockScriptExecutor BlockScriptExecutor
-    {
-        get
-        {
-            if (_state.BlockScriptExecutor == null)
-            {
-                Log.Information("[BlockScriptServiceImpl] Creating new BlockScriptExecutor, IsParserInitialized = {_IsParserInitialized}",
-                    _state.IsParserInitialized);
-                _state.BlockScriptExecutor = new BlockScriptExecutor();
-                TrySetPluginManager();
-            }
-            return _state.BlockScriptExecutor;
-        }
-    }
+    private BlockScriptExecutor BlockScriptExecutor => _executor;
 
     /// <inheritdoc />
     public BlockScriptParseResult ParseBlockScript(string sourceCode)

KitX Clients/KitX Workflow/KitX.Workflow/BlockScripting/BlockScriptServiceImpl.cs

@@ -75,7 +75,6 @@ public string CreateWorkflow(string name, string blockScriptSource)
                     LastModifiedTime = DateTime.UtcNow,
                     UseBlockMode = true,
                     BlockScriptSource = blockScriptSource,
-                    TriggerType = "Manual",
                     Author = "AI Assistant",
                     Description = "Workflow generated by KitX AI Assistant"
                 };

KitX Clients/KitX Workflow/KitX.Workflow/BuiltinFunctions/CreateWorkflowFunction.cs

@@ -67,7 +67,7 @@ public string ListWorkflows()
                     w.Id,
                     w.Name,
                     w.Description,
-                    w.TriggerType
+                    TriggerType = w.TriggerConfig?.TriggerType ?? "Manual"
                 });
                 return JsonSerializer.Serialize(info);
             }

KitX Clients/KitX Workflow/KitX.Workflow/BuiltinFunctions/ListWorkflowsFunction.cs

@@ -32,14 +32,17 @@ public static IServiceCollection AddKitXWorkflow(this IServiceCollection service
     {
         Log.Information("[AddKitXWorkflow] Registering workflow services...");
 
-        // IBlockScriptService is created via factory to inject RealPluginManager from DI.
+        // IBlockScriptService is created via factory. It receives the same DI-registered,
+        // plugin-manager-wired IBlockScriptExecutor singleton (registered below) so the trigger
+        // execution path runs plugins through the wired executor, not a bare new instance.
         // WorkflowScriptService facade is kept as the backward-compat singleton graph.
         services.AddSingleton<IBlockScriptService>(provider =>
         {
             var state = WorkflowScriptService.RuntimeState;
             var rpm = provider.GetRequiredService<RealPluginManager>();
-            var service = new BlockScriptServiceImpl(state, rpm);
-            Log.Information("[DI] IBlockScriptService created with RealPluginManager. HashCode: {HashCode}", rpm.GetHashCode());
+            var executor = provider.GetRequiredService<IBlockScriptExecutor>();
+            var service = new BlockScriptServiceImpl(state, executor);
+            Log.Information("[DI] IBlockScriptService created with RealPluginManager + wired executor. RPM HashCode: {HashCode}", rpm.GetHashCode());
             return service;
         });
         // IBlockScriptPipelineService was removed (zero interface-type consumers;

KitX Clients/KitX Workflow/KitX.Workflow/Hosting/ServiceCollectionExtensions.cs

@@ -27,7 +27,5 @@ public class WorkflowCase : IWorkflowCase
 
     public DateTime LastModifiedTime { get; set; } = DateTime.UtcNow;
 
-    public string TriggerType { get; set; } = "Manual";
-
     public TriggerConfig? TriggerConfig { get; set; }
 }

KitX Clients/KitX Workflow/KitX.Workflow/Services/WorkflowCase.cs

@@ -1,6 +1,5 @@
 using KitX.Core.Contract.Workflow;
 using KitX.Core.Contract.Plugin;
-using KitX.Workflow.Hosting;
 using KitX.Shared.CSharp.Plugin;
 using Microsoft.CodeAnalysis.CSharp;
 using Serilog;
@@ -24,32 +23,6 @@ internal WorkflowPluginService(WorkflowRuntimeState state)
         _state = state;
     }
 
-    /// <inheritdoc />
-    public void InitializePluginManager()
-    {
-        if (_state.IsParserInitialized) return;
-
-        try
-        {
-            if (!ServiceLocator.IsInitialized)
-            {
-                Log.Error("[WorkflowPluginService] Cannot initialize plugin manager: ServiceLocator not initialized");
-                return;
-            }
-
-            var pluginServer = ServiceLocator.GetRequiredService<IPluginServer>();
-            var realPluginManager = new RealPluginManager(pluginServer);
-
-            _state.IsParserInitialized = true;
-            Log.Information("[WorkflowPluginService] Real plugin manager initialized");
-        }
-        catch (Exception ex)
-        {
-            Log.Error($"[WorkflowPluginService] Failed to initialize real plugin manager: {ex.Message}");
-            _state.IsParserInitialized = true;
-        }
-    }
-
     /// <inheritdoc />
     public void UpdateAvailablePlugins(List<PluginInfo> plugins)
     {

KitX Clients/KitX Workflow/KitX.Workflow/Services/WorkflowPluginService.cs

@@ -22,11 +22,6 @@ internal class WorkflowRuntimeState
     /// </summary>
     internal CSharpScriptEngine? Engine;
 
-    /// <summary>
-    /// Whether the plugin manager has been initialized.
-    /// </summary>
-    internal bool IsParserInitialized;
-
     /// <summary>
     /// Available plugins for workflow execution.
     /// </summary>
@@ -36,9 +31,4 @@ internal class WorkflowRuntimeState
     /// Block script parser instance.
     /// </summary>
     internal BlockScriptParser? BlockScriptParser;
-
-    /// <summary>
-    /// Block script executor instance.
-    /// </summary>
-    internal BlockScriptExecutor? BlockScriptExecutor;
 }

KitX Clients/KitX Workflow/KitX.Workflow/Services/WorkflowRuntimeState.cs

@@ -60,7 +60,6 @@ public async Task<IWorkflowCase> CreateWorkflowAsync(string name, string? descri
             Author = string.Empty,
             CreatedTime = now,
             LastModifiedTime = now,
-            TriggerType = "Manual",
             UseBlockMode = true,
             BlockScriptSource = GetDefaultBlockScriptTemplate(),
             MainProgram = string.Empty,
@@ -84,7 +83,6 @@ public async Task<IWorkflowCase> CreateWorkflowAsync(string name, string? descri
             ScriptPath = filePath,
             CreatedTime = now,
             LastModifiedTime = now,
-            TriggerType = "Manual",
         };
     }
 
@@ -169,11 +167,6 @@ public async Task<IReadOnlyList<IWorkflowCase>> DiscoverWorkflowsAsync()
                         ? File.GetCreationTimeUtc(file)
                         : kcs.CreatedTime;
 
-                    // Prefer TriggerConfig (structured) over legacy TriggerType (string)
-                    var triggerConfig = kcs.TriggerConfig;
-                    var triggerType = triggerConfig?.TriggerType
-                        ?? (string.IsNullOrEmpty(kcs.TriggerType) ? "Manual" : kcs.TriggerType);
-
                     results.Add(new WorkflowCase
                     {
                         Id = id,
@@ -184,8 +177,7 @@ public async Task<IReadOnlyList<IWorkflowCase>> DiscoverWorkflowsAsync()
                         ScriptPath = file,
                         CreatedTime = createdTime,
                         LastModifiedTime = kcs.LastModifiedTime == default ? File.GetLastWriteTimeUtc(file) : kcs.LastModifiedTime,
-                        TriggerType = triggerType,
-                        TriggerConfig = triggerConfig,
+                        TriggerConfig = kcs.TriggerConfig,
                     });
                 }
                 catch (Exception ex)
@@ -298,8 +290,6 @@ private void EnsureDirectoryExists()
                 result.Description = desc.GetString() ?? string.Empty;
             if (root.TryGetProperty(nameof(KcsFileFormat.Author), out var author))
                 result.Author = author.GetString() ?? string.Empty;
-            if (root.TryGetProperty(nameof(KcsFileFormat.TriggerType), out var triggerType))
-                result.TriggerType = triggerType.GetString() ?? "Manual";
             if (root.TryGetProperty(nameof(KcsFileFormat.UseBlockMode), out var useBlockMode))
                 result.UseBlockMode = useBlockMode.GetBoolean();
             if (root.TryGetProperty(nameof(KcsFileFormat.BlockScriptSource), out var bsSource))