@xopcai/xopc 0.0.284 → 0.0.286

package/dist/src/agent/inbound/inbound-loop.js

@@ -30,7 +30,7 @@ var InboundLoop = class {
 	/** Begin consuming inbound messages from the bus until {@link stop} or shutdown. */
 	async start() {
 		this.running = true;
-		await this.cfg.hookHandler.trigger("session_start", { sessionId: this.cfg.agentId });
+		await this.cfg.hookHandler.trigger("session_start", { transcriptId: this.cfg.agentId });
 		let consecutiveConsumeFailures = 0;
 		while (this.running) {
 			let msg;
@@ -66,7 +66,7 @@ var InboundLoop = class {
 			}
 		}
 		await this.cfg.hookHandler.trigger("session_end", {
-			sessionId: this.cfg.agentId,
+			transcriptId: this.cfg.agentId,
 			messageCount: 0
 		});
 	}
@@ -78,7 +78,7 @@ var InboundLoop = class {
 		await runWithLogContext({ requestId: inboundMessageLogRequestId(msg) }, async () => {
 			const { context, isCommand, command, commandArgs } = await this.cfg.messageRouter.routeMessage(msg);
 			const sessionContext = {
-				sessionKey: context.sessionKey,
+				conversationId: context.conversationId,
 				channel: context.channel,
 				chatId: context.chatId,
 				senderId: context.senderId || "",
@@ -89,14 +89,14 @@ var InboundLoop = class {
 				},
 				metadata: { transcribedVoice: msg.metadata?.transcribedVoice === true }
 			};
-			const sessionMetadata = await this.cfg.sessionStore.getMetadata(sessionContext.sessionKey).catch(() => null);
+			const sessionMetadata = await this.cfg.sessionStore.getMetadata(sessionContext.conversationId).catch(() => null);
 			updateAsyncLogContext({
-				sessionKey: sessionContext.sessionKey,
-				...sessionMetadata?.sessionId ? { sessionId: sessionMetadata.sessionId } : {}
+				conversationId: sessionContext.conversationId,
+				...sessionMetadata?.transcriptId ? { transcriptId: sessionMetadata.transcriptId } : {}
 			});
 			await this.cfg.sessionContextManager.runWith(sessionContext, async () => {
-				this.cfg.agentManager.getOrCreateAgent(sessionContext.sessionKey);
-				this.cfg.setupSessionEventHandling(sessionContext.sessionKey);
+				this.cfg.agentManager.getOrCreateAgent(sessionContext.conversationId);
+				this.cfg.setupSessionEventHandling(sessionContext.conversationId);
 				await this.cfg.sessionLifecycleManager.startSession(sessionContext);
 				let typingController = null;
 				let inboundTurnArmed = false;
@@ -114,7 +114,7 @@ var InboundLoop = class {
 					if (cfg && typeof msg.content === "string") {
 						const turn = await initSessionTurn({
 							cfg,
-							sessionKey: sessionContext.sessionKey,
+							conversationId: sessionContext.conversationId,
 							body: msg.content,
 							resetSession: (sk) => this.cfg.resetSession(sk)
 						});
@@ -133,7 +133,7 @@ var InboundLoop = class {
 					if (isCommand && command) {
 						if (!shouldSkipResetOverlapCommand(command, resetTriggeredAtInit)) {
 							if (await this.cfg.commandHandler.executeCommand(command, commandArgs || "", {
-								sessionKey: sessionContext.sessionKey,
+								conversationId: sessionContext.conversationId,
 								channel: sessionContext.channel,
 								chatId: sessionContext.chatId,
 								senderId: sessionContext.senderId,
@@ -156,7 +156,7 @@ var InboundLoop = class {
 						});
 						if (streamHandle) this.cfg.setStreamHandle(streamHandle);
 					}
-					this.cfg.sessionState.beginInboundTurn(sessionContext.sessionKey);
+					this.cfg.sessionState.beginInboundTurn(sessionContext.conversationId);
 					inboundTurnArmed = true;
 					try {
 						await this.cfg.agentOrchestrator.process(inboundMsg, sessionContext);
@@ -174,10 +174,10 @@ var InboundLoop = class {
 					}
 					if (inboundTurnArmed) {
 						const meta = msg.metadata;
-						const assistantPlainText = this.cfg.getLastAssistantPlainText(sessionContext.sessionKey) ?? "";
+						const assistantPlainText = this.cfg.getLastAssistantPlainText(sessionContext.conversationId) ?? "";
 						try {
 							await this.cfg.outboundCoordinator.emitSessionTurnComplete({
-								sessionKey: sessionContext.sessionKey,
+								conversationId: sessionContext.conversationId,
 								channel: sessionContext.channel,
 								chatId: sessionContext.chatId,
 								inboundUserText: inboundMsg.content,
@@ -194,19 +194,19 @@ var InboundLoop = class {
 							const em = turnErr instanceof Error ? turnErr.message : String(turnErr);
 							this.log.warn({
 								err: turnErr,
-								sessionKey: sessionContext.sessionKey
+								conversationId: sessionContext.conversationId
 							}, `Session turn complete failed: ${em}`);
 						}
-						this.cfg.sessionState.endInboundTurn(sessionContext.sessionKey);
+						this.cfg.sessionState.endInboundTurn(sessionContext.conversationId);
 					}
 				}
 			});
 		});
 	}
 	async handleSystemMessage(msg, context) {
-		this.log.debug({ sessionKey: context.sessionKey }, "Processing system message");
-		await this.cfg.sessionHydrator.workspace(context.sessionKey);
-		await this.cfg.sessionHydrator.model(context.sessionKey);
+		this.log.debug({ conversationId: context.conversationId }, "Processing system message");
+		await this.cfg.sessionHydrator.workspace(context.conversationId);
+		await this.cfg.sessionHydrator.model(context.conversationId);
 		const systemMessage = {
 			role: "user",
 			content: [{
@@ -217,15 +217,15 @@ var InboundLoop = class {
 		};
 		try {
 			const finalContent = (await runEmbeddedTurnForSession({
-				sessionKey: context.sessionKey,
+				conversationId: context.conversationId,
 				userMessage: systemMessage,
 				sessionStore: this.cfg.sessionStore,
 				agentManager: this.cfg.agentManager,
 				modelManager: this.cfg.modelManager,
 				getConfig: this.cfg.getConfig
-			})).lastAssistantText ?? this.cfg.getLastAssistantPlainText(context.sessionKey);
+			})).lastAssistantText ?? this.cfg.getLastAssistantPlainText(context.conversationId);
 			if (finalContent) {
-				this.cfg.sessionState.setLastAssistantText(context.sessionKey, finalContent);
+				this.cfg.sessionState.setLastAssistantText(context.conversationId, finalContent);
 				const hookResult = await this.cfg.hookHandler.runMessageSending(context.chatId, finalContent, context.channel);
 				if (hookResult.send) await this.cfg.bus.publishOutbound({
 					channel: context.channel,
@@ -234,13 +234,13 @@ var InboundLoop = class {
 					type: "message"
 				});
 			}
-			this.cfg.enqueueMaybeAutoTitleAfterPersist(context.sessionKey);
+			this.cfg.enqueueMaybeAutoTitleAfterPersist(context.conversationId);
 		} catch (error) {
 			const em = error instanceof Error ? error.message : String(error);
 			this.log.error({
 				err: error,
 				errorMessage: em,
-				sessionKey: context.sessionKey,
+				conversationId: context.conversationId,
 				channel: context.channel,
 				chatId: context.chatId,
 				senderId: msg.sender_id

package/dist/src/agent/inbound/turn-dispatcher.d.ts

@@ -37,23 +37,23 @@ export interface TurnDispatcherConfig {
     getConfig: () => Config | undefined;
     /** Strict accessor — required for direct-turn paths that must have a config. */
     requireConfig: () => Config;
-    resolveSessionEndpoint: (sessionKey: string) => Promise<{
+    resolveSessionEndpoint: (conversationId: string) => Promise<{
         channel: string;
         chatId: string;
     }>;
     /** Establish per-session context (also creates the Agent + subscribes to events). */
-    initSessionContext: (sessionKey: string, channel: string, chatId: string, origin: TurnOrigin) => SessionContext;
+    initSessionContext: (conversationId: string, channel: string, chatId: string, origin: TurnOrigin) => SessionContext;
     /** Per-session config hydration: workspace, model, thinking. */
     sessionHydrator: SessionHydrator;
-    prepareInboundAttachments: (sessionKey: string, attachments?: InboundAttachmentInput[]) => Promise<MediaRef[] | undefined>;
-    enqueueMaybeAutoTitleAfterPersist: (sessionKey: string) => void;
-    enqueueProvisionalSessionTitle?: (sessionKey: string, userText: string) => void;
+    prepareInboundAttachments: (conversationId: string, attachments?: InboundAttachmentInput[]) => Promise<MediaRef[] | undefined>;
+    enqueueMaybeAutoTitleAfterPersist: (conversationId: string) => void;
+    enqueueProvisionalSessionTitle?: (conversationId: string, userText: string) => void;
     endDirectRequestContext: () => void;
     /** Gateway hook fired after assistant text lands on disk (UI refetch). */
-    onSessionTranscriptUpdated?: (sessionKey: string) => void;
-    resetSession: (sessionKey: string) => Promise<{
-        sessionId: string;
-        previousSessionId: string;
+    onSessionTranscriptUpdated?: (conversationId: string) => void;
+    resetSession: (conversationId: string) => Promise<{
+        transcriptId: string;
+        previousTranscriptId: string;
     } | null>;
     sourceContextResolver?: AgentSourceContextResolver;
 }
@@ -69,27 +69,27 @@ export declare class TurnDispatcher {
     private readonly log;
     constructor(cfg: TurnDispatcherConfig);
     /** One-shot direct turn (CLI / embedded TUI). */
-    processDirect(content: string, sessionKey: string, origin: TurnOrigin, attachments?: DirectAttachment[], thinking?: string, options?: ProcessDirectOptions): Promise<string>;
+    processDirect(content: string, conversationId: string, origin: TurnOrigin, attachments?: DirectAttachment[], thinking?: string, options?: ProcessDirectOptions): Promise<string>;
     /** Streaming direct turn (webchat realtime / CLI streaming). */
-    processDirectStreaming(content: string, sessionKey: string, origin: TurnOrigin, attachments?: DirectAttachment[], thinking?: string, options?: {
+    processDirectStreaming(content: string, conversationId: string, origin: TurnOrigin, attachments?: DirectAttachment[], thinking?: string, options?: {
         signal?: AbortSignal;
         runId?: string;
         sourceContexts?: AgentSourceContext[];
         presentation?: 'voice';
     }): AsyncGenerator<ProcessDirectStreamEvent, void, unknown>;
     /** Push an out-of-band event into the live webchat stream for a session. */
-    enqueueWebchatStreamEvent(sessionKey: string, event: {
+    enqueueWebchatStreamEvent(conversationId: string, event: {
         type: string;
         [key: string]: unknown;
     }): void;
     /** Stream assistant text to live webchat session + notify transcript listeners. */
-    notifyWebchatTranscriptAppend(sessionKey: string, assistantText: string): void;
+    notifyWebchatTranscriptAppend(conversationId: string, assistantText: string): void;
     /**
      * Queue a steering user message into pi-agent's in-flight run (delivered
      * after current tool work, before the next LLM call). See `Agent.steer`
      * in `@earendil-works/pi-agent-core`.
      */
-    steerWebchatSession(sessionKey: string, text: string): Promise<boolean>;
+    steerWebchatSession(conversationId: string, text: string): Promise<boolean>;
     private buildStreamingDeps;
     private buildOneShotDeps;
 }

package/dist/src/agent/inbound/turn-dispatcher.js

@@ -12,10 +12,10 @@ var TurnDispatcher = class {
 		this.log = cfg.log;
 	}
 	/** One-shot direct turn (CLI / embedded TUI). */
-	processDirect(content, sessionKey, origin, attachments, thinking, options) {
+	processDirect(content, conversationId, origin, attachments, thinking, options) {
 		return runProcessDirect(this.buildOneShotDeps(), {
 			content,
-			sessionKey,
+			conversationId,
 			origin,
 			attachments,
 			thinking,
@@ -25,10 +25,10 @@ var TurnDispatcher = class {
 		});
 	}
 	/** Streaming direct turn (webchat realtime / CLI streaming). */
-	async *processDirectStreaming(content, sessionKey, origin, attachments, thinking, options) {
+	async *processDirectStreaming(content, conversationId, origin, attachments, thinking, options) {
 		yield* runProcessDirectStreaming(this.buildStreamingDeps(), {
 			content,
-			sessionKey,
+			conversationId,
 			origin,
 			attachments,
 			thinking,
@@ -39,12 +39,12 @@ var TurnDispatcher = class {
 		});
 	}
 	/** Push an out-of-band event into the live webchat stream for a session. */
-	enqueueWebchatStreamEvent(sessionKey, event) {
-		const pub = this.cfg.sessionState.getWebchatPublisher(sessionKey);
+	enqueueWebchatStreamEvent(conversationId, event) {
+		const pub = this.cfg.sessionState.getWebchatPublisher(conversationId);
 		if (pub) pub(event);
 	}
 	/** Stream assistant text to live webchat session + notify transcript listeners. */
-	notifyWebchatTranscriptAppend(sessionKey, assistantText) {
+	notifyWebchatTranscriptAppend(conversationId, assistantText) {
 		const trimmed = assistantText.trim();
 		if (trimmed) {
 			const message = {
@@ -55,35 +55,35 @@ var TurnDispatcher = class {
 				}],
 				timestamp: Date.now()
 			};
-			this.enqueueWebchatStreamEvent(sessionKey, {
+			this.enqueueWebchatStreamEvent(conversationId, {
 				type: "message_start",
 				message
 			});
-			this.enqueueWebchatStreamEvent(sessionKey, {
+			this.enqueueWebchatStreamEvent(conversationId, {
 				type: "message_update",
 				message
 			});
-			this.enqueueWebchatStreamEvent(sessionKey, {
+			this.enqueueWebchatStreamEvent(conversationId, {
 				type: "message_end",
 				message
 			});
 		}
-		this.cfg.onSessionTranscriptUpdated?.(sessionKey);
+		this.cfg.onSessionTranscriptUpdated?.(conversationId);
 	}
 	/**
 	* Queue a steering user message into pi-agent's in-flight run (delivered
 	* after current tool work, before the next LLM call). See `Agent.steer`
 	* in `@earendil-works/pi-agent-core`.
 	*/
-	async steerWebchatSession(sessionKey, text) {
+	async steerWebchatSession(conversationId, text) {
 		const trimmed = text.trim();
 		if (!trimmed) return false;
 		try {
-			return await queueEmbeddedSteer(sessionKey, trimmed);
+			return await queueEmbeddedSteer(conversationId, trimmed);
 		} catch (err) {
 			this.log.warn({
 				err,
-				sessionKey
+				conversationId
 			}, "steerWebchatSession failed");
 			return false;
 		}
@@ -109,7 +109,7 @@ var TurnDispatcher = class {
 			buildTranscriptUserMessage: async (text, prepared, sk) => buildDirectUserMessageContent({
 				content: text,
 				attachments: prepared,
-				sessionKey: sk,
+				conversationId: sk,
 				config: c.requireConfig(),
 				agentManager: c.agentManager,
 				modelManager: c.modelManager
@@ -129,7 +129,7 @@ var TurnDispatcher = class {
 			maybeEmitWebchatTts: (sk, hadVoice) => maybeEmitWebchatTts({
 				config: c.getConfig(),
 				sessionStore: c.sessionStore,
-				getLastAssistantPlainText: (sessionKey) => c.sessionState.getLastAssistantText(sessionKey) ?? c.agentManager.getLastAssistantContent(sessionKey) ?? "",
+				getLastAssistantPlainText: (conversationId) => c.sessionState.getLastAssistantText(conversationId) ?? c.agentManager.getLastAssistantContent(conversationId) ?? "",
 				log: this.log
 			}, sk, hadVoice),
 			endDirectRequestContext: c.endDirectRequestContext,

package/dist/src/agent/ipc/bus.d.ts

@@ -3,7 +3,7 @@ import type { AgentIPCMessage, AgentResponseMessage, AgentSignal, IPCPriority }
 export interface TaskOptions {
     context?: string;
     priority?: IPCPriority;
-    sessionKey?: string;
+    conversationId?: string;
     callbackAgentId?: string;
     timeoutMs?: number;
 }

package/dist/src/agent/ipc/types.d.ts

@@ -30,7 +30,7 @@ export interface TaskPayload {
     /** Task priority */
     priority?: IPCPriority;
     /** Associated session key */
-    sessionKey?: string;
+    conversationId?: string;
     /** Agent to receive result callback */
     callbackAgentId?: string;
 }
@@ -70,7 +70,7 @@ export interface EventPayload {
     /** Event data */
     data?: unknown;
     /** Source session */
-    sessionKey?: string;
+    conversationId?: string;
 }
 export interface AgentEventMessage extends AgentIPCMessage {
     type: 'event';
@@ -92,7 +92,7 @@ export declare function isValidIPCMessage(msg: unknown): msg is AgentIPCMessage;
 export declare function createTaskMessage(from: string, to: string, task: string, options?: {
     context?: string;
     priority?: IPCPriority;
-    sessionKey?: string;
+    conversationId?: string;
     callbackAgentId?: string;
     timeoutMs?: number;
 }): AgentTaskMessage;

package/dist/src/agent/ipc/types.js

@@ -21,7 +21,7 @@ function createTaskMessage(from, to, task, options = {}) {
 			task,
 			context: options.context,
 			priority: options.priority || "normal",
-			sessionKey: options.sessionKey,
+			conversationId: options.conversationId,
 			callbackAgentId: options.callbackAgentId
 		},
 		timeoutMs: options.timeoutMs,

package/dist/src/agent/lifecycle/hook-handler.d.ts

@@ -7,7 +7,7 @@ import type { AgentMessage } from '@earendil-works/pi-agent-core';
 import type { ExtensionHookRunner } from '../../extensions/index.js';
 export interface HookHandlerDeps {
     hookRunner?: ExtensionHookRunner;
-    sessionKey?: string;
+    conversationId?: string;
     agentId: string;
 }
 export declare class HookHandler {
@@ -16,7 +16,7 @@ export declare class HookHandler {
     private getContext;
     trigger(event: string, eventData: Record<string, unknown>): Promise<void>;
     /** Run a hook with an explicit session key (e.g. webchat turn lifecycle). */
-    triggerWithSessionKey(sessionKey: string, event: string, eventData: Record<string, unknown>): Promise<void>;
+    triggerWithConversationId(conversationId: string, event: string, eventData: Record<string, unknown>): Promise<void>;
     runMessageSending(to: string, content: string, channel?: string): Promise<{
         send: boolean;
         content?: string;

package/dist/src/agent/lifecycle/hook-handler.js

@@ -12,7 +12,7 @@ var HookHandler = class {
 	getContext(overrides) {
 		return createHookContext({
 			extensionId: void 0,
-			sessionKey: this.deps.sessionKey,
+			conversationId: this.deps.conversationId,
 			agentId: this.deps.agentId,
 			timestamp: /* @__PURE__ */ new Date(),
 			...overrides
@@ -32,23 +32,23 @@ var HookHandler = class {
 				event,
 				err: error,
 				errorMessage: em,
-				sessionKey: this.deps.sessionKey,
+				conversationId: this.deps.conversationId,
 				agentId: this.deps.agentId
 			}, `Extension hook "${event}" failed: ${em}`);
 		}
 	}
 	/** Run a hook with an explicit session key (e.g. webchat turn lifecycle). */
-	async triggerWithSessionKey(sessionKey, event, eventData) {
+	async triggerWithConversationId(conversationId, event, eventData) {
 		if (!this.deps.hookRunner) return;
 		const ctx = this.getContext({
 			extensionId: void 0,
-			sessionKey,
+			conversationId,
 			timestamp: /* @__PURE__ */ new Date()
 		});
 		try {
 			await this.deps.hookRunner.runHooks(event, {
 				...eventData,
-				sessionKey
+				conversationId
 			}, ctx);
 		} catch (error) {
 			const em = error instanceof Error ? error.message : String(error);
@@ -56,7 +56,7 @@ var HookHandler = class {
 				event,
 				err: error,
 				errorMessage: em,
-				sessionKey,
+				conversationId,
 				agentId: this.deps.agentId
 			}, `Extension hook "${event}" failed: ${em}`);
 		}

package/dist/src/agent/lifecycle/manager.d.ts

@@ -3,7 +3,7 @@ import type { LifecycleEventType, LifecycleHandler } from './types.js';
 export declare class LifecycleManager {
     private handlers;
     on<T>(eventType: LifecycleEventType, handler: LifecycleHandler<T>): this;
-    emit<T>(eventType: LifecycleEventType, sessionKey: string, payload: T, context: AgentContext): Promise<void>;
+    emit<T>(eventType: LifecycleEventType, conversationId: string, payload: T, context: AgentContext): Promise<void>;
     getRegisteredHandlers(): Record<LifecycleEventType, string[]>;
     clear(): void;
 }

package/dist/src/agent/lifecycle/manager.js

@@ -15,24 +15,24 @@ var LifecycleManager = class {
 		}, "Registered lifecycle handler");
 		return this;
 	}
-	async emit(eventType, sessionKey, payload, context) {
+	async emit(eventType, conversationId, payload, context) {
 		const handlers = this.handlers.get(eventType) || [];
 		if (handlers.length === 0) {
 			logger.debug({
 				eventType,
-				sessionKey
+				conversationId
 			}, "No handlers registered for event");
 			return;
 		}
 		const event = {
 			type: eventType,
-			sessionKey,
+			conversationId,
 			payload,
 			timestamp: Date.now()
 		};
 		logger.debug({
 			eventType,
-			sessionKey,
+			conversationId,
 			handlerCount: handlers.length
 		}, "Emitting lifecycle event");
 		const results = await Promise.allSettled(handlers.map(async (handler) => {

package/dist/src/agent/lifecycle/types.d.ts

@@ -2,7 +2,7 @@ import type { AgentContext } from '../service.types.js';
 export type LifecycleEventType = 'conversation_start' | 'llm_request' | 'llm_response' | 'tool_call_start' | 'tool_call_end' | 'conversation_end' | 'session_start' | 'session_end';
 export interface LifecycleEventData<T = unknown> {
     type: LifecycleEventType;
-    sessionKey: string;
+    conversationId: string;
     payload: T;
     timestamp: number;
 }

package/dist/src/agent/mcp/bundle-mcp-runtime.d.ts

@@ -8,7 +8,7 @@ export declare function createBundleMcpJsonSchemaValidator(): jsonSchemaValidato
 declare function resolveSessionMcpRuntimeIdleTtlMs(cfg?: Config): number;
 export declare function createSessionMcpRuntime(params: {
     sessionId: string;
-    sessionKey?: string;
+    conversationId?: string;
     workspaceDir: string;
     cfg?: Config;
 }): SessionMcpRuntime;
@@ -21,7 +21,7 @@ declare function createSessionMcpRuntimeManager(opts?: {
 export declare function getSessionMcpRuntimeManager(): SessionMcpRuntimeManager;
 export declare function getOrCreateSessionMcpRuntime(params: {
     sessionId: string;
-    sessionKey?: string;
+    conversationId?: string;
     workspaceDir: string;
     cfg?: Config;
 }): Promise<SessionMcpRuntime>;
@@ -31,8 +31,8 @@ export declare function retireSessionMcpRuntime(params: {
     reason: string;
     onError?: (error: unknown, sessionId: string, reason: string) => void;
 }): Promise<boolean>;
-export declare function retireSessionMcpRuntimeForSessionKey(params: {
-    sessionKey?: string | null;
+export declare function retireSessionMcpRuntimeForConversationId(params: {
+    conversationId?: string | null;
     reason: string;
     onError?: (error: unknown, sessionId: string, reason: string) => void;
 }): Promise<boolean>;

package/dist/src/agent/mcp/bundle-mcp-runtime.js

@@ -1,6 +1,6 @@
+import { init_global_singleton, resolveGlobalSingleton } from "../../utils/global-singleton.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { resolveGlobalSingleton } from "../../utils/global-singleton.js";
 import { init_string_coerce, normalizeOptionalString } from "../../utils/string-coerce.js";
 import { redactSensitiveUrlLikeString } from "../../utils/redact-sensitive-url.js";
 import { loadEmbeddedMcpConfig } from "./embedded-mcp.js";
@@ -14,6 +14,7 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { AjvJsonSchemaValidator } from "@modelcontextprotocol/sdk/validation/ajv-provider.js";
 //#region src/agent/mcp/bundle-mcp-runtime.ts
 init_logger();
+init_global_singleton();
 init_string_coerce();
 const log = createLogger("Mcp:Bundle");
 const SESSION_MCP_RUNTIME_MANAGER_KEY = Symbol.for("xopc.sessionMcpRuntimeManager");
@@ -290,7 +291,7 @@ function createSessionMcpRuntime(params) {
 	};
 	return {
 		sessionId: params.sessionId,
-		sessionKey: params.sessionKey,
+		conversationId: params.conversationId,
 		workspaceDir: params.workspaceDir,
 		configFingerprint,
 		createdAt,
@@ -341,7 +342,7 @@ function createSessionMcpRuntime(params) {
 }
 function createSessionMcpRuntimeManager(opts = {}) {
 	const runtimesBySessionId = /* @__PURE__ */ new Map();
-	const sessionIdBySessionKey = /* @__PURE__ */ new Map();
+	const sessionIdByConversationId = /* @__PURE__ */ new Map();
 	const idleTtlMsBySessionId = /* @__PURE__ */ new Map();
 	const createRuntime = opts.createRuntime ?? createSessionMcpRuntime;
 	const now = opts.now ?? Date.now;
@@ -349,8 +350,8 @@ function createSessionMcpRuntimeManager(opts = {}) {
 	const idleSweepIntervalMs = opts.idleSweepIntervalMs ?? SESSION_MCP_RUNTIME_SWEEP_INTERVAL_MS;
 	let idleSweepTimer;
 	let idleSweepInFlight;
-	const forgetSessionKeysForSessionId = (sessionId) => {
-		for (const [sessionKey, mappedSessionId] of sessionIdBySessionKey.entries()) if (mappedSessionId === sessionId) sessionIdBySessionKey.delete(sessionKey);
+	const forgetConversationIdsForSessionId = (sessionId) => {
+		for (const [conversationId, mappedSessionId] of sessionIdByConversationId.entries()) if (mappedSessionId === sessionId) sessionIdByConversationId.delete(conversationId);
 	};
 	const sweepIdleRuntimes = async () => {
 		const nowMs = now();
@@ -361,7 +362,7 @@ function createSessionMcpRuntimeManager(opts = {}) {
 			if (nowMs - runtime.lastUsedAt < idleTtlMs) continue;
 			runtimesBySessionId.delete(sessionId);
 			idleTtlMsBySessionId.delete(sessionId);
-			forgetSessionKeysForSessionId(sessionId);
+			forgetConversationIdsForSessionId(sessionId);
 			expired.push(runtime);
 		}
 		await Promise.allSettled(expired.map((runtime) => runtime.dispose()));
@@ -396,7 +397,7 @@ function createSessionMcpRuntimeManager(opts = {}) {
 			if (runtimesBySessionId.has(params.sessionId)) idleTtlMsBySessionId.set(params.sessionId, idleTtlMs);
 			await sweepIdleRuntimes();
 			if (idleTtlMs > 0) ensureIdleSweepTimer();
-			if (params.sessionKey) sessionIdBySessionKey.set(params.sessionKey, params.sessionId);
+			if (params.conversationId) sessionIdByConversationId.set(params.conversationId, params.sessionId);
 			const { fingerprint: nextFingerprint } = loadSessionMcpConfig({
 				workspaceDir: params.workspaceDir,
 				cfg: params.cfg,
@@ -422,7 +423,7 @@ function createSessionMcpRuntimeManager(opts = {}) {
 			}
 			const created = Promise.resolve(createRuntime({
 				sessionId: params.sessionId,
-				sessionKey: params.sessionKey,
+				conversationId: params.conversationId,
 				workspaceDir: params.workspaceDir,
 				cfg: params.cfg
 			})).then((runtime) => {
@@ -442,11 +443,11 @@ function createSessionMcpRuntimeManager(opts = {}) {
 				createInFlight.delete(params.sessionId);
 			}
 		},
-		bindSessionKey(sessionKey, sessionId) {
-			sessionIdBySessionKey.set(sessionKey, sessionId);
+		bindConversationId(conversationId, sessionId) {
+			sessionIdByConversationId.set(conversationId, sessionId);
 		},
-		resolveSessionId(sessionKey) {
-			return sessionIdBySessionKey.get(sessionKey);
+		resolveSessionId(conversationId) {
+			return sessionIdByConversationId.get(conversationId);
 		},
 		async disposeSession(sessionId) {
 			const inFlight = createInFlight.get(sessionId);
@@ -456,10 +457,10 @@ function createSessionMcpRuntimeManager(opts = {}) {
 			runtimesBySessionId.delete(sessionId);
 			idleTtlMsBySessionId.delete(sessionId);
 			if (!runtime) {
-				forgetSessionKeysForSessionId(sessionId);
+				forgetConversationIdsForSessionId(sessionId);
 				return;
 			}
-			forgetSessionKeysForSessionId(sessionId);
+			forgetConversationIdsForSessionId(sessionId);
 			await runtime.dispose();
 		},
 		async disposeAll() {
@@ -468,7 +469,7 @@ function createSessionMcpRuntimeManager(opts = {}) {
 			createInFlight.clear();
 			const runtimes = Array.from(runtimesBySessionId.values());
 			runtimesBySessionId.clear();
-			sessionIdBySessionKey.clear();
+			sessionIdByConversationId.clear();
 			idleTtlMsBySessionId.clear();
 			const lateRuntimes = await Promise.all(inFlightRuntimes.map(async ({ promise }) => await promise.catch(() => void 0)));
 			const allRuntimes = new Set(runtimes);
@@ -501,11 +502,11 @@ async function retireSessionMcpRuntime(params) {
 		return false;
 	}
 }
-async function retireSessionMcpRuntimeForSessionKey(params) {
-	const sessionKey = normalizeOptionalString(params.sessionKey);
-	if (!sessionKey) return false;
+async function retireSessionMcpRuntimeForConversationId(params) {
+	const conversationId = normalizeOptionalString(params.conversationId);
+	if (!conversationId) return false;
 	return await retireSessionMcpRuntime({
-		sessionId: getSessionMcpRuntimeManager().resolveSessionId(sessionKey),
+		sessionId: getSessionMcpRuntimeManager().resolveSessionId(conversationId),
 		reason: params.reason,
 		onError: params.onError
 	});
@@ -524,4 +525,4 @@ const __testing = {
 	resolveSessionMcpRuntimeIdleTtlMs
 };
 //#endregion
-export { __testing, createBundleMcpJsonSchemaValidator, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, retireSessionMcpRuntime, retireSessionMcpRuntimeForSessionKey };
+export { __testing, createBundleMcpJsonSchemaValidator, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, retireSessionMcpRuntime, retireSessionMcpRuntimeForConversationId };

package/dist/src/agent/mcp/bundle-mcp-tools.d.ts

@@ -1,2 +1,2 @@
 export type { McpCatalogTool, McpServerCatalog, McpToolCatalog, SessionMcpRuntime, SessionMcpRuntimeManager, } from "./bundle-mcp-types.js";
-export { __testing, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, retireSessionMcpRuntime, retireSessionMcpRuntimeForSessionKey, } from "./bundle-mcp-runtime.js";
+export { __testing, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, retireSessionMcpRuntime, retireSessionMcpRuntimeForConversationId, } from "./bundle-mcp-runtime.js";

package/dist/src/agent/mcp/bundle-mcp-tools.js

@@ -1,2 +1,2 @@
-import { __testing, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, retireSessionMcpRuntime, retireSessionMcpRuntimeForSessionKey } from "./bundle-mcp-runtime.js";
-export { __testing, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, retireSessionMcpRuntime, retireSessionMcpRuntimeForSessionKey };
+import { __testing, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, retireSessionMcpRuntime, retireSessionMcpRuntimeForConversationId } from "./bundle-mcp-runtime.js";
+export { __testing, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, retireSessionMcpRuntime, retireSessionMcpRuntimeForConversationId };