@xopcai/xopc 0.0.285 → 0.0.286

package/dist/src/tui/tui-commands.js

@@ -1,8 +1,7 @@
 import { closeXopcDatabase, isXopcDatabaseOpen, openXopcDatabase } from "../storage/sqlite/connection.js";
-import { parseAgentSessionKey } from "../routing/session-key-utils.js";
-import { init_agent_session_key, isValidAgentId, normalizeAgentId } from "../routing/agent-session-key.js";
 import { getSessionMetadata } from "../storage/sqlite/session-repository.js";
 import "../storage/sqlite/index.js";
+import { init_agent_session_key, isValidAgentId, normalizeAgentId } from "../routing/agent-session-key.js";
 import { resolveConfigPath } from "../config/paths.js";
 import { loadConfig } from "../config/loader.js";
 import { init_providers, providerSupportsOAuth } from "../providers/index.js";
@@ -35,7 +34,7 @@ function getSlashCommands(_isLocal, keybindings) {
 	const abortKey = keyLabel(keybindings, "app.interrupt", "Escape");
 	const toolsKey = keyLabel(keybindings, "app.tools.expand", "Ctrl+O");
 	const thinkingKey = keyLabel(keybindings, "app.thinking.toggle", "Ctrl+T");
-	const sessionKey = keyLabel(keybindings, "app.session.resume", "Ctrl+Shift+P");
+	const conversationId = keyLabel(keybindings, "app.session.resume", "Ctrl+Shift+P");
 	const modelCycleKey = keyLabel(keybindings, "app.model.cycleForward", "Ctrl+P");
 	return [
 		{
@@ -124,7 +123,7 @@ function getSlashCommands(_isLocal, keybindings) {
 		},
 		{
 			name: "new",
-			description: "Start a new isolated TUI session (tui-{uuid})"
+			description: "Start a new isolated TUI conversation"
 		},
 		{
 			name: "fork",
@@ -156,7 +155,7 @@ function getSlashCommands(_isLocal, keybindings) {
 		},
 		{
 			name: "resume",
-			description: `Open session picker (or ${sessionKey})`
+			description: `Open session picker (or ${conversationId})`
 		},
 		{
 			name: "tree",
@@ -433,9 +432,9 @@ function formatAgentsList(agents, currentAgentId) {
 	].join("\n");
 }
 function formatCurrentAgent(state) {
-	const parsed = parseAgentSessionKey(state.currentSessionKey);
-	if (!parsed) return `Current session is not an agent session.\nSession: ${state.currentSessionKey}`;
-	const lines = [`Current agent: ${parsed.agentId}`, `Session: ${state.currentSessionKey}`];
+	const parsed = state.sessionInfo;
+	if (!parsed) return `Current session is not an agent session.\nSession: ${state.currentConversationId}`;
+	const lines = [`Current agent: ${parsed.agentId}`, `Session: ${state.currentConversationId}`];
 	const workspace = state.sessionInfo.effectiveWorkspacePath?.trim();
 	if (workspace) lines.push(`Workspace: ${workspace}`);
 	const provider = state.sessionInfo.modelProvider?.trim();
@@ -550,8 +549,8 @@ function runTuiProjectCommand(state, args) {
 	const subcommand = parts[0]?.toLowerCase();
 	return withTuiProjects((projects) => {
 		if (!subcommand || subcommand === "status") {
-			const projectId = getSessionMetadata(state.currentSessionKey)?.projectId;
-			if (!projectId) return `No project selected.\nSession: ${state.currentSessionKey}`;
+			const projectId = getSessionMetadata(state.currentConversationId)?.projectId;
+			if (!projectId) return `No project selected.\nSession: ${state.currentConversationId}`;
 			const project = projects.getWithDetails(projectId);
 			return project ? formatTuiProject(project) : `Current project not found: ${projectId}`;
 		}
@@ -583,7 +582,7 @@ function runTuiProjectCommand(state, args) {
 				...defaultAgentId ? { defaultAgentId } : {},
 				...parsed.projectKind ? { projectKind: parsed.projectKind } : {}
 			});
-			projects.attachSession(state.currentSessionKey, project.id);
+			projects.attachSession(state.currentConversationId, project.id);
 			state.sessionInfo.projectId = project.id;
 			return `Created and attached project:\n${formatTuiProject(project)}`;
 		}
@@ -592,12 +591,12 @@ function runTuiProjectCommand(state, args) {
 			if (!ref) return `Usage: /project ${subcommand} <id-or-slug>`;
 			const project = resolveTuiProject(projects, ref);
 			if (!project) return `Project not found: ${ref}`;
-			projects.attachSession(state.currentSessionKey, project.id);
+			projects.attachSession(state.currentConversationId, project.id);
 			state.sessionInfo.projectId = project.id;
 			return `Attached current session to project: ${project.name}`;
 		}
 		if (subcommand === "detach") {
-			projects.detachSession(state.currentSessionKey);
+			projects.detachSession(state.currentConversationId);
 			state.sessionInfo.projectId = void 0;
 			return "Detached current session from project.";
 		}
@@ -612,29 +611,29 @@ function runTuiProjectCommand(state, args) {
 		if (subcommand === "set-agent") {
 			const agentId = normalizeProjectAgentId(parts[1]);
 			if (!agentId) return "Usage: /project set-agent <agent-id>";
-			const currentProjectId = getSessionMetadata(state.currentSessionKey)?.projectId;
+			const currentProjectId = getSessionMetadata(state.currentConversationId)?.projectId;
 			if (!currentProjectId) return "No current project.";
 			if (!isValidProjectAgentId(loadConfig(resolveConfigPath()), agentId)) return `Agent not found: ${parts[1]}`;
 			return `Project default agent set to ${projects.update(currentProjectId, { defaultAgentId: agentId }).defaultAgentId}.`;
 		}
 		if (subcommand === "clear-agent") {
-			const currentProjectId = getSessionMetadata(state.currentSessionKey)?.projectId;
+			const currentProjectId = getSessionMetadata(state.currentConversationId)?.projectId;
 			if (!currentProjectId) return "No current project.";
 			projects.update(currentProjectId, { defaultAgentId: null });
 			return "Project default agent cleared.";
 		}
 		if (subcommand === "sessions") {
 			const ref = parts[1];
-			const currentProjectId = getSessionMetadata(state.currentSessionKey)?.projectId;
+			const currentProjectId = getSessionMetadata(state.currentConversationId)?.projectId;
 			const project = ref ? resolveTuiProject(projects, ref) : currentProjectId ? projects.get(currentProjectId) : null;
 			if (!project) return ref ? `Project not found: ${ref}` : "No current project.";
-			const keys = projects.listSessionKeys(project.id, 20);
+			const keys = projects.listConversationIds(project.id, 20);
 			if (!keys.length) return `No sessions in ${project.name}.`;
 			return [`Sessions in ${project.name}:`, ...keys.map((key) => `- ${key}`)].join("\n");
 		}
 		if (subcommand === "tasks") {
 			const ref = parts[1];
-			const currentProjectId = getSessionMetadata(state.currentSessionKey)?.projectId;
+			const currentProjectId = getSessionMetadata(state.currentConversationId)?.projectId;
 			const project = ref ? resolveTuiProject(projects, ref) : currentProjectId ? projects.get(currentProjectId) : null;
 			if (!project) return ref ? `Project not found: ${ref}` : "No current project.";
 			const tasks = new TaskRepository().listByProject(project.id, 20);
@@ -663,7 +662,7 @@ function createTuiCommandHandler(deps) {
 		await abortActive();
 		if (resetSession) {
 			await resetSession();
-			chatLog.addSystem(`session ${state.currentSessionKey} reset`);
+			chatLog.addSystem(`session ${state.currentConversationId} reset`);
 		} else {
 			chatLog.clearAll();
 			chatLog.addSystem("Session cleared (reset not available in this mode).");
@@ -727,7 +726,7 @@ function createTuiCommandHandler(deps) {
 					return;
 				}
 				Promise.resolve(deps.listAgents?.() ?? []).then((agents) => {
-					const current = parseAgentSessionKey(state.currentSessionKey)?.agentId;
+					const current = state.sessionInfo?.agentId;
 					chatLog.addSystem(formatAgentsList(agents, current));
 					tui.requestRender();
 				}).catch((err) => {
@@ -744,8 +743,7 @@ function createTuiCommandHandler(deps) {
 					return;
 				}
 				(async () => {
-					const parsedCurrent = parseAgentSessionKey(state.currentSessionKey);
-					if (!parsedCurrent) {
+					if (!state.sessionInfo.agentId) {
 						chatLog.addSystem("Cannot switch agent: current session is not an agent session.");
 						tui.requestRender();
 						return;
@@ -766,8 +764,8 @@ function createTuiCommandHandler(deps) {
 						tui.requestRender();
 						return;
 					}
-					const targetSessionKey = `agent:${targetAgentId}:${parsedCurrent.rest}`;
-					if (targetSessionKey === state.currentSessionKey) {
+					const targetConversationId = randomUUID();
+					if (targetAgentId === state.sessionInfo.agentId) {
 						chatLog.addSystem(`Already using agent: ${targetAgentId}`);
 						tui.requestRender();
 						return;
@@ -777,8 +775,8 @@ function createTuiCommandHandler(deps) {
 						tui.requestRender();
 						return;
 					}
-					await deps.switchAgentSession(targetSessionKey, targetAgentId);
-					chatLog.addSystem(`Switched to agent: ${targetAgentId}\nSession: ${targetSessionKey}`);
+					await deps.switchAgentSession(targetConversationId, targetAgentId);
+					chatLog.addSystem(`Switched to agent: ${targetAgentId}\nSession: ${targetConversationId}`);
 					tui.requestRender();
 				})().catch((err) => {
 					const errorMessage = err instanceof Error ? err.message : String(err);
@@ -795,7 +793,7 @@ function createTuiCommandHandler(deps) {
 							"Usage: /tui-default-agent <agent-id>",
 							"This changes new TUI sessions only; the current session is unchanged.",
 							"",
-							formatAgentsList(agents, parseAgentSessionKey(state.currentSessionKey)?.agentId)
+							formatAgentsList(agents, state.sessionInfo?.agentId)
 						].join("\n"));
 						tui.requestRender();
 					}).catch((err) => {
@@ -965,7 +963,7 @@ function createTuiCommandHandler(deps) {
 				return;
 			case "list":
 				Promise.resolve(deps.listSessions?.() ?? []).then((sessions) => {
-					chatLog.addSystem(formatTuiSessionListInfo(sessions, { currentSessionKey: state.currentSessionKey }));
+					chatLog.addSystem(formatTuiSessionListInfo(sessions, { currentConversationId: state.currentConversationId }));
 					tui.requestRender();
 				});
 				return;
@@ -984,7 +982,7 @@ function createTuiCommandHandler(deps) {
 				uiOverlays?.openSessionTree();
 				if (uiOverlays) return;
 				Promise.resolve(deps.listSessions?.() ?? []).then((sessions) => {
-					chatLog.addSystem(formatTuiSessionTreeInfo(sessions, { currentSessionKey: state.currentSessionKey }));
+					chatLog.addSystem(formatTuiSessionTreeInfo(sessions, { currentConversationId: state.currentConversationId }));
 					tui.requestRender();
 				});
 				return;
@@ -1265,10 +1263,10 @@ function createTuiCommandHandler(deps) {
 						await abortActive();
 						if (deps.newSession) {
 							await deps.newSession();
-							chatLog.addSystem(`new session: ${state.currentSessionKey}`);
+							chatLog.addSystem(`new session: ${state.currentConversationId}`);
 						} else if (setSession) {
-							await setSession(`tui-${randomUUID()}`);
-							chatLog.addSystem(`new session: ${state.currentSessionKey}`);
+							await setSession(randomUUID());
+							chatLog.addSystem(`new session: ${state.currentConversationId}`);
 						} else {
 							chatLog.clearAll();
 							chatLog.addSystem("New session requires gateway or local session support.");
@@ -1335,7 +1333,7 @@ function createTuiCommandHandler(deps) {
 				definitionId: workflowName,
 				goal: commandArgs.trim() || void 0
 			})).then((result) => {
-				chatLog.addSystem(`Workflow started: ${result.definitionId}\nrunId: ${result.runId}\nsessionKey: ${result.sessionKey}`);
+				chatLog.addSystem(`Workflow started: ${result.definitionId}\nrunId: ${result.runId}\nconversationId: ${result.conversationId}`);
 				tui.requestRender();
 			}).catch((err) => {
 				const errorMessage = err instanceof Error ? err.message : String(err);

package/dist/src/tui/tui-empty-session-cleanup.d.ts

@@ -5,6 +5,5 @@ export declare const GENERATED_TUI_SESSION_SHELL_PATCH: {
         readonly genericNewChatShell: true;
     };
 };
-export declare function isGeneratedTuiSessionKey(sessionKey: string): boolean;
-export declare function deleteGeneratedTuiSessionIfEmpty(client: Pick<TuiBackend, 'getSessionStats' | 'deleteSession'>, sessionKey: string): Promise<boolean>;
-export declare function cleanupAbandonedTuiSessions(client: Pick<TuiBackend, 'listSessions' | 'getSessionStats' | 'deleteSession'>, currentSessionKey: string, nowMs?: number): Promise<string[]>;
+export declare function deleteGeneratedTuiSessionIfEmpty(client: Pick<TuiBackend, 'getSessionInfo' | 'getSessionStats' | 'deleteSession'>, conversationId: string): Promise<boolean>;
+export declare function cleanupAbandonedTuiSessions(client: Pick<TuiBackend, 'listSessions' | 'getSessionInfo' | 'getSessionStats' | 'deleteSession'>, currentConversationId: string, nowMs?: number): Promise<string[]>;

package/dist/src/tui/tui-empty-session-cleanup.js

@@ -1,27 +1,19 @@
-import { parseAgentSessionKey } from "../routing/session-key-utils.js";
-import { init_agent_session_key } from "../routing/agent-session-key.js";
 //#region src/tui/tui-empty-session-cleanup.ts
-init_agent_session_key();
-const GENERATED_TUI_SUFFIX_RE = /^tui-[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const ABANDONED_SESSION_AGE_MS = 60 * 6e4;
 const GENERATED_TUI_SESSION_SHELL_PATCH = {
 	hiddenFromSessionList: true,
 	customData: { genericNewChatShell: true }
 };
-function isGeneratedTuiSessionKey(sessionKey) {
-	const parsed = parseAgentSessionKey(sessionKey);
-	return parsed ? GENERATED_TUI_SUFFIX_RE.test(parsed.rest) : false;
+async function deleteGeneratedTuiSessionIfEmpty(client, conversationId) {
+	if (!(await client.getSessionInfo(conversationId)).generatedShell) return false;
+	if ((await client.getSessionStats(conversationId)).totalMessages > 0) return false;
+	return (await client.deleteSession(conversationId)).ok;
 }
-async function deleteGeneratedTuiSessionIfEmpty(client, sessionKey) {
-	if (!isGeneratedTuiSessionKey(sessionKey)) return false;
-	if ((await client.getSessionStats(sessionKey)).totalMessages > 0) return false;
-	return (await client.deleteSession(sessionKey)).ok;
-}
-async function cleanupAbandonedTuiSessions(client, currentSessionKey, nowMs = Date.now()) {
-	const candidates = (await client.listSessions()).filter((session) => session.key !== currentSessionKey && session.messageCount === 0 && typeof session.updatedAt === "number" && session.updatedAt <= nowMs - ABANDONED_SESSION_AGE_MS && isGeneratedTuiSessionKey(session.key));
+async function cleanupAbandonedTuiSessions(client, currentConversationId, nowMs = Date.now()) {
+	const candidates = (await client.listSessions()).filter((session) => session.key !== currentConversationId && session.messageCount === 0 && typeof session.updatedAt === "number" && session.updatedAt <= nowMs - ABANDONED_SESSION_AGE_MS && session.generatedShell === true);
 	const deleted = [];
 	for (const session of candidates) if (await deleteGeneratedTuiSessionIfEmpty(client, session.key)) deleted.push(session.key);
 	return deleted;
 }
 //#endregion
-export { GENERATED_TUI_SESSION_SHELL_PATCH, cleanupAbandonedTuiSessions, deleteGeneratedTuiSessionIfEmpty, isGeneratedTuiSessionKey };
+export { GENERATED_TUI_SESSION_SHELL_PATCH, cleanupAbandonedTuiSessions, deleteGeneratedTuiSessionIfEmpty };

package/dist/src/tui/tui-file-autocomplete.d.ts

@@ -1,5 +1,5 @@
 import type { TuiAutocompleteProvider } from '../extensions/types/tui.js';
 import type { TuiWorkspaceFileSearchEntry } from './tui-backend.js';
-export declare function createTuiFileAutocompleteProvider(searchWorkspaceFiles: (sessionKey: string, query: string, options?: {
+export declare function createTuiFileAutocompleteProvider(searchWorkspaceFiles: (conversationId: string, query: string, options?: {
     limit?: number;
 }) => Promise<TuiWorkspaceFileSearchEntry[]>): TuiAutocompleteProvider;

package/dist/src/tui/tui-file-autocomplete.js

@@ -6,10 +6,10 @@ function formatFilePathForWire(path) {
 	return `"${path.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
 }
 function createTuiFileAutocompleteProvider(searchWorkspaceFiles) {
-	return async (query, { sessionKey }) => {
+	return async (query, { conversationId }) => {
 		const trimmed = query.trim();
 		if (/^(skill|doc|url|symbol):/i.test(trimmed)) return [];
-		return (await searchWorkspaceFiles(sessionKey, trimmed.replace(/^file:/i, ""), { limit: 15 })).map((entry) => {
+		return (await searchWorkspaceFiles(conversationId, trimmed.replace(/^file:/i, ""), { limit: 15 })).map((entry) => {
 			const path = entry.isDirectory && !entry.path.endsWith("/") ? `${entry.path}/` : entry.path;
 			return {
 				name: path,

package/dist/src/tui/tui-new-session-preferences.js

@@ -1,5 +1,7 @@
 import { createDefaultNewSessionPreferences, modelPreferenceForAgent, withAgentModelPreference, withLastChatScope, withSelectedAgent } from "../../packages/gateway-contract/src/new-session.js";
+import { init_src } from "../../packages/gateway-contract/src/index.js";
 //#region src/tui/tui-new-session-preferences.ts
+init_src();
 function tuiGatewayPreferenceKey(url) {
 	return url?.trim() || "local";
 }

package/dist/src/tui/tui-picker-overlay.d.ts

@@ -16,7 +16,7 @@ export declare function formatReviewPickerOpenedHint(keybindings: KeybindingsMan
 export declare function formatAgentPickerOpenedHint(keybindings: KeybindingsManager): string;
 export declare function formatSessionTreeOpenedHint(keybindings: KeybindingsManager): string;
 export declare function openTimelineOverlay(svc: PickerServices, initialQuery?: string): Promise<void>;
-export declare function sessionTreeSelectItems(sessions: TuiSessionItem[], currentSessionKey?: string): SelectItem[];
+export declare function sessionTreeSelectItems(sessions: TuiSessionItem[], currentConversationId?: string): SelectItem[];
 export declare function openAgentPickerOverlay(svc: PickerServices): Promise<void>;
 export declare function openReviewLauncherOverlay(svc: PickerServices): Promise<void>;
 export interface SessionPickerOverlayOptions {

package/dist/src/tui/tui-picker-overlay.js

@@ -1,5 +1,3 @@
-import { parseAgentSessionKey } from "../routing/session-key-utils.js";
-import { init_agent_session_key } from "../routing/agent-session-key.js";
 import { getProjectTrustOptions, hasTrustRequiringProjectResources } from "../project-trust/trust-store.js";
 import { listThinkingLevels, normalizeThinkLevel } from "../agent/transcript/thinking-types.js";
 import { searchableSelectListTheme, theme } from "./theme.js";
@@ -14,8 +12,8 @@ import { SessionSelector } from "./components/session-selector.js";
 import { ThinkingSelector } from "./components/thinking-selector.js";
 import { TimelineSelectList, formatTimelineOpenedHint } from "./tui-timeline-picker.js";
 import { TranscriptTreeSelectList, defaultTranscriptForkKey, formatTranscriptTreeFilterHint, formatUserMessageForkOpenedHint, userMessageForkSelectItems } from "./tui-transcript-tree-picker.js";
+import { randomUUID } from "node:crypto";
 //#region src/tui/tui-picker-overlay.ts
-init_agent_session_key();
 function formatSelectNavigationHint(keybindings) {
 	return `${formatKeyIds(keybindings, "tui.select.up", { capitalize: true })}/${formatKeyIds(keybindings, "tui.select.down", { capitalize: true })}`;
 }
@@ -64,7 +62,7 @@ function formatSessionTreeOpenedHint(keybindings) {
 	return `Session tree (${formatSelectNavigationHint(keybindings)} · type to filter · ${formatKeyIds(keybindings, "tui.select.confirm", { capitalize: true })} resume · ${formatKeyIds(keybindings, "tui.select.cancel", { capitalize: true })} close)`;
 }
 async function openTimelineOverlay(svc, initialQuery) {
-	const turns = buildTuiTimelineTurns(await svc.client.loadTimeline(svc.state.currentSessionKey));
+	const turns = buildTuiTimelineTurns(await svc.client.loadTimeline(svc.state.currentConversationId));
 	if (turns.length === 0) {
 		svc.chatLog.addSystem("No timeline turns found.");
 		svc.tui.requestRender();
@@ -96,10 +94,10 @@ async function openTimelineOverlay(svc, initialQuery) {
 	svc.chatLog.addSystem(theme.dim(formatTimelineOpenedHint(svc.keybindings)));
 	svc.tui.requestRender();
 }
-function resumeSession(svc, sessionKey) {
-	svc.setSessionKey(sessionKey);
+function resumeSession(svc, conversationId) {
+	svc.setConversationId(conversationId);
 	svc.clearChatForSessionSwitch();
-	svc.chatLog.addSystem(`Session: ${sessionKey}`);
+	svc.chatLog.addSystem(`Session: ${conversationId}`);
 	svc.refreshSessionInfo().then(() => svc.loadSessionHistory()).then(() => {
 		svc.updateHeader();
 		svc.tui.requestRender();
@@ -107,23 +105,13 @@ function resumeSession(svc, sessionKey) {
 	svc.tui.requestRender();
 }
 function sessionTreeGroup(session) {
-	const raw = session.key.trim();
-	const parts = raw.split(":").filter(Boolean);
-	if (parts.length >= 3 && parts[0] === "agent") {
-		const rest = parts.slice(2);
-		return {
-			agentId: parts[1] ?? "main",
-			root: rest[0] ?? raw,
-			leaf: rest.length > 1 ? rest.slice(1).join(":") : rest.join(":") || raw
-		};
-	}
 	return {
-		agentId: "legacy",
-		root: raw || "session",
-		leaf: raw || "session"
+		agentId: session.agentId ?? "unknown",
+		root: session.sourceChannel ?? "chat",
+		leaf: session.displayName ?? session.key
 	};
 }
-function sessionTreeSelectItems(sessions, currentSessionKey) {
+function sessionTreeSelectItems(sessions, currentConversationId) {
 	const byKey = new Map(sessions.map((session) => [session.key, session]));
 	return [...sessions].sort((a, b) => {
 		const ga = sessionTreeGroup(a);
@@ -133,9 +121,9 @@ function sessionTreeSelectItems(sessions, currentSessionKey) {
 		return (b.updatedAt ?? 0) - (a.updatedAt ?? 0);
 	}).map((session) => {
 		const group = sessionTreeGroup(session);
-		const current = session.key === currentSessionKey ? "* " : "  ";
+		const current = session.key === currentConversationId ? "* " : "  ";
 		const label = session.displayName?.trim() || group.leaf;
-		const parent = session.forkedFromSessionKey ? byKey.get(session.forkedFromSessionKey)?.displayName?.trim() ?? session.forkedFromSessionKey : null;
+		const parent = session.forkedFromConversationId ? byKey.get(session.forkedFromConversationId)?.displayName?.trim() ?? session.forkedFromConversationId : null;
 		const description = [
 			`${group.agentId}/${group.root}`,
 			formatSessionPickerDescription(session, { showKey: Boolean(session.displayName) }),
@@ -150,8 +138,8 @@ function sessionTreeSelectItems(sessions, currentSessionKey) {
 	});
 }
 async function openAgentPickerOverlay(svc) {
-	const parsed = parseAgentSessionKey(svc.state.currentSessionKey);
-	if (!parsed) {
+	const parsed = svc.state.sessionInfo;
+	if (!parsed.agentId) {
 		svc.chatLog.addSystem("Cannot switch agent: current session is not an agent session.");
 		svc.tui.requestRender();
 		return;
@@ -183,9 +171,9 @@ async function openAgentPickerOverlay(svc) {
 			svc.tui.requestRender();
 			return;
 		}
-		const targetSessionKey = `agent:${targetAgentId}:${parsed.rest}`;
-		Promise.resolve(svc.switchAgentSession?.(targetSessionKey, targetAgentId)).then(() => {
-			svc.chatLog.addSystem(`Switched to agent: ${targetAgentId}\nSession: ${targetSessionKey}`);
+		const targetConversationId = randomUUID();
+		Promise.resolve(svc.switchAgentSession?.(targetConversationId, targetAgentId)).then(() => {
+			svc.chatLog.addSystem(`Switched to agent: ${targetAgentId}\nSession: ${targetConversationId}`);
 		}).catch((err) => {
 			const errorMessage = err instanceof Error ? err.message : String(err);
 			svc.chatLog.addSystem(`Agent switch failed: ${errorMessage}`);
@@ -335,7 +323,7 @@ async function openReviewLauncherOverlay(svc) {
 	}
 	let context;
 	try {
-		context = await svc.client.getReviewContext(svc.state.currentSessionKey);
+		context = await svc.client.getReviewContext(svc.state.currentConversationId);
 	} catch (err) {
 		const errorMessage = err instanceof Error ? err.message : String(err);
 		svc.chatLog.addSystem(`Review picker failed: ${errorMessage}`);
@@ -354,24 +342,24 @@ async function openSessionPickerOverlay(svc, options = {}) {
 		return;
 	}
 	const selector = new SessionSelector(sessions, {
-		onResume: (sessionKey) => {
+		onResume: (conversationId) => {
 			svc.closeOverlay();
 			svc.tui.setFocus(svc.editor);
-			resumeSession(svc, sessionKey);
+			resumeSession(svc, conversationId);
 			options.onResume?.();
 		},
-		onRename: async (sessionKey, name) => {
-			return (await svc.client.renameSession(sessionKey, name)).ok ? { ok: true } : {
+		onRename: async (conversationId, name) => {
+			return (await svc.client.renameSession(conversationId, name)).ok ? { ok: true } : {
 				ok: false,
 				error: "Rename failed"
 			};
 		},
-		onDelete: async (sessionKey) => {
-			if (sessionKey === svc.state.currentSessionKey) return {
+		onDelete: async (conversationId) => {
+			if (conversationId === svc.state.currentConversationId) return {
 				ok: false,
 				error: "Switch away before deleting the active session"
 			};
-			return (await svc.client.deleteSession(sessionKey)).ok ? { ok: true } : {
+			return (await svc.client.deleteSession(conversationId)).ok ? { ok: true } : {
 				ok: false,
 				error: "Delete failed"
 			};
@@ -383,7 +371,7 @@ async function openSessionPickerOverlay(svc, options = {}) {
 			options.onCancel?.();
 		},
 		requestRender: () => svc.tui.requestRender()
-	}, svc.keybindings, sessions.find((s) => s.key === svc.state.currentSessionKey)?.cwd ?? process.cwd(), svc.state.currentSessionKey);
+	}, svc.keybindings, sessions.find((s) => s.key === svc.state.currentConversationId)?.cwd ?? process.cwd(), svc.state.currentConversationId);
 	svc.openOverlay(selector);
 	svc.chatLog.addSystem(theme.dim("Session picker"));
 	svc.tui.requestRender();
@@ -396,7 +384,7 @@ async function openSessionTreeOverlay(svc) {
 		svc.tui.requestRender();
 		return;
 	}
-	const items = sessionTreeSelectItems(sessions, svc.state.currentSessionKey);
+	const items = sessionTreeSelectItems(sessions, svc.state.currentConversationId);
 	const list = new SearchableSelectList(items, Math.min(14, items.length), searchableSelectListTheme);
 	list.onSelect = (item) => {
 		svc.closeOverlay();
@@ -414,7 +402,7 @@ async function openSessionTreeOverlay(svc) {
 }
 /** Searchable current-transcript tree overlay. */
 async function openTranscriptTreeOverlay(svc) {
-	const entries = await svc.client.loadTranscriptTree(svc.state.currentSessionKey);
+	const entries = await svc.client.loadTranscriptTree(svc.state.currentConversationId);
 	const filterMode = svc.getTuiSettings().treeFilterMode;
 	const visibleEntries = filterTuiTranscriptTreeEntries(entries, filterMode);
 	if (visibleEntries.length === 0) {
@@ -432,14 +420,14 @@ async function openTranscriptTreeOverlay(svc) {
 			svc.tui.requestRender();
 			return;
 		}
-		const targetKey = defaultTranscriptForkKey(svc.state.currentSessionKey, entry.id);
-		const sourceSessionKey = svc.state.currentSessionKey;
+		const targetKey = defaultTranscriptForkKey(svc.state.currentConversationId, entry.id);
+		const sourceConversationId = svc.state.currentConversationId;
 		svc.chatLog.addSystem(theme.dim(`Forking transcript at ${entry.id}...`));
-		svc.client.forkSessionAt(sourceSessionKey, targetKey, entry.id).then((result) => {
-			resumeSession(svc, result.sessionKey);
+		svc.client.forkSessionAt(sourceConversationId, targetKey, entry.id).then((result) => {
+			resumeSession(svc, result.conversationId);
 			svc.chatLog.addBranchSummary({
-				sourceSessionKey,
-				targetSessionKey: result.sessionKey,
+				sourceConversationId,
+				targetConversationId: result.conversationId,
 				rowCount: result.rowCount,
 				entryId: entry.id
 			});
@@ -460,7 +448,7 @@ async function openTranscriptTreeOverlay(svc) {
 		svc.tui.requestRender();
 	};
 	list.onLabelSubmit = (entry, label) => {
-		svc.client.setTranscriptLabel(svc.state.currentSessionKey, entry.id, label).then(() => {
+		svc.client.setTranscriptLabel(svc.state.currentConversationId, entry.id, label).then(() => {
 			list.updateEntryLabel(entry.id, label);
 			svc.chatLog.addSystem(theme.dim(label?.trim() ? `Labeled ${entry.id}: ${label.trim()}` : `Cleared label for ${entry.id}`));
 			svc.tui.requestRender();
@@ -476,7 +464,7 @@ async function openTranscriptTreeOverlay(svc) {
 }
 /** Pi-style `/fork` overlay: select a previous user message and branch there. */
 async function openUserMessageForkOverlay(svc) {
-	const entries = await svc.client.loadTranscriptTree(svc.state.currentSessionKey);
+	const entries = await svc.client.loadTranscriptTree(svc.state.currentConversationId);
 	const byId = new Map(entries.map((entry) => [entry.id, entry]));
 	const items = userMessageForkSelectItems(entries);
 	if (items.length === 0) {
@@ -490,15 +478,15 @@ async function openUserMessageForkOverlay(svc) {
 		svc.closeOverlay();
 		svc.tui.setFocus(svc.editor);
 		const entry = byId.get(item.value);
-		const targetKey = defaultTranscriptForkKey(svc.state.currentSessionKey, item.value);
-		const sourceSessionKey = svc.state.currentSessionKey;
+		const targetKey = defaultTranscriptForkKey(svc.state.currentConversationId, item.value);
+		const sourceConversationId = svc.state.currentConversationId;
 		svc.chatLog.addSystem(theme.dim(`Forking from ${item.value}...`));
-		svc.client.forkSessionAt(sourceSessionKey, targetKey, item.value).then((result) => {
-			resumeSession(svc, result.sessionKey);
+		svc.client.forkSessionAt(sourceConversationId, targetKey, item.value).then((result) => {
+			resumeSession(svc, result.conversationId);
 			if (entry?.contentText) svc.setEditorText(entry.contentText);
 			svc.chatLog.addBranchSummary({
-				sourceSessionKey,
-				targetSessionKey: result.sessionKey,
+				sourceConversationId,
+				targetConversationId: result.conversationId,
 				rowCount: result.rowCount,
 				entryId: item.value,
 				restoredText: entry?.contentText

package/dist/src/tui/tui-picker-services.d.ts

@@ -27,9 +27,9 @@ export type PickerServices = {
     openEditorSelector: (component: Component, focus?: Component) => () => void;
     refreshSessionInfo: () => Promise<void>;
     updateHeader: () => void;
-    state: Pick<TuiState, 'currentSessionKey' | 'sessionInfo' | 'activeRunId'>;
-    setSessionKey: (key: string) => void;
-    switchAgentSession?: (sessionKey: string, agentId: string) => void | Promise<void>;
+    state: Pick<TuiState, 'currentConversationId' | 'sessionInfo' | 'activeRunId'>;
+    setConversationId: (key: string) => void;
+    switchAgentSession?: (conversationId: string, agentId: string) => void | Promise<void>;
     clearChatForSessionSwitch: () => void;
     loadSessionHistory: () => Promise<void>;
     loadHistoryWindow: (opts: {

package/dist/src/tui/tui-session-actions.d.ts

@@ -8,7 +8,7 @@ export type SessionActionsContext = {
     chatLog: ChatLog;
     tui: TUI;
     state: TuiState;
-    resolveSessionKey: (raw?: string) => string;
+    resolveConversationId: (raw?: string) => string;
     updateHeader: () => void;
     updateFooter: () => void;
     setActivityStatus: (status: string) => void;

package/dist/src/tui/tui-session-actions.js

@@ -1,22 +1,15 @@
-import { parseAgentSessionKey } from "../routing/session-key-utils.js";
-import { init_agent_session_key } from "../routing/agent-session-key.js";
 import { appendHistoryToChatLog, historyKeysHaveAppendOnlyPrefix, historyMessageKey } from "./chat-history.js";
 import { markRunAborting, markRunIdleAfterAbort, resetRunStatus } from "./tui-run-state.js";
 import { clearSeenStreamEvents } from "./tui-agent-events.js";
 //#region src/tui/tui-session-actions.ts
-init_agent_session_key();
 function createSessionActions(context) {
-	const { client, chatLog, tui, state, resolveSessionKey, updateHeader, updateFooter, setActivityStatus, historyLimit = 200, onAgentIdChange, sessionSnapshot, onSessionInfoChange } = context;
+	const { client, chatLog, tui, state, resolveConversationId, updateHeader, updateFooter, setActivityStatus, historyLimit = 200, onAgentIdChange, sessionSnapshot, onSessionInfoChange } = context;
 	let refreshSessionInfoPromise = Promise.resolve();
 	let lastHistoryKeys = [];
-	const updateAgentFromSessionKey = (key) => {
-		const parsed = parseAgentSessionKey(key);
-		if (!parsed?.agentId) return;
-		onAgentIdChange?.(parsed.agentId);
-	};
 	const runRefreshSessionInfo = async () => {
 		try {
-			state.sessionInfo = await client.getSessionInfo(state.currentSessionKey);
+			state.sessionInfo = await client.getSessionInfo(state.currentConversationId);
+			if (state.sessionInfo.agentId) onAgentIdChange?.(state.sessionInfo.agentId);
 			onSessionInfoChange?.();
 			updateFooter();
 			tui.requestRender();
@@ -37,7 +30,7 @@ function createSessionActions(context) {
 	const loadHistory = async (opts) => {
 		try {
 			const { messages } = await client.loadHistory({
-				sessionKey: state.currentSessionKey,
+				conversationId: state.currentConversationId,
 				limit: historyLimit
 			});
 			sessionSnapshot?.replaceFromHistory(messages);
@@ -58,7 +51,7 @@ function createSessionActions(context) {
 		if (!client.loadHistoryWindow) return false;
 		try {
 			const { messages } = await client.loadHistoryWindow({
-				sessionKey: state.currentSessionKey,
+				conversationId: state.currentConversationId,
 				rowNumber: opts.rowNumber,
 				before: opts.before,
 				after: opts.after
@@ -78,9 +71,7 @@ function createSessionActions(context) {
 		}
 	};
 	const setSession = async (rawKey) => {
-		const nextKey = resolveSessionKey(rawKey);
-		updateAgentFromSessionKey(nextKey);
-		state.currentSessionKey = nextKey;
+		state.currentConversationId = resolveConversationId(rawKey);
 		state.activeRunId = null;
 		setActivityStatus("idle");
 		clearChatForSessionSwitch();
@@ -98,12 +89,12 @@ function createSessionActions(context) {
 		markRunIdleAfterAbort(state);
 		tui.requestRender();
 		await client.abortChat({
-			sessionKey: state.currentSessionKey,
+			conversationId: state.currentConversationId,
 			runId
 		}).catch(() => {});
 	};
 	const resetCurrentSession = async () => {
-		await client.resetSession(state.currentSessionKey);
+		await client.resetSession(state.currentConversationId);
 		clearChatForSessionSwitch();
 		await loadHistory();
 	};

package/dist/src/tui/tui-session-format.js

@@ -27,12 +27,15 @@ function sessionMetadataToTuiItem(meta) {
 	const modelRef = typeof cd?.model === "string" ? cd.model : typeof cd?.modelRef === "string" ? cd.modelRef : null;
 	return {
 		key: meta.key,
+		agentId: meta.agentId,
+		sourceChannel: meta.sourceChannel,
+		generatedShell: meta.customData?.genericNewChatShell === true,
 		displayName: meta.name,
 		updatedAt: Date.parse(meta.updatedAt),
 		totalTokens: meta.estimatedTokens ?? null,
 		messageCount: meta.messageCount,
 		model: modelRef,
-		forkedFromSessionKey: typeof cd?.forkedFromSessionKey === "string" ? cd.forkedFromSessionKey : void 0,
+		forkedFromConversationId: typeof cd?.forkedFromConversationId === "string" ? cd.forkedFromConversationId : void 0,
 		cwd: meta.cwd
 	};
 }