@markusylisiurunen/tau 0.3.78 → 0.3.80

package/dist/host/local_session_host.js

@@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
 import { resolvePromptTemplateWithBackend } from "../core/config/index.js";
 import { assistantHistoryEntries, systemHistoryEntry, toolHistoryEntry, userHistoryEntry, } from "../core/history/transcript.js";
+import { McpManager } from "../core/mcp/manager.js";
 import { ChatRuntime } from "../core/runtime/chat_runtime.js";
 import { formatSteeringUserMessage } from "../core/runtime/steering.js";
 import { buildGoalContinuationText, prependGoalPolicy } from "../core/session/goal.js";
@@ -28,11 +29,13 @@ export class LocalSessionHost {
     historyRemote;
     onShutdown;
     clientToolBroker = new ClientToolBroker();
+    mcp;
     sessionOptions;
     shutdownPromise;
     shuttingDown = false;
     constructor(options) {
-        const { store, history, historyRemote, onShutdown, ...sessionOptions } = options;
+        const { store, history, historyRemote, mcpServers, onShutdown, ...sessionOptions } = options;
+        this.mcp = new McpManager(mcpServers);
         this.store = store;
         this.history = history;
         this.historyRemote = historyRemote;
@@ -112,12 +115,13 @@ export class LocalSessionHost {
         }
         const runtimeContext = await executionEnvironment.resolveRuntimeContext({
             cwd: executionEnvironment.snapshot().cwd,
-            persona: bootstrap.persona,
             discoveredSkills: bootstrap.discoveredSkills,
             includeAgentContext: this.sessionOptions.includeAgentContext,
-            agentContextFiles: bootstrap.config?.agentContextFiles ?? [],
         });
-        const catalog = createContentCatalogSnapshot(bootstrap);
+        const catalog = createContentCatalogSnapshot(bootstrap, this.mcp
+            .listServers()
+            .map(({ name }) => name)
+            .sort());
         return this.createLocalSessionHandleFromRuntimeContext(executionEnvironment, runtimeContext, bootstrap, catalog, remoteCatalog, committedSnapshot, createParams, forceNextSnapshotRevision);
     }
     async createLocalSessionHandleFromRuntimeContext(executionEnvironment, runtimeContext, bootstrap, catalog, remoteCatalog, committedSnapshot, createParams, forceNextSnapshotRevision = false) {
@@ -134,7 +138,6 @@ export class LocalSessionHost {
             resolveSubagentPrompt: createExecutionEnvironmentSubagentPromptResolver({
                 sessionId,
                 executionEnvironment,
-                getRemoteModelCatalog: () => hostedSession.getRemoteModelCatalog(),
                 includeAgentContext: this.sessionOptions.includeAgentContext,
                 sessionStartedAt: createdAt,
             }),
@@ -147,6 +150,7 @@ export class LocalSessionHost {
                 updateGoal: async (update) => await hostedSession.updateGoal(update),
             },
             history: this.history.query(this.historyRemote),
+            mcp: this.mcp,
             initialPromptComposition: committedSnapshot
                 ? promptCompositionFromSnapshot(committedSnapshot)
                 : undefined,
@@ -379,6 +383,12 @@ export class LocalSessionHost {
             }
         }
         this.sessionEvictions.clear();
+        try {
+            await this.mcp.close();
+        }
+        catch (error) {
+            errors.push(error);
+        }
         try {
             await this.history.flush();
         }
@@ -496,9 +506,6 @@ class LocalHostedSessionHandle {
             ? cloneSessionProtocolSnapshot(committedSnapshot)
             : { ...this.buildSnapshotDraft(), revision: 1 };
     }
-    getRemoteModelCatalog() {
-        return this.remoteCatalog;
-    }
     get isTurnRunning() {
         return this.runtime.isTurnRunning;
     }
@@ -945,7 +952,7 @@ class LocalHostedSessionHandle {
     async setPersona(personaId) {
         this.assertActive();
         const runtimeConfig = await this.executionEnvironment.resolveRuntimeConfig(this.executionEnvironment.snapshot().cwd, { remoteCatalog: this.remoteCatalog });
-        const personas = runtimeConfig.personas.map((persona) => this.normalizeReloadedPersona(persona));
+        const personas = runtimeConfig.personas.map(clonePersona);
         const persona = personas.find((persona) => persona.id.toLowerCase() === personaId.toLowerCase());
         if (!persona) {
             throw new Error(`unknown persona '${personaId}'`);
@@ -953,17 +960,13 @@ class LocalHostedSessionHandle {
         const selectedPersona = clonePersona(persona);
         const runtimeContext = await this.executionEnvironment.resolveRuntimeContext({
             cwd: this.executionEnvironment.snapshot().cwd,
-            persona: selectedPersona,
             discoveredSkills: runtimeConfig.skills,
             includeAgentContext: this.includeAgentContext,
-            agentContextFiles: runtimeConfig.config.agentContextFiles ?? [],
         });
         return await this.enqueueConfigurationMutation(async () => {
             this.runtime.setRuntimeConfig(runtimeConfig.config, runtimeConfig.bootstrap.modelResolver.resolveModel);
             this.runtime.updatePromptContext(runtimeContext.promptBootstrap.promptContext);
-            this.runtime.setPersona(selectedPersona, {
-                skillsBlock: runtimeContext.promptBootstrap.promptContext.skillsBlock,
-            });
+            this.runtime.setPersona(selectedPersona);
             this.bootstrap = {
                 persona: clonePersona(selectedPersona),
                 discoveredSkills: structuredClone(runtimeConfig.skills),
@@ -972,7 +975,7 @@ class LocalHostedSessionHandle {
                 modelResolver: runtimeConfig.bootstrap.modelResolver.resolveModel,
                 config: runtimeConfig.config,
             };
-            this.catalog = createContentCatalogSnapshot(this.bootstrap);
+            this.catalog = createContentCatalogSnapshot(this.bootstrap, this.catalog.mcpServers);
             const snapshot = await this.commitSnapshot();
             this.emitSnapshotReset("configuration", snapshot);
             return snapshot;
@@ -985,22 +988,18 @@ class LocalHostedSessionHandle {
         if (runtimeConfig.personas.length === 0) {
             throw new Error("reload failed: no personas available");
         }
-        const personas = runtimeConfig.personas.map((persona) => this.normalizeReloadedPersona(persona));
+        const personas = runtimeConfig.personas.map(clonePersona);
         const currentPersonaId = this.runtime.persona.id.toLowerCase();
         const nextPersona = personas.find((persona) => persona.id.toLowerCase() === currentPersonaId) ?? personas[0];
         const runtimeContext = await this.executionEnvironment.resolveRuntimeContext({
             cwd: this.executionEnvironment.snapshot().cwd,
-            persona: nextPersona,
             discoveredSkills: runtimeConfig.skills,
             includeAgentContext: this.includeAgentContext,
-            agentContextFiles: runtimeConfig.config.agentContextFiles ?? [],
         });
         return await this.enqueueConfigurationMutation(async () => {
             this.runtime.setRuntimeConfig(runtimeConfig.config, runtimeConfig.bootstrap.modelResolver.resolveModel);
             this.runtime.updatePromptContext(runtimeContext.promptBootstrap.promptContext);
-            this.runtime.setPersona(nextPersona, {
-                skillsBlock: runtimeContext.promptBootstrap.promptContext.skillsBlock,
-            });
+            this.runtime.setPersona(nextPersona);
             this.remoteCatalog = remoteCatalog;
             this.bootstrap = {
                 persona: clonePersona(nextPersona),
@@ -1010,13 +1009,12 @@ class LocalHostedSessionHandle {
                 modelResolver: runtimeConfig.bootstrap.modelResolver.resolveModel,
                 config: runtimeConfig.config,
             };
-            this.catalog = createContentCatalogSnapshot(this.bootstrap);
-            const unknownSkillWarnings = runtimeContext.promptBootstrap.unknownSkills.map((skill) => `unknown skill enabled by persona '${nextPersona.id}': ${skill}`);
+            this.catalog = createContentCatalogSnapshot(this.bootstrap, this.catalog.mcpServers);
             const snapshot = await this.commitSnapshot();
             this.emitSnapshotReset("configuration", snapshot);
             return {
                 snapshot,
-                warnings: [...runtimeConfig.warnings, ...unknownSkillWarnings],
+                warnings: runtimeConfig.warnings,
                 counts: {
                     personas: runtimeConfig.personas.length,
                     prompts: runtimeConfig.prompts.length,
@@ -1025,9 +1023,6 @@ class LocalHostedSessionHandle {
             };
         });
     }
-    normalizeReloadedPersona(persona) {
-        return clonePersona(persona);
-    }
     async resolvePrompt(promptId) {
         this.assertActive();
         const executionSnapshot = this.executionEnvironment.snapshot();
@@ -1150,7 +1145,7 @@ class LocalHostedSessionHandle {
             sessionId: this.sessionId,
             sessionStartedAt: this.createdAt,
             persona: this.runtime.persona,
-            config: this.bootstrap.config ?? {},
+            config: this.runtime.config,
             discoveredSkills: this.bootstrap.discoveredSkills,
             includeAgentContext: this.includeAgentContext,
             executionEnvironment: this.executionEnvironment,
@@ -2796,19 +2791,19 @@ function cloneResolvedBootstrap(bootstrap) {
         ...(bootstrap.config !== undefined ? { config: structuredClone(bootstrap.config) } : {}),
     };
 }
-function createContentCatalogSnapshot(bootstrap) {
+function createContentCatalogSnapshot(bootstrap, mcpServers) {
     return {
         personas: bootstrap.personas.map(personaSnapshotFromPersona),
         prompts: bootstrap.prompts.map((prompt) => ({
             id: prompt.id,
-            ...(prompt.label !== undefined ? { label: prompt.label } : {}),
-            ...(prompt.description !== undefined ? { description: prompt.description } : {}),
+            label: prompt.label,
         })),
         skills: bootstrap.discoveredSkills.map((skill) => ({
             name: skill.name,
             description: skill.description,
             path: skill.path,
         })),
+        mcpServers: [...mcpServers],
     };
 }
 function clonePersona(persona) {
@@ -2824,7 +2819,6 @@ function personaSnapshotFromPersona(persona) {
             : {}),
         subagentLaunchModels: [...persona.subagentLaunchModels],
         ...(persona.tools ? { tools: [...persona.tools] } : {}),
-        skills: Array.isArray(persona.skills) ? [...persona.skills] : persona.skills,
         source: persona.source,
     };
 }