@xopcai/xopc 0.0.285 → 0.0.286

package/dist/src/tui/components/branch-summary.js

@@ -8,8 +8,8 @@ function expandKeyLabel(keybindings) {
 function branchSummaryMarkdown(summary) {
 	const lines = [
 		`**Rows forked:** ${summary.rowCount.toLocaleString()}`,
-		`**Source:** ${summary.sourceSessionKey}`,
-		`**Target:** ${summary.targetSessionKey}`
+		`**Source:** ${summary.sourceConversationId}`,
+		`**Target:** ${summary.targetConversationId}`
 	];
 	if (summary.entryId) lines.push(`**Entry:** ${summary.entryId}`);
 	if (summary.restoredText?.trim()) lines.push("", "**Restored input:**", summary.restoredText.trim());
@@ -39,7 +39,7 @@ var BranchSummaryComponent = class extends Container {
 		const title = `${theme.bold("[branch]")} ${theme.dim(`${this.summary.rowCount.toLocaleString()} rows`)}`;
 		this.body.addChild(new Text(title, 1, 1, (text) => theme.toolSuccessBg(text)));
 		if (!this.expanded) {
-			this.body.addChild(new Text(theme.dim(`Forked to ${this.summary.targetSessionKey} (${expandKeyLabel(this.keybindings)} to expand)`), 1, 0));
+			this.body.addChild(new Text(theme.dim(`Forked to ${this.summary.targetConversationId} (${expandKeyLabel(this.keybindings)} to expand)`), 1, 0));
 			return;
 		}
 		this.body.addChild(new Markdown(branchSummaryMarkdown(this.summary), 1, 0, markdownTheme, { color: (line) => theme.assistantText(line) }, { preserveOrderedListMarkers: true }));

package/dist/src/tui/components/session-selector.d.ts

@@ -1,12 +1,12 @@
 import { type Focusable, type Component, type KeybindingsManager, type SelectItem } from '@earendil-works/pi-tui';
 import type { TuiSessionItem } from '../tui-backend.js';
 export type SessionSelectorCallbacks = {
-    onResume: (sessionKey: string) => void;
-    onRename: (sessionKey: string, name: string) => Promise<{
+    onResume: (conversationId: string) => void;
+    onRename: (conversationId: string, name: string) => Promise<{
         ok: boolean;
         error?: string;
     }>;
-    onDelete: (sessionKey: string) => Promise<{
+    onDelete: (conversationId: string) => Promise<{
         ok: boolean;
         error?: string;
     }>;
@@ -19,7 +19,7 @@ export declare class SessionSelector implements Component, Focusable {
     private readonly callbacks;
     private readonly keybindings?;
     private readonly currentCwd?;
-    private readonly currentSessionKey?;
+    private readonly currentConversationId?;
     private sessions;
     private readonly list;
     private readonly footer;
@@ -31,7 +31,7 @@ export declare class SessionSelector implements Component, Focusable {
     private showKey;
     private scope;
     private _focused;
-    constructor(sessions: TuiSessionItem[], callbacks: SessionSelectorCallbacks, keybindings?: KeybindingsManager, currentCwd?: string, currentSessionKey?: string);
+    constructor(sessions: TuiSessionItem[], callbacks: SessionSelectorCallbacks, keybindings?: KeybindingsManager, currentCwd?: string, currentConversationId?: string);
     get focused(): boolean;
     set focused(value: boolean);
     setSessions(sessions: TuiSessionItem[]): void;

package/dist/src/tui/components/session-selector.js

@@ -119,11 +119,11 @@ var SessionSelector = class {
 	showKey = false;
 	scope = "current";
 	_focused = false;
-	constructor(sessions, callbacks, keybindings, currentCwd, currentSessionKey) {
+	constructor(sessions, callbacks, keybindings, currentCwd, currentConversationId) {
 		this.callbacks = callbacks;
 		this.keybindings = keybindings;
 		this.currentCwd = currentCwd;
-		this.currentSessionKey = currentSessionKey;
+		this.currentConversationId = currentConversationId;
 		this.sessions = sessions;
 		this.list = new SearchableSelectList(toSelectItems(sessions, this.sortByName, this.namedOnly, this.showKey, this.scope, this.currentCwd), 12, searchableSelectListTheme, { filterItems: filterSessionSelectItems });
 		this.list.onSelect = (item) => {
@@ -189,7 +189,7 @@ var SessionSelector = class {
 	triggerDeleteForSelectedSession() {
 		const item = this.list.getSelectedItem();
 		if (!item) return;
-		if (item.value === this.currentSessionKey) {
+		if (item.value === this.currentConversationId) {
 			this.pendingDeleteKey = null;
 			this.setFooterHint("Cannot delete the active session");
 			this.callbacks.requestRender();
@@ -263,14 +263,14 @@ var SessionSelector = class {
 		}
 		if (this.pendingDeleteKey) {
 			if (this.matchesAction(keyData, "tui.select.confirm", ["enter"])) {
-				const sessionKey = this.pendingDeleteKey;
+				const conversationId = this.pendingDeleteKey;
 				this.pendingDeleteKey = null;
-				this.callbacks.onDelete(sessionKey).then((result) => {
+				this.callbacks.onDelete(conversationId).then((result) => {
 					if (result.ok) {
-						this.sessions = this.sessions.filter((s) => s.key !== sessionKey);
+						this.sessions = this.sessions.filter((s) => s.key !== conversationId);
 						this.refreshList();
 					}
-					this.setFooterHint(result.ok ? `Deleted ${sessionKey}` : result.error ?? "Delete failed");
+					this.setFooterHint(result.ok ? `Deleted ${conversationId}` : result.error ?? "Delete failed");
 					this.callbacks.requestRender();
 				});
 				return;

package/dist/src/tui/components/tui-bottom-bar.js

@@ -83,7 +83,7 @@ var TuiBottomBar = class {
 			const branch = getGitBranchCached(cwdRaw);
 			return branch ? `${cwd} (${branch})` : cwd;
 		})() : "workspace loading";
-		const sessionLine = state.sessionInfo.displayName ?? `session ${state.currentSessionKey}`;
+		const sessionLine = state.sessionInfo.displayName ?? `session ${state.currentConversationId}`;
 		const pwdLine = truncateToWidth(theme.dim(`${cwdWithBranch} · ${sessionLine}`), width, theme.dim("…"));
 		const busy = BUSY_ACTIVITY.has(state.activityStatus);
 		const leftParts = [state.connectionStatus];

package/dist/src/tui/components/tui-header.d.ts

@@ -2,7 +2,7 @@ import type { Component, KeybindingsManager } from '@earendil-works/pi-tui';
 export type TuiHeaderModel = {
     version: string;
     connectionLabel: string;
-    sessionKey: string;
+    conversationId: string;
     showHints: boolean;
 };
 /** Collapsible startup header (pi-style hints subset). */

package/dist/src/tui/components/tui-header.js

@@ -28,8 +28,8 @@ var TuiHeader = class {
 	}
 	render(width) {
 		if (this.customComponent) return this.customComponent.render(width).map((line) => truncateToWidth(line, width, theme.dim("…")));
-		const { version, connectionLabel, sessionKey, showHints } = this.getModel();
-		const lines = [truncateToWidth(theme.header(`xopc tui v${version} — ${connectionLabel} — ${sessionKey}`), width, theme.dim("…"))];
+		const { version, connectionLabel, conversationId, showHints } = this.getModel();
+		const lines = [truncateToWidth(theme.header(`xopc tui v${version} — ${connectionLabel} — ${conversationId}`), width, theme.dim("…"))];
 		if (showHints) {
 			lines.push(truncateToWidth(theme.dim(this.getCompactHints()), width, theme.dim("…")));
 			lines.push(truncateToWidth(theme.dim(STARTUP_HELP_HINT), width, theme.dim("…")));

package/dist/src/tui/extension-host/autocomplete.d.ts

@@ -11,10 +11,10 @@ export declare class ChainedAutocompleteProvider implements AutocompleteProvider
     private readonly extraProviders;
     private readonly extensionSlashCommands;
     private readonly baseSlashCommandNames;
-    private readonly getSessionKey;
+    private readonly getConversationId;
     private readonly cwd;
     private readonly additionalSlashCommands;
-    constructor(primary: AutocompleteProvider, extraProviders: TuiAutocompleteProvider[], extensionSlashCommands: ExtensionSlashCommandAutocompleteItem[], baseSlashCommandNames: Set<string>, getSessionKey: () => string, cwd: string, additionalSlashCommands?: ExtensionSlashCommandAutocompleteItem[]);
+    constructor(primary: AutocompleteProvider, extraProviders: TuiAutocompleteProvider[], extensionSlashCommands: ExtensionSlashCommandAutocompleteItem[], baseSlashCommandNames: Set<string>, getConversationId: () => string, cwd: string, additionalSlashCommands?: ExtensionSlashCommandAutocompleteItem[]);
     getSuggestions(lines: string[], cursorLine: number, cursorCol: number, options: {
         signal: AbortSignal;
         force?: boolean;

package/dist/src/tui/extension-host/autocomplete.js

@@ -8,12 +8,12 @@ function dedupeAutocompleteItems(items) {
 	});
 }
 var ChainedAutocompleteProvider = class {
-	constructor(primary, extraProviders, extensionSlashCommands, baseSlashCommandNames, getSessionKey, cwd, additionalSlashCommands = []) {
+	constructor(primary, extraProviders, extensionSlashCommands, baseSlashCommandNames, getConversationId, cwd, additionalSlashCommands = []) {
 		this.primary = primary;
 		this.extraProviders = extraProviders;
 		this.extensionSlashCommands = extensionSlashCommands;
 		this.baseSlashCommandNames = baseSlashCommandNames;
-		this.getSessionKey = getSessionKey;
+		this.getConversationId = getConversationId;
 		this.cwd = cwd;
 		this.additionalSlashCommands = additionalSlashCommands;
 	}
@@ -47,12 +47,12 @@ var ChainedAutocompleteProvider = class {
 		if (!atMatch) return primary;
 		const query = atMatch[1] ?? "";
 		const prefix = `@${query}`;
-		const sessionKey = this.getSessionKey();
+		const conversationId = this.getConversationId();
 		const items = [];
 		for (const provider of this.extraProviders) {
 			const suggestions = await provider(query, {
 				cwd: this.cwd,
-				sessionKey
+				conversationId
 			});
 			for (const s of suggestions) {
 				const value = s.value ?? `@${s.name}`;

package/dist/src/tui/extension-host/host.d.ts

@@ -4,7 +4,7 @@ import { TuiExtensionSurface } from './surface.js';
 export interface TuiExtensionHostDeps {
     extensionId: string;
     surface: TuiExtensionSurface;
-    getSessionKey: () => string;
+    getConversationId: () => string;
     notify: (message: string, level?: TuiNotifyLevel) => void;
     onTerminalInputAdded: (handler: TuiTerminalInputHandler) => () => void;
     showOverlay: (component: Component) => void;

package/dist/src/tui/extension-host/runtime-context.d.ts

@@ -4,7 +4,7 @@ import type { ChatLog } from '../components/chat-log.js';
 import type { TuiState } from '../tui-types.js';
 export declare const STALE_EXTENSION_CONTEXT_MESSAGE = "This extension ctx is stale after session replacement or reload. Do not use a captured pi or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().";
 export declare function boundedWidgetLines(lines: string[]): string[];
-export declare function createEmptySessionManager(cwd: string, sessionKey: string): TuiReadonlySessionManager;
+export declare function createEmptySessionManager(cwd: string, conversationId: string): TuiReadonlySessionManager;
 export declare function createDefaultModelRegistry(): TuiModelRegistry;
 export declare function resolveCustomOverlayOptions(component: TuiCustomComponent, customOpts?: TuiCustomOptions): OverlayOptions | undefined;
 export declare function invokeCustomFactory<T>(factory: TuiCustomFactory<T>, tui: TUI, keybindings: KeybindingsManager | undefined, done: (result: T) => void): TuiCustomComponent | Promise<TuiCustomComponent>;

package/dist/src/tui/extension-host/runtime-context.js

@@ -17,7 +17,7 @@ function boundedWidgetLines(lines) {
 	if (lines.length <= MAX_WIDGET_LINES) return lines;
 	return [...lines.slice(0, MAX_WIDGET_LINES), WIDGET_TRUNCATED_LINE];
 }
-function createEmptySessionManager(cwd, sessionKey) {
+function createEmptySessionManager(cwd, conversationId) {
 	return {
 		getEntries: () => [],
 		getBranch: () => [],
@@ -27,7 +27,7 @@ function createEmptySessionManager(cwd, sessionKey) {
 		getLabel: () => void 0,
 		getHeader: () => null,
 		getTree: () => [],
-		getSessionId: () => sessionKey,
+		getSessionId: () => conversationId,
 		getSessionFile: () => void 0,
 		getSessionDir: () => void 0,
 		getSessionName: () => void 0,

package/dist/src/tui/extension-host/runtime.d.ts

@@ -73,7 +73,7 @@ export interface CreateTuiExtensionRuntimeOptions {
     reload?: () => Promise<void>;
     sendUserMessage?: TuiReplacedSessionContext['sendUserMessage'];
     sendMessage?: TuiReplacedSessionContext['sendMessage'];
-    searchWorkspaceFiles?: (sessionKey: string, query: string, options?: {
+    searchWorkspaceFiles?: (conversationId: string, query: string, options?: {
         limit?: number;
     }) => Promise<Array<{
         name: string;

package/dist/src/tui/extension-host/runtime.js

@@ -48,7 +48,7 @@ function createTuiExtensionRuntime(opts) {
 	const autocompleteProvider = new WrappedAutocompleteProvider(new ChainedAutocompleteProvider(new CombinedAutocompleteProvider(opts.baseSlashCommands.map((c) => ({
 		name: c.name,
 		description: c.description
-	})), opts.cwd, null), autocompleteProviders, slashCommands, new Set(opts.baseSlashCommands.map((command) => command.name)), () => opts.getState().currentSessionKey, opts.cwd, opts.additionalSlashCommands ?? []), autocompleteProviderFactories);
+	})), opts.cwd, null), autocompleteProviders, slashCommands, new Set(opts.baseSlashCommands.map((command) => command.name)), () => opts.getState().currentConversationId, opts.cwd, opts.additionalSlashCommands ?? []), autocompleteProviderFactories);
 	const invalidate = () => {
 		opts.header.setCustomComponent?.(surface.customHeader);
 		opts.header.setExtensionLines(surface.getHeaderLines());
@@ -216,7 +216,7 @@ function createTuiExtensionRuntime(opts) {
 				assertActive();
 				return opts.getSystemPromptOptions?.() ?? {
 					cwd: opts.cwd,
-					sessionKey: opts.getState().currentSessionKey,
+					conversationId: opts.getState().currentConversationId,
 					model: getTuiModelInfo(opts.getState())
 				};
 			},
@@ -321,7 +321,7 @@ function createTuiExtensionRuntime(opts) {
 				enumerable: true,
 				get: () => {
 					assertActive();
-					return opts.getSessionManager?.() ?? createEmptySessionManager(opts.cwd, opts.getState().currentSessionKey);
+					return opts.getSessionManager?.() ?? createEmptySessionManager(opts.cwd, opts.getState().currentConversationId);
 				}
 			},
 			modelRegistry: {
@@ -345,11 +345,11 @@ function createTuiExtensionRuntime(opts) {
 					return opts.cwd;
 				}
 			},
-			sessionKey: {
+			conversationId: {
 				enumerable: true,
 				get: () => {
 					assertActive();
-					return opts.getState().currentSessionKey;
+					return opts.getState().currentConversationId;
 				}
 			}
 		});
@@ -457,7 +457,7 @@ function createTuiExtensionRuntime(opts) {
 	const createHost = (extensionId) => createTuiExtensionHost({
 		extensionId,
 		surface,
-		getSessionKey: () => opts.getState().currentSessionKey,
+		getConversationId: () => opts.getState().currentConversationId,
 		notify: (message, level) => notifyInChatLog(opts.chatLog, opts.tui, message, level),
 		onTerminalInputAdded: (handler) => {
 			const unregister = opts.addInputListener?.(handler);

package/dist/src/tui/tui-backend.d.ts

@@ -5,7 +5,7 @@ import type { ReviewContext } from '../review/review-git.js';
 import type { SessionInfo, TuiEventSource } from './tui-types.js';
 /** Options for sending a chat message. */
 export interface ChatSendOptions {
-    sessionKey: string;
+    conversationId: string;
     message: string;
     attachments?: TuiInboundAttachment[];
     thinking?: string;
@@ -32,13 +32,16 @@ export interface TuiComposerHistoryItem {
 }
 /** Minimal session list item. */
 export interface TuiSessionItem {
+    agentId?: string;
+    sourceChannel?: string;
+    generatedShell?: boolean;
     key: string;
     updatedAt?: number | null;
     model?: string | null;
     totalTokens?: number | null;
     displayName?: string;
     messageCount?: number;
-    forkedFromSessionKey?: string;
+    forkedFromConversationId?: string;
     cwd?: string;
 }
 export interface TuiAgentInfo {
@@ -83,8 +86,8 @@ export interface TuiCompactionResult {
     transcriptSummary?: string;
 }
 export interface TuiBranchSummary {
-    sourceSessionKey: string;
-    targetSessionKey: string;
+    sourceConversationId: string;
+    targetConversationId: string;
     rowCount: number;
     entryId?: string;
     restoredText?: string;
@@ -118,7 +121,7 @@ export interface TuiStartupResources {
     connectors: string[];
 }
 export interface TuiChatInputState {
-    sessionKey: string;
+    conversationId: string;
     revision: number;
     inputs: Array<{
         id: string;
@@ -132,7 +135,7 @@ export interface TuiWorkspaceFileSearchEntry {
     isDirectory: boolean;
 }
 export interface TuiWorkflowRunStartRequest {
-    sessionKey: string;
+    conversationId: string;
     definitionId: string;
     agentId?: string;
     goal?: string;
@@ -140,7 +143,7 @@ export interface TuiWorkflowRunStartRequest {
 }
 export interface TuiWorkflowRunStartResult {
     runId: string;
-    sessionKey: string;
+    conversationId: string;
     definitionId: string;
 }
 export interface TuiStartupProjectResult {
@@ -204,7 +207,7 @@ export interface TuiBackend {
     }>;
     /** Reattach to a live gateway/webchat run when the original response stream stalled. */
     resumeChat?(opts: {
-        sessionKey: string;
+        conversationId: string;
         runId: string;
     }): Promise<{
         ok: boolean;
@@ -212,60 +215,60 @@ export interface TuiBackend {
     }>;
     /** Abort an active run. */
     abortChat(opts: {
-        sessionKey: string;
+        conversationId: string;
         runId: string;
     }): Promise<{
         ok: boolean;
     }>;
     /** Inject steering text into an active run (tool-boundary delivery). */
     submitChatInput(opts: {
-        sessionKey: string;
+        conversationId: string;
         message: string;
         delivery: 'next' | 'steer';
     }): Promise<{
         ok: boolean;
         effectiveDelivery?: 'next' | 'steer';
     }>;
-    getChatInputState(sessionKey: string): Promise<TuiChatInputState>;
+    getChatInputState(conversationId: string): Promise<TuiChatInputState>;
     /** Start a workflow run directly, without routing through the LLM. */
     startWorkflowRun?(opts: TuiWorkflowRunStartRequest): Promise<TuiWorkflowRunStartResult>;
     /** Resolve or create the project implied by the TUI launch workspace. */
     resolveStartupProject?(opts: {
         workspacePath: string;
-        sessionKey: string;
+        conversationId: string;
         agentId: string;
         autoCreate?: boolean;
     }): Promise<TuiStartupProjectResult>;
     /** Load startup resources shown in `/start` and initial help. */
-    getStartupResources?(sessionKey: string): Promise<TuiStartupResources>;
+    getStartupResources?(conversationId: string): Promise<TuiStartupResources>;
     /** Re-evaluate project-scoped resources after a local trust decision changes. */
     refreshWorkspaceTrust?(): void | Promise<void>;
     /** Fuzzy search files in this session's effective workspace. */
-    searchWorkspaceFiles?(sessionKey: string, query: string, options?: {
+    searchWorkspaceFiles?(conversationId: string, query: string, options?: {
         limit?: number;
     }): Promise<TuiWorkspaceFileSearchEntry[]>;
     /** Load git branches/commits/status for the interactive review launcher. */
-    getReviewContext?(sessionKey: string): Promise<ReviewContext>;
+    getReviewContext?(conversationId: string): Promise<ReviewContext>;
     /** Load chat history for a session. */
     loadHistory(opts: {
-        sessionKey: string;
+        conversationId: string;
         limit?: number;
     }): Promise<{
         messages: HistoryMessage[];
     }>;
     /** Load a bounded transcript window around a persisted row number. */
     loadHistoryWindow?(opts: {
-        sessionKey: string;
+        conversationId: string;
         rowNumber: number;
         before?: number;
         after?: number;
     }): Promise<TuiHistoryWindow>;
     /** Load current transcript rows as a tree-shaped list. */
-    loadTranscriptTree(sessionKey: string): Promise<TuiTranscriptTreeEntry[]>;
+    loadTranscriptTree(conversationId: string): Promise<TuiTranscriptTreeEntry[]>;
     /** Load current transcript rows as timeline items for turn navigation. */
-    loadTimeline(sessionKey: string): Promise<SessionTimelineItem[]>;
+    loadTimeline(conversationId: string): Promise<SessionTimelineItem[]>;
     /** Compute transcript message/token statistics. */
-    getSessionStats(sessionKey: string): Promise<TuiSessionStats>;
+    getSessionStats(conversationId: string): Promise<TuiSessionStats>;
     /** List sessions. */
     listSessions(): Promise<TuiSessionItem[]>;
     /** List agents available for TUI agent switching. */
@@ -275,64 +278,65 @@ export interface TuiBackend {
         agentId: string;
     }>;
     /** Fetch session info (model, tokens, thinking). */
-    getSessionInfo(sessionKey: string): Promise<SessionInfo>;
+    getSessionInfo(conversationId: string): Promise<SessionInfo>;
+    createConversation(agentId: string, conversationId?: string): Promise<string>;
     /** List available models. */
     listModels(): Promise<TuiModelChoice[]>;
     /** Refresh dynamic model catalogs after credentials change. */
     refreshModels?(): Promise<void>;
     /** Reset / create new session. */
-    resetSession(sessionKey: string): Promise<void>;
+    resetSession(conversationId: string): Promise<void>;
     /** Rename session display name. */
-    renameSession(sessionKey: string, name: string): Promise<{
+    renameSession(conversationId: string, name: string): Promise<{
         ok: boolean;
     }>;
     /** Delete session and transcript. */
-    deleteSession(sessionKey: string): Promise<{
+    deleteSession(conversationId: string): Promise<{
         ok: boolean;
     }>;
     /** Patch session settings (e.g. model). */
-    patchSession(sessionKey: string, patch: Record<string, unknown>): Promise<void>;
+    patchSession(conversationId: string, patch: Record<string, unknown>): Promise<void>;
     /** Compact session transcript (returns whether compaction ran). */
-    compactSession(sessionKey: string, options?: {
+    compactSession(conversationId: string, options?: {
         force?: boolean;
         instructions?: string;
     }): Promise<TuiCompactionResult>;
     /** Export a session transcript. */
-    exportSession(sessionKey: string, format: ExportFormat): Promise<string>;
+    exportSession(conversationId: string, format: ExportFormat): Promise<string>;
     /** Import an xopc JSON session export into a new session key. */
-    importSession(targetSessionKey: string, jsonContent: string): Promise<{
-        sessionKey: string;
+    importSession(targetConversationId: string, jsonContent: string): Promise<{
+        conversationId: string;
         rowCount: number;
     }>;
     /** Create a share link for a workspace file/folder/site artifact. */
-    createShare(sessionKey: string, request: TuiShareRequest, options?: {
+    createShare(conversationId: string, request: TuiShareRequest, options?: {
         agentId?: string;
     }): Promise<TuiShareResult>;
     /** Ask an ephemeral side question using this session as read-only background. */
-    btwQuery(sessionKey: string, question: string): Promise<{
+    btwQuery(conversationId: string, question: string): Promise<{
         text: string;
         error?: string;
     }>;
     /** Fork one session transcript into a new session key. */
-    forkSession(sourceSessionKey: string, targetSessionKey: string): Promise<{
-        sessionKey: string;
+    forkSession(sourceConversationId: string, targetConversationId: string): Promise<{
+        conversationId: string;
         rowCount: number;
     }>;
     /** Fork one session transcript through a selected transcript-tree entry. */
-    forkSessionAt(sourceSessionKey: string, targetSessionKey: string, entryId: string): Promise<{
-        sessionKey: string;
+    forkSessionAt(sourceConversationId: string, targetConversationId: string, entryId: string): Promise<{
+        conversationId: string;
         rowCount: number;
     }>;
     /** Append or clear a label for a transcript entry. */
-    setTranscriptLabel(sessionKey: string, entryId: string, label: string | undefined): Promise<{
+    setTranscriptLabel(conversationId: string, entryId: string, label: string | undefined): Promise<{
         ok: boolean;
     }>;
     /** Append extension state for replay by TUI extension sessionManager APIs. */
-    appendCustomEntry(sessionKey: string, customType: string, data?: unknown): Promise<{
+    appendCustomEntry(conversationId: string, customType: string, data?: unknown): Promise<{
         ok: boolean;
     }>;
     /** Append a visible extension custom message. */
-    appendCustomMessage(sessionKey: string, message: {
+    appendCustomMessage(conversationId: string, message: {
         customType: string;
         content?: string | unknown[];
         display?: boolean;
@@ -341,7 +345,7 @@ export interface TuiBackend {
         ok: boolean;
     }>;
     /** Persist a local TUI shell execution for replay and optional LLM context. */
-    appendBashExecution(sessionKey: string, entry: {
+    appendBashExecution(conversationId: string, entry: {
         command: string;
         output?: string;
         exitCode?: number | null;

package/dist/src/tui/tui-command-formatters.d.ts

@@ -41,11 +41,11 @@ export declare function formatTuiDebugInfo(params: {
 export declare function writeTuiDebugInfo(deps: TuiDebugDeps): string;
 export declare function formatTuiModelsInfo(models: TuiModelChoice[]): string;
 export declare function formatTuiSessionListInfo(sessions: TuiSessionItem[], options?: {
-    currentSessionKey?: string;
+    currentConversationId?: string;
     limit?: number;
 }): string;
 export declare function formatTuiSessionTreeInfo(sessions: TuiSessionItem[], options?: {
-    currentSessionKey?: string;
+    currentConversationId?: string;
     limitPerGroup?: number;
 }): string;
 export declare function formatTuiTranscriptTreeInfo(entries: TuiTranscriptTreeEntry[], options?: {

package/dist/src/tui/tui-command-formatters.js

@@ -1,8 +1,6 @@
 import { getLogDir } from "../utils/logger/config.js";
 import { getRuntimeLogStats } from "../utils/logger/stats.js";
 import { init_logger } from "../utils/logger.js";
-import { parseAgentSessionKey } from "../routing/session-key-utils.js";
-import { init_agent_session_key } from "../routing/agent-session-key.js";
 import { resolveConfigPath } from "../config/paths.js";
 import { getProviderDisplayName, getSortedProviders, init_providers, providerSupportsApiKey, providerSupportsOAuth } from "../providers/index.js";
 import { createWorkflowCatalog } from "../agent/workflow/catalog.js";
@@ -16,7 +14,6 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { visibleWidth } from "@earendil-works/pi-tui";
 //#region src/tui/tui-command-formatters.ts
 init_providers();
-init_agent_session_key();
 init_logger();
 const SHARE_AUDIENCES = new Set([
 	"friend",
@@ -277,7 +274,7 @@ function formatTuiSessionListInfo(sessions, options = {}) {
 	const visible = sessions.slice(0, limit);
 	const lines = ["Sessions", ""];
 	for (const session of visible) {
-		const current = session.key === options.currentSessionKey ? "* " : "  ";
+		const current = session.key === options.currentConversationId ? "* " : "  ";
 		const label = session.displayName?.trim() || session.key;
 		const description = formatSessionPickerDescription(session, { showKey: Boolean(session.displayName) });
 		lines.push(`${current}${label}${description ? ` — ${description}` : ""}`);
@@ -286,14 +283,10 @@ function formatTuiSessionListInfo(sessions, options = {}) {
 	return lines.join("\n");
 }
 function sessionTreeGroup(session) {
-	const parsed = parseAgentSessionKey(session.key);
-	const agentId = parsed?.agentId ?? "unknown";
-	const rest = parsed?.rest ?? session.key;
-	const parts = rest.split(":").filter(Boolean);
 	return {
-		agentId,
-		root: parts[0] ?? rest,
-		leaf: parts.length > 1 ? parts.slice(1).join(":") : rest
+		agentId: session.agentId ?? "unknown",
+		root: session.sourceChannel ?? "chat",
+		leaf: session.displayName ?? session.key
 	};
 }
 function formatTuiSessionTreeInfo(sessions, options = {}) {
@@ -316,13 +309,13 @@ function formatTuiSessionTreeInfo(sessions, options = {}) {
 		const sorted = [...groupSessions].sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
 		const visible = sorted.slice(0, limitPerGroup);
 		for (const session of visible) {
-			const current = session.key === options.currentSessionKey ? "*" : " ";
+			const current = session.key === options.currentConversationId ? "*" : " ";
 			const group = sessionTreeGroup(session);
 			const label = session.displayName?.trim() || group.leaf;
 			const description = formatSessionPickerDescription(session, { showKey: Boolean(session.displayName) });
 			lines.push(`  ${current} ${label}${description ? ` — ${description}` : ""}`);
-			if (session.forkedFromSessionKey) {
-				const sourceLabel = byKey.get(session.forkedFromSessionKey)?.displayName?.trim() || session.forkedFromSessionKey;
+			if (session.forkedFromConversationId) {
+				const sourceLabel = byKey.get(session.forkedFromConversationId)?.displayName?.trim() || session.forkedFromConversationId;
 				lines.push(`      forked from ${sourceLabel}`);
 			}
 		}
@@ -443,7 +436,6 @@ function formatTuiSessionStatsBlock(stats) {
 	];
 }
 function formatTuiSessionInfo(state, stats) {
-	const parsedKey = parseAgentSessionKey(state.currentSessionKey);
 	const tokenEstimate = state.sessionInfo.totalTokens ?? state.sessionInfo.contextTokens;
 	const contextLabel = formatContextUsageLabel(state.sessionInfo.contextUsagePercent ?? computeContextUsagePercent(tokenEstimate, state.sessionInfo.contextWindow), state.sessionInfo.contextWindow) ?? "-";
 	const connectionLabel = state.isConnected ? "connected" : "disconnected";
@@ -451,8 +443,8 @@ function formatTuiSessionInfo(state, stats) {
 		"Session Info",
 		"",
 		`Name: ${formatMaybe(state.sessionInfo.displayName)}`,
-		`Key: ${state.currentSessionKey}`,
-		`Agent: ${formatMaybe(parsedKey?.agentId)}`,
+		`Key: ${state.currentConversationId}`,
+		`Agent: ${formatMaybe(state.sessionInfo.agentId)}`,
 		`Connection: ${connectionLabel} (${formatMaybe(state.connectionStatus)})`,
 		`Activity: ${formatMaybe(state.activityStatus)}`,
 		`Model: ${formatModelLabel(state)}`,
@@ -528,7 +520,7 @@ function formatTuiConfigInfo(state) {
 	return [
 		"Config",
 		"",
-		`Session: ${state.currentSessionKey}`,
+		`Session: ${state.currentConversationId}`,
 		`Model: ${formatModelLabel(state)}`,
 		`Thinking: ${formatMaybe(state.sessionInfo.thinkingLevel)}`,
 		`Reasoning: ${formatMaybe(state.sessionInfo.reasoningLevel)}`,

package/dist/src/tui/tui-commands.d.ts

@@ -61,7 +61,7 @@ export type CommandHandlerDeps = {
     } | Promise<{
         agentId: string;
     }>;
-    switchAgentSession?: (sessionKey: string, agentId: string) => void | Promise<void>;
+    switchAgentSession?: (conversationId: string, agentId: string) => void | Promise<void>;
     getSessionStats?: () => TuiSessionStats | Promise<TuiSessionStats>;
     getStartupResources?: () => TuiStartupResources | undefined;
     loadTranscriptTree?: () => TuiTranscriptTreeEntry[] | Promise<TuiTranscriptTreeEntry[]>;
@@ -80,11 +80,11 @@ export type CommandHandlerDeps = {
         goal?: string;
     }) => {
         runId: string;
-        sessionKey: string;
+        conversationId: string;
         definitionId: string;
     } | Promise<{
         runId: string;
-        sessionKey: string;
+        conversationId: string;
         definitionId: string;
     }>;
     authProfiles?: {