@xopcai/xopc 0.0.285 → 0.0.286

package/dist/src/agent/orchestration/agent-orchestrator.d.ts

@@ -24,17 +24,17 @@ export interface AgentOrchestratorConfig {
     /** Default workspace root when no per-session resolver is set. */
     workspaceRoot: string;
     /** Per-agent workspace root for attachments (optional; defaults to `workspaceRoot`). */
-    getWorkspaceRootForSession?: (sessionKey: string) => string;
+    getWorkspaceRootForSession?: (conversationId: string) => string;
     /** Agent home (`…/agents/<id>/`) for inbound/TTS files — keeps internal state out of the markdown workspace. */
-    getAgentInternalStorageRootForSession?: (sessionKey: string) => string;
+    getAgentInternalStorageRootForSession?: (conversationId: string) => string;
     /** Fire-and-forget after full session persist (e.g. LLM session title); not called from mid-turn snapshots. */
-    enqueueAutoTitle?: (sessionKey: string) => void;
+    enqueueAutoTitle?: (conversationId: string) => void;
     /** For per-turn timeout. */
     getConfig?: () => Config | undefined;
     /** Channel streaming: token/tool events from pi embedded session. */
-    onEmbeddedStreamEvent?: (sessionKey: string, event: EmbeddedStreamEvent) => void;
+    onEmbeddedStreamEvent?: (conversationId: string, event: EmbeddedStreamEvent) => void;
     /** Called after a successful embedded turn with assistant plain text. */
-    onEmbeddedTurnComplete?: (sessionKey: string, lastAssistantText?: string) => void;
+    onEmbeddedTurnComplete?: (conversationId: string, lastAssistantText?: string) => void;
 }
 export declare class AgentOrchestrator {
     private agentManager;
@@ -59,9 +59,9 @@ export declare class AgentOrchestrator {
     /**
      * Check if agent is currently processing for a session
      */
-    isProcessing(sessionKey: string): boolean;
+    isProcessing(conversationId: string): boolean;
     /**
      * Abort current agent execution for a session
      */
-    abort(sessionKey: string): void;
+    abort(conversationId: string): void;
 }

package/dist/src/agent/orchestration/agent-orchestrator.js

@@ -46,15 +46,15 @@ var AgentOrchestrator = class {
 	* Process a message through the agent orchestration pipeline
 	*/
 	async process(msg, context) {
-		const { sessionKey } = context;
-		log.debug({ sessionKey }, "Processing message through agent orchestrator");
-		await this.sessionHydrator.workspace(sessionKey);
-		if (typeof msg.content === "string" && (sessionKey.startsWith("cron:") || sessionKey.includes(":cron:") || sessionKey.includes(":automation:") || context.channel === "cron" || context.channel === "automation")) {
+		const { conversationId } = context;
+		log.debug({ conversationId }, "Processing message through agent orchestrator");
+		await this.sessionHydrator.workspace(conversationId);
+		if (typeof msg.content === "string" && (context.channel === "cron" || context.channel === "automation")) {
 			const maintenanceJob = parseMaintenanceInstruction(msg.content);
 			if (maintenanceJob) {
 				const cfg = this.getConfig?.();
 				if (!cfg) {
-					log.warn({ sessionKey }, "Memory maintenance skipped: config unavailable");
+					log.warn({ conversationId }, "Memory maintenance skipped: config unavailable");
 					return;
 				}
 				const maintenance = cfg.userContext.userModel.maintenance;
@@ -68,29 +68,29 @@ var AgentOrchestrator = class {
 			}
 		}
 		try {
-			await this.sessionHydrator.model(sessionKey);
+			await this.sessionHydrator.model(conversationId);
 			const channelSystemPrompt = typeof context.metadata?.channelSystemPrompt === "string" ? context.metadata.channelSystemPrompt.trim() : "";
 			if (channelSystemPrompt) {
-				this.agentManager.getOrCreateAgent(sessionKey);
-				this.agentManager.applyTurnChannelSystemPrompt(sessionKey, channelSystemPrompt);
+				this.agentManager.getOrCreateAgent(conversationId);
+				this.agentManager.applyTurnChannelSystemPrompt(conversationId, channelSystemPrompt);
 			}
 			const thinkingDefault = this.getThinkingDefault();
-			const thinkingLevel = await resolveEffectiveThinkingLevel(this.sessionConfigStore, sessionKey, null, thinkingDefault);
-			this.agentManager.setThinkingLevel(sessionKey, thinkingLevel);
+			const thinkingLevel = await resolveEffectiveThinkingLevel(this.sessionConfigStore, conversationId, null, thinkingDefault);
+			this.agentManager.setThinkingLevel(conversationId, thinkingLevel);
 			const persistedAttachments = await persistInboundAttachments(msg.attachments);
-			const modelRef = this.modelManager.getModelForSession(sessionKey);
+			const modelRef = this.modelManager.getModelForSession(conversationId);
 			const userMessage = await buildTranscriptUserMessage({
 				text: msg.content,
 				prepared: persistedAttachments,
-				sessionKey,
+				conversationId,
 				modelRef,
 				config: this.getConfig?.(),
 				agentManager: this.agentManager
 			});
-			setPendingTranscriptUserMessage(sessionKey, userMessage);
+			setPendingTranscriptUserMessage(conversationId, userMessage);
 			const userPlainForMemory = extractAgentUserPlainText(userMessage);
 			const turnId = randomUUID();
-			const userMessageForModel = (await this.agentManager.prepareUserTurnContext(userMessage, sessionKey, turnId)).modelMessage;
+			const userMessageForModel = (await this.agentManager.prepareUserTurnContext(userMessage, conversationId, turnId)).modelMessage;
 			const llmTurn = await hydrateUserTurnForLlm({
 				message: userMessage,
 				modelRef
@@ -98,7 +98,7 @@ var AgentOrchestrator = class {
 			const turnResult = await (async () => {
 				try {
 					return await runEmbeddedTurnForSession({
-						sessionKey,
+						conversationId,
 						runId: turnId,
 						userMessage: userMessageForModel,
 						llmImages: llmTurn.images,
@@ -107,26 +107,26 @@ var AgentOrchestrator = class {
 						modelManager: this.modelManager,
 						thinkingOverride: thinkingLevel,
 						getConfig: this.getConfig,
-						beforeTurn: () => this.agentManager.beginBackgroundReviewUserTurn(sessionKey),
-						onEvent: (event) => this.onEmbeddedStreamEvent?.(sessionKey, event)
+						beforeTurn: () => this.agentManager.beginBackgroundReviewUserTurn(conversationId),
+						onEvent: (event) => this.onEmbeddedStreamEvent?.(conversationId, event)
 					});
 				} finally {
-					clearPendingTranscriptUserMessage(sessionKey, userMessage);
+					clearPendingTranscriptUserMessage(conversationId, userMessage);
 				}
 			})();
-			await this.agentManager.afterAgentTurn(sessionKey, userPlainForMemory, turnId);
-			this.agentManager.scheduleBackgroundReviewAfterUserTurn(sessionKey);
+			await this.agentManager.afterAgentTurn(conversationId, userPlainForMemory, turnId);
+			this.agentManager.scheduleBackgroundReviewAfterUserTurn(conversationId);
 			if (turnResult.ok) {
-				this.onEmbeddedTurnComplete?.(sessionKey, turnResult.lastAssistantText);
-				this.enqueueAutoTitle?.(sessionKey);
+				this.onEmbeddedTurnComplete?.(conversationId, turnResult.lastAssistantText);
+				this.enqueueAutoTitle?.(conversationId);
 			} else if (turnResult.errorMessage) log.warn({
-				sessionKey,
+				conversationId,
 				errorMessage: turnResult.errorMessage
 			}, "Embedded inbound turn failed");
 		} catch (error) {
 			log.error({
 				err: error,
-				sessionKey
+				conversationId
 			}, "Error in agent orchestration");
 			throw error;
 		}
@@ -140,17 +140,17 @@ var AgentOrchestrator = class {
 	/**
 	* Check if agent is currently processing for a session
 	*/
-	isProcessing(sessionKey) {
-		const agent = this.agentManager.getAgent(sessionKey);
+	isProcessing(conversationId) {
+		const agent = this.agentManager.getAgent(conversationId);
 		if (!agent) return false;
 		return agent.state.messages.length > 0;
 	}
 	/**
 	* Abort current agent execution for a session
 	*/
-	abort(sessionKey) {
-		abortEmbeddedRun(sessionKey);
-		this.agentManager.getAgent(sessionKey)?.abort();
+	abort(conversationId) {
+		abortEmbeddedRun(conversationId);
+		this.agentManager.getAgent(conversationId)?.abort();
 	}
 };
 //#endregion

package/dist/src/agent/orchestration/context-overflow.js

@@ -1,5 +1,7 @@
 //#region src/agent/orchestration/context-overflow.ts
 const CONTEXT_OVERFLOW_PATTERNS = [
+	/context budget.*(?:exceed|limit)/i,
+	/\b413\b|(?:request|payload) (?:body )?(?:is )?too large|content too large/i,
 	/context(?:_|\s|-)*(?:length|window).*(?:exceed|limit|maximum|too (?:large|long))/i,
 	/\bexceed(?:s|ed)?\s+(?:the\s+)?context(?:_|\s|-)*(?:length|window)\b/i,
 	/maximum context length/i,

package/dist/src/agent/orchestration/llm-turn-retry.d.ts

@@ -25,7 +25,7 @@ export interface RetryTransientTurnOptions {
     /** Initial deterministic backoff. Each later retry doubles it. */
     baseDelayMs?: number;
     signal?: AbortSignal;
-    sessionKey: string;
+    conversationId: string;
     log: {
         warn: (obj: Record<string, unknown>, msg: string) => void;
     };

package/dist/src/agent/orchestration/llm-turn-retry.js

@@ -95,7 +95,7 @@ async function maybeRetryTurnAfterTransientLlmFailure(agent, options) {
 		const failureKind = classifyLlmFailure(errMsg);
 		if (failureKind !== "transient_network") {
 			options.log.warn({
-				sessionKey: options.sessionKey,
+				conversationId: options.conversationId,
 				errorMessage: errMsg,
 				failureKind
 			}, "Assistant turn ended with error (not retrying as transient)");
@@ -104,7 +104,7 @@ async function maybeRetryTurnAfterTransientLlmFailure(agent, options) {
 		continues += 1;
 		const retryDelayMs = baseDelayMs * 2 ** (continues - 1);
 		options.log.warn({
-			sessionKey: options.sessionKey,
+			conversationId: options.conversationId,
 			errorMessage: errMsg,
 			failureKind,
 			continueAttempt: continues,

package/dist/src/agent/orchestration/run-agent-turn-with-timeout.d.ts

@@ -17,7 +17,7 @@ export declare class AgentTurnUnsettledError extends Error {
     constructor(timeoutMs: number, abortGraceMs: number);
 }
 export declare function isAgentTurnUnsettledError(err: unknown): err is AgentTurnUnsettledError;
-export declare function resolveAgentTurnTimeoutMs(config?: Config, sessionKey?: string): number;
+export declare function resolveAgentTurnTimeoutMs(config?: Config, conversationId?: string): number;
 export declare function isAgentTurnTimeoutError(err: unknown): boolean;
 export declare function runAgentTurnWithTimeout(agent: Agent, runTurn: () => Promise<void>, timeoutMs: number, options?: {
     abortGraceMs?: number;

package/dist/src/agent/orchestration/run-agent-turn-with-timeout.js

@@ -18,9 +18,9 @@ var AgentTurnUnsettledError = class extends Error {
 function isAgentTurnUnsettledError(err) {
 	return err instanceof AgentTurnUnsettledError;
 }
-function resolveAgentTurnTimeoutMs(config, sessionKey) {
+function resolveAgentTurnTimeoutMs(config, conversationId) {
 	if (!config) return DEFAULT_AGENT_TURN_TIMEOUT_MS;
-	const configured = resolveEffectiveAgentConfigForSession(config, sessionKey).config.runtime.timeoutMs;
+	const configured = resolveEffectiveAgentConfigForSession(config, conversationId).config.runtime.timeoutMs;
 	if (!configured) return DEFAULT_AGENT_TURN_TIMEOUT_MS;
 	return Math.min(MAX_AGENT_TURN_TIMEOUT_MS, Math.max(MIN_AGENT_TURN_TIMEOUT_MS, configured));
 }

package/dist/src/agent/prompt/response-language.d.ts

@@ -1,3 +1,3 @@
 import type { Config } from '../../config/schema.js';
 import { type ResponseLanguage } from '../../i18n/response-language.js';
-export declare function resolveResponseLanguageForSession(config: Config | undefined, sessionKey?: string): ResponseLanguage;
+export declare function resolveResponseLanguageForSession(config: Config | undefined, conversationId?: string): ResponseLanguage;

package/dist/src/agent/prompt/response-language.js

@@ -4,8 +4,8 @@ import "../../storage/sqlite/index.js";
 import { init_response_language, resolveResponseLanguage } from "../../i18n/response-language.js";
 //#region src/agent/prompt/response-language.ts
 init_response_language();
-function resolveResponseLanguageForSession(config, sessionKey) {
-	return resolveResponseLanguage(config?.userContext?.preferences?.responseLanguage ?? "auto", sessionKey && isXopcDatabaseOpen() ? getSessionConfig(sessionKey)?.responseLanguage : void 0);
+function resolveResponseLanguageForSession(config, conversationId) {
+	return resolveResponseLanguage(config?.userContext?.preferences?.responseLanguage ?? "auto", conversationId && isXopcDatabaseOpen() ? getSessionConfig(conversationId)?.responseLanguage : void 0);
 }
 //#endregion
 export { resolveResponseLanguageForSession };

package/dist/src/agent/prompt/service-prompt-builder.d.ts

@@ -17,7 +17,7 @@ export interface SystemPromptBuildOptions {
     skillAllowlist?: string[];
     registeredToolNames?: string[];
     toolSummaries?: Record<string, string>;
-    sessionKey?: string;
+    conversationId?: string;
     promptMode?: PromptMode;
     modelRef?: string;
     agentId?: string;
@@ -45,7 +45,7 @@ export declare class SystemPromptBuilder {
         workspaceOverride?: string;
         profileMarkdownPathRoot?: string;
         registeredToolNames?: string[];
-        sessionKey?: string;
+        conversationId?: string;
     }): string;
 }
 export declare function createSystemPromptBuilder(config: SystemPromptBuilderConfig): SystemPromptBuilder;

package/dist/src/agent/prompt/service-prompt-builder.js

@@ -29,7 +29,7 @@ var SystemPromptBuilder = class {
 	build(contextFiles, options) {
 		const ws = options.workspaceOverride ?? this.workspace;
 		const actionTrustLevel = isXopcDatabaseOpen() ? getUserTrustPolicy().defaultActionLevel : DEFAULT_USER_TRUST_LEVEL;
-		const interactionState = isXopcDatabaseOpen() && options.sessionKey ? getInteractionState(options.sessionKey) : void 0;
+		const interactionState = isXopcDatabaseOpen() && options.conversationId ? getInteractionState(options.conversationId) : void 0;
 		const interactionPrompt = interactionState ? buildInteractionStatePrompt(interactionState) : "";
 		const heartbeatEnabled = this.config.gateway?.heartbeat?.includeSystemPromptSection ?? false;
 		const userTimezone = isXopcDatabaseOpen() ? getUserTimezone() : void 0;
@@ -42,10 +42,10 @@ var SystemPromptBuilder = class {
 			modelOverrides: ttsMerged.modelOverrides,
 			textToSpeechTool: ttsMerged.enabled && reg.includes("text_to_speech")
 		});
-		const responseLanguage = resolveResponseLanguageForSession(this.config, options.sessionKey);
+		const responseLanguage = resolveResponseLanguageForSession(this.config, options.conversationId);
 		const resolved = resolveSystemPromptBuildParams(this.config, {
 			workspaceDir: ws,
-			sessionKey: options.sessionKey,
+			conversationId: options.conversationId,
 			toolNames: options.registeredToolNames,
 			toolSummaries: options.toolSummaries,
 			userTimezone,
@@ -109,7 +109,7 @@ var SystemPromptBuilder = class {
 		const ws = options?.workspaceOverride ?? this.workspace;
 		const resolved = resolveSystemPromptBuildParams(this.config, {
 			workspaceDir: ws,
-			sessionKey: options?.sessionKey,
+			conversationId: options?.conversationId,
 			toolNames: options?.registeredToolNames,
 			userTimezone: isXopcDatabaseOpen() ? getUserTimezone() : void 0,
 			externalMemoryInstructions: options?.externalMemoryInstructions,

package/dist/src/agent/prompt/subagent-context.d.ts

@@ -3,15 +3,15 @@ export declare function buildSubagentContextSection(params: {
     goal: string;
     context?: string;
     workspace?: string;
-    requesterSessionKey?: string;
-    childSessionKey?: string;
+    requesterConversationId?: string;
+    childConversationId?: string;
 }): string;
 export declare function buildSubagentSystemPrompt(params: {
     goal: string;
     context?: string;
     workspace?: string;
-    requesterSessionKey?: string;
-    childSessionKey?: string;
+    requesterConversationId?: string;
+    childConversationId?: string;
     toolNames?: string[];
     responseLanguage?: ResponseLanguage;
 }): string;

package/dist/src/agent/prompt/subagent-context.js

@@ -50,7 +50,7 @@ function buildSubagentContextSection(params) {
 	];
 	if (params.context?.trim()) lines.push("## Context", params.context.trim(), "");
 	if (params.workspace?.trim()) lines.push(`Workspace: ${params.workspace.trim()}`, "");
-	if (params.requesterSessionKey || params.childSessionKey) lines.push("## Session Context", ...params.requesterSessionKey ? [`- Requester session: ${params.requesterSessionKey}`] : [], ...params.childSessionKey ? [`- Your session: ${params.childSessionKey}`] : [], "");
+	if (params.requesterConversationId || params.childConversationId) lines.push("## Session Context", ...params.requesterConversationId ? [`- Requester session: ${params.requesterConversationId}`] : [], ...params.childConversationId ? [`- Your session: ${params.childConversationId}`] : [], "");
 	lines.push(`If a completion event arrives AFTER you already sent your final answer, reply ONLY with ${NO_REPLY}.`);
 	return lines.filter(Boolean).join("\n");
 }

package/dist/src/agent/prompt/system-prompt-params.d.ts

@@ -2,8 +2,8 @@ import type { Config } from '../../config/schema.js';
 import type { ProviderSystemPromptContribution } from './contribution.js';
 import type { MemoryCitationsMode, PromptMode, SilentReplyPromptMode } from './types.js';
 export type { RuntimeInfoInput } from './sections/workspace-runtime.js';
-export declare function resolvePromptMode(sessionKey?: string): PromptMode;
-export declare function resolveRuntimeChannel(sessionKey?: string): string | undefined;
+export declare function resolvePromptMode(conversationId?: string): PromptMode;
+export declare function resolveRuntimeChannel(conversationId?: string): string | undefined;
 export declare function resolveDeliverableChannels(config: Config): string[];
 export declare function normalizeProviderPromptBlock(value?: string): string | undefined;
 export declare function buildOverridablePromptSection(params: {
@@ -12,7 +12,7 @@ export declare function buildOverridablePromptSection(params: {
 }): string;
 export interface SystemPromptBuildParams {
     workspaceDir: string;
-    sessionKey?: string;
+    conversationId?: string;
     promptMode?: PromptMode;
     toolNames?: string[];
     toolSummaries?: Record<string, string>;
@@ -34,7 +34,7 @@ export interface SystemPromptBuildParams {
 }
 export declare function resolveSystemPromptBuildParams(config: Config, params: {
     workspaceDir: string;
-    sessionKey?: string;
+    conversationId?: string;
     toolNames?: string[];
     toolSummaries?: Record<string, string>;
     userTimezone?: string;

package/dist/src/agent/prompt/system-prompt-params.js

@@ -1,19 +1,20 @@
 import { PACKAGE_VERSION, init_package_version } from "../../package-version.js";
-import { isCronSessionKey, isSubagentSessionKey } from "../../routing/session-key-utils.js";
-import { init_session_key, parseSessionKey } from "../../routing/session-key.js";
+import { getConversationRouting } from "../../storage/sqlite/conversation-repository.js";
+import { isCronConversationId, isSubagentConversationId } from "../../routing/agent-session-key.js";
+import { init_session_key } from "../../routing/session-key.js";
 import { normalizePromptSection } from "./cache-boundary.js";
 import { listChannelPlugins } from "../../channels/plugins/registry.js";
 //#region src/agent/prompt/system-prompt-params.ts
 init_package_version();
 init_session_key();
-function resolvePromptMode(sessionKey) {
-	if (!sessionKey) return "full";
-	if (isSubagentSessionKey(sessionKey) || isCronSessionKey(sessionKey)) return "minimal";
+function resolvePromptMode(conversationId) {
+	if (!conversationId) return "full";
+	if (isSubagentConversationId(conversationId) || isCronConversationId(conversationId)) return "minimal";
 	return "full";
 }
-function resolveRuntimeChannel(sessionKey) {
-	if (!sessionKey) return;
-	return parseSessionKey(sessionKey)?.source;
+function resolveRuntimeChannel(conversationId) {
+	if (!conversationId) return;
+	return getConversationRouting(conversationId)?.source;
 }
 function resolveDeliverableChannels(config) {
 	const channels = new Set(["webchat", "cli"]);
@@ -38,12 +39,12 @@ function buildOverridablePromptSection(params) {
 	return params.fallback;
 }
 function resolveSystemPromptBuildParams(config, params) {
-	const sessionKey = params.sessionKey;
-	const channel = resolveRuntimeChannel(sessionKey);
+	const conversationId = params.conversationId;
+	const channel = resolveRuntimeChannel(conversationId);
 	return {
 		workspaceDir: params.workspaceDir,
-		sessionKey,
-		promptMode: params.promptMode ?? resolvePromptMode(sessionKey),
+		conversationId,
+		promptMode: params.promptMode ?? resolvePromptMode(conversationId),
 		toolNames: params.toolNames,
 		toolSummaries: params.toolSummaries,
 		runtimeInfo: {

package/dist/src/agent/reply/apply-turn-user-enrichment.d.ts

@@ -3,7 +3,7 @@ import type { Config } from '../../config/schema.js';
 import type { SessionStore } from '../../session/store.js';
 export declare function applyStartupContextToUserMessage(params: {
     userMessage: AgentMessage;
-    sessionKey: string;
+    conversationId: string;
     workspaceDir: string;
     cfg?: Config;
     sessionStore: SessionStore;

package/dist/src/agent/reply/apply-turn-user-enrichment.js

@@ -41,16 +41,16 @@ function prependTextToUserMessage(message, prefix) {
 		content: trimmedPrefix
 	};
 }
-async function isBareSessionTurn(sessionStore, sessionKey) {
+async function isBareSessionTurn(sessionStore, conversationId) {
 	try {
-		return !(await sessionStore.loadMessages(sessionKey)).some((message) => message.role === "user");
+		return !(await sessionStore.loadMessages(conversationId)).some((message) => message.role === "user");
 	} catch {
 		return true;
 	}
 }
 async function applyStartupContextToUserMessage(params) {
 	const action = params.startupAction ?? "new";
-	if (!params.force && !await isBareSessionTurn(params.sessionStore, params.sessionKey)) return params.userMessage;
+	if (!params.force && !await isBareSessionTurn(params.sessionStore, params.conversationId)) return params.userMessage;
 	if (!shouldApplyStartupContext({
 		cfg: params.cfg,
 		action

package/dist/src/agent/reply/post-compaction-context.d.ts

@@ -11,7 +11,7 @@ export type PostCompactionContextOptions = {
 export declare function readPostCompactionContextFromAgentsMd(agentsMdContent: string, options?: PostCompactionContextOptions): string | null;
 export declare function readPostCompactionContext(params: {
     cfg?: Config;
-    sessionKey?: string;
+    conversationId?: string;
     agentId?: string;
     nowMs?: number;
     userTimezone?: string;

package/dist/src/agent/reply/post-compaction-context.js

@@ -72,8 +72,8 @@ function readPostCompactionContext(params) {
 	const cfg = params.cfg;
 	if (!cfg) return null;
 	let agentId = params.agentId;
-	if (!agentId && params.sessionKey) try {
-		agentId = resolveEffectiveAgentProfileForSession(cfg, params.sessionKey).agentId;
+	if (!agentId && params.conversationId) try {
+		agentId = resolveEffectiveAgentProfileForSession(cfg, params.conversationId).agentId;
 	} catch {
 		return null;
 	}

package/dist/src/agent/service/btw-query.d.ts

@@ -5,7 +5,7 @@ type BtwLog = {
 };
 /** One-shot LLM answer for /btw: transcript as background only; does not persist. */
 export declare function runBtwQuery(opts: {
-    sessionKey: string;
+    conversationId: string;
     question: string;
     sessionStore: SessionStore;
     modelForSession: string;

package/dist/src/agent/service/btw-query.js

@@ -71,7 +71,7 @@ async function runBtwQuery(opts) {
 	const includeSessionContext = opts.includeSessionContext ?? true;
 	let userPrompt = q;
 	if (includeSessionContext) {
-		const background = formatMessagesForBtw((await opts.sessionStore.load(opts.sessionKey)).slice(-40));
+		const background = formatMessagesForBtw((await opts.sessionStore.load(opts.conversationId)).slice(-40));
 		userPrompt = [
 			[
 				"You are answering an ephemeral /btw side question about the current conversation.",
@@ -130,7 +130,7 @@ async function runBtwQuery(opts) {
 		const errorMessage = typeof response.errorMessage === "string" ? response.errorMessage.trim() : "";
 		if (stopReason === "error" && errorMessage) {
 			opts.log.warn({
-				sessionKey: opts.sessionKey,
+				conversationId: opts.conversationId,
 				modelRef,
 				stopReason,
 				errorMessage
@@ -149,7 +149,7 @@ async function runBtwQuery(opts) {
 		].filter(Boolean).join("; ");
 		const error = `No text returned from model${detail ? ` (${detail})` : ""}.`;
 		opts.log.warn({
-			sessionKey: opts.sessionKey,
+			conversationId: opts.conversationId,
 			modelRef,
 			stopReason,
 			errorMessage: errorMessage || void 0,
@@ -164,7 +164,7 @@ async function runBtwQuery(opts) {
 		const em = err instanceof Error ? err.message : String(err);
 		opts.log.warn({
 			err,
-			sessionKey: opts.sessionKey,
+			conversationId: opts.conversationId,
 			errorMessage: em
 		}, "btwQuery failed");
 		return {

package/dist/src/agent/service/build-direct-message-content.d.ts

@@ -7,7 +7,7 @@ export type { MediaRef as DirectInboundAttachment } from '../../channels/attachm
 export declare function buildDirectUserMessageContent(opts: {
     content: string;
     attachments?: MediaRef[];
-    sessionKey?: string;
+    conversationId?: string;
     config: Config;
     agentManager: AgentInstanceGateway;
     modelManager: ModelManager;

package/dist/src/agent/service/build-direct-message-content.js

@@ -5,12 +5,12 @@ import { buildTranscriptUserMessage } from "../inbound/attachment-pipeline.js";
 init_schema();
 init_providers();
 async function buildDirectUserMessageContent(opts) {
-	const sk = opts.sessionKey ?? "";
+	const sk = opts.conversationId ?? "";
 	const modelRef = sk !== "" ? opts.modelManager.getModelForSession(sk) : getAgentDefaultModelRef(opts.config) ?? getDefaultModelSync(opts.config);
 	return buildTranscriptUserMessage({
 		text: opts.content,
 		prepared: opts.attachments,
-		sessionKey: sk,
+		conversationId: sk,
 		modelRef: modelRef || getDefaultModelSync(opts.config),
 		config: opts.config,
 		agentManager: opts.agentManager

package/dist/src/agent/service/direct-turn-helpers.d.ts

@@ -16,12 +16,12 @@ import type { AgentInstanceGateway } from '../agent-instance-gateway.js';
 import type { ModelManager } from '../models/index.js';
 import type { EmbeddedStreamEvent } from '../embedded/types.js';
 export interface HydratePerTurnStateDeps {
-    hydrateSessionWorkspaceFromStore: (sessionKey: string) => Promise<void>;
-    hydrateSessionModelFromStore: (sessionKey: string) => Promise<void>;
-    applyResolvedThinkingLevel: (sessionKey: string, thinking?: string | null) => Promise<void>;
+    hydrateSessionWorkspaceFromStore: (conversationId: string) => Promise<void>;
+    hydrateSessionModelFromStore: (conversationId: string) => Promise<void>;
+    applyResolvedThinkingLevel: (conversationId: string, thinking?: string | null) => Promise<void>;
 }
 /** Workspace + model + thinking level — common prep before any direct turn. */
-export declare function hydratePerTurnState(deps: HydratePerTurnStateDeps, sessionKey: string, thinking?: string): Promise<void>;
+export declare function hydratePerTurnState(deps: HydratePerTurnStateDeps, conversationId: string, thinking?: string): Promise<void>;
 export interface SlashCommandTask {
     /** True if the input parsed as a registered slash command (handled or not). */
     matched: boolean;
@@ -44,7 +44,7 @@ export interface TryRunSlashCommandDeps {
  * can persist the receipt or stream it as a token.
  */
 export declare function tryRunSlashCommand(deps: TryRunSlashCommandDeps, ctx: {
-    sessionKey: string;
+    conversationId: string;
     channel: string;
     chatId: string;
     senderId?: string;
@@ -62,7 +62,7 @@ export interface RunDirectAgentTurnDeps {
     config: Config | undefined;
 }
 export interface RunDirectAgentTurnInput {
-    sessionKey: string;
+    conversationId: string;
     runId?: string;
     userMessage: AgentMessage;
     abortSignal?: AbortSignal;