@xopcai/xopc 0.0.284 → 0.0.286

package/dist/src/session/session-title.js

@@ -1,7 +1,8 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import { isCronSessionKey } 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 } from "../routing/agent-session-key.js";
+import { init_session_key } from "../routing/session-key.js";
 import { init_providers, resolveModel } from "../providers/index.js";
 import { completeWithResolvedCredentials } from "../providers/model-call.js";
 import { readAgentMessageContent } from "../agent/memory/agent-message-access.js";
@@ -65,16 +66,15 @@ function firstAssistantText(messages) {
 	}
 	return "";
 }
-function isWebchatSessionKey(sessionKey) {
-	if (parseSessionKey(sessionKey)?.source === "webchat") return true;
-	return sessionKey.includes(":webchat:");
+function isWebchatConversationId(conversationId) {
+	return getConversationRouting(conversationId)?.source === "webchat";
 }
 /** Whether to run LLM/fallback session naming for this key (excludes cron, heartbeat). */
-function shouldAutoTitleSessionKey(sessionKey) {
-	const raw = (sessionKey ?? "").trim();
+function shouldAutoTitleConversationId(conversationId) {
+	const raw = (conversationId ?? "").trim();
 	if (!raw) return false;
-	if (isCronSessionKey(raw)) return false;
-	if (raw.toLowerCase().startsWith("heartbeat:")) return false;
+	if (isCronConversationId(raw)) return false;
+	if (getConversationRouting(raw)?.source === "heartbeat") return false;
 	return true;
 }
 function sanitizeSessionTitle(raw) {
@@ -203,49 +203,49 @@ function canAutoWriteTitle(meta) {
 * Set provisional title from first user text when session is still unnamed.
 * Skips cron/heartbeat keys and user-locked titles.
 */
-async function maybeSetProvisionalSessionTitle(sessionStore, sessionKey, userText, onUpdated) {
-	if (!shouldAutoTitleSessionKey(sessionKey)) return;
-	let meta = await sessionStore.getMetadata(sessionKey);
+async function maybeSetProvisionalSessionTitle(sessionStore, conversationId, userText, onUpdated) {
+	if (!shouldAutoTitleConversationId(conversationId)) return;
+	let meta = await sessionStore.getMetadata(conversationId);
 	if (!meta) return;
 	if (!canAutoWriteTitle(meta)) return;
 	let title = null;
 	if (userText?.trim()) title = provisionalTitleFromUserText(userText);
 	if (!title) {
-		const messages = await sessionStore.load(sessionKey);
+		const messages = await sessionStore.load(conversationId);
 		if (!messages.length) return;
 		title = fallbackTitleFromMessages(messages);
 	}
 	if (!title) return;
 	try {
-		await sessionStore.updateMetadata(sessionKey, {
+		await sessionStore.updateMetadata(conversationId, {
 			name: title,
 			customData: {
 				...meta.customData ?? {},
 				titleSource: "provisional"
 			}
 		});
-		await onUpdated?.(sessionKey, title);
+		await onUpdated?.(conversationId, title);
 	} catch (err) {
 		log.warn({
 			err,
-			sessionKey
+			conversationId
 		}, "Session title: provisional updateMetadata failed");
 	}
 }
 /**
 * LLM refine when title is empty or still provisional (not user-locked).
 */
-async function maybeRefineSessionTitleWithLlm(sessionStore, sessionKey, modelRef, onUpdated) {
-	if (!shouldAutoTitleSessionKey(sessionKey)) return;
-	let messages = await sessionStore.load(sessionKey);
+async function maybeRefineSessionTitleWithLlm(sessionStore, conversationId, modelRef, onUpdated) {
+	if (!shouldAutoTitleConversationId(conversationId)) return;
+	let messages = await sessionStore.load(conversationId);
 	if (!messages.length) return;
-	let meta = await sessionStore.getMetadata(sessionKey);
+	let meta = await sessionStore.getMetadata(conversationId);
 	if (!meta) {
-		await sessionStore.saveMessages(sessionKey, messages);
-		meta = await sessionStore.getMetadata(sessionKey);
+		await sessionStore.saveMessages(conversationId, messages);
+		meta = await sessionStore.getMetadata(conversationId);
 	}
 	if (!meta) {
-		log.warn({ sessionKey }, "Session title: metadata missing after save");
+		log.warn({ conversationId }, "Session title: metadata missing after save");
 		return;
 	}
 	if (!shouldRefineSessionTitleWithLlm(meta)) return;
@@ -265,7 +265,7 @@ async function maybeRefineSessionTitleWithLlm(sessionStore, sessionKey, modelRef
 	if (!title) return;
 	if (meta.name?.trim() === title) {
 		if (source !== "llm") try {
-			await sessionStore.updateMetadata(sessionKey, { customData: {
+			await sessionStore.updateMetadata(conversationId, { customData: {
 				...meta.customData ?? {},
 				titleSource: "llm"
 			} });
@@ -273,20 +273,20 @@ async function maybeRefineSessionTitleWithLlm(sessionStore, sessionKey, modelRef
 		return;
 	}
 	try {
-		await sessionStore.updateMetadata(sessionKey, {
+		await sessionStore.updateMetadata(conversationId, {
 			name: title,
 			customData: {
 				...meta.customData ?? {},
 				titleSource: "llm"
 			}
 		});
-		await onUpdated?.(sessionKey, title);
+		await onUpdated?.(conversationId, title);
 	} catch (err) {
 		log.warn({
 			err,
-			sessionKey
+			conversationId
 		}, "Session title: refine updateMetadata failed");
 	}
 }
 //#endregion
-export { fallbackTitleFromMessages, generateSessionTitleFromMessages, getSessionTitleSource, isWebchatSessionKey, maybeRefineSessionTitleWithLlm, maybeSetProvisionalSessionTitle, provisionalTitleFromUserText, sanitizeGeneratedSessionTitle, sanitizeSessionTitle, shouldAutoTitleSessionKey, shouldRefineSessionTitleWithLlm };
+export { fallbackTitleFromMessages, generateSessionTitleFromMessages, getSessionTitleSource, isWebchatConversationId, maybeRefineSessionTitleWithLlm, maybeSetProvisionalSessionTitle, provisionalTitleFromUserText, sanitizeGeneratedSessionTitle, sanitizeSessionTitle, shouldAutoTitleConversationId, shouldRefineSessionTitleWithLlm };

package/dist/src/session/session-workspace.d.ts

@@ -19,4 +19,4 @@ export declare function projectWorkspacePath(project: Pick<Project, 'workspaceRo
  * Resolved workspace for tools/shell: bound execution environment, project workspace,
  * session override, or merged agent profile default.
  */
-export declare function effectiveWorkspacePathForSession(cfg: Config, sessionKey: string, sessionAgentConfig: SessionAgentConfig | null | undefined, project?: Pick<Project, 'workspaceRoot'> | null): string;
+export declare function effectiveWorkspacePathForSession(cfg: Config, conversationId: string, sessionAgentConfig: SessionAgentConfig | null | undefined, project?: Pick<Project, 'workspaceRoot'> | null): string;

package/dist/src/session/session-workspace.js

@@ -33,9 +33,9 @@ function projectWorkspacePath(project) {
 * Resolved workspace for tools/shell: bound execution environment, project workspace,
 * session override, or merged agent profile default.
 */
-function effectiveWorkspacePathForSession(cfg, sessionKey, sessionAgentConfig, project) {
-	const base = resolveEffectiveAgentProfileForSession(cfg, sessionKey).resolvedWorkspacePath;
-	const environment = getExecutionEnvironmentForSession(sessionKey);
+function effectiveWorkspacePathForSession(cfg, conversationId, sessionAgentConfig, project) {
+	const base = resolveEffectiveAgentProfileForSession(cfg, conversationId).resolvedWorkspacePath;
+	const environment = getExecutionEnvironmentForSession(conversationId);
 	if (environment) return environment.rootPath;
 	const projectWorkspace = projectWorkspacePath(project);
 	if (projectWorkspace) return projectWorkspace;

package/dist/src/session/store.d.ts

@@ -15,12 +15,12 @@ export interface SessionStoreOptions {
 }
 export interface SessionCompactionHooks {
     before?: (event: {
-        sessionKey: string;
+        conversationId: string;
         messageCount: number;
         tokenCount: number;
     }) => Promise<void> | void;
     after?: (event: {
-        sessionKey: string;
+        conversationId: string;
         messageCount: number;
         tokenCount: number;
         compactedCount: number;
@@ -33,7 +33,7 @@ export interface ForkSessionAtTurnOptions {
     targetMetadata: SessionMetadataSeed;
 }
 export interface ForkSessionResult {
-    sessionKey: string;
+    conversationId: string;
     rowCount: number;
     lastTurnId?: string;
 }
@@ -53,13 +53,13 @@ export declare class SessionStore {
     private runCompactionExclusive;
     initialize(): Promise<void>;
     getSessionsRoot(): string;
-    resolveTranscriptPath(sessionKey: string, options?: {
+    resolveTranscriptPath(conversationId: string, options?: {
         metadata?: SessionMetadataSeed;
     }): Promise<{
-        sessionId: string;
-        sessionKey: string;
+        transcriptId: string;
+        conversationId: string;
     }>;
-    appendTranscriptMessage(sessionKey: string, message: AgentMessage, options?: {
+    appendTranscriptMessage(conversationId: string, message: AgentMessage, options?: {
         metadata?: SessionMetadataSeed;
     }): Promise<void>;
     getByAgent(agentId: string): Promise<SessionMetadata[]>;
@@ -95,11 +95,11 @@ export declare class SessionStore {
     loadTranscriptHistoryRows(key: string): Promise<TranscriptStoredRow[]>;
     prepareModelFallback(key: string, rowsBeforeAttempt: readonly TranscriptStoredRow[]): Promise<ModelFallbackPreparation>;
     getMetadata(key: string): Promise<SessionMetadata | null>;
-    resolveKeyBySessionId(sessionId: string): Promise<string | null>;
+    resolveKeyByTranscriptId(transcriptId: string): Promise<string | null>;
     updateMetadata(key: string, updates: Partial<SessionMetadata>): Promise<void>;
     reset(key: string): Promise<{
-        sessionId: string;
-        previousSessionId: string;
+        transcriptId: string;
+        previousTranscriptId: string;
     } | null>;
     delete(key: string): Promise<boolean>;
     deleteMany(keys: string[]): Promise<{
@@ -126,7 +126,7 @@ export declare class SessionStore {
         data?: unknown;
     }): Promise<void>;
     appendTranscriptCustomMessageEntry(key: string, entry: {
-        expectedSessionId?: string;
+        expectedTranscriptId?: string;
         customType: string;
         content?: string | unknown[];
         display?: boolean;
@@ -182,17 +182,17 @@ export declare class SessionStore {
     }): import("../storage/sqlite/transcript-repository.js").SessionTranscriptRecallMatch[];
     exportSession(key: string, format: ExportFormat): Promise<string>;
     importSessionExport(targetKey: string, jsonContent: string): Promise<{
-        sessionKey: string;
+        conversationId: string;
         rowCount: number;
     }>;
     forkSession(sourceKey: string, targetKey: string): Promise<{
-        sessionKey: string;
+        conversationId: string;
         rowCount: number;
     }>;
     forkSessionRows(sourceKey: string, targetKey: string, options?: {
         throughRow?: number;
     }): Promise<{
-        sessionKey: string;
+        conversationId: string;
         rowCount: number;
     }>;
     /**

package/dist/src/session/store.js

@@ -3,20 +3,20 @@ import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { requireXopcDatabase } from "../storage/sqlite/connection.js";
 import { runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
-import { buildSessionContextForLlm, buildSessionDisplayMessages, isRuntimeOnlyTranscriptMessage, isTranscriptCompactionEntry, mergeLlmMessagesPreservingContextRows, transcriptRowsFromJsonArray } from "./session-context-for-llm.js";
+import { buildSessionContextForLlm, buildSessionDisplayMessages, init_session_context_for_llm, isRuntimeOnlyTranscriptMessage, isTranscriptCompactionEntry, mergeLlmMessagesPreservingContextRows, transcriptRowsFromJsonArray } from "./session-context-for-llm.js";
 import "./types.js";
-import { init_agent_session_key, resolveAgentIdFromSessionKey } from "../routing/agent-session-key.js";
 import { estimateTokensFromMessages } from "../storage/sqlite/row-mappers.js";
-import { deleteSessionRecord, ensureSessionRecord, findSessionKeyBySessionId, getGlobalSessionStats, getSessionMetadata, listSessionMetadata, listSessionsByAgent, patchSessionMetadata, resetSessionRecord } from "../storage/sqlite/session-repository.js";
+import { deleteSessionRecord, ensureSessionRecord, findConversationIdByTranscriptId, getGlobalSessionStats, getSessionMetadata, listSessionMetadata, listSessionsByAgent, patchSessionMetadata, resetSessionRecord } from "../storage/sqlite/session-repository.js";
 import { appendCompactionBoundaryIfUnchanged, appendTranscriptEntry, listCompactionBoundaries, loadCompactionSourceSnapshot, loadLlmMessagesForSession, loadTranscriptHistoryRowsForSession, loadTranscriptRowsForSession, paginateTranscriptMessages, replaceTranscriptRows, restoreBeforeCompactionBoundary, searchSessionTranscript } from "../storage/sqlite/transcript-repository.js";
 import { getSessionConfig, setSessionConfig } from "../storage/sqlite/config-repository.js";
 import "../storage/sqlite/index.js";
-import { resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
+import { init_agent_session_key, resolveAgentIdFromConversationId } from "../routing/agent-session-key.js";
+import { resolveEffectiveAgentProfile } from "../config/agent-profile.js";
 import { transcriptRowsToClientHistory } from "./client-history.js";
 import { SessionCompactor } from "../agent/memory/compaction.js";
+import { resolveCompactionPolicy } from "../agent/memory/compaction-policy.js";
 import { resolveUserContextSessionAccess } from "../user-context/access-policy.js";
 import { readPostCompactionContext } from "../agent/reply/post-compaction-context.js";
-import { resolveCompactionPolicy } from "../agent/memory/compaction-policy.js";
 import { promoteCompactionLedger } from "../agent/memory/compaction-promotion.js";
 import { SlidingWindow } from "../agent/memory/window.js";
 import { isAppendOnlyLlmTranscriptMessage } from "./transcript-stats.js";
@@ -26,6 +26,7 @@ import { computeTranscriptUserRoundDeleteRange } from "./user-round-delete.js";
 init_paths_state();
 init_agent_session_key();
 init_logger();
+init_session_context_for_llm();
 const log = createLogger("SessionStore");
 const INDEX_VERSION = "1.0";
 function isTranscriptMessageRole(row, role) {
@@ -73,29 +74,31 @@ var SessionStore = class {
 			log.warn({
 				err,
 				phase,
-				sessionKey: event.sessionKey
+				conversationId: event.conversationId
 			}, `Session compaction ${phase} hook failed`);
 		}
 	}
-	resolveWorkspaceCwd(sessionKey) {
-		return resolveEffectiveAgentProfileForSession(this.options.config, sessionKey).resolvedWorkspacePath;
+	resolveWorkspaceCwd(conversationId, seed) {
+		const agentId = getSessionMetadata(conversationId)?.agentId ?? seed?.agentId ?? seed?.routing?.agentId;
+		if (!agentId) throw new Error(`Conversation not found: ${conversationId}`);
+		return resolveEffectiveAgentProfile(this.options.config, agentId).resolvedWorkspacePath;
 	}
 	async runStoreMutation(fn) {
 		return fn();
 	}
-	async runCompactionExclusive(sessionKey, fn) {
-		const previous = this.compactionTails.get(sessionKey) ?? Promise.resolve();
+	async runCompactionExclusive(conversationId, fn) {
+		const previous = this.compactionTails.get(conversationId) ?? Promise.resolve();
 		let release;
 		const current = new Promise((resolve) => {
 			release = resolve;
 		});
-		this.compactionTails.set(sessionKey, current);
+		this.compactionTails.set(conversationId, current);
 		await previous;
 		try {
 			return await fn();
 		} finally {
 			release();
-			if (this.compactionTails.get(sessionKey) === current) this.compactionTails.delete(sessionKey);
+			if (this.compactionTails.get(conversationId) === current) this.compactionTails.delete(conversationId);
 		}
 	}
 	async initialize() {
@@ -105,18 +108,18 @@ var SessionStore = class {
 	getSessionsRoot() {
 		return resolveStateDir();
 	}
-	async resolveTranscriptPath(sessionKey, options) {
+	async resolveTranscriptPath(conversationId, options) {
 		requireXopcDatabase();
 		return {
-			sessionId: ensureSessionRecord(sessionKey, this.resolveWorkspaceCwd(sessionKey), options?.metadata).sessionId,
-			sessionKey
+			transcriptId: ensureSessionRecord(conversationId, this.resolveWorkspaceCwd(conversationId, options?.metadata), options?.metadata).transcriptId,
+			conversationId
 		};
 	}
-	async appendTranscriptMessage(sessionKey, message, options) {
+	async appendTranscriptMessage(conversationId, message, options) {
 		return this.runStoreMutation(async () => {
 			requireXopcDatabase();
-			ensureSessionRecord(sessionKey, this.resolveWorkspaceCwd(sessionKey), options?.metadata);
-			appendTranscriptEntry(sessionKey, message);
+			ensureSessionRecord(conversationId, this.resolveWorkspaceCwd(conversationId, options?.metadata), options?.metadata);
+			appendTranscriptEntry(conversationId, message);
 		});
 	}
 	async getByAgent(agentId) {
@@ -254,9 +257,9 @@ var SessionStore = class {
 		requireXopcDatabase();
 		return getSessionMetadata(key);
 	}
-	async resolveKeyBySessionId(sessionId) {
+	async resolveKeyByTranscriptId(transcriptId) {
 		requireXopcDatabase();
-		return findSessionKeyBySessionId(sessionId);
+		return findConversationIdByTranscriptId(transcriptId);
 	}
 	async updateMetadata(key, updates) {
 		return this.runStoreMutation(async () => {
@@ -322,7 +325,7 @@ var SessionStore = class {
 	}
 	async loadTranscriptDocument(key) {
 		const metadata = await this.getMetadata(key);
-		if (!metadata?.sessionId) return null;
+		if (!metadata?.transcriptId) return null;
 		const rows = await this.loadTranscriptRows(key);
 		const compactions = [];
 		for (const row of rows) if (isTranscriptCompactionEntry(row)) compactions.push({
@@ -342,7 +345,7 @@ var SessionStore = class {
 		return {
 			type: "xopc_session_transcript",
 			version: 1,
-			id: metadata.sessionId,
+			id: metadata.transcriptId,
 			createdAt: metadata.createdAt,
 			updatedAt: metadata.updatedAt,
 			messages: rows,
@@ -350,12 +353,12 @@ var SessionStore = class {
 		};
 	}
 	async syncEmbeddedTranscriptUpdate(update) {
-		const sessionKey = update.sessionKey?.trim();
-		if (!sessionKey) return;
+		const conversationId = update.conversationId?.trim();
+		if (!conversationId) return;
 		return this.runStoreMutation(async () => {
 			requireXopcDatabase();
-			ensureSessionRecord(sessionKey, this.resolveWorkspaceCwd(sessionKey));
-			if (update.message && isAppendOnlyLlmTranscriptMessage(update.message)) appendTranscriptEntry(sessionKey, update.message);
+			ensureSessionRecord(conversationId, this.resolveWorkspaceCwd(conversationId));
+			if (update.message && isAppendOnlyLlmTranscriptMessage(update.message)) appendTranscriptEntry(conversationId, update.message);
 		});
 	}
 	async appendTranscriptContextEntry(key, entry) {
@@ -398,7 +401,7 @@ var SessionStore = class {
 	async appendTranscriptCustomMessageEntry(key, entry) {
 		return this.runStoreMutation(async () => {
 			requireXopcDatabase();
-			if (entry.expectedSessionId && getSessionMetadata(key)?.sessionId !== entry.expectedSessionId) throw new Error("Voice conversation session changed");
+			if (entry.expectedTranscriptId && getSessionMetadata(key)?.transcriptId !== entry.expectedTranscriptId) throw new Error("Voice conversation session changed");
 			ensureSessionRecord(key, this.resolveWorkspaceCwd(key));
 			appendTranscriptEntry(key, {
 				role: "custom",
@@ -430,7 +433,8 @@ var SessionStore = class {
 	async saveMessages(key, messages, options) {
 		return this.runStoreMutation(async () => {
 			requireXopcDatabase();
-			ensureSessionRecord(key, this.resolveWorkspaceCwd(key), options?.metadata);
+			ensureSessionRecord(key, this.resolveWorkspaceCwd(key, options?.metadata), options?.metadata);
+			if (options?.metadata) patchSessionMetadata(key, options.metadata);
 			replaceTranscriptRows(key, mergeLlmMessagesPreservingContextRows(await this.loadTranscriptRows(key), messages));
 		});
 	}
@@ -458,7 +462,19 @@ var SessionStore = class {
 	async applyCompaction(key, result, expectedSnapshot = loadCompactionSourceSnapshot(key)) {
 		if (!expectedSnapshot) throw new Error(`Session not found: ${key}`);
 		if (!result.compacted || !result.handover || !result.audit) throw new Error("Cannot persist an incomplete compaction result");
-		const compacted = result.messages;
+		const refresh = readPostCompactionContext({
+			cfg: this.options.config,
+			conversationId: key,
+			sectionNames: resolveCompactionPolicy(this.options.config).postCompactionSections
+		});
+		const compacted = refresh?.trim() ? [...result.messages, {
+			role: "user",
+			content: refresh,
+			timestamp: Date.now(),
+			droppable: true
+		}] : result.messages;
+		result.messages = compacted;
+		if (refresh?.trim()) result.tokensAfter = this.estimateTokens(compacted);
 		return this.runStoreMutation(async () => {
 			if (!appendCompactionBoundaryIfUnchanged(key, expectedSnapshot, {
 				type: "compaction",
@@ -478,9 +494,9 @@ var SessionStore = class {
 				const metadata = getSessionMetadata(key);
 				const access = resolveUserContextSessionAccess(this.options.config, key);
 				const promoted = promoteCompactionLedger({
-					sessionKey: key,
-					sessionId: expectedSnapshot.sessionId,
-					sourceAgentId: resolveAgentIdFromSessionKey(key),
+					conversationId: key,
+					transcriptId: expectedSnapshot.transcriptId,
+					sourceAgentId: resolveAgentIdFromConversationId(key),
 					workspaceId: this.resolveWorkspaceCwd(key),
 					projectId: metadata?.projectId,
 					handover: result.handover,
@@ -489,7 +505,7 @@ var SessionStore = class {
 					writePolicy: access.knowledge && this.options.config.userContext.knowledgeMemory.sources.includes("session") ? this.options.config.userContext.knowledgeMemory.writePolicy : "deny"
 				});
 				log.info({
-					sessionKey: key,
+					conversationId: key,
 					episodicCount: promoted.episodicRecordIds.length,
 					durableCount: promoted.durableRecordIds.length,
 					rejectedCount: promoted.rejectedRecordIds.length
@@ -497,7 +513,7 @@ var SessionStore = class {
 			} catch (err) {
 				log.warn({
 					err,
-					sessionKey: key
+					conversationId: key
 				}, "Compaction ledger memory promotion failed");
 			}
 			log.info({
@@ -512,23 +528,24 @@ var SessionStore = class {
 	}
 	async compact(key, messages, model, instructions, force, executionOptions) {
 		return this.runCompactionExclusive(key, async () => {
+			executionOptions?.signal?.throwIfAborted();
 			const snapshot = loadCompactionSourceSnapshot(key);
 			if (!snapshot) throw new Error(`Session not found: ${key}`);
 			const tokenCount = this.estimateTokens(messages);
 			await this.runCompactionHook("before", {
-				sessionKey: key,
+				conversationId: key,
 				messageCount: messages.length,
 				tokenCount
 			});
 			const result = await this.compactor.compact(snapshot.entries, model, instructions, force, {
 				...executionOptions,
-				sessionKey: key
+				conversationId: key
 			});
 			executionOptions?.signal?.throwIfAborted();
 			if (result.compacted) {
 				const compacted = await this.applyCompaction(key, result, snapshot);
 				await this.runCompactionHook("after", {
-					sessionKey: key,
+					conversationId: key,
 					messageCount: compacted.length,
 					tokenCount: result.tokensAfter,
 					compactedCount: Math.max(0, Math.min(messages.length, result.firstKeptIndex))
@@ -617,7 +634,8 @@ var SessionStore = class {
 			const rows = rowsSource ? transcriptRowsFromJsonArray(rowsSource) : [];
 			if (rows.length === 0) throw new Error("Session export contains no importable transcript rows");
 			const metadata = record.metadata && typeof record.metadata === "object" ? record.metadata : {};
-			ensureSessionRecord(targetKey, this.resolveWorkspaceCwd(targetKey), {
+			ensureSessionRecord(targetKey, this.resolveWorkspaceCwd(targetKey, metadata), {
+				agentId: metadata.agentId,
 				sourceChannel: metadata.sourceChannel,
 				sourceChatId: metadata.sourceChatId,
 				sessionType: metadata.sessionType,
@@ -633,12 +651,12 @@ var SessionStore = class {
 				tags: [...new Set([...Array.isArray(metadata.tags) ? metadata.tags.filter((tag) => typeof tag === "string") : [], "import"])],
 				customData: {
 					...metadata.customData && typeof metadata.customData === "object" ? metadata.customData : {},
-					...sourceKey ? { importedFromSessionKey: sourceKey } : {},
+					...sourceKey ? { importedFromConversationId: sourceKey } : {},
 					importedAt: (/* @__PURE__ */ new Date()).toISOString()
 				}
 			});
 			return {
-				sessionKey: targetKey,
+				conversationId: targetKey,
 				rowCount: normalizedRows.length
 			};
 		});
@@ -655,7 +673,8 @@ var SessionStore = class {
 			const rows = await this.loadTranscriptRows(sourceKey);
 			if (options.throughRow !== void 0 && (options.throughRow < 1 || options.throughRow > rows.length)) throw new Error(`Invalid fork row: ${options.throughRow}`);
 			const selectedRows = options.throughRow === void 0 ? rows : rows.slice(0, Math.max(0, Math.trunc(options.throughRow)));
-			ensureSessionRecord(targetKey, this.resolveWorkspaceCwd(targetKey), {
+			ensureSessionRecord(targetKey, this.resolveWorkspaceCwd(sourceKey), {
+				agentId: sourceMetadata.agentId,
 				sourceChannel: sourceMetadata.sourceChannel,
 				sourceChatId: sourceMetadata.sourceChatId,
 				sessionType: sourceMetadata.sessionType,
@@ -668,14 +687,14 @@ var SessionStore = class {
 				tags: [...new Set([...sourceMetadata.tags ?? [], "fork"])],
 				customData: {
 					...sourceMetadata.customData ?? {},
-					forkedFromSessionKey: sourceKey,
-					forkedFromSessionId: sourceMetadata.sessionId,
+					forkedFromConversationId: sourceKey,
+					forkedFromTranscriptId: sourceMetadata.transcriptId,
 					...options.throughRow !== void 0 ? { forkedFromRow: selectedRows.length } : {},
 					forkedAt: (/* @__PURE__ */ new Date()).toISOString()
 				}
 			});
 			return {
-				sessionKey: targetKey,
+				conversationId: targetKey,
 				rowCount: selectedRows.length
 			};
 		});
@@ -707,20 +726,21 @@ var SessionStore = class {
 			const selectedRows = rows.slice(0, lastTurnRow + 1);
 			const sourceLabel = sourceMetadata.name?.trim() || sourceKey;
 			const forkedAt = (/* @__PURE__ */ new Date()).toISOString();
-			const cwd = sourceMetadata.cwd?.trim() || this.resolveWorkspaceCwd(targetKey);
+			const cwd = sourceMetadata.cwd?.trim() || this.resolveWorkspaceCwd(sourceKey);
 			ensureSessionRecord(targetKey, cwd, {
+				agentId: sourceMetadata.agentId,
 				...options.targetMetadata,
 				name: `Fork of ${sourceLabel}`,
 				tags: [...new Set([...sourceMetadata.tags ?? [], "fork"])],
 				projectId: sourceMetadata.projectId,
-				parentSessionKey: sourceKey,
+				parentConversationId: sourceKey,
 				hiddenFromSessionList: false,
 				customData: {
 					...sourceMetadata.customData ?? {},
 					...options.targetMetadata.customData ?? {},
 					genericNewChatShell: false,
-					forkedFromSessionKey: sourceKey,
-					forkedFromSessionId: sourceMetadata.sessionId,
+					forkedFromConversationId: sourceKey,
+					forkedFromTranscriptId: sourceMetadata.transcriptId,
 					forkedFromSessionName: sourceMetadata.name,
 					forkedFromTurnId: lastTurnId,
 					forkedAt
@@ -730,7 +750,7 @@ var SessionStore = class {
 			const sourceConfig = getSessionConfig(sourceKey);
 			if (sourceConfig) setSessionConfig(targetKey, sourceConfig, cwd);
 			return {
-				sessionKey: targetKey,
+				conversationId: targetKey,
 				rowCount: selectedRows.length,
 				lastTurnId
 			};
@@ -801,7 +821,7 @@ var SessionStore = class {
 		const policy = resolveCompactionPolicy(this.options.config);
 		const contextText = readPostCompactionContext({
 			cfg: this.options.config,
-			sessionKey: key,
+			conversationId: key,
 			sectionNames: policy.postCompactionSections
 		});
 		if (!contextText?.trim()) return;

package/dist/src/session/stored-rows-to-file-entries.d.ts

@@ -4,7 +4,7 @@ import { type TranscriptStoredRow } from './session-context-for-llm.js';
 export declare const XOPC_CONTEXT_CUSTOM_TYPE = "xopc:transcript-row";
 /** Convert SQLite transcript rows into pi-coding-agent JSONL file entries (header + tree). */
 export declare function storedRowsToFileEntries(params: {
-    sessionId: string;
+    transcriptId: string;
     cwd: string;
     rows: TranscriptStoredRow[];
     appendCompaction?: TranscriptCompactionRecord;

package/dist/src/session/stored-rows-to-file-entries.js

@@ -1,8 +1,10 @@
-import { voiceTranscriptMessage } from "./voice-transcript.js";
-import { isTranscriptContextEntry, isTranscriptCustomMessageEntry, isTranscriptCustomStateEntry } from "./session-context-for-llm.js";
+import { init_voice_transcript, voiceTranscriptMessage } from "./voice-transcript.js";
+import { init_session_context_for_llm, isTranscriptContextEntry, isTranscriptCustomMessageEntry, isTranscriptCustomStateEntry } from "./session-context-for-llm.js";
 import { randomUUID } from "node:crypto";
 import { CURRENT_SESSION_VERSION } from "@earendil-works/pi-coding-agent";
 //#region src/session/stored-rows-to-file-entries.ts
+init_voice_transcript();
+init_session_context_for_llm();
 const XOPC_CONTEXT_CUSTOM_TYPE = "xopc:transcript-row";
 function generateShortId(byId) {
 	for (let i = 0; i < 100; i++) {
@@ -80,7 +82,7 @@ function storedRowsToFileEntries(params) {
 	const entries = [{
 		type: "session",
 		version: CURRENT_SESSION_VERSION,
-		id: params.sessionId,
+		id: params.transcriptId,
 		timestamp: (/* @__PURE__ */ new Date()).toISOString(),
 		cwd: params.cwd
 	}];

package/dist/src/session/thinking-resolve.d.ts

@@ -7,7 +7,7 @@ import { type ThinkLevel, type ReasoningLevel } from '../agent/transcript/thinki
 /**
  * @param requestOverride - Raw value from HTTP/API (e.g. Web pill); wins over persisted session when valid.
  */
-export declare function resolveEffectiveThinkingLevel(sessionConfigStore: SessionConfigStore, sessionKey: string, requestOverride?: string | null, agentDefault?: ThinkLevel): Promise<ThinkingLevel>;
+export declare function resolveEffectiveThinkingLevel(sessionConfigStore: SessionConfigStore, conversationId: string, requestOverride?: string | null, agentDefault?: ThinkLevel): Promise<ThinkingLevel>;
 export declare const DEFAULT_ACTIVITY_DETAIL_LEVEL: ReasoningLevel;
 export declare function resolveConfiguredActivityDetailDefault(config?: {
     gateway?: {
@@ -19,4 +19,4 @@ export declare function resolveConfiguredActivityDetailDefault(config?: {
 /**
  * Session override > runtime default.
  */
-export declare function resolveEffectiveReasoningLevel(sessionConfigStore: SessionConfigStore, sessionKey: string, agentDefault?: ReasoningLevel): Promise<ReasoningLevel>;
+export declare function resolveEffectiveReasoningLevel(sessionConfigStore: SessionConfigStore, conversationId: string, agentDefault?: ReasoningLevel): Promise<ReasoningLevel>;

package/dist/src/session/thinking-resolve.js

@@ -5,10 +5,10 @@ const FALLBACK = "medium";
 /**
 * @param requestOverride - Raw value from HTTP/API (e.g. Web pill); wins over persisted session when valid.
 */
-async function resolveEffectiveThinkingLevel(sessionConfigStore, sessionKey, requestOverride, agentDefault) {
+async function resolveEffectiveThinkingLevel(sessionConfigStore, conversationId, requestOverride, agentDefault) {
 	const fromRequest = normalizeThinkLevel(requestOverride ?? void 0);
 	if (fromRequest !== void 0) return fromRequest;
-	const fromSession = await resolveThinkingLevel(sessionConfigStore, sessionKey, agentDefault);
+	const fromSession = await resolveThinkingLevel(sessionConfigStore, conversationId, agentDefault);
 	if (fromSession !== void 0) return fromSession;
 	return agentDefault ?? FALLBACK;
 }
@@ -19,9 +19,9 @@ function resolveConfiguredActivityDetailDefault(config) {
 /**
 * Session override > runtime default.
 */
-async function resolveEffectiveReasoningLevel(sessionConfigStore, sessionKey, agentDefault) {
+async function resolveEffectiveReasoningLevel(sessionConfigStore, conversationId, agentDefault) {
 	const def = agentDefault ?? "on";
-	return await resolveReasoningLevel(sessionConfigStore, sessionKey, def) ?? def;
+	return await resolveReasoningLevel(sessionConfigStore, conversationId, def) ?? def;
 }
 //#endregion
 export { DEFAULT_ACTIVITY_DETAIL_LEVEL, resolveConfiguredActivityDetailDefault, resolveEffectiveReasoningLevel, resolveEffectiveThinkingLevel };

package/dist/src/session/transcript-events.d.ts

@@ -1,5 +1,5 @@
 export type SessionTranscriptUpdate = {
-    sessionKey?: string;
+    conversationId?: string;
     message?: unknown;
     messageId?: string;
 };