@xopcai/xopc 0.0.285 → 0.0.286

package/dist/src/agent/embedded/transcript-runtime.js

@@ -1,35 +1,37 @@
+import { buildSessionContextForLlm, init_session_context_for_llm } from "../../session/session-context-for-llm.js";
 import { SessionCompactor } from "../memory/compaction.js";
 import { openSqliteHydratingSessionManager } from "./sqlite-hydrating-session-manager.js";
 import crypto from "node:crypto";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 //#region src/agent/embedded/transcript-runtime.ts
+init_session_context_for_llm();
 async function createSqliteTranscriptRuntime(params) {
-	const identity = await params.sessionStore.resolveTranscriptPath(params.sessionKey);
+	const identity = await params.sessionStore.resolveTranscriptPath(params.conversationId);
 	return {
-		runtimeId: params.sessionKey,
-		sessionId: identity.sessionId,
+		runtimeId: params.conversationId,
+		transcriptId: identity.transcriptId,
 		persistent: true,
 		openSessionManager: (cwd) => openSqliteHydratingSessionManager({
-			sessionKey: params.sessionKey,
-			sessionId: identity.sessionId,
+			conversationId: params.conversationId,
+			transcriptId: identity.transcriptId,
 			cwd
 		}),
-		loadMessages: () => params.sessionStore.load(params.sessionKey),
-		compact: (messages, model, instructions, force, options) => params.sessionStore.compact(params.sessionKey, messages, model, instructions, force, options)
+		loadMessages: () => params.sessionStore.load(params.conversationId),
+		compact: (messages, model, instructions, force, options) => params.sessionStore.compact(params.conversationId, messages, model, instructions, force, options)
 	};
 }
 var InMemoryTranscriptRuntime = class {
 	persistent = false;
 	runtimeId;
-	sessionId;
+	transcriptId;
 	sessionManager;
 	compactor = new SessionCompactor();
 	compactionRows = /* @__PURE__ */ new Map();
 	baselineEntryCount = 0;
 	constructor(params) {
 		this.runtimeId = params.runtimeId;
-		this.sessionId = crypto.randomUUID();
-		this.sessionManager = SessionManager.inMemory(params.cwd, { id: this.sessionId });
+		this.transcriptId = crypto.randomUUID();
+		this.sessionManager = SessionManager.inMemory(params.cwd, { id: this.transcriptId });
 		for (const message of params.initialMessages ?? []) if (message.role === "compactionSummary") this.sessionManager.appendCustomMessageEntry("side-chat-parent-compaction", `The parent conversation was compacted into this summary:\n\n${message.summary}`, false);
 		else if (message.role === "branchSummary") this.sessionManager.appendCustomMessageEntry("side-chat-parent-branch", `The parent conversation includes this branch summary:\n\n${message.summary}`, false);
 		else this.sessionManager.appendMessage(message);
@@ -39,7 +41,7 @@ var InMemoryTranscriptRuntime = class {
 		return this.sessionManager;
 	}
 	async loadMessages() {
-		return [...this.sessionManager.buildSessionContext().messages];
+		return buildSessionContextForLlm(this.sourceEntries().map((entry) => entry.row));
 	}
 	captureBaseline() {
 		this.baselineEntryCount = this.sessionManager.getBranch().length;
@@ -47,9 +49,8 @@ var InMemoryTranscriptRuntime = class {
 	loadConversationMessages() {
 		return this.sessionManager.getBranch().slice(this.baselineEntryCount).flatMap((entry) => entry.type === "message" ? [entry.message] : []);
 	}
-	async compact(_messages, model, instructions, force, options) {
-		const branch = this.sessionManager.getBranch();
-		const sources = branch.flatMap((entry, index) => {
+	sourceEntries() {
+		return this.sessionManager.getBranch().flatMap((entry, index) => {
 			const compaction = this.compactionRows.get(entry.id);
 			if (compaction) return [{
 				entryId: entry.id,
@@ -57,6 +58,17 @@ var InMemoryTranscriptRuntime = class {
 				createdAt: Date.now(),
 				row: compaction
 			}];
+			if (entry.type === "custom_message") return [{
+				entryId: entry.id,
+				seq: index + 1,
+				createdAt: Date.now(),
+				row: {
+					role: "custom",
+					customType: entry.customType,
+					content: entry.content,
+					display: entry.display
+				}
+			}];
 			if (entry.type !== "message") return [];
 			return [{
 				entryId: entry.id,
@@ -65,14 +77,15 @@ var InMemoryTranscriptRuntime = class {
 				row: entry.message
 			}];
 		});
+	}
+	async compact(_messages, model, instructions, force, options) {
+		const branch = this.sessionManager.getBranch();
+		const sources = this.sourceEntries();
 		const result = await this.compactor.compact(sources, model, instructions, force, options);
 		if (!result.compacted || !result.handover || !result.audit) return result;
-		const firstKept = branch.filter((entry) => entry.type === "message")[result.firstKeptIndex];
-		if (!firstKept) return {
-			...result,
-			compacted: false
-		};
-		this.sessionManager.appendCompaction(result.summary, firstKept.id, result.tokensBefore, {
+		options?.signal?.throwIfAborted();
+		if (this.sessionManager.getBranch().at(-1)?.id !== branch.at(-1)?.id) throw new Error("Session changed while compaction was running");
+		this.sessionManager.appendCompaction(result.summary, result.firstKeptEntryId ?? "", result.tokensBefore, {
 			plannerVersion: result.plannerVersion,
 			summaryModelRef: result.summaryModelRef,
 			qualityAudit: result.qualityAudit

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

@@ -65,7 +65,7 @@ export type EmbeddedStreamEvent = {
     summary?: string;
 };
 export type RunXopcEmbeddedTurnParams = {
-    sessionKey: string;
+    conversationId: string;
     runId: string;
     userMessage: AgentMessage;
     model: Model<Api>;
@@ -73,6 +73,7 @@ export type RunXopcEmbeddedTurnParams = {
     tools: import('@earendil-works/pi-agent-core').AgentTool[];
     systemPrompt: string;
     thinkingLevel?: ThinkingLevel;
+    compactionPolicy?: import('../memory/compaction-policy.js').ResolvedCompactionPolicy;
     promptCachePolicy?: import('../../providers/prompt-cache-plan.js').PromptCachePolicy;
     workspaceDir: string;
     sessionStore?: SessionStore;

package/dist/src/agent/external-tools/composio-provider.d.ts

@@ -6,7 +6,7 @@ import type { ExternalToolDescriptor, ExternalToolExecutionContext, ExternalTool
 type CurrentContext = {
     channel: string;
     chatId: string;
-    sessionKey: string;
+    conversationId: string;
 } | null;
 export interface ComposioToolProviderDeps {
     getConfig: () => Config | undefined;

package/dist/src/agent/external-tools/composio-provider.js

@@ -1,6 +1,6 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { connectionBinding, connectionBindings, publishConnectionWait, requireSessionConnection } from "../../storage/sqlite/connection-wait-repository.js";
+import { connectionBinding, connectionBindings, init_connection_wait_repository, publishConnectionWait, requireSessionConnection } from "../../storage/sqlite/connection-wait-repository.js";
 import { consumeConnectorApproval, createConnectorApproval, getConnectorApproval, getConnectorInstallation, listConnectorActionMetadata, listConnectorConnections, listConnectorInstallations, upsertConnectorActionMetadata, upsertConnectorInstallation } from "../../storage/sqlite/connector-repository.js";
 import "../../storage/sqlite/index.js";
 import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
@@ -12,6 +12,7 @@ import { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { ExternalToolSearchError } from "./search-error.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
 //#region src/agent/external-tools/composio-provider.ts
+init_connection_wait_repository();
 init_logger();
 const CONNECTION_ARGUMENT = "xopcConnectionId";
 const log = createLogger("ComposioToolProvider");
@@ -205,7 +206,7 @@ var ComposioToolProvider = class {
 		if (!resolved) return textResult("This connected app tool is not allowed for this user and agent.");
 		let executionArgs = args;
 		if (this.deps.hookRunner) {
-			const hook = await this.deps.hookRunner.runBeforeToolCall(toolRef, args, { sessionKey: available.context?.sessionKey });
+			const hook = await this.deps.hookRunner.runBeforeToolCall(toolRef, args, { conversationId: available.context?.conversationId });
 			if (!hook.allowed) throw new Error(hook.reason ?? "Connected app tool call blocked by policy hook.");
 			executionArgs = hook.params ?? args;
 		}
@@ -213,7 +214,7 @@ var ComposioToolProvider = class {
 		const action = listConnectorActionMetadata(resolved.installation.connectorId).find((candidate) => candidate.actionId === resolved.actionId);
 		if (!action || !isToolInputSchema(action.inputSchema) || !isComposioActionAllowedByCatalog(resolved.actionId)) return textResult("The exact action contract is unavailable. Search and describe the tool again.");
 		let fresh = await this.adapter.syncConnections({ principalId: available.principalId });
-		const binding = available.context ? connectionBinding(available.context.sessionKey, resolved.installation.connectorId) : void 0;
+		const binding = available.context ? connectionBinding(available.context.conversationId, resolved.installation.connectorId) : void 0;
 		const expired = fresh.find((item) => item.connectorId === resolved.installation.connectorId && item.status === "expired" && item.id === binding);
 		if (expired) {
 			const refreshed = await this.adapter.refreshConnection(expired);
@@ -223,8 +224,8 @@ var ComposioToolProvider = class {
 			principalId: available.principalId,
 			connectorId: resolved.installation.connectorId
 		}).filter((connection) => connection.status === "active" && fresh.some((item) => item.id === connection.id) && (!resolved.installation.selectedConnectionIds.length || resolved.installation.selectedConnectionIds.includes(connection.id)));
-		const requestedConnection = typeof executionArgs[CONNECTION_ARGUMENT] === "string" ? executionArgs[CONNECTION_ARGUMENT] : available.context ? connectionBinding(available.context.sessionKey, resolved.installation.connectorId) : void 0;
-		const bindings = available.context ? connectionBindings(available.context.sessionKey).filter((need) => need.connectorId === resolved.installation.connectorId) : [];
+		const requestedConnection = typeof executionArgs[CONNECTION_ARGUMENT] === "string" ? executionArgs[CONNECTION_ARGUMENT] : available.context ? connectionBinding(available.context.conversationId, resolved.installation.connectorId) : void 0;
+		const bindings = available.context ? connectionBindings(available.context.conversationId).filter((need) => need.connectorId === resolved.installation.connectorId) : [];
 		if (bindings.length > 1 && !requestedConnection) return textResult({
 			status: "account_selection_required",
 			accounts: bindings,
@@ -235,7 +236,7 @@ var ComposioToolProvider = class {
 		const requestConnection = () => {
 			if (!available.context) return textResult({ status: "connection_required" });
 			const result = requireSessionConnection({
-				sessionKey: available.context.sessionKey,
+				conversationId: available.context.conversationId,
 				principalId: available.principalId,
 				agentId: available.agentId ?? "main",
 				summary: `Continue ${action.actionId} using ${toolkit}`,
@@ -247,7 +248,7 @@ var ComposioToolProvider = class {
 					capabilities: [action.actionId]
 				}]
 			});
-			publishConnectionWait(available.context.sessionKey);
+			publishConnectionWait(available.context.conversationId);
 			return textResult(result);
 		};
 		if (!connection) return requestConnection();
@@ -257,7 +258,7 @@ var ComposioToolProvider = class {
 		let confirmed = false;
 		if (approvalId) {
 			const pending = getConnectorApproval(approvalId);
-			if (!pending || pending.principalId !== available.principalId || pending.connectorId !== resolved.installation.connectorId || pending.actionId !== action.actionId || pending.sessionKey !== available.context?.sessionKey) return textResult("The connector approval is invalid for this session or action.");
+			if (!pending || pending.principalId !== available.principalId || pending.connectorId !== resolved.installation.connectorId || pending.actionId !== action.actionId || pending.conversationId !== available.context?.conversationId) return textResult("The connector approval is invalid for this session or action.");
 			confirmed = Boolean(consumeConnectorApproval(approvalId, argsHash));
 			if (!confirmed) return textResult("The connector approval is not approved, has expired, or was already used.");
 		}
@@ -274,7 +275,7 @@ var ComposioToolProvider = class {
 				action,
 				args: actionArgs,
 				agentId: available.agentId,
-				sessionKey: available.context?.sessionKey,
+				conversationId: available.context?.conversationId,
 				confirmed
 			});
 		} catch (error) {
@@ -290,7 +291,7 @@ var ComposioToolProvider = class {
 				connectorId: resolved.installation.connectorId,
 				connectionId: connection?.id,
 				agentId: available.agentId,
-				sessionKey: available.context?.sessionKey,
+				conversationId: available.context?.conversationId,
 				actionId: action.actionId,
 				scope: action.scope,
 				argumentsHash: argsHash,
@@ -311,7 +312,7 @@ var ComposioToolProvider = class {
 	}
 	availableInstallations() {
 		const context = this.deps.getCurrentContext();
-		const principal = connectorPrincipalForSession(context?.sessionKey);
+		const principal = connectorPrincipalForSession(context?.conversationId);
 		if (principal.isLocalOwner) syncLocalOwnerInstallations(this.deps.getConfig());
 		const agentId = this.deps.agentId ?? principal.agentId;
 		const installations = listConnectorInstallations(principal.principalId).filter((installation) => installation.enabled && composioToolkitFromConnectorId(installation.connectorId) !== void 0 && (installation.allowedAgentIds.length === 0 || Boolean(agentId && installation.allowedAgentIds.includes(agentId))));

package/dist/src/agent/external-tools/endpoint-provider.js

@@ -76,7 +76,7 @@ var EndpointToolProvider = class {
 	currentEndpoint() {
 		const context = this.deps.getCurrentContext();
 		if (!context) return void 0;
-		if (this.deps.runtime.bindings.get(context.sessionKey)) return this.deps.runtime.bindings.resolve(context.sessionKey);
+		if (this.deps.runtime.bindings.get(context.conversationId)) return this.deps.runtime.bindings.resolve(context.conversationId);
 		const origin = context.origin;
 		if (origin?.type !== "endpoint") return void 0;
 		return this.deps.runtime.registry.get(origin.endpointId);

package/dist/src/agent/external-tools/extension-provider.d.ts

@@ -5,7 +5,7 @@ import type { ExternalToolDescriptor, ExternalToolExecutionContext, ExternalTool
 export interface ExtensionToolProviderDeps {
     registry?: ExtensionRegistry;
     disabledTools?: Set<string>;
-    getSessionKey: () => string | undefined;
+    getConversationId: () => string | undefined;
     hookRunner?: ExtensionHookRunner;
     toolExecutorConfig?: Partial<ToolExecutorConfig>;
 }

package/dist/src/agent/external-tools/extension-provider.js

@@ -45,7 +45,7 @@ var ExtensionToolProvider = class {
 		if (this.deps.hookRunner) {
 			const hook = await this.deps.hookRunner.runBeforeToolCall(resolved.tool.name, args, {
 				extensionId: resolved.extensionId,
-				sessionKey: this.deps.getSessionKey()
+				conversationId: this.deps.getConversationId()
 			});
 			if (!hook.allowed) throw new Error(hook.reason ?? "Extension tool call blocked by policy hook.");
 			executionArgs = hook.params ?? args;

package/dist/src/agent/external-tools/gateway-tools.js

@@ -1,4 +1,4 @@
-import { connectionBindings, getActiveConnectionWait, publishConnectionWait, requireSessionConnection, reviseCurrentConnectionObjective } from "../../storage/sqlite/connection-wait-repository.js";
+import { connectionBindings, getActiveConnectionWait, init_connection_wait_repository, publishConnectionWait, requireSessionConnection, reviseCurrentConnectionObjective } from "../../storage/sqlite/connection-wait-repository.js";
 import { listConnectorConnections } from "../../storage/sqlite/connector-repository.js";
 import { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { connectionCandidates, resolveConnectionCandidate } from "../../connectors/connection-candidates.js";
@@ -6,6 +6,7 @@ import { ExternalToolService } from "./service.js";
 import { EXTERNAL_TOOL_SOURCES } from "./types.js";
 import { Type } from "@sinclair/typebox";
 //#region src/agent/external-tools/gateway-tools.ts
+init_connection_wait_repository();
 const EXTERNAL_TOOL_NAMES = {
 	search: "xopc_tool_search",
 	describe: "xopc_tool_describe",
@@ -55,8 +56,8 @@ function createExternalToolGatewayTools(providers, getContext) {
 			return textResult({
 				...await service.search(params),
 				connectionCandidates: connectionCandidates(params.query),
-				selectedConnections: getContext?.()?.sessionKey ? connectionBindings(getContext().sessionKey) : [],
-				waitingObjective: getContext?.()?.sessionKey ? getActiveConnectionWait(getContext().sessionKey)?.summary : void 0
+				selectedConnections: getContext?.()?.conversationId ? connectionBindings(getContext().conversationId) : [],
+				waitingObjective: getContext?.()?.conversationId ? getActiveConnectionWait(getContext().conversationId)?.summary : void 0
 			});
 		}
 	};
@@ -135,9 +136,9 @@ function createExternalToolGatewayTools(providers, getContext) {
 			const range = params.checkpoint.timeRange;
 			if (range && (!Number.isFinite(Date.parse(range.from)) || !Number.isFinite(Date.parse(range.to)) || Date.parse(range.from) >= Date.parse(range.to))) throw new Error("Provide a valid absolute time range.");
 			if (range) new Intl.DateTimeFormat("en", { timeZone: range.timezone }).format();
-			const principal = connectorPrincipalForSession(context.sessionKey);
+			const principal = connectorPrincipalForSession(context.conversationId);
 			if (!principal.isLocalOwner) throw new Error("Connection recovery is available in the owner chat.");
-			const selected = connectionBindings(context.sessionKey);
+			const selected = connectionBindings(context.conversationId);
 			if (params.requirements.every((item) => selected.some((need) => need.connectorId === item.candidateRef && need.connectionId && (!item.accountId || item.accountId === need.accountId) && (!item.accountSelector || item.accountSelector === need.accountSelector) && listConnectorConnections({
 				principalId: principal.principalId,
 				connectorId: need.connectorId
@@ -147,7 +148,7 @@ function createExternalToolGatewayTools(providers, getContext) {
 				instruction: "These accounts were already checked for this objective. Missing tool contracts are a tool availability problem. Do not request authorization again or invent a revision. Explain the unavailable capability and stop retrying the same tools."
 			});
 			const result = requireSessionConnection({
-				sessionKey: context.sessionKey,
+				conversationId: context.conversationId,
 				principalId: principal.principalId,
 				agentId: principal.agentId ?? "main",
 				summary: params.purpose,
@@ -166,7 +167,7 @@ function createExternalToolGatewayTools(providers, getContext) {
 					};
 				})
 			});
-			publishConnectionWait(context.sessionKey);
+			publishConnectionWait(context.conversationId);
 			return textResult(result);
 		}
 	};
@@ -191,7 +192,7 @@ function createExternalToolGatewayTools(providers, getContext) {
 				const context = getContext?.();
 				if (!context) throw new Error("No active conversation.");
 				if (params.action === "update" && !params.objective) throw new Error("The revised objective is required.");
-				reviseCurrentConnectionObjective(context.sessionKey, params.action === "update" ? params.objective : void 0);
+				reviseCurrentConnectionObjective(context.conversationId, params.action === "update" ? params.objective : void 0);
 				return textResult({ status: params.action === "update" ? "updated" : "cancelled" });
 			}
 		}

package/dist/src/agent/external-tools/index.js

@@ -11,7 +11,7 @@ function createDefaultExternalToolGatewayTools(deps) {
 		new McpToolProvider({
 			workspace: deps.workspace,
 			getConfig: deps.getConfig,
-			getSessionKey: () => deps.getCurrentContext()?.sessionKey,
+			getConversationId: () => deps.getCurrentContext()?.conversationId,
 			agentId: deps.agentId,
 			hookRunner: deps.hookRunner
 		}),
@@ -24,14 +24,14 @@ function createDefaultExternalToolGatewayTools(deps) {
 		new ExtensionToolProvider({
 			registry: deps.extensionRegistry,
 			disabledTools: deps.disabledTools,
-			getSessionKey: () => deps.getCurrentContext()?.sessionKey,
+			getConversationId: () => deps.getCurrentContext()?.conversationId,
 			hookRunner: deps.hookRunner,
 			toolExecutorConfig: deps.toolExecutorConfig
 		}),
 		new MemoryToolProvider({
 			getMemoryManager: deps.getMemoryManager,
 			disabledTools: deps.disabledTools,
-			getSessionKey: () => deps.getCurrentContext()?.sessionKey,
+			getConversationId: () => deps.getCurrentContext()?.conversationId,
 			canAccess: deps.canAccessMemory,
 			hookRunner: deps.hookRunner,
 			toolExecutorConfig: deps.toolExecutorConfig

package/dist/src/agent/external-tools/mcp-provider.d.ts

@@ -6,12 +6,12 @@ import type { ExternalToolDescriptor, ExternalToolExecutionContext, ExternalTool
 export interface McpToolProviderDeps {
     workspace: string;
     getConfig: () => Config | undefined;
-    getSessionKey: () => string | undefined;
+    getConversationId: () => string | undefined;
     agentId?: string;
     hookRunner?: ExtensionHookRunner;
     getRuntime?: (params: {
         sessionId: string;
-        sessionKey?: string;
+        conversationId?: string;
         workspaceDir: string;
         cfg?: Config;
     }) => Promise<SessionMcpRuntime>;

package/dist/src/agent/external-tools/mcp-provider.js

@@ -64,7 +64,7 @@ var McpToolProvider = class {
 			let executionArgs = args;
 			if (this.deps.hookRunner) {
 				const hook = await this.deps.hookRunner.runBeforeToolCall(policyToolId(tool), args, {
-					sessionKey: this.deps.getSessionKey(),
+					conversationId: this.deps.getConversationId(),
 					isMcpTool: true,
 					mcpServerId: tool.serverName
 				});
@@ -87,26 +87,26 @@ var McpToolProvider = class {
 	}
 	isAllowed(tool) {
 		const cfg = this.deps.getConfig();
-		const sessionKey = this.deps.getSessionKey();
-		const profile = cfg && sessionKey ? resolveEffectiveAgentProfileForSession(cfg, sessionKey) : void 0;
+		const conversationId = this.deps.getConversationId();
+		const profile = cfg && conversationId ? resolveEffectiveAgentProfileForSession(cfg, conversationId) : void 0;
 		const policyName = policyToolId(tool);
 		return !profile?.tools.denied.has(policyName);
 	}
 	executionSignal(tool, signal) {
 		const cfg = this.deps.getConfig();
-		const sessionKey = this.deps.getSessionKey();
-		const timeoutMs = (cfg && sessionKey ? resolveEffectiveAgentProfileForSession(cfg, sessionKey) : void 0)?.config.tools[policyToolId(tool)]?.timeoutMs;
+		const conversationId = this.deps.getConversationId();
+		const timeoutMs = (cfg && conversationId ? resolveEffectiveAgentProfileForSession(cfg, conversationId) : void 0)?.config.tools[policyToolId(tool)]?.timeoutMs;
 		if (!timeoutMs) return signal;
 		const timeoutSignal = AbortSignal.timeout(timeoutMs);
 		return signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
 	}
 	async withRuntime(run) {
 		const cfg = this.deps.getConfig();
-		const sessionKey = this.deps.getSessionKey();
-		const sessionId = sessionKey ?? `agent:${this.deps.agentId ?? "main"}`;
+		const conversationId = this.deps.getConversationId();
+		const sessionId = conversationId ?? `agent:${this.deps.agentId ?? "main"}`;
 		const runtime = await (this.deps.getRuntime ?? getOrCreateSessionMcpRuntime)({
 			sessionId,
-			sessionKey,
+			conversationId,
 			workspaceDir: this.deps.workspace,
 			cfg
 		});

package/dist/src/agent/external-tools/memory-provider.d.ts

@@ -5,7 +5,7 @@ import type { ExternalToolDescriptor, ExternalToolExecutionContext, ExternalTool
 export interface MemoryToolProviderDeps {
     getMemoryManager?: () => MemoryManager;
     disabledTools?: Set<string>;
-    getSessionKey: () => string | undefined;
+    getConversationId: () => string | undefined;
     canAccess: () => boolean;
     hookRunner?: ExtensionHookRunner;
     toolExecutorConfig?: Partial<ToolExecutorConfig>;

package/dist/src/agent/external-tools/memory-provider.js

@@ -37,7 +37,7 @@ var MemoryToolProvider = class {
 		if (!resolved) throw new Error(`Memory provider tool is unavailable: ${toolRef}`);
 		let executionArgs = args;
 		if (this.deps.hookRunner) {
-			const hook = await this.deps.hookRunner.runBeforeToolCall(resolved.tool.name, args, { sessionKey: this.deps.getSessionKey() });
+			const hook = await this.deps.hookRunner.runBeforeToolCall(resolved.tool.name, args, { conversationId: this.deps.getConversationId() });
 			if (!hook.allowed) throw new Error(hook.reason ?? "Memory provider tool call blocked by policy hook.");
 			executionArgs = hook.params ?? args;
 		}

package/dist/src/agent/external-tools/types.d.ts

@@ -24,7 +24,7 @@ export interface ExternalToolExecutionContext {
 export interface ExternalToolTurnContext {
     channel: string;
     chatId: string;
-    sessionKey: string;
+    conversationId: string;
     origin: TurnOrigin;
 }
 export interface ExternalToolProvider {

package/dist/src/agent/inbound/attachment-pipeline.d.ts

@@ -20,7 +20,7 @@ export declare function assertTranscriptUserMessage(message: AgentMessage): void
 export declare function buildTranscriptUserMessage(opts: {
     text: string;
     prepared: MediaRef[] | undefined;
-    sessionKey: string;
+    conversationId: string;
     modelRef: string;
     config: Config | undefined;
     agentManager: AgentInstanceGateway;
@@ -30,9 +30,9 @@ export declare function hydrateUserTurnForLlm(opts: {
     message: TranscriptUserMessage;
     modelRef: string;
 }): Promise<LlmUserTurn>;
-export declare function setPendingTranscriptUserMessage(sessionKey: string, message: TranscriptUserMessage): void;
-export declare function getPendingTranscriptUserText(sessionKey: string): string | undefined;
-export declare function takePendingTranscriptUserMessage(sessionKey: string): TranscriptUserMessage | undefined;
-export declare function clearPendingTranscriptUserMessage(sessionKey: string, message?: TranscriptUserMessage): void;
-export declare function pendingTranscriptReferencesMediaUri(sessionKey: string, uri: string): boolean;
-export declare function transformUserMessageForPersistence(sessionKey: string | undefined, message: AgentMessage): AgentMessage;
+export declare function setPendingTranscriptUserMessage(conversationId: string, message: TranscriptUserMessage): void;
+export declare function getPendingTranscriptUserText(conversationId: string): string | undefined;
+export declare function takePendingTranscriptUserMessage(conversationId: string): TranscriptUserMessage | undefined;
+export declare function clearPendingTranscriptUserMessage(conversationId: string, message?: TranscriptUserMessage): void;
+export declare function pendingTranscriptReferencesMediaUri(conversationId: string, uri: string): boolean;
+export declare function transformUserMessageForPersistence(conversationId: string | undefined, message: AgentMessage): AgentMessage;

package/dist/src/agent/inbound/attachment-pipeline.js

@@ -1,4 +1,5 @@
 import { stripRuntimeUserMessageEnvelope } from "../../../packages/gateway-contract/src/user-message-display.js";
+import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { mimeTypeFromMediaPath } from "../../media/store.js";
 import { readAgentMessageContent } from "../memory/agent-message-access.js";
@@ -10,6 +11,7 @@ import { resolveImageHandlingStrategy } from "../image/vision-detection.js";
 import { resolveInboundImageContentParts } from "../image/inbound-image-handling.js";
 import { MODEL_IMAGE_MAX_BYTES, MODEL_IMAGE_SOURCE_MAX_BYTES, prepareImageForModel } from "../image/prepare-image-for-model.js";
 //#region src/agent/inbound/attachment-pipeline.ts
+init_src();
 function textBlocksFromContent(content) {
 	if (typeof content === "string") return content.trim() ? [content] : [];
 	if (!Array.isArray(content)) return [];
@@ -64,12 +66,11 @@ function appendMediaAttachedLines(textParts, media) {
 		"Use the read_media tool with the xopc-media-uri value when you need to inspect this attachment."
 	].join("\n"));
 }
-async function expandUserText(text, sessionKey, agentManager) {
+async function expandUserText(text, conversationId, agentManager) {
 	if (!text.trim()) return "";
 	let out = text;
 	if (/@file:/.test(out)) {
-		const wsKey = sessionKey || "agent:main:main";
-		const root = agentManager.getResolvedWorkspaceForSession(wsKey);
+		const root = agentManager.getResolvedWorkspaceForSession(conversationId);
 		out = await expandAtFileMentionsInPlainText(out, root);
 	}
 	return out.trim();
@@ -78,7 +79,7 @@ async function expandUserText(text, sessionKey, agentManager) {
 * Build the transcript row for a user turn (text + media metadata only).
 */
 async function buildTranscriptUserMessage(opts) {
-	const expandedText = await expandUserText(opts.text, opts.sessionKey, opts.agentManager);
+	const expandedText = await expandUserText(opts.text, opts.conversationId, opts.agentManager);
 	const prepared = opts.prepared ?? [];
 	const imageRefs = prepared.filter(isImageInboundAttachment);
 	const textParts = [];
@@ -87,7 +88,7 @@ async function buildTranscriptUserMessage(opts) {
 	appendMediaAttachedLines(textParts, prepared.filter((m) => !isImageInboundAttachment(m)));
 	if (imageRefs.length > 0 && strategy !== "native") {
 		const images = await Promise.all(imageRefs.map((ref) => readImageBase64FromRef(ref)));
-		const agentId = opts.config ? extractProfileAgentId(opts.sessionKey, opts.config) : void 0;
+		const agentId = opts.config ? extractProfileAgentId(opts.conversationId, opts.config) : void 0;
 		const parts = await resolveInboundImageContentParts({
 			modelRef: opts.modelRef,
 			cfg: opts.config,
@@ -142,35 +143,35 @@ function pendingMatchesMessage(pending, message) {
 	const actualUserText = stripRuntimeUserMessageEnvelope(actualText).trim();
 	return Boolean(pendingUserText) && (actualUserText === pendingUserText || actualUserText.includes(pendingUserText) || pendingUserText.includes(actualUserText));
 }
-function setPendingTranscriptUserMessage(sessionKey, message) {
+function setPendingTranscriptUserMessage(conversationId, message) {
 	assertTranscriptUserMessage(message);
-	pendingTranscriptBySession.set(sessionKey, message);
+	pendingTranscriptBySession.set(conversationId, message);
 }
-function getPendingTranscriptUserText(sessionKey) {
-	const message = pendingTranscriptBySession.get(sessionKey);
+function getPendingTranscriptUserText(conversationId) {
+	const message = pendingTranscriptBySession.get(conversationId);
 	if (!message) return void 0;
 	return stripRuntimeUserMessageEnvelope(messageTextForPendingCompare(message)).trim();
 }
-function takePendingTranscriptUserMessage(sessionKey) {
-	const msg = pendingTranscriptBySession.get(sessionKey);
-	pendingTranscriptBySession.delete(sessionKey);
+function takePendingTranscriptUserMessage(conversationId) {
+	const msg = pendingTranscriptBySession.get(conversationId);
+	pendingTranscriptBySession.delete(conversationId);
 	return msg;
 }
-function clearPendingTranscriptUserMessage(sessionKey, message) {
-	const existing = pendingTranscriptBySession.get(sessionKey);
+function clearPendingTranscriptUserMessage(conversationId, message) {
+	const existing = pendingTranscriptBySession.get(conversationId);
 	if (!existing) return;
 	if (message && existing !== message) return;
-	pendingTranscriptBySession.delete(sessionKey);
+	pendingTranscriptBySession.delete(conversationId);
 }
-function pendingTranscriptReferencesMediaUri(sessionKey, uri) {
-	return pendingTranscriptBySession.get(sessionKey)?.media?.some((ref) => ref.uri === uri.trim()) === true;
+function pendingTranscriptReferencesMediaUri(conversationId, uri) {
+	return pendingTranscriptBySession.get(conversationId)?.media?.some((ref) => ref.uri === uri.trim()) === true;
 }
-function transformUserMessageForPersistence(sessionKey, message) {
+function transformUserMessageForPersistence(conversationId, message) {
 	if (message.role !== "user") return message;
-	if (sessionKey) {
-		const pending = pendingTranscriptBySession.get(sessionKey);
+	if (conversationId) {
+		const pending = pendingTranscriptBySession.get(conversationId);
 		if (pending && pendingMatchesMessage(pending, message)) {
-			pendingTranscriptBySession.delete(sessionKey);
+			pendingTranscriptBySession.delete(conversationId);
 			return pending;
 		}
 	}

package/dist/src/agent/inbound/inbound-loop.d.ts

@@ -43,20 +43,20 @@ export interface InboundLoopConfig {
     sessionStore: SessionStore;
     modelManager: ModelManager;
     /** Register a per-session agent-event subscription (idempotent). */
-    setupSessionEventHandling: (sessionKey: string) => void;
+    setupSessionEventHandling: (conversationId: string) => void;
     /** Per-session config hydration (workspace + model override) before a turn runs. */
     sessionHydrator: SessionHydrator;
     /** Returns the visible last assistant text used for outbound delivery. */
-    getLastAssistantPlainText: (sessionKey: string) => string;
+    getLastAssistantPlainText: (conversationId: string) => string;
     /** Pre-turn auto-compaction (only used by system messages). */
     /** Fire-and-forget auto-title (no-ops for cron/heartbeat keys). */
-    enqueueMaybeAutoTitleAfterPersist: (sessionKey: string) => void;
+    enqueueMaybeAutoTitleAfterPersist: (conversationId: string) => void;
     /** Effective merged config snapshot. */
     getConfig: () => Config | undefined;
     /** Archive transcript + new session id (freshness / reset trigger rollover). */
-    resetSession: (sessionKey: string) => Promise<{
-        sessionId: string;
-        previousSessionId: string;
+    resetSession: (conversationId: string) => Promise<{
+        transcriptId: string;
+        previousTranscriptId: string;
     } | null>;
     /** Connect a channel stream handle for partial assistant text rendering. */
     setStreamHandle: (handle: StreamHandle) => void;