1 files changed, 7 insertions, 5 deletions
diff --git a/src/Agent.App/Program.cs b/src/Agent.App/Program.cs
index 7839e82..1c29ec3 100644
--- a/src/Agent.App/Program.cs
+++ b/src/Agent.App/Program.cs
@@ -3,6 +3,7 @@ using Agent.App.Configuration;
 using Agent.App.Logging;
 using Agent.Core.Localization;
 using Agent.Core.Prompts;
+using Agent.Core.Sessions;
 using Agent.Mcp;
 using Agent.Core.Runtime;
 using Agent.Windows.Diagnostics;
@@ -73,7 +74,8 @@ internal static class Program
                 return 2;
             }
 
-            InternalToolDispatcher toolDispatcher = CreateToolDispatcher(configuration, baseDirectory, logDirectory);
+            var sessionStore = new SessionStore();
+            InternalToolDispatcher toolDispatcher = CreateToolDispatcher(configuration, baseDirectory, logDirectory, sessionStore);
             var runtimeObserver = new JsonLinesRuntimeObserver(logDirectory);
             string taskStateDirectory = Path.Combine(baseDirectory, "state", "mcp-tasks");
             UserOnlyDirectory.Ensure(taskStateDirectory);
@@ -89,7 +91,7 @@ internal static class Program
                 var runtimeSettings = new AgentRuntimeSettings(userPrompt, language, skills, "Windows AppContainer, ACL, Job Object, child-process restriction, and WFP sandbox capabilities.", configuration.Agent.MaxIterations, configuration.Agent.SameFailureLimit, locale.Get("ollama.vision_unsupported"));
                 var visionLimits = new VisionLimits(configuration.Mcp.Images.MaxCount, configuration.Mcp.Images.MaxBytesEach, configuration.Mcp.Images.MaxTotalBytes);
                 await McpHost.RunStdioAsync(locale, OllamaSettingsFactory.Create(configuration.Ollama), runtimeSettings, visionLimits, CancellationToken.None,
-                    toolDispatcher, runtimeObserver, taskStoreSettings, hostObserver).ConfigureAwait(false);
+                    toolDispatcher, runtimeObserver, taskStoreSettings, hostObserver, sessionStore: sessionStore).ConfigureAwait(false);
                 return 0;
             }
             if (configuration.Mcp.Transport == "http")
@@ -101,7 +103,7 @@ internal static class Program
                 var visionLimits = new VisionLimits(configuration.Mcp.Images.MaxCount, configuration.Mcp.Images.MaxBytesEach, configuration.Mcp.Images.MaxTotalBytes);
                 await McpHost.RunHttpAsync(locale, OllamaSettingsFactory.Create(configuration.Ollama), runtimeSettings, visionLimits,
                     configuration.Mcp.Http.Host, configuration.Mcp.Http.Port, CancellationToken.None, toolDispatcher, runtimeObserver,
-                    taskStoreSettings, hostObserver).ConfigureAwait(false);
+                    taskStoreSettings, hostObserver, sessionStore: sessionStore).ConfigureAwait(false);
                 return 0;
             }
             throw new ConfigurationException("Unsupported MCP transport.");
@@ -118,7 +120,7 @@ internal static class Program
         }
     }
 
-    private static InternalToolDispatcher CreateToolDispatcher(AgentConfiguration configuration, string baseDirectory, string logDirectory)
+    private static InternalToolDispatcher CreateToolDispatcher(AgentConfiguration configuration, string baseDirectory, string logDirectory, SessionStore? sessionStore = null)
     {
         string stateDirectory = Path.Combine(baseDirectory, "state");
         string journalDirectory = Path.Combine(stateDirectory, "journals");
@@ -142,7 +144,7 @@ internal static class Program
             configuration.Sandbox.Network.Allow.Select(item => (item.Host, (IReadOnlyList<int>)item.Ports)).ToArray(),
             journalDirectory, backupDirectory, checked((long)configuration.FileEdit.MemoryBackupLimitMb * 1024 * 1024),
             configuration.Limits.WholeReadBytes, configuration.Limits.SearchMaxResults, configuration.Limits.TailMaxLines);
-        var backend = new WindowsToolBackend(settings, audit, new TaskGraphToolHandler(configuration.Planner.MaxTasks));
+        var backend = new WindowsToolBackend(settings, audit, new TaskGraphToolHandler(configuration.Planner.MaxTasks, sessionStore));
         var allowed = InternalToolCatalog.All.Select(static item => item.Name).ToHashSet(StringComparer.Ordinal);
         return new InternalToolDispatcher(new DenyByDefaultPolicy(allowed), backend);