@xopcai/xopc 0.0.285 → 0.0.286

package/dist/src/gateway/hono/routes/tasks.js

@@ -1,9 +1,10 @@
-import { runSqliteWriteTransaction } from "../../../storage/sqlite/transaction.js";
+import { init_transaction, runSqliteWriteTransaction } from "../../../storage/sqlite/transaction.js";
 import { TaskPhaseSchema } from "../../../../packages/gateway-contract/src/task-lifecycle.js";
 import { TaskBoardPositionRequestSchema, TaskCommandRequestSchema, TaskContextInputSchema, TaskCreateRequestSchema, TaskDependencyUpdateRequestSchema, TaskHandoffRequestSchema, TaskPatchRequestSchema } from "../../../../packages/gateway-contract/src/tasks.js";
 import { ProjectMonitoringUpdateSchema } from "../../../../packages/gateway-contract/src/project-monitoring.js";
-import { enqueueTaskChangedEvent } from "../../../tasks/task-change-events.js";
-import { TaskRunRepository } from "../../../tasks/task-run-repository.js";
+import { init_src } from "../../../../packages/gateway-contract/src/index.js";
+import { enqueueTaskChangedEvent, init_task_change_events } from "../../../tasks/task-change-events.js";
+import { TaskRunRepository, init_task_run_repository } from "../../../tasks/task-run-repository.js";
 import { TaskRepository } from "../../../tasks/task-repository.js";
 import { TaskConversationRepository } from "../../../tasks/task-conversation-repository.js";
 import { TaskReadModelProjector } from "../../../tasks/task-read-model-projector.js";
@@ -21,6 +22,10 @@ import { submitSessionInput } from "./session-input-handler.js";
 import { patchChatModelConfig } from "./chat-model-config.js";
 import { TaskConversationQueryService } from "../../service/task-conversation-query-service.js";
 //#region src/gateway/hono/routes/tasks.ts
+init_src();
+init_transaction();
+init_task_change_events();
+init_task_run_repository();
 function registerTaskRoutes(authenticated, deps) {
 	const taskRateLimit = deps.taskRateLimitMiddleware ?? deps.strictRateLimitMiddleware;
 	const application = new TaskApplicationService();
@@ -39,7 +44,7 @@ function registerTaskRoutes(authenticated, deps) {
 	const handoffs = new TaskHandoffService({
 		getConfig: () => deps.service.currentConfig,
 		sessionIndex: deps.service.sessionIndexInstance,
-		getActiveRunId: (sessionKey) => deps.service.getActiveWebchatRunId(sessionKey),
+		getActiveRunId: (conversationId) => deps.service.getActiveWebchatRunId(conversationId),
 		abortRun: (runId) => deps.service.abortAgentRun(runId)
 	});
 	authenticated.get("/api/tasks", (c) => {
@@ -189,7 +194,7 @@ function registerTaskRoutes(authenticated, deps) {
 				conversation: result.conversation,
 				...result.fromAgentId ? { fromAgentId: result.fromAgentId } : {},
 				toAgentId: result.toAgentId,
-				activeSessionKey: result.activeSessionKey,
+				activeConversationId: result.activeConversationId,
 				assignmentEpoch: result.assignmentEpoch
 			});
 		} catch (error) {
@@ -202,22 +207,22 @@ function registerTaskRoutes(authenticated, deps) {
 	});
 	authenticated.post("/api/tasks/:id/inputs", deps.chatRateLimitMiddleware, async (c) => {
 		const active = conversations.getActiveSession(c.req.param("id"));
-		if (!active?.sessionKey) return c.json({
+		if (!active?.conversationId) return c.json({
 			ok: false,
 			error: {
 				code: "NOT_FOUND",
 				message: "Task has no active conversation"
 			}
 		}, 404);
-		const expectedSessionKey = c.req.header("X-Xopc-Expected-Session-Key")?.trim();
-		if (expectedSessionKey && expectedSessionKey !== active.sessionKey) return c.json({
+		const expectedConversationId = c.req.header("X-Xopc-Expected-Session-Key")?.trim();
+		if (expectedConversationId && expectedConversationId !== active.conversationId) return c.json({
 			ok: false,
 			error: {
 				code: "CONFLICT",
 				message: "Task executor changed; refresh the conversation"
 			}
 		}, 409);
-		return submitSessionInput(c, deps, active.sessionKey);
+		return submitSessionInput(c, deps, active.conversationId);
 	});
 	authenticated.patch("/api/tasks/:id/conversation/config", taskRateLimit, async (c) => {
 		const body = await c.req.json().catch(() => null);
@@ -226,11 +231,11 @@ function registerTaskRoutes(authenticated, deps) {
 			error: "Invalid configuration"
 		}, 400);
 		const active = conversations.getActiveSession(c.req.param("id"));
-		if (!active?.sessionKey) return c.json({
+		if (!active?.conversationId) return c.json({
 			ok: false,
 			error: "Task has no active conversation"
 		}, 404);
-		return patchChatModelConfig(c, deps.service, active.sessionKey, body);
+		return patchChatModelConfig(c, deps.service, active.conversationId, body);
 	});
 	authenticated.get("/api/tasks/:id/conversation/history", async (c) => {
 		const parsedLimit = Number.parseInt(c.req.query("limit") ?? "50", 10);
@@ -409,8 +414,8 @@ function registerTaskRoutes(authenticated, deps) {
 		}
 		if (parsed.data.command?.type === "add_wait" && parsed.data.command.wait.kind === "paused" || parsed.data.command?.type === "close" || parsed.data.command?.type === "resolve_wait" && parsed.data.command.resolution?.kind === "task_approval" && parsed.data.command.resolution.decision === "deny") {
 			const activeRun = runs.getActiveRoot(c.req.param("id"));
-			if (activeRun?.sessionKey) {
-				const liveRunId = deps.service.getActiveWebchatRunId(activeRun.sessionKey);
+			if (activeRun?.conversationId) {
+				const liveRunId = deps.service.getActiveWebchatRunId(activeRun.conversationId);
 				if (liveRunId) await deps.service.abortAgentRun(liveRunId);
 			}
 		}

package/dist/src/gateway/hono/routes/tui.js

@@ -2,8 +2,8 @@ import { collectTuiStartupResources } from "../../../tui/tui-startup-resources.j
 //#region src/gateway/hono/routes/tui.ts
 function registerTuiRoutes(authenticated, deps) {
 	authenticated.get("/api/tui/startup-resources", (c) => {
-		const sessionKey = c.req.query("sessionKey")?.trim() || void 0;
-		const payload = collectTuiStartupResources(deps.service.currentConfig, sessionKey);
+		const conversationId = c.req.query("conversationId")?.trim() || void 0;
+		const payload = collectTuiStartupResources(deps.service.currentConfig, conversationId);
 		return c.json({
 			ok: true,
 			payload

package/dist/src/gateway/hono/routes/user-model.js

@@ -388,7 +388,7 @@ function registerUserModelRoutes(authenticated, deps) {
 			context: {
 				agentId: c.req.query("agentId") ?? "main",
 				workspaceId: c.req.query("workspaceId") ?? "",
-				sessionId: c.req.query("sessionId") ?? "",
+				conversationId: c.req.query("sessionId") ?? "",
 				...c.req.query("projectId") ? { projectId: c.req.query("projectId") } : {}
 			},
 			recordClass: "memory",

package/dist/src/gateway/hono/routes/voice.js

@@ -223,7 +223,7 @@ function registerVoiceRoutes(authenticated, deps) {
 			}
 			const principal = getGatewayPrincipal(c);
 			const create = () => service.voiceRealtime.createSession(parsed.data, principal.principalId);
-			const payload = parsed.data.sessionKey ? await withModelConfigLock(parsed.data.sessionKey, create) : await create();
+			const payload = parsed.data.conversationId ? await withModelConfigLock(parsed.data.conversationId, create) : await create();
 			return c.json({
 				ok: true,
 				payload

package/dist/src/gateway/hono/routes/workflows.js

@@ -7,10 +7,10 @@ import { WorkflowNameConflictError, WorkflowRevisionConflictError, createWorkflo
 import "../../../workflows/domain/index.js";
 import { resolveWorkflowRunArtifactsDir } from "../../../workflows/store/paths.js";
 import { WorkflowDraftService } from "../../../workflows/draft/workflow-draft-service.js";
-import { WorkflowDraftConflictError, WorkflowDraftStore } from "../../../workflows/authoring/workflow-draft-store.js";
-import "../../../workflows/authoring/index.js";
 import "../../../workflows/draft/index.js";
 import { ProjectWorkflowPresetRepository } from "../../../workflows/project-presets/project-workflow-preset-repository.js";
+import { WorkflowDraftConflictError, WorkflowDraftStore } from "../../../workflows/authoring/workflow-draft-store.js";
+import "../../../workflows/authoring/index.js";
 import { basename, join } from "node:path";
 import { readFile, stat } from "node:fs/promises";
 //#region src/gateway/hono/routes/workflows.ts
@@ -289,7 +289,7 @@ function registerWorkflowRoutes(authenticated, deps) {
 		const body = await readJsonBody(c.req.raw);
 		const definitionId = body.definitionId?.trim();
 		if (!definitionId) return c.json({ error: "definitionId is required" }, 400);
-		const parentSessionKey = body.parentSessionKey?.trim() || void 0;
+		const parentConversationId = body.parentConversationId?.trim() || void 0;
 		const taskRunId = body.taskRunId?.trim();
 		const projectId = body.projectId?.trim();
 		if (projectId && !service.projects.get(projectId)) return c.json({ error: "Project not found" }, 404);
@@ -315,7 +315,7 @@ function registerWorkflowRoutes(authenticated, deps) {
 			input: body.inputEnvelope ? void 0 : body.input,
 			inputEnvelope: body.inputEnvelope,
 			goal: body.goal,
-			parentSessionKey,
+			parentConversationId,
 			source: normalizeWorkflowRunSource(body.source),
 			concurrency: normalizePositiveInteger(body.concurrency),
 			maxSubagents: normalizePositiveInteger(body.maxSubagents),
@@ -328,7 +328,7 @@ function registerWorkflowRoutes(authenticated, deps) {
 		}, result.httpStatus);
 		return c.json({
 			runId: result.runId,
-			sessionKey: result.sessionKey
+			conversationId: result.conversationId
 		}, 202);
 	});
 	authenticated.get("/api/workflows/runs", async (c) => {
@@ -374,10 +374,10 @@ function registerWorkflowRoutes(authenticated, deps) {
 		const normalizedWorkflowAgentId = workflowAgentId.startsWith("agent-") ? workflowAgentId : `agent-${workflowAgentId}`;
 		const agent = view.agents.find((item) => item.id === workflowAgentId || item.id === normalizedWorkflowAgentId);
 		if (!agent) return c.json({ error: "Workflow agent not found" }, 404);
-		const session = await service.sessions.getSession(agent.sessionKey);
+		const session = await service.sessions.getSession(agent.conversationId);
 		if (!session || session.sessionType !== "workflow-subagent") return c.json({ error: "Workflow agent session not found" }, 404);
 		return c.json({
-			sessionKey: agent.sessionKey,
+			conversationId: agent.conversationId,
 			metadata: {
 				sessionType: session.sessionType,
 				workflowRunId: session.workflowRunId,
@@ -456,7 +456,7 @@ function registerWorkflowRoutes(authenticated, deps) {
 		}, result.httpStatus);
 		return c.json({
 			runId: result.runId,
-			sessionKey: result.sessionKey
+			conversationId: result.conversationId
 		}, 202);
 	});
 	authenticated.post("/api/workflows/runs/:runId/replay", async (c) => {
@@ -475,7 +475,7 @@ function registerWorkflowRoutes(authenticated, deps) {
 		}, result.httpStatus);
 		return c.json({
 			runId: result.runId,
-			sessionKey: result.sessionKey
+			conversationId: result.conversationId
 		}, 202);
 	});
 }

package/dist/src/gateway/media-access.d.ts

@@ -1,6 +1,6 @@
 import type { GatewayService } from './service.js';
 /** Resolve media only when the supplied session or task references it. */
 export declare function resolveScopedMediaReference(service: GatewayService, uri: string, scope: {
-    sessionKey?: string;
+    conversationId?: string;
     taskId?: string;
 }): Promise<import("../media/media-reference.js").ResolvedMediaReference>;

package/dist/src/gateway/media-access.js

@@ -7,10 +7,10 @@ import { messagesReferenceMediaUri } from "../media/session-references.js";
 //#region src/gateway/media-access.ts
 /** Resolve media only when the supplied session or task references it. */
 async function resolveScopedMediaReference(service, uri, scope) {
-	const { sessionKey, taskId } = scope;
-	if (!sessionKey && !taskId) throw new FileServiceError(400, "Missing media scope");
+	const { conversationId, taskId } = scope;
+	if (!conversationId && !taskId) throw new FileServiceError(400, "Missing media scope");
 	const media = await resolveMediaReference(uri);
-	const sessionReferencesUri = sessionKey ? messagesReferenceMediaUri(await service.sessionIndexInstance.loadMessages(sessionKey), media.uri) || pendingTranscriptReferencesMediaUri(sessionKey, media.uri) : false;
+	const sessionReferencesUri = conversationId ? messagesReferenceMediaUri(await service.sessionIndexInstance.loadMessages(conversationId), media.uri) || pendingTranscriptReferencesMediaUri(conversationId, media.uri) : false;
 	const taskReferencesUri = taskId && new TaskRepository().get(taskId) ? new TaskContextRepository().list(taskId).some((edge) => edge.targetKind === "file" && edge.targetId === media.uri) : false;
 	if (!sessionReferencesUri && !taskReferencesUri) throw new FileServiceError(404, "Not found");
 	return media;

package/dist/src/gateway/resolve-webchat-session-key.d.ts

@@ -1,9 +1,9 @@
-export type ResolveWebchatSessionKeyInput = {
-    sessionKey?: string;
+export type ResolveWebchatConversationIdInput = {
+    conversationId?: string;
 };
-export type ResolveWebchatSessionKeyResult = {
+export type ResolveWebchatConversationIdResult = {
     ok: true;
-    sessionKey: string;
+    conversationId: string;
 } | {
     ok: false;
     error: string;
@@ -12,4 +12,4 @@ export type ResolveWebchatSessionKeyResult = {
  * Resolve the server-owned session key for webchat `/api/agent` requests.
  * Creation is intentionally out-of-band via `POST /api/sessions`.
  */
-export declare function resolveWebchatSessionKey(input: ResolveWebchatSessionKeyInput): ResolveWebchatSessionKeyResult;
+export declare function resolveWebchatConversationId(input: ResolveWebchatConversationIdInput): ResolveWebchatConversationIdResult;

package/dist/src/gateway/resolve-webchat-session-key.js

@@ -3,16 +3,16 @@
 * Resolve the server-owned session key for webchat `/api/agent` requests.
 * Creation is intentionally out-of-band via `POST /api/sessions`.
 */
-function resolveWebchatSessionKey(input) {
-	const raw = input.sessionKey?.trim() ?? "";
+function resolveWebchatConversationId(input) {
+	const raw = input.conversationId?.trim() ?? "";
 	if (!raw) return {
 		ok: false,
-		error: "Missing sessionKey; create sessions via POST /api/sessions"
+		error: "Missing conversationId; create sessions via POST /api/sessions"
 	};
 	return {
 		ok: true,
-		sessionKey: raw
+		conversationId: raw
 	};
 }
 //#endregion
-export { resolveWebchatSessionKey };
+export { resolveWebchatConversationId };

package/dist/src/gateway/service/agent-runner.d.ts

@@ -38,18 +38,18 @@ export declare class GatewayAgentRunner {
     readonly inputs: SessionInputCoordinator;
     private readonly unsubscribeConnectionWait;
     constructor(opts: GatewayAgentRunnerOptions);
-    /** True when a webchat agent run is currently in-flight for `sessionKey`. */
-    hasActiveRun(sessionKey: string): boolean;
-    getActiveRunId(sessionKey: string): string | undefined;
+    /** True when a webchat agent run is currently in-flight for `conversationId`. */
+    hasActiveRun(conversationId: string): boolean;
+    getActiveRunId(conversationId: string): string | undefined;
     listActiveRuns(): Array<{
-        sessionKey: string;
+        conversationId: string;
         runId: string;
     }>;
     disposeClarifications(): void;
-    registerExternalWebchatRun(sessionKey: string, runId: string, publish: (event: ClarificationStreamEvent) => void, options?: {
+    registerExternalWebchatRun(conversationId: string, runId: string, publish: (event: ClarificationStreamEvent) => void, options?: {
         beforeClarificationResponse?: () => boolean;
     }): void;
-    unregisterExternalWebchatRun(sessionKey: string, runId: string): void;
+    unregisterExternalWebchatRun(conversationId: string, runId: string): void;
     cancelClarificationForRun(runId: string): void;
     runAgent(message: string, channel: string, chatId: string, origin: TurnOrigin, attachments?: UserTurnAttachment[], thinking?: string, runOptions?: {
         signal?: AbortSignal;
@@ -80,8 +80,8 @@ export declare class GatewayAgentRunner {
         ok: false;
         code: "BAD_REQUEST" | "TARGET_NOT_FOUND" | "NOT_LATEST" | "SESSION_BUSY" | "CONTEXT_UNAVAILABLE";
     }>;
-    getSessionInputState(sessionKey: string): import("../../storage/sqlite/session-input-repository.js").SessionInputState;
-    updateSessionInput(sessionKey: string, id: string, body: {
+    getSessionInputState(conversationId: string): import("../../storage/sqlite/session-input-repository.js").SessionInputState;
+    updateSessionInput(conversationId: string, id: string, body: {
         version: number;
         content?: string;
         attachments?: UserTurnAttachment[];
@@ -93,7 +93,7 @@ export declare class GatewayAgentRunner {
         state: import("../../storage/sqlite/session-input-repository.js").SessionInputState;
         contextUnavailable?: boolean;
     }>;
-    removeSessionInput(sessionKey: string, id: string, version: number): {
+    removeSessionInput(conversationId: string, id: string, version: number): {
         ok: boolean;
         state: import("../../storage/sqlite/session-input-repository.js").SessionInputState;
     };
@@ -104,7 +104,7 @@ export declare class GatewayAgentRunner {
         idle: boolean;
     }>;
     answerEphemeralClarification(requestId: string, answer: string): boolean;
-    getClarificationState(sessionKey: string): import("@xopcai/gateway-contract").ClarificationWaitSnapshot;
+    getClarificationState(conversationId: string): import("@xopcai/gateway-contract").ClarificationWaitSnapshot;
     resolveClarificationResponse(input: {
         id: string;
         expectedVersion: number;
@@ -114,12 +114,12 @@ export declare class GatewayAgentRunner {
     }): import("../../storage/sqlite/clarification-wait-repository.js").ResolveClarificationResult;
     getClarificationById(id: string): import("@xopcai/gateway-contract").ClarificationWait;
     answerClarificationChoice(requestId: string, choiceIndex: number, idempotencyKey: string): boolean;
-    answerClarificationText(sessionKey: string, answer: string, idempotencyKey: string): boolean;
+    answerClarificationText(conversationId: string, answer: string, idempotencyKey: string): boolean;
     /** Same execution path as scheduled continuation, but lets callers observe failures. */
-    runScheduledWebchatTurn(sessionKey: string, userTurn: UserTurnInput): Promise<void>;
-    runScheduledWebchatContinuation(sessionKey: string, message: string): Promise<void>;
+    runScheduledWebchatTurn(conversationId: string, userTurn: UserTurnInput): Promise<void>;
+    runScheduledWebchatContinuation(conversationId: string, message: string): Promise<void>;
     /** Background drain for extension-initiated webchat turns (`scheduleWebchatContinuation`). */
-    drainScheduledWebchatContinuation(sessionKey: string, message: string): Promise<void>;
+    drainScheduledWebchatContinuation(conversationId: string, message: string): Promise<void>;
     /**
      * Persist normal clarification waits and use the lifecycle-bound waiter only
      * for caller-owned ephemeral sessions.
@@ -130,7 +130,7 @@ export declare class GatewayAgentRunner {
      * runner does not import AgentService statically.
      */
     requestClarification(opts: {
-        sessionKey: string;
+        conversationId: string;
         runId: string;
         toolCallId: string;
         request: ClarifyRequestPayload;

package/dist/src/gateway/service/agent-runner.js

@@ -2,7 +2,7 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { listActiveSessionInputRuns } from "../../storage/sqlite/session-input-repository.js";
 import { createClarificationWait, getClarification, getClarificationSnapshot, resolveClarification, supersedeActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
-import { onConnectionWaitChanged } from "../../storage/sqlite/connection-wait-repository.js";
+import { init_connection_wait_repository, onConnectionWaitChanged } from "../../storage/sqlite/connection-wait-repository.js";
 import "../../storage/sqlite/index.js";
 import { EphemeralClarificationWaiter } from "../ephemeral-clarification-waiter.js";
 import { runGatewayAgent } from "./run-gateway-agent.js";
@@ -10,6 +10,7 @@ import { fitSourceContextsToBudget } from "../../agent/source-context/budget.js"
 import { SessionInputCoordinator } from "./session-input-coordinator.js";
 import crypto from "node:crypto";
 //#region src/gateway/service/agent-runner.ts
+init_connection_wait_repository();
 init_logger();
 /**
 * Owns gateway agent runs, durable clarification coordination, and the
@@ -32,22 +33,22 @@ var GatewayAgentRunner = class {
 	unsubscribeConnectionWait;
 	constructor(opts) {
 		this.opts = opts;
-		this.unsubscribeConnectionWait = onConnectionWaitChanged((sessionKey) => {
-			const revision = this.inputs.snapshot(sessionKey).revision;
+		this.unsubscribeConnectionWait = onConnectionWaitChanged((conversationId) => {
+			const revision = this.inputs.snapshot(conversationId).revision;
 			opts.emit("session.connection-wait.changed", {
-				sessionKey,
+				conversationId,
 				revision
 			});
 			opts.publishRealtime("sessions", "session.connection-wait.changed", {
-				sessionKey,
+				conversationId,
 				revision
 			});
 		});
 		this.inputs = new SessionInputCoordinator({
 			beforeExecute: opts.validateConnectionResume,
-			sessionExists: async (sessionKey) => Boolean(await opts.sessionIndex.getSessionMetadata(sessionKey)),
+			sessionExists: async (conversationId) => Boolean(await opts.sessionIndex.getSessionMetadata(conversationId)),
 			execute: async (input) => {
-				const generator = this.runAgent(input.content, "webchat", input.sessionKey, input.origin, input.attachments, input.thinking, {
+				const generator = this.runAgent(input.content, "webchat", input.conversationId, input.origin, input.attachments, input.thinking, {
 					runId: input.runId,
 					taskRunId: input.taskRunId,
 					sourceContexts: input.sourceContexts,
@@ -63,8 +64,8 @@ var GatewayAgentRunner = class {
 				}
 				return result;
 			},
-			prepareAttachments: async (sessionKey, attachments) => {
-				const media = await opts.getAgentService().prepareInboundAttachments(sessionKey, attachments);
+			prepareAttachments: async (conversationId, attachments) => {
+				const media = await opts.getAgentService().prepareInboundAttachments(conversationId, attachments);
 				if (!media?.length) return void 0;
 				return media.map((ref) => ({
 					id: ref.id,
@@ -90,22 +91,22 @@ var GatewayAgentRunner = class {
 				if (contexts.some((context) => context === null)) throw new Error("A referenced source is unavailable or has changed; select it again");
 				return fitSourceContextsToBudget(contexts.filter((context) => context !== null));
 			},
-			steer: (sessionKey, content) => opts.getAgentService().turnDispatcher.steerWebchatSession(sessionKey, content),
+			steer: (conversationId, content) => opts.getAgentService().turnDispatcher.steerWebchatSession(conversationId, content),
 			emit: opts.emit
 		});
 	}
-	/** True when a webchat agent run is currently in-flight for `sessionKey`. */
-	hasActiveRun(sessionKey) {
-		return this.activeWebchatRunBySession.has(sessionKey);
+	/** True when a webchat agent run is currently in-flight for `conversationId`. */
+	hasActiveRun(conversationId) {
+		return this.activeWebchatRunBySession.has(conversationId);
 	}
-	getActiveRunId(sessionKey) {
-		return this.activeWebchatRunBySession.get(sessionKey) ?? this.inputs.snapshot(sessionKey).activeRunId;
+	getActiveRunId(conversationId) {
+		return this.activeWebchatRunBySession.get(conversationId) ?? this.inputs.snapshot(conversationId).activeRunId;
 	}
 	listActiveRuns() {
-		const runs = new Map(listActiveSessionInputRuns().map(({ sessionKey, runId }) => [sessionKey, runId]));
-		for (const [sessionKey, runId] of this.activeWebchatRunBySession) runs.set(sessionKey, runId);
-		return [...runs].map(([sessionKey, runId]) => ({
-			sessionKey,
+		const runs = new Map(listActiveSessionInputRuns().map(({ conversationId, runId }) => [conversationId, runId]));
+		for (const [conversationId, runId] of this.activeWebchatRunBySession) runs.set(conversationId, runId);
+		return [...runs].map(([conversationId, runId]) => ({
+			conversationId,
 			runId
 		}));
 	}
@@ -113,16 +114,16 @@ var GatewayAgentRunner = class {
 		this.ephemeralClarifications.dispose();
 		this.unsubscribeConnectionWait();
 	}
-	registerExternalWebchatRun(sessionKey, runId, publish, options) {
-		this.activeWebchatRunBySession.set(sessionKey, runId);
-		this.externalStreamBySession.set(sessionKey, publish);
-		if (options?.beforeClarificationResponse) this.externalClarificationResponses.set(sessionKey, options.beforeClarificationResponse);
+	registerExternalWebchatRun(conversationId, runId, publish, options) {
+		this.activeWebchatRunBySession.set(conversationId, runId);
+		this.externalStreamBySession.set(conversationId, publish);
+		if (options?.beforeClarificationResponse) this.externalClarificationResponses.set(conversationId, options.beforeClarificationResponse);
 	}
-	unregisterExternalWebchatRun(sessionKey, runId) {
-		if (this.activeWebchatRunBySession.get(sessionKey) === runId) {
-			this.activeWebchatRunBySession.delete(sessionKey);
-			this.externalStreamBySession.delete(sessionKey);
-			this.externalClarificationResponses.delete(sessionKey);
+	unregisterExternalWebchatRun(conversationId, runId) {
+		if (this.activeWebchatRunBySession.get(conversationId) === runId) {
+			this.activeWebchatRunBySession.delete(conversationId);
+			this.externalStreamBySession.delete(conversationId);
+			this.externalClarificationResponses.delete(conversationId);
 		}
 	}
 	cancelClarificationForRun(runId) {
@@ -163,21 +164,21 @@ var GatewayAgentRunner = class {
 	}
 	replaceLatestSessionTurn(input) {
 		return this.inputs.replaceLatestTurn(input, async () => {
-			const activeRunId = this.activeWebchatRunBySession.get(input.sessionKey) ?? this.inputs.snapshot(input.sessionKey).activeRunId;
+			const activeRunId = this.activeWebchatRunBySession.get(input.conversationId) ?? this.inputs.snapshot(input.conversationId).activeRunId;
 			if (activeRunId) await this.abortAgentRun(activeRunId);
 			const { evictEmbeddedSessionRunner } = await import("../../agent/embedded/session-runner.js");
-			evictEmbeddedSessionRunner(input.sessionKey, "gateway_user_turn_replaced");
-			this.opts.getAgentService().evictSessionAgent(input.sessionKey);
+			evictEmbeddedSessionRunner(input.conversationId, "gateway_user_turn_replaced");
+			this.opts.getAgentService().evictSessionAgent(input.conversationId);
 		});
 	}
-	getSessionInputState(sessionKey) {
-		return this.inputs.snapshot(sessionKey);
+	getSessionInputState(conversationId) {
+		return this.inputs.snapshot(conversationId);
 	}
-	updateSessionInput(sessionKey, id, body) {
-		return this.inputs.update(sessionKey, id, body);
+	updateSessionInput(conversationId, id, body) {
+		return this.inputs.update(conversationId, id, body);
 	}
-	removeSessionInput(sessionKey, id, version) {
-		return this.inputs.remove(sessionKey, id, version);
+	removeSessionInput(conversationId, id, version) {
+		return this.inputs.remove(conversationId, id, version);
 	}
 	recoverSessionInputs() {
 		this.inputs.recover();
@@ -202,7 +203,7 @@ var GatewayAgentRunner = class {
 		}
 		c.abort();
 		const { abortEmbeddedRun } = await import("../../agent/embedded/runs.js");
-		await Promise.all(keysToMark.map((sessionKey) => abortEmbeddedRun(sessionKey).catch(() => false)));
+		await Promise.all(keysToMark.map((conversationId) => abortEmbeddedRun(conversationId).catch(() => false)));
 		await completion;
 		return {
 			aborted: true,
@@ -212,14 +213,14 @@ var GatewayAgentRunner = class {
 	answerEphemeralClarification(requestId, answer) {
 		return this.ephemeralClarifications.answer(requestId, answer);
 	}
-	getClarificationState(sessionKey) {
-		return getClarificationSnapshot(sessionKey);
+	getClarificationState(conversationId) {
+		return getClarificationSnapshot(conversationId);
 	}
 	resolveClarificationResponse(input) {
 		const result = resolveClarification(input);
 		if (result.ok) {
 			this.opts.emit("clarification.updated", result.clarification);
-			if (result.queued) this.inputs.drain(result.clarification.sessionKey);
+			if (result.queued) this.inputs.drain(result.clarification.conversationId);
 		}
 		return result;
 	}
@@ -238,8 +239,8 @@ var GatewayAgentRunner = class {
 			answer
 		}).ok;
 	}
-	answerClarificationText(sessionKey, answer, idempotencyKey) {
-		const wait = getClarificationSnapshot(sessionKey)?.clarification;
+	answerClarificationText(conversationId, answer, idempotencyKey) {
+		const wait = getClarificationSnapshot(conversationId)?.clarification;
 		if (!wait || wait.status !== "open" || !answer.trim()) return false;
 		return this.resolveClarificationResponse({
 			id: wait.id,
@@ -250,10 +251,10 @@ var GatewayAgentRunner = class {
 		}).ok;
 	}
 	/** Same execution path as scheduled continuation, but lets callers observe failures. */
-	async runScheduledWebchatTurn(sessionKey, userTurn) {
+	async runScheduledWebchatTurn(conversationId, userTurn) {
 		const clientMessageId = crypto.randomUUID();
 		const accepted = await this.inputs.submit({
-			sessionKey,
+			conversationId,
 			clientMessageId,
 			delivery: "next",
 			content: userTurn.text,
@@ -264,19 +265,19 @@ var GatewayAgentRunner = class {
 			}
 		});
 		if (accepted.ok === false) throw new Error(`Scheduled session input was rejected: ${accepted.code}`);
-		await this.inputs.waitForCompletion(sessionKey, clientMessageId);
+		await this.inputs.waitForCompletion(conversationId, clientMessageId);
 	}
-	async runScheduledWebchatContinuation(sessionKey, message) {
-		await this.runScheduledWebchatTurn(sessionKey, { text: message });
+	async runScheduledWebchatContinuation(conversationId, message) {
+		await this.runScheduledWebchatTurn(conversationId, { text: message });
 	}
 	/** Background drain for extension-initiated webchat turns (`scheduleWebchatContinuation`). */
-	async drainScheduledWebchatContinuation(sessionKey, message) {
+	async drainScheduledWebchatContinuation(conversationId, message) {
 		try {
-			await this.runScheduledWebchatContinuation(sessionKey, message);
+			await this.runScheduledWebchatContinuation(conversationId, message);
 		} catch (err) {
 			log.warn({
 				err,
-				sessionKey
+				conversationId
 			}, "Scheduled webchat continuation failed");
 		}
 	}
@@ -290,15 +291,15 @@ var GatewayAgentRunner = class {
 	* runner does not import AgentService statically.
 	*/
 	async requestClarification(opts) {
-		const { sessionKey, request, publishStreamFor } = opts;
-		const runId = this.activeWebchatRunBySession.get(sessionKey) ?? opts.runId;
-		const publishStream = this.externalStreamBySession.get(sessionKey) ?? (runId ? publishStreamFor(runId) : void 0);
-		const deliver = ((await this.opts.sessionIndex.getSessionMetadata(sessionKey).catch(() => null))?.routing)?.source === "telegram" ? async (ctx) => {
+		const { conversationId, request, publishStreamFor } = opts;
+		const runId = this.activeWebchatRunBySession.get(conversationId) ?? opts.runId;
+		const publishStream = this.externalStreamBySession.get(conversationId) ?? (runId ? publishStreamFor(runId) : void 0);
+		const deliver = ((await this.opts.sessionIndex.getSessionMetadata(conversationId).catch(() => null))?.routing)?.source === "telegram" ? async (ctx) => {
 			await this.deliverTelegramClarify(ctx);
 		} : void 0;
-		const persistedSession = getClarificationSnapshot(sessionKey);
-		if (!persistedSession && this.externalStreamBySession.has(sessionKey)) return this.ephemeralClarifications.start({
-			beforeResponse: this.externalClarificationResponses.get(sessionKey),
+		const persistedSession = getClarificationSnapshot(conversationId);
+		if (!persistedSession && this.externalStreamBySession.has(conversationId)) return this.ephemeralClarifications.start({
+			beforeResponse: this.externalClarificationResponses.get(conversationId),
 			runId,
 			publish: publishStream,
 			request
@@ -308,7 +309,7 @@ var GatewayAgentRunner = class {
 		}));
 		if (!persistedSession) return Promise.reject(/* @__PURE__ */ new Error("Clarify requires a persisted session."));
 		const wait = createClarificationWait({
-			sessionKey,
+			conversationId,
 			runId: opts.runId,
 			toolCallId: opts.toolCallId,
 			kind: request.kind === "approval" ? "approval" : "input",
@@ -328,9 +329,9 @@ var GatewayAgentRunner = class {
 			createdAt: wait.createdAt,
 			version: wait.version
 		};
-		if (this.activeWebchatRunBySession.has(sessionKey)) publishStream?.(event);
+		if (this.activeWebchatRunBySession.has(conversationId)) publishStream?.(event);
 		if (deliver) await deliver({
-			sessionKey,
+			conversationId,
 			requestId: wait.id,
 			request
 		});
@@ -341,7 +342,7 @@ var GatewayAgentRunner = class {
 		};
 	}
 	async deliverTelegramClarify(ctx) {
-		const routing = (await this.opts.sessionIndex.getSessionMetadata(ctx.sessionKey).catch(() => null))?.routing;
+		const routing = (await this.opts.sessionIndex.getSessionMetadata(ctx.conversationId).catch(() => null))?.routing;
 		if (!routing || routing.source !== "telegram") return;
 		let body = ctx.request.question;
 		if (ctx.request.suggestedAnswer) body += `\n\nSuggested answer (never selected automatically): ${ctx.request.suggestedAnswer}`;

package/dist/src/gateway/service/marketplace-service.d.ts

@@ -73,9 +73,9 @@ export declare class GatewayMarketplaceService {
     } & SkillCatalogRuntimeMeta;
     getSkillsStatusApi(): SkillCatalogRuntimeMeta;
     getAgentSkillsApi(agentId: string): AgentSkillAvailabilityPayload;
-    getSessionSkillsApi(sessionKey: string): Promise<AgentSkillAvailabilityPayload>;
-    getSessionWorkspaceTrustApi(sessionKey: string): Promise<WorkspaceTrustState>;
-    setSessionWorkspaceTrustApi(sessionKey: string, trusted: boolean): Promise<WorkspaceTrustState>;
+    getSessionSkillsApi(conversationId: string): Promise<AgentSkillAvailabilityPayload>;
+    getSessionWorkspaceTrustApi(conversationId: string): Promise<WorkspaceTrustState>;
+    setSessionWorkspaceTrustApi(conversationId: string, trusted: boolean): Promise<WorkspaceTrustState>;
     getSkillMarkdownSource(skillName: string): SkillMarkdownPreviewPayload | null;
     deleteSkill(skillId: string, target?: SkillInstallTarget): void;
     installSkillZip(buffer: Buffer, opts: {