@xopcai/xopc 0.0.284 → 0.0.286

package/dist/src/endpoint-tools/upload-service.js

@@ -1,8 +1,9 @@
-import { ENDPOINT_MAX_FILE_BYTES } from "../../packages/endpoint-tools-protocol/src/index.js";
+import { ENDPOINT_MAX_FILE_BYTES, init_src } from "../../packages/endpoint-tools-protocol/src/index.js";
 import { join } from "node:path";
 import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import crypto from "node:crypto";
 //#region src/endpoint-tools/upload-service.ts
+init_src();
 const GRANT_TTL_MS = 5 * 6e4;
 const ENDPOINT_UPLOAD_MAX_BYTES = ENDPOINT_MAX_FILE_BYTES;
 const DEFAULT_MAX_FILES = 8;

package/dist/src/execution-environments/local-worktree-manager.d.ts

@@ -33,7 +33,7 @@ export declare class LocalWorktreeManager {
     inspect(environmentId: string): Promise<LocalWorktreeInspection>;
     reconcile(environmentId: string): Promise<ExecutionEnvironment>;
     remove(environmentId: string, options?: {
-        releaseSessionKey: string;
+        releaseConversationId: string;
     }): Promise<ExecutionEnvironment>;
     private cleanupFailedProvision;
 }

package/dist/src/execution-environments/local-worktree-manager.js

@@ -236,7 +236,7 @@ var LocalWorktreeManager = class {
 		}
 		if (environment.kind !== "managed_worktree" || !environment.repositoryRoot || !environment.gitCommonDir) throw new Error(`Execution environment ${environmentId} is not a managed worktree`);
 		assertManagedPath(environment.rootPath, this.stateDir);
-		if (this.store.listBindings(environmentId).some((binding) => binding.sessionKey !== options?.releaseSessionKey)) throw new ExecutionEnvironmentConflictError(`Managed worktree ${environmentId} still has active bindings`);
+		if (this.store.listBindings(environmentId).some((binding) => binding.conversationId !== options?.releaseConversationId)) throw new ExecutionEnvironmentConflictError(`Managed worktree ${environmentId} still has active bindings`);
 		const deleting = environment.status === "deleting" ? environment : this.store.transition({
 			environmentId,
 			expectedVersion: environment.version,
@@ -278,7 +278,7 @@ var LocalWorktreeManager = class {
 					}
 				}
 			});
-			if (options?.releaseSessionKey) this.store.releaseBinding(options.releaseSessionKey, environmentId);
+			if (options?.releaseConversationId) this.store.releaseBinding(options.releaseConversationId, environmentId);
 			const deleted = this.store.transition({
 				environmentId,
 				expectedVersion: deleting.version,

package/dist/src/execution-environments/session-environment-service.d.ts

@@ -10,13 +10,13 @@ export declare class SessionEnvironmentService {
     private readonly store;
     private readonly worktrees;
     constructor(options?: SessionEnvironmentServiceOptions);
-    get(sessionKey: string): ExecutionEnvironment | undefined;
+    get(conversationId: string): ExecutionEnvironment | undefined;
     attach(input: {
-        sessionKey: string;
+        conversationId: string;
         project: Project;
         mode?: ProjectExecutionMode;
         baseRef?: string;
     }): Promise<ExecutionEnvironment>;
-    release(sessionKey: string, removeManaged?: boolean): Promise<ExecutionEnvironment | undefined>;
+    release(conversationId: string, removeManaged?: boolean): Promise<ExecutionEnvironment | undefined>;
     private resolveLocalCheckout;
 }

package/dist/src/execution-environments/session-environment-service.js

@@ -10,15 +10,15 @@ var SessionEnvironmentService = class {
 		this.store = options.store ?? new ExecutionEnvironmentStore();
 		this.worktrees = options.worktrees ?? new LocalWorktreeManager({ store: this.store });
 	}
-	get(sessionKey) {
-		const binding = this.store.resolveBinding(sessionKey);
+	get(conversationId) {
+		const binding = this.store.resolveBinding(conversationId);
 		return binding ? this.store.get(binding.environmentId) : void 0;
 	}
 	async attach(input) {
-		const existing = this.get(input.sessionKey);
+		const existing = this.get(input.conversationId);
 		if (existing) {
-			if (existing.projectId !== input.project.id) throw new ExecutionEnvironmentConflictError(`Session ${input.sessionKey} is already bound to a different project's execution environment`);
-			if (input.mode && existing.kind !== input.mode) throw new ExecutionEnvironmentConflictError(`Session ${input.sessionKey} is already using ${existing.kind}; release it before switching to ${input.mode}`);
+			if (existing.projectId !== input.project.id) throw new ExecutionEnvironmentConflictError(`Session ${input.conversationId} is already bound to a different project's execution environment`);
+			if (input.mode && existing.kind !== input.mode) throw new ExecutionEnvironmentConflictError(`Session ${input.conversationId} is already using ${existing.kind}; release it before switching to ${input.mode}`);
 			const checked = existing.kind === "managed_worktree" ? await this.worktrees.reconcile(existing.id) : existing;
 			if (checked.status !== "ready") throw new ExecutionEnvironmentConflictError(`Execution environment ${checked.id} is ${checked.status}; repair it before resuming`);
 			return checked;
@@ -32,7 +32,7 @@ var SessionEnvironmentService = class {
 		}) : await this.resolveLocalCheckout(input.project.id, workspaceRoot);
 		try {
 			this.store.bind({
-				sessionKey: input.sessionKey,
+				conversationId: input.conversationId,
 				environmentId: environment.id
 			});
 			return environment;
@@ -41,12 +41,12 @@ var SessionEnvironmentService = class {
 			throw error;
 		}
 	}
-	async release(sessionKey, removeManaged = true) {
-		const binding = this.store.resolveBinding(sessionKey);
+	async release(conversationId, removeManaged = true) {
+		const binding = this.store.resolveBinding(conversationId);
 		if (!binding) return void 0;
 		const environment = this.store.get(binding.environmentId);
-		if (removeManaged && environment?.kind === "managed_worktree") await this.worktrees.remove(environment.id, { releaseSessionKey: sessionKey });
-		else this.store.releaseBinding(sessionKey, binding.environmentId);
+		if (removeManaged && environment?.kind === "managed_worktree") await this.worktrees.remove(environment.id, { releaseConversationId: conversationId });
+		else this.store.releaseBinding(conversationId, binding.environmentId);
 		return environment;
 	}
 	async resolveLocalCheckout(projectId, workspaceRoot) {

package/dist/src/execution-environments/store.d.ts

@@ -6,8 +6,8 @@ export declare class ExecutionEnvironmentStore {
     list(query?: ExecutionEnvironmentListQuery): ExecutionEnvironment[];
     transition(input: TransitionExecutionEnvironmentInput): ExecutionEnvironment;
     bind(input: BindExecutionEnvironmentInput): ExecutionEnvironmentBinding;
-    resolveBinding(sessionKey: string): ExecutionEnvironmentBinding | undefined;
+    resolveBinding(conversationId: string): ExecutionEnvironmentBinding | undefined;
     listBindings(environmentId: string, includeReleased?: boolean): ExecutionEnvironmentBinding[];
-    releaseBinding(sessionKey: string, expectedEnvironmentId?: string): ExecutionEnvironmentBinding | undefined;
+    releaseBinding(conversationId: string, expectedEnvironmentId?: string): ExecutionEnvironmentBinding | undefined;
     listEvents(environmentId: string): ExecutionEnvironmentEvent[];
 }

package/dist/src/execution-environments/store.js

@@ -1,8 +1,9 @@
-import { getSqliteDatabase, runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
+import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
 import { ExecutionEnvironmentConflictError, ExecutionEnvironmentNotFoundError, canTransitionExecutionEnvironment } from "./types.js";
 import { resolve } from "node:path";
 import { randomUUID } from "node:crypto";
 //#region src/execution-environments/store.ts
+init_transaction();
 function optionalText(value) {
 	return value?.trim() || void 0;
 }
@@ -34,7 +35,7 @@ function environmentFromRow(row) {
 function bindingFromRow(row) {
 	return {
 		id: row.binding_id,
-		sessionKey: row.session_key,
+		conversationId: row.conversation_id,
 		environmentId: row.environment_id,
 		createdAt: row.created_at,
 		...row.released_at == null ? {} : { releasedAt: row.released_at }
@@ -122,38 +123,38 @@ var ExecutionEnvironmentStore = class {
 		return this.getRequired(input.environmentId);
 	}
 	bind(input) {
-		const sessionKey = requiredText(input.sessionKey, "sessionKey");
+		const conversationId = requiredText(input.conversationId, "conversationId");
 		return runSqliteWriteTransaction((db) => {
 			const environment = getEnvironmentRow(input.environmentId);
 			if (!environment) throw new ExecutionEnvironmentNotFoundError(input.environmentId);
 			if (environment.status !== "ready") throw new ExecutionEnvironmentConflictError(`Execution environment ${input.environmentId} is not bindable while ${environment.status}`);
 			const active = db.prepare(`SELECT * FROM execution_environment_bindings
-         WHERE session_key = ? AND released_at IS NULL`).get(sessionKey);
+         WHERE conversation_id = ? AND released_at IS NULL`).get(conversationId);
 			if (active) {
 				if (active.environment_id === input.environmentId) return bindingFromRow(active);
-				throw new ExecutionEnvironmentConflictError(`Session ${sessionKey} is already bound to ${active.environment_id}`);
+				throw new ExecutionEnvironmentConflictError(`Session ${conversationId} is already bound to ${active.environment_id}`);
 			}
 			if (environment.kind === "managed_worktree") {
 				const owner = db.prepare(`SELECT * FROM execution_environment_bindings
            WHERE environment_id = ? AND released_at IS NULL LIMIT 1`).get(input.environmentId);
-				if (owner) throw new ExecutionEnvironmentConflictError(`Managed worktree ${input.environmentId} is already bound to session ${owner.session_key}`);
+				if (owner) throw new ExecutionEnvironmentConflictError(`Managed worktree ${input.environmentId} is already bound to session ${owner.conversation_id}`);
 			}
 			const binding = {
 				id: randomUUID(),
-				sessionKey,
+				conversationId,
 				environmentId: input.environmentId,
 				createdAt: Date.now()
 			};
 			db.prepare(`INSERT INTO execution_environment_bindings (
-          binding_id, session_key, environment_id, created_at
-        ) VALUES (?, ?, ?, ?)`).run(binding.id, binding.sessionKey, binding.environmentId, binding.createdAt);
+          binding_id, conversation_id, environment_id, created_at
+        ) VALUES (?, ?, ?, ?)`).run(binding.id, binding.conversationId, binding.environmentId, binding.createdAt);
 			db.prepare(`UPDATE execution_environments SET last_used_at = ?, updated_at = ? WHERE environment_id = ?`).run(binding.createdAt, binding.createdAt, binding.environmentId);
 			return binding;
 		});
 	}
-	resolveBinding(sessionKey) {
+	resolveBinding(conversationId) {
 		const row = getSqliteDatabase().prepare(`SELECT * FROM execution_environment_bindings
-       WHERE session_key = ? AND released_at IS NULL`).get(sessionKey);
+       WHERE conversation_id = ? AND released_at IS NULL`).get(conversationId);
 		return row ? bindingFromRow(row) : void 0;
 	}
 	listBindings(environmentId, includeReleased = false) {
@@ -161,12 +162,12 @@ var ExecutionEnvironmentStore = class {
        WHERE environment_id = ? ${includeReleased ? "" : "AND released_at IS NULL"}
        ORDER BY created_at, rowid`).all(environmentId).map(bindingFromRow);
 	}
-	releaseBinding(sessionKey, expectedEnvironmentId) {
+	releaseBinding(conversationId, expectedEnvironmentId) {
 		return runSqliteWriteTransaction((db) => {
 			const active = db.prepare(`SELECT * FROM execution_environment_bindings
-         WHERE session_key = ? AND released_at IS NULL`).get(sessionKey);
+         WHERE conversation_id = ? AND released_at IS NULL`).get(conversationId);
 			if (!active) return void 0;
-			if (expectedEnvironmentId && active.environment_id !== expectedEnvironmentId) throw new ExecutionEnvironmentConflictError(`Session ${sessionKey} is bound to ${active.environment_id}, not ${expectedEnvironmentId}`);
+			if (expectedEnvironmentId && active.environment_id !== expectedEnvironmentId) throw new ExecutionEnvironmentConflictError(`Session ${conversationId} is bound to ${active.environment_id}, not ${expectedEnvironmentId}`);
 			const releasedAt = Date.now();
 			db.prepare(`UPDATE execution_environment_bindings SET released_at = ? WHERE binding_id = ? AND released_at IS NULL`).run(releasedAt, active.binding_id);
 			return bindingFromRow({

package/dist/src/execution-environments/subject.d.ts

@@ -1,2 +1,2 @@
 import type { ExecutionEnvironment } from './types.js';
-export declare function getExecutionEnvironmentForSession(sessionKey: string): ExecutionEnvironment | undefined;
+export declare function getExecutionEnvironmentForSession(conversationId: string): ExecutionEnvironment | undefined;

package/dist/src/execution-environments/subject.js

@@ -2,10 +2,10 @@ import { isXopcDatabaseOpen } from "../storage/sqlite/connection.js";
 import "../storage/sqlite/index.js";
 import { ExecutionEnvironmentStore } from "./store.js";
 //#region src/execution-environments/subject.ts
-function getExecutionEnvironmentForSession(sessionKey) {
+function getExecutionEnvironmentForSession(conversationId) {
 	if (!isXopcDatabaseOpen()) return void 0;
 	const store = new ExecutionEnvironmentStore();
-	const binding = store.resolveBinding(sessionKey);
+	const binding = store.resolveBinding(conversationId);
 	return binding ? store.get(binding.environmentId) : void 0;
 }
 //#endregion

package/dist/src/execution-environments/types.d.ts

@@ -22,7 +22,7 @@ export interface ExecutionEnvironment {
 }
 export interface ExecutionEnvironmentBinding {
     id: string;
-    sessionKey: string;
+    conversationId: string;
     environmentId: string;
     createdAt: number;
     releasedAt?: number;
@@ -54,7 +54,7 @@ export interface ExecutionEnvironmentListQuery {
     limit?: number;
 }
 export interface BindExecutionEnvironmentInput {
-    sessionKey: string;
+    conversationId: string;
     environmentId: string;
 }
 export interface TransitionExecutionEnvironmentInput {

package/dist/src/extensions/api.js

@@ -135,7 +135,7 @@ var ExtensionApiImpl = class {
 			examples: command.examples,
 			handler: async (ctx, args) => {
 				const extensionCtx = {
-					sessionKey: ctx.sessionKey,
+					conversationId: ctx.conversationId,
 					source: ctx.source,
 					isGroup: ctx.isGroup,
 					config: ctx.config,

package/dist/src/extensions/install.js

@@ -5,9 +5,9 @@ import { init_paths, resolveBundledExtensionsDir, resolveExtensionsDir as resolv
 import { MAX_EXTENSION_STORE_ZIP_BYTES } from "./store-zip-limits.js";
 import { checkEngineCompatibility } from "./engine-check.js";
 import { collectExtensionPackageDependencyIssues } from "./package-contract.js";
+import { execFileSync } from "node:child_process";
 import { dirname, isAbsolute, join, resolve, sep } from "path";
 import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from "fs";
-import { execFileSync } from "node:child_process";
 import semver from "semver";
 import AdmZip from "adm-zip";
 import { tmpdir } from "os";

package/dist/src/extensions/loader.d.ts

@@ -78,7 +78,7 @@ export declare class ExtensionLoader {
     setRuntimeContext(ctx: {
         bus?: MessageBus;
         sessionManager?: SessionIndex;
-        scheduleWebchatContinuation?: (sessionKey: string, message: string) => void;
+        scheduleWebchatContinuation?: (conversationId: string, message: string) => void;
         setLabel?: (entryId: string, label: string | undefined) => void;
         sendUserMessage?: import('./types/index.js').ExtensionRuntime['sendUserMessage'];
         appendEntry?: import('./types/index.js').ExtensionRuntime['appendEntry'];

package/dist/src/extensions/types/core.d.ts

@@ -55,7 +55,7 @@ export interface ExtensionRuntime {
      * Queue another durable webchat input after the current run unlocks.
      * Only injected in the Gateway process.
      */
-    scheduleWebchatContinuation?: (sessionKey: string, message: string) => void;
+    scheduleWebchatContinuation?: (conversationId: string, message: string) => void;
     /** Set or clear a TUI transcript label, when running inside an interactive TUI host. */
     setLabel?: (entryId: string, label: string | undefined) => void;
     /** Send a user-visible message through the active interactive host. */
@@ -220,7 +220,7 @@ export interface ExtensionCommand {
 }
 export type ExtensionCommandHandler = (args: string, context: ExtensionCommandContext) => Promise<ExtensionCommandResult | void> | ExtensionCommandResult | void;
 export interface ExtensionCommandContext {
-    sessionKey: string;
+    conversationId: string;
     source: string;
     isGroup: boolean;
     config: Config;

package/dist/src/extensions/types/hooks.d.ts

@@ -28,7 +28,7 @@ export interface HookOptions {
 export interface HookAgentContext {
     timestamp?: Date;
     extensionId?: string;
-    sessionKey?: string;
+    conversationId?: string;
     agentId?: string;
     isMcpTool?: boolean;
     mcpServerId?: string;
@@ -89,7 +89,7 @@ export interface HookInboundClaimResult {
     response?: string;
 }
 export interface HookBeforeResetEvent {
-    sessionKey: string;
+    conversationId: string;
     reason?: 'user_request' | 'timeout' | 'error' | 'manual';
 }
 export interface HookBeforeResetResult {
@@ -110,7 +110,7 @@ export interface HookTurnStartEvent {
     turnId: string;
     prompt?: string;
     agentId?: string;
-    sessionKey?: string;
+    conversationId?: string;
 }
 export interface HookTurnEndEvent {
     turnId: string;
@@ -137,7 +137,7 @@ export interface HookToolExecutionEndEvent {
     durationMs?: number;
 }
 export interface HookSubagentSpawningEvent {
-    childSessionKey: string;
+    childConversationId: string;
     requester?: {
         channel?: string;
         accountId?: string;
@@ -156,8 +156,8 @@ export type HookSubagentSpawningResult = {
     error: string;
 } | void;
 export interface HookSubagentDeliveryTargetEvent {
-    childSessionKey: string;
-    requesterSessionKey?: string;
+    childConversationId: string;
+    requesterConversationId?: string;
     requesterOrigin?: {
         channel?: string;
         accountId?: string;
@@ -175,7 +175,7 @@ export type HookSubagentDeliveryTargetResult = {
     };
 } | void;
 export interface HookSubagentEndedEvent {
-    targetSessionKey: string;
+    targetConversationId: string;
     accountId?: string;
 }
 /**
@@ -217,7 +217,7 @@ export type HookHandlerMap = {
 export interface HookContext {
     timestamp?: Date;
     extensionId?: string;
-    sessionKey?: string;
+    conversationId?: string;
     agentId?: string;
     isMcpTool?: boolean;
     mcpServerId?: string;
@@ -236,9 +236,9 @@ export interface AgentEndContext extends HookContext {
     error?: string;
     durationMs?: number;
 }
-/** Payload for {@link ExtensionHookEvent} `webchat_turn_complete` (also passed as `event` fields + ctx.sessionKey). */
+/** Payload for {@link ExtensionHookEvent} `webchat_turn_complete` (also passed as `event` fields + ctx.conversationId). */
 export interface WebchatTurnCompleteEvent extends HookContext {
-    sessionKey: string;
+    conversationId: string;
     /** Channel id (e.g. `telegram:default`, `webchat`) when the turn is not webchat-only. */
     channel?: string;
     chatId?: string;
@@ -324,7 +324,7 @@ export interface ContextEvent {
         content: string;
     }>;
     agentId?: string;
-    sessionKey?: string;
+    conversationId?: string;
 }
 export interface ContextResult {
     messages: Array<{
@@ -349,7 +349,7 @@ export interface TurnEvent {
     turnId: string;
     prompt?: string;
     agentId?: string;
-    sessionKey?: string;
+    conversationId?: string;
 }
 export interface TurnResult {
     context?: string;

package/dist/src/extensions/types/tools.d.ts

@@ -10,14 +10,14 @@ export interface ToolExecutionStartEvent {
     toolCallId: string;
     params: Record<string, unknown>;
     agentId?: string;
-    sessionKey?: string;
+    conversationId?: string;
 }
 export interface ToolExecutionUpdateEvent<TDetails = unknown> {
     toolName: string;
     toolCallId: string;
     update: AgentToolResult<TDetails>;
     agentId?: string;
-    sessionKey?: string;
+    conversationId?: string;
 }
 export interface ToolExecutionEndEvent<TDetails = unknown> {
     toolName: string;
@@ -26,5 +26,5 @@ export interface ToolExecutionEndEvent<TDetails = unknown> {
     error?: Error;
     durationMs?: number;
     agentId?: string;
-    sessionKey?: string;
+    conversationId?: string;
 }

package/dist/src/extensions/types/tui.d.ts

@@ -11,7 +11,7 @@ export interface TuiAutocompleteSuggestion {
 }
 export type TuiAutocompleteProvider = (query: string, context: {
     cwd: string;
-    sessionKey: string;
+    conversationId: string;
 }) => TuiAutocompleteSuggestion[] | Promise<TuiAutocompleteSuggestion[]>;
 export interface TuiAutocompleteItem {
     value: string;
@@ -237,7 +237,7 @@ export interface TuiCompactResult {
 }
 export interface TuiSystemPromptOptions {
     cwd: string;
-    sessionKey?: string;
+    conversationId?: string;
     model?: TuiModelInfo;
 }
 export interface TuiReplacementResult {
@@ -365,7 +365,7 @@ export interface TuiActionContext {
     readonly modelRegistry: TuiModelRegistry;
     readonly model: TuiModelInfo | undefined;
     cwd: string;
-    sessionKey: string;
+    conversationId: string;
     isProjectTrusted(): boolean;
     isIdle(): boolean;
     hasPendingMessages(): boolean;

package/dist/src/files/file-service.d.ts

@@ -23,11 +23,11 @@ export declare class FileSpaceService {
     private readonly listSessionWorkspaces;
     private readonly dynamicSpaces;
     private cache;
-    constructor(getConfig: () => Config, projects: ProjectService, resolveSessionWorkspace: (sessionKey: string) => string | Promise<string>, listSessionWorkspaces?: () => Array<{
-        sessionKey: string;
+    constructor(getConfig: () => Config, projects: ProjectService, resolveSessionWorkspace: (conversationId: string) => string | Promise<string>, listSessionWorkspaces?: () => Array<{
+        conversationId: string;
         root: string;
     }> | Promise<Array<{
-        sessionKey: string;
+        conversationId: string;
         root: string;
     }>>);
     private createSpace;

package/dist/src/files/file-service.js

@@ -417,10 +417,10 @@ var FileSpaceService = class {
 			offset += page.items.length;
 		}
 		const merged = /* @__PURE__ */ new Map();
-		for (const { sessionKey, root } of await this.listSessionWorkspaces()) {
-			const space = await this.createSpace(root, sessionKey, [{
+		for (const { conversationId, root } of await this.listSessionWorkspaces()) {
+			const space = await this.createSpace(root, conversationId, [{
 				kind: "session",
-				id: sessionKey
+				id: conversationId
 			}]);
 			if (space) spaces.push(space);
 		}

package/dist/src/gateway/automation-agent-session.js

@@ -1,6 +1,6 @@
 //#region src/gateway/automation-agent-session.ts
 async function prepareAutomationAgentSession(store, projects, input) {
-	await store.resolveTranscriptPath(input.sessionKey, { metadata: {
+	await store.resolveTranscriptPath(input.conversationId, { metadata: {
 		hiddenFromSessionList: true,
 		name: input.automationName,
 		customData: { titleSource: "provisional" },
@@ -16,8 +16,8 @@ async function prepareAutomationAgentSession(store, projects, input) {
 			peerId: input.peerId
 		}
 	} });
-	const current = await store.getMetadata(input.sessionKey);
-	await store.updateMetadata(input.sessionKey, {
+	const current = await store.getMetadata(input.conversationId);
+	await store.updateMetadata(input.conversationId, {
 		sourceChannel: "automation",
 		sourceChatId: `default:dm:${input.peerId}`,
 		sessionType: "chat",
@@ -36,8 +36,8 @@ async function prepareAutomationAgentSession(store, projects, input) {
 			latestAutomationRunId: input.runId
 		}
 	});
-	if (input.projectId) projects.attachSession(input.sessionKey, input.projectId);
-	else if (current?.projectId) projects.detachSession(input.sessionKey);
+	if (input.projectId) projects.attachSession(input.conversationId, input.projectId);
+	else if (current?.projectId) projects.detachSession(input.conversationId);
 }
 //#endregion
 export { prepareAutomationAgentSession };

package/dist/src/gateway/chat-stream/mapper.d.ts

@@ -6,7 +6,7 @@ export type RuntimeStreamEvent = EmbeddedStreamEvent | {
 };
 export interface ChatStreamMapperOptions {
     runId: string;
-    sessionKey: string;
+    conversationId: string;
     channel: string;
 }
 export declare class ChatStreamMapper {

package/dist/src/gateway/chat-stream/mapper.js

@@ -1,7 +1,9 @@
 import { parseTurnOutcome } from "../../../packages/gateway-contract/src/turn-outcome.js";
 import { resolveToolActivity } from "../../../packages/gateway-contract/src/tool-activity.js";
+import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { createPetFeedback } from "./pet-feedback.js";
 //#region src/gateway/chat-stream/mapper.ts
+init_src();
 const MAX_REALTIME_TOOL_RESULT_BYTES = 256 * 1024;
 const MAX_REALTIME_TOOL_RESULT_TEXT_BYTES = 128 * 1024;
 const TOOL_RESULT_TRUNCATION_MARKER = "\n\n[Tool result truncated for realtime delivery. The complete result remains in the session transcript.]";
@@ -388,7 +390,7 @@ var ChatStreamMapper = class {
 			const items = extractTodoItems(details);
 			if (items) events.push(this.make("task_plan_updated", {
 				messageId,
-				planId: `${this.opts.sessionKey}:todo`,
+				planId: `${this.opts.conversationId}:todo`,
 				revision: nextTaskPlanRevision(),
 				source: "todo",
 				scope: "session",
@@ -409,7 +411,7 @@ var ChatStreamMapper = class {
 		return {
 			type,
 			runId: this.opts.runId,
-			sessionKey: this.opts.sessionKey,
+			conversationId: this.opts.conversationId,
 			timestamp: Date.now(),
 			payload
 		};

package/dist/src/gateway/chat-stream/protocol.d.ts

@@ -25,7 +25,7 @@ export type PetFeedback = {
 export interface ChatStreamEnvelope<TType extends string, TPayload> {
     type: TType;
     runId: string;
-    sessionKey: string;
+    conversationId: string;
     timestamp: number;
     payload: TPayload;
 }

package/dist/src/gateway/chat-stream/thinking-delta-coalescer.js

@@ -5,7 +5,7 @@ function isThinkingDelta(event) {
 	return event.type === "thinking_delta";
 }
 function belongsToSameThinkingStream(left, right) {
-	return left.runId === right.runId && left.sessionKey === right.sessionKey && left.payload.messageId === right.payload.messageId;
+	return left.runId === right.runId && left.conversationId === right.conversationId && left.payload.messageId === right.payload.messageId;
 }
 function mergeThinkingDelta(left, right) {
 	return {

package/dist/src/gateway/clarify-runtime.d.ts

@@ -1,7 +1,7 @@
 export type ClarificationChannelRuntime = {
     answerChoice(requestId: string, choiceIndex: number, idempotencyKey: string): boolean;
-    answerText(sessionKey: string, text: string, idempotencyKey: string): boolean;
+    answerText(conversationId: string, text: string, idempotencyKey: string): boolean;
 };
 export declare function registerClarificationChannelRuntime(next: ClarificationChannelRuntime | null): void;
 export declare function answerClarificationChoiceFromChannel(requestId: string, choiceIndex: number, idempotencyKey: string): boolean;
-export declare function answerClarificationTextFromChannel(sessionKey: string, text: string, idempotencyKey: string): boolean;
+export declare function answerClarificationTextFromChannel(conversationId: string, text: string, idempotencyKey: string): boolean;

package/dist/src/gateway/clarify-runtime.js

@@ -6,8 +6,8 @@ function registerClarificationChannelRuntime(next) {
 function answerClarificationChoiceFromChannel(requestId, choiceIndex, idempotencyKey) {
 	return runtime?.answerChoice(requestId, choiceIndex, idempotencyKey) ?? false;
 }
-function answerClarificationTextFromChannel(sessionKey, text, idempotencyKey) {
-	return runtime?.answerText(sessionKey, text, idempotencyKey) ?? false;
+function answerClarificationTextFromChannel(conversationId, text, idempotencyKey) {
+	return runtime?.answerText(conversationId, text, idempotencyKey) ?? false;
 }
 //#endregion
 export { answerClarificationChoiceFromChannel, answerClarificationTextFromChannel, registerClarificationChannelRuntime };

package/dist/src/gateway/file-path-classifier.d.ts

@@ -10,9 +10,9 @@ export interface FilePathClassifierContext {
     agentsHomeDir: string;
     agentId: string;
 }
-export declare function buildFilePathClassifierContext(cfg: Config, sessionKeyRaw?: string): FilePathClassifierContext;
+export declare function buildFilePathClassifierContext(cfg: Config, conversationIdRaw?: string, explicitAgentId?: string): FilePathClassifierContext;
 export declare function looksLikeHostAbsolutePath(pathRaw: string): boolean;
-export declare function fileRefSessionKeysMatch(registered?: string, query?: string): boolean;
+export declare function fileRefConversationIdsMatch(registered?: string, query?: string): boolean;
 export interface ClassifiedFileLocation {
     scope: FileReferenceScope;
     locationKind?: FileReferenceLocationKind;

package/dist/src/gateway/file-path-classifier.js

@@ -10,8 +10,8 @@ import { stat } from "node:fs/promises";
 init_agent_scope();
 init_paths();
 init_paths_state();
-function buildFilePathClassifierContext(cfg, sessionKeyRaw) {
-	const agentId = extractProfileAgentId(sessionKeyRaw, cfg);
+function buildFilePathClassifierContext(cfg, conversationIdRaw, explicitAgentId) {
+	const agentId = explicitAgentId ?? extractProfileAgentId(conversationIdRaw, cfg);
 	const stateDir = resolveStateDir();
 	return {
 		workspaceRoot: "",
@@ -29,7 +29,7 @@ function looksLikeHostAbsolutePath(pathRaw) {
 	if (/^[a-z][a-z0-9+.-]*:/i.test(p) && !/^[A-Za-z]:[\\/]/.test(p)) return false;
 	return isAbsolute(p) || /^[A-Za-z]:[\\/]/.test(p) || p.startsWith("\\\\");
 }
-function fileRefSessionKeysMatch(registered, query) {
+function fileRefConversationIdsMatch(registered, query) {
 	return (registered ?? "").trim() === (query ?? "").trim();
 }
 function classifyFileLocation(absPath, ctx) {
@@ -102,4 +102,4 @@ function displayNameForPath(rawPath) {
 	return basename(rawPath.replace(/\\/g, "/")) || rawPath;
 }
 //#endregion
-export { buildFilePathClassifierContext, classifyFileLocation, displayNameForPath, fileRefSessionKeysMatch, looksLikeHostAbsolutePath, resolveFileReferenceCandidate };
+export { buildFilePathClassifierContext, classifyFileLocation, displayNameForPath, fileRefConversationIdsMatch, looksLikeHostAbsolutePath, resolveFileReferenceCandidate };

package/dist/src/gateway/file-reference-registry.d.ts

@@ -5,7 +5,7 @@ export type FileReferenceCapability = 'preview' | 'edit' | 'openExternal' | 'rev
 export interface RegisteredFileReference {
     id: string;
     absolutePath: string;
-    sessionKey?: string;
+    conversationId?: string;
     scope: FileReferenceScope;
     locationKind?: FileReferenceLocationKind;
     capabilities: FileReferenceCapability[];
@@ -13,7 +13,7 @@ export interface RegisteredFileReference {
 }
 export interface RegisterFileReferenceInput {
     absolutePath: string;
-    sessionKey?: string;
+    conversationId?: string;
     scope: FileReferenceScope;
     locationKind?: FileReferenceLocationKind;
     capabilities: FileReferenceCapability[];