@xopcai/xopc 0.0.285 → 0.0.291

package/dist/src/workflows/domain/run.d.ts

@@ -21,7 +21,7 @@ export interface WorkflowRun {
 }
 export interface WorkflowRunMetadata {
     preparationOnly?: boolean;
-    sessionKey: string;
+    conversationId: string;
     triggerSource: WorkflowRunSource['kind'];
     agentId?: string;
     projectId?: string;
@@ -82,7 +82,7 @@ export interface WorkflowRunCorrelation {
 }
 export interface WorkflowRunOrigin {
     channel: string;
-    sessionKey?: string;
+    conversationId?: string;
     chatId?: string;
     messageId?: string;
     automationId?: string;
@@ -119,11 +119,11 @@ export interface WorkflowRunDefinitionSnapshot {
 }
 export type WorkflowRunSource = {
     kind: 'chat';
-    sessionKey: string;
+    conversationId: string;
     messageId?: string;
 } | {
     kind: 'webui';
-    sessionKey?: string;
+    conversationId?: string;
     requestId?: string;
 } | {
     kind: 'automation';
@@ -211,7 +211,7 @@ export interface WorkflowAgentView {
     status: WorkflowAgentStatus;
     prompt?: string;
     invocation?: WorkflowAgentInvocationSnapshot;
-    sessionKey: string;
+    conversationId: string;
     transcriptMessageCount: number;
     currentStep?: string;
     resultPreview?: string;

package/dist/src/workflows/engine/projector.js

@@ -132,7 +132,7 @@ function projectWorkflowRunView(events) {
 					status: "queued",
 					prompt: payload.prompt,
 					invocation: payload.invocation,
-					sessionKey: payload.sessionKey,
+					conversationId: payload.conversationId,
 					transcriptMessageCount: 0,
 					steps: []
 				});

package/dist/src/workflows/engine/workflow-engine.d.ts

@@ -15,11 +15,11 @@ export interface WorkflowEngineOptions {
     runner: WorkflowRuntimeSubagentRunner;
     runtime?: WorkflowRuntime;
     hooks?: WorkflowEngineHook[];
-    subagentSessionKeyFactory?: (ctx: {
+    subagentConversationIdFactory?: (ctx: {
         runId: string;
         agentId: string;
     }) => string;
-    parentSessionKey?: string;
+    parentConversationId?: string;
     onEventAppended?: (event: WorkflowEventEnvelope) => void;
     onRunViewUpdated?: (view: WorkflowRunView) => void;
     resolveModelId?: (modelId: string) => Model<Api>;

package/dist/src/workflows/engine/workflow-engine.js

@@ -15,7 +15,7 @@ var WorkflowEngine = class {
 		let eventQueue = Promise.resolve();
 		const progressRecorders = /* @__PURE__ */ new Map();
 		const runtimeAgentStatuses = /* @__PURE__ */ new Map();
-		const subagentSessionKeys = /* @__PURE__ */ new Map();
+		const subagentConversationIds = /* @__PURE__ */ new Map();
 		const run = {
 			id: runId,
 			definitionId: definition.id,
@@ -93,11 +93,11 @@ var WorkflowEngine = class {
 				},
 				onAgentQueued: (event) => {
 					const agentId = formatRuntimeAgentId(event.id);
-					const subagentSessionKey = this.options.subagentSessionKeyFactory?.({
+					const subagentConversationId = this.options.subagentConversationIdFactory?.({
 						runId,
 						agentId
-					}) ?? defaultSubagentSessionKey(runId, agentId);
-					subagentSessionKeys.set(event.id, subagentSessionKey);
+					}) ?? randomUUID();
+					subagentConversationIds.set(event.id, subagentConversationId);
 					runtimeAgentStatuses.set(event.id, "queued");
 					const phaseId = event.phase ? phaseTitleToId.get(event.phase) ?? normalizePhaseId(event.phase) : currentPhaseId;
 					this.callHooks((hook) => hook.beforeAgent?.({
@@ -113,7 +113,7 @@ var WorkflowEngine = class {
 						label: event.label,
 						phaseId,
 						prompt: event.prompt,
-						sessionKey: subagentSessionKey,
+						conversationId: subagentConversationId,
 						invocation: event.invocation
 					});
 				},
@@ -155,16 +155,16 @@ var WorkflowEngine = class {
 					});
 					progressRecorders.set(ctx.id, recorder);
 					const agentId = formatRuntimeAgentId(ctx.id);
-					const sessionKey = subagentSessionKeys.get(ctx.id) ?? this.options.subagentSessionKeyFactory?.({
+					const conversationId = subagentConversationIds.get(ctx.id) ?? this.options.subagentConversationIdFactory?.({
 						runId,
 						agentId
-					}) ?? defaultSubagentSessionKey(runId, agentId);
-					subagentSessionKeys.set(ctx.id, sessionKey);
+					}) ?? randomUUID();
+					subagentConversationIds.set(ctx.id, conversationId);
 					return {
-						sessionKey,
+						conversationId,
 						instructions: this.options.contextInstructions,
 						sessionMetadata: {
-							parentSessionKey: this.options.parentSessionKey,
+							parentConversationId: this.options.parentConversationId,
 							projectId: this.options.projectId,
 							workflowRunId: runId,
 							workflowDefinitionId: definition.id,
@@ -333,10 +333,10 @@ var WorkflowEngine = class {
 	async runReplayTarget(params) {
 		const { target } = params;
 		const invocation = normalizeReplayInvocation(target);
-		const sessionKey = this.options.subagentSessionKeyFactory?.({
+		const conversationId = this.options.subagentConversationIdFactory?.({
 			runId: params.runId,
 			agentId: target.agentId
-		}) ?? defaultSubagentSessionKey(params.runId, target.agentId);
+		}) ?? randomUUID();
 		await this.callHooks((hook) => hook.beforeAgent?.({
 			runId: params.runId,
 			agentId: target.agentId,
@@ -349,7 +349,7 @@ var WorkflowEngine = class {
 			label: invocation.label,
 			phaseId: target.phaseId,
 			prompt: invocation.prompt,
-			sessionKey,
+			conversationId,
 			invocation
 		});
 		await params.appendEvent("agent_started", { agentId: target.agentId });
@@ -369,9 +369,9 @@ var WorkflowEngine = class {
 				phase: invocation.phase ?? target.phaseTitle,
 				signal: params.signal,
 				model,
-				sessionKey,
+				conversationId,
 				sessionMetadata: {
-					parentSessionKey: this.options.parentSessionKey,
+					parentConversationId: this.options.parentConversationId,
 					projectId: this.options.projectId,
 					workflowRunId: params.runId,
 					workflowDefinitionId: params.definition.id,
@@ -654,9 +654,6 @@ function resolveReplayModel(invocation, resolveModelId) {
 function formatRuntimeAgentId(id) {
 	return `agent-${id}`;
 }
-function defaultSubagentSessionKey(runId, agentId) {
-	return `workflow:${runId}:subagent:${agentId}`;
-}
 function normalizeCompletedAgentStatus(status) {
 	if (status === "done" || status === "error" || status === "skipped") return status;
 	return "error";

package/dist/src/workflows/index.js

@@ -10,10 +10,10 @@ import { WorkflowEngine } from "./engine/workflow-engine.js";
 import "./engine/index.js";
 import { WorkflowEventStore, createWorkflowEventStore } from "./store/event-store.js";
 import { WorkflowRunStore, createWorkflowRunStore } from "./store/run-store.js";
-import { WorkflowRunService, buildWorkflowRunDefinitionSnapshot, buildWorkflowRunInputEnvelope, buildWorkflowRunMetadata, extractWorkflowRunSessionKey, preparationDefinition, resolveWorkflowReplayTargets } from "./service/workflow-run-service.js";
+import { WorkflowRunService, buildWorkflowRunDefinitionSnapshot, buildWorkflowRunInputEnvelope, buildWorkflowRunMetadata, extractWorkflowRunConversationId, preparationDefinition, resolveWorkflowReplayTargets } from "./service/workflow-run-service.js";
 import { runViewToSnapshot } from "./service/run-view-to-snapshot.js";
-import { buildWorkflowRunSessionKey, readWorkflowRunIdFromSessionCustomData } from "./service/workflow-session-key.js";
+import { buildWorkflowRunConversationId, readWorkflowRunIdFromSessionCustomData } from "./service/workflow-session-key.js";
 import { WORKFLOW_RUN_LINK_CONTEXT_KIND, WORKFLOW_SESSION_TYPE, WorkflowSessionBridge, formatParentRunLinkText } from "./service/workflow-session-bridge.js";
 import "./registry/index.js";
 import { resolveWorkflowRootDir, resolveWorkflowRunArtifactsDir, resolveWorkflowRunDir, resolveWorkflowRunsDir } from "./store/paths.js";
-export { CatalogWorkflowDefinitionRegistry, DEFAULT_WORKFLOW_CONCURRENCY, DEFAULT_WORKFLOW_MAX_SUBAGENTS, DEFAULT_WORKFLOW_TIMEOUT_SEC, GraphWorkflowRuntime, WORKFLOW_RUN_LINK_CONTEXT_KIND, WORKFLOW_SESSION_TYPE, WorkflowEngine, WorkflowEventStore, WorkflowRunService, WorkflowRunStore, WorkflowSessionBridge, buildWorkflowDefinition, buildWorkflowRunDefinitionSnapshot, buildWorkflowRunInputEnvelope, buildWorkflowRunMetadata, buildWorkflowRunSessionKey, createGraphWorkflowRuntime, createWorkflowEventStore, createWorkflowRunStore, deriveWorkflowPhases, extractWorkflowRunSessionKey, formatParentRunLinkText, hashWorkflowStableValue, isTerminalWorkflowRunStatus, normalizeWorkflowDefinitionId, preparationDefinition, projectWorkflowRunView, readWorkflowRunIdFromSessionCustomData, renderWorkflowTemplate, resolveWorkflowReplayTargets, resolveWorkflowRootDir, resolveWorkflowRunArtifactsDir, resolveWorkflowRunDir, resolveWorkflowRunsDir, runViewToSnapshot, toWorkflowDefinitionTitle, validateWorkflowDefinitionInput, validateWorkflowGraph, validateWorkflowJsonSchema };
+export { CatalogWorkflowDefinitionRegistry, DEFAULT_WORKFLOW_CONCURRENCY, DEFAULT_WORKFLOW_MAX_SUBAGENTS, DEFAULT_WORKFLOW_TIMEOUT_SEC, GraphWorkflowRuntime, WORKFLOW_RUN_LINK_CONTEXT_KIND, WORKFLOW_SESSION_TYPE, WorkflowEngine, WorkflowEventStore, WorkflowRunService, WorkflowRunStore, WorkflowSessionBridge, buildWorkflowDefinition, buildWorkflowRunConversationId, buildWorkflowRunDefinitionSnapshot, buildWorkflowRunInputEnvelope, buildWorkflowRunMetadata, createGraphWorkflowRuntime, createWorkflowEventStore, createWorkflowRunStore, deriveWorkflowPhases, extractWorkflowRunConversationId, formatParentRunLinkText, hashWorkflowStableValue, isTerminalWorkflowRunStatus, normalizeWorkflowDefinitionId, preparationDefinition, projectWorkflowRunView, readWorkflowRunIdFromSessionCustomData, renderWorkflowTemplate, resolveWorkflowReplayTargets, resolveWorkflowRootDir, resolveWorkflowRunArtifactsDir, resolveWorkflowRunDir, resolveWorkflowRunsDir, runViewToSnapshot, toWorkflowDefinitionTitle, validateWorkflowDefinitionInput, validateWorkflowGraph, validateWorkflowJsonSchema };

package/dist/src/workflows/project-presets/project-workflow-preset-repository.js

@@ -1,5 +1,6 @@
-import { getSqliteDatabase } from "../../storage/sqlite/transaction.js";
+import { getSqliteDatabase, init_transaction } from "../../storage/sqlite/transaction.js";
 //#region src/workflows/project-presets/project-workflow-preset-repository.ts
+init_transaction();
 function fromRow(row) {
 	return {
 		projectId: row.project_id,

package/dist/src/workflows/service/run-view-to-snapshot.js

@@ -21,7 +21,7 @@ function runViewToSnapshot(view) {
 		label: agent.label,
 		phase: agent.phaseId ? phaseTitleById.get(agent.phaseId) : void 0,
 		prompt: agent.prompt ?? "",
-		sessionKey: agent.sessionKey,
+		conversationId: agent.conversationId,
 		transcriptMessageCount: agent.transcriptMessageCount,
 		status: agent.status,
 		resultPreview: agent.resultPreview,

package/dist/src/workflows/service/workflow-run-service.d.ts

@@ -45,7 +45,7 @@ export declare function buildWorkflowRunMetadata(params: {
     contextRefs?: WorkflowRunMetadata['contextRefs'];
     contextSnapshot?: WorkflowRunMetadata['contextSnapshot'];
     writebackPolicy?: WorkflowRunMetadata['writebackPolicy'];
-    sessionKey: string;
+    conversationId: string;
     source: WorkflowRunSource;
     input: WorkflowRunInputEnvelope;
     retryOfRunId?: string;
@@ -57,6 +57,6 @@ export declare function resolveWorkflowReplayTargets(view: WorkflowRunView, scop
     phaseIds?: string[];
 };
 export declare function buildWorkflowRunDefinitionSnapshot(definition: WorkflowDefinition): WorkflowRunDefinitionSnapshot;
-export declare function extractWorkflowRunSessionKey(source: WorkflowRunSource): string | null;
+export declare function extractWorkflowRunConversationId(source: WorkflowRunSource): string | null;
 /** Preparation runs can only transform supplied context into a reviewable result. */
 export declare function preparationDefinition(original: WorkflowDefinition): WorkflowDefinition;

package/dist/src/workflows/service/workflow-run-service.js

@@ -1,7 +1,8 @@
-import { TaskRunRepository } from "../../tasks/task-run-repository.js";
+import { TaskRunRepository, init_task_run_repository } from "../../tasks/task-run-repository.js";
+import { init_conversation_repository, resolveRoutedConversation } from "../../storage/sqlite/conversation-repository.js";
 import { getDefaultAgentId, init_resolve_route } from "../../routing/resolve-route.js";
-import { extractProfileAgentId, resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { init_providers, resolveModel } from "../../providers/index.js";
+import { extractProfileAgentId, resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { TaskRepository } from "../../tasks/task-repository.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
 import { getProjectWorkspacePathForSession } from "../../projects/workspace.js";
@@ -23,6 +24,8 @@ import { WorkflowRunStore } from "../store/run-store.js";
 import { WorkflowWritebackService, resolveWorkflowWritebackPolicy } from "./workflow-writeback-service.js";
 import { randomUUID } from "node:crypto";
 //#region src/workflows/service/workflow-run-service.ts
+init_conversation_repository();
+init_task_run_repository();
 init_resolve_route();
 init_providers();
 var WorkflowRunService = class {
@@ -90,7 +93,7 @@ var WorkflowRunService = class {
 	}
 	async startWorkflowRun(params) {
 		const config = this.options.service.currentConfig;
-		const workflowPolicy = config.agents?.list ? resolveEffectiveAgentProfileForSession(config, params.parentSessionKey ?? `agent:${params.agentId}`).config.workflows : void 0;
+		const workflowPolicy = config.agents?.list ? resolveEffectiveAgentProfile(config, params.agentId).config.workflows : void 0;
 		if (workflowPolicy?.allowed && !workflowPolicy.allowed.includes(params.definitionId)) return {
 			ok: false,
 			code: "policy_denied",
@@ -129,12 +132,12 @@ var WorkflowRunService = class {
 		if (existingRun) return {
 			ok: true,
 			runId: existingRun.run.id,
-			sessionKey: existingRun.run.metadata?.sessionKey ?? ""
+			conversationId: existingRun.run.metadata?.conversationId ?? ""
 		};
 		const runId = randomUUID();
 		const goal = params.goal ?? "";
 		const linkedTaskRun = params.taskRunId ? new TaskRunRepository().get(params.taskRunId) : void 0;
-		const inheritedProjectId = params.projectId?.trim() || (linkedTaskRun ? new TaskRepository().get(linkedTaskRun.taskId)?.projectId : void 0) || (params.parentSessionKey?.trim() ? (await this.options.service.sessionIndexInstance.getStore().getMetadata(params.parentSessionKey.trim()))?.projectId : void 0);
+		const inheritedProjectId = params.projectId?.trim() || (linkedTaskRun ? new TaskRepository().get(linkedTaskRun.taskId)?.projectId : void 0) || (params.parentConversationId?.trim() ? (await this.options.service.sessionIndexInstance.getStore().getMetadata(params.parentConversationId.trim()))?.projectId : void 0);
 		const taskId = linkedTaskRun?.taskId;
 		const requestedContextRefs = params.contextRefs ? [...inheritedProjectId && !params.contextRefs.some((ref) => ref.kind === "project" && ref.id === inheritedProjectId) ? [{
 			kind: "project",
@@ -187,14 +190,14 @@ var WorkflowRunService = class {
 				httpStatus: 400
 			};
 		}
-		const { sessionKey } = await this.options.sessionBridge.prepareRunSession({
+		const { conversationId } = await this.options.sessionBridge.prepareRunSession({
 			runId,
 			agentId: params.agentId,
 			definitionId: params.definitionId,
 			definitionTitle: definition.title,
 			triggerSource: params.source.kind,
 			goal,
-			parentSessionKey: params.parentSessionKey,
+			parentConversationId: params.parentConversationId,
 			projectId
 		});
 		if (linkedTaskRun?.status === "queued") {
@@ -203,7 +206,7 @@ var WorkflowRunService = class {
 			const snapshot = context.captureSnapshot({
 				ownerKind: "task_run",
 				ownerId: linkedTaskRun.id,
-				sessionKey,
+				conversationId,
 				query: task.contract?.objective ?? task.title,
 				selectedItems: context.list(task.id),
 				authorizationSnapshot: { grants: context.listActiveGrants(task.id) }
@@ -216,23 +219,23 @@ var WorkflowRunService = class {
 					executorKind: "workflow",
 					definitionId: params.definitionId
 				},
-				sessionKey
+				conversationId
 			})) throw new Error("TaskRun changed before workflow execution started");
 			new TaskConversationRepository().activateExecutionSession({
 				taskId: task.id,
-				sessionKey,
+				conversationId,
 				agentId: params.agentId,
 				runId: linkedTaskRun.id
 			});
 		}
-		const source = normalizeWorkflowRunSourceForSession(params.source, sessionKey, params.parentSessionKey);
+		const source = normalizeWorkflowRunSourceForSession(params.source, conversationId, params.parentConversationId);
 		const abortController = new AbortController();
 		const eventStore = new WorkflowEventStore(this.options.service.currentConfig, params.agentId);
 		const runStore = new WorkflowRunStore(this.options.service.currentConfig, params.agentId, eventStore);
 		const engine = this.createWorkflowEngine({
 			eventStore,
 			runStore,
-			sessionKey,
+			conversationId,
 			projectId,
 			contextInstructions: resolvedContext?.instructions
 		});
@@ -261,7 +264,7 @@ var WorkflowRunService = class {
 				contextRefs,
 				contextSnapshot: resolvedContext?.snapshot,
 				writebackPolicy,
-				sessionKey,
+				conversationId,
 				source,
 				input: inputEnvelope,
 				retryOfRunId: params.retryOfRunId,
@@ -286,7 +289,7 @@ var WorkflowRunService = class {
 		return {
 			ok: true,
 			runId,
-			sessionKey
+			conversationId
 		};
 	}
 	async retryWorkflowRun(params) {
@@ -297,7 +300,7 @@ var WorkflowRunService = class {
 			message: "Workflow run not found",
 			httpStatus: 404
 		};
-		const parentSessionKey = existing.run.source.kind === "chat" ? existing.run.source.sessionKey : void 0;
+		const parentConversationId = existing.run.source.kind === "chat" ? existing.run.source.conversationId : void 0;
 		const projectId = params.projectId?.trim() || existing.run.metadata?.projectId;
 		return this.startWorkflowRun({
 			agentId: params.agentId,
@@ -312,7 +315,7 @@ var WorkflowRunService = class {
 			inputEnvelope: existing.run.metadata?.input,
 			goal: existing.run.goal,
 			source: existing.run.source,
-			parentSessionKey,
+			parentConversationId,
 			retryOfRunId: existing.run.id
 		});
 	}
@@ -344,7 +347,7 @@ var WorkflowRunService = class {
 		};
 		const replayRunId = randomUUID();
 		const goal = buildReplayGoal(existing, params.scope, targets.targets.length);
-		const parentSessionKey = existing.run.source.kind === "chat" ? existing.run.source.sessionKey : void 0;
+		const parentConversationId = existing.run.source.kind === "chat" ? existing.run.source.conversationId : void 0;
 		const projectId = existing.run.metadata?.projectId;
 		const taskRunId = existing.run.metadata?.taskRunId;
 		const taskId = taskRunId ? new TaskRunRepository().get(taskRunId)?.taskId : void 0;
@@ -383,24 +386,24 @@ var WorkflowRunService = class {
 				httpStatus: 400
 			};
 		}
-		const { sessionKey } = await this.options.sessionBridge.prepareRunSession({
+		const { conversationId } = await this.options.sessionBridge.prepareRunSession({
 			runId: replayRunId,
 			agentId: params.agentId,
 			definitionId: existing.run.definitionId,
 			definitionTitle: `${definition.title} replay`,
 			triggerSource: existing.run.source.kind,
 			goal,
-			parentSessionKey,
+			parentConversationId,
 			projectId
 		});
-		const source = normalizeWorkflowRunSourceForSession(existing.run.source, sessionKey, parentSessionKey);
+		const source = normalizeWorkflowRunSourceForSession(existing.run.source, conversationId, parentConversationId);
 		const abortController = new AbortController();
 		const eventStore = new WorkflowEventStore(this.options.service.currentConfig, params.agentId);
 		const replayRunStore = new WorkflowRunStore(this.options.service.currentConfig, params.agentId, eventStore);
 		const engine = this.createWorkflowEngine({
 			eventStore,
 			runStore: replayRunStore,
-			sessionKey,
+			conversationId,
 			projectId,
 			contextInstructions: resolvedContext?.instructions
 		});
@@ -428,7 +431,7 @@ var WorkflowRunService = class {
 				contextRefs: existing.run.metadata?.contextRefs,
 				contextSnapshot: resolvedContext?.snapshot,
 				writebackPolicy,
-				sessionKey,
+				conversationId,
 				source,
 				input: inputEnvelope,
 				retryOfRunId: existing.run.id,
@@ -462,7 +465,7 @@ var WorkflowRunService = class {
 		return {
 			ok: true,
 			runId: replayRunId,
-			sessionKey
+			conversationId
 		};
 	}
 	async cancelWorkflowRun(params) {
@@ -557,14 +560,14 @@ var WorkflowRunService = class {
 	}
 	createWorkflowEngine(params) {
 		const gatewayService = this.options.service;
-		const profileAgentId = extractProfileAgentId(params.sessionKey, gatewayService.currentConfig);
-		const agentWorkspace = gatewayService.currentConfig.agents?.list ? resolveEffectiveAgentProfileForSession(gatewayService.currentConfig, params.sessionKey).resolvedWorkspacePath : gatewayService.currentWorkspacePath;
-		const workspace = getProjectWorkspacePathForSession(params.sessionKey) ?? agentWorkspace;
+		const profileAgentId = extractProfileAgentId(params.conversationId, gatewayService.currentConfig);
+		const agentWorkspace = gatewayService.currentConfig.agents?.list ? resolveEffectiveAgentProfileForSession(gatewayService.currentConfig, params.conversationId).resolvedWorkspacePath : gatewayService.currentWorkspacePath;
+		const workspace = getProjectWorkspacePathForSession(params.conversationId) ?? agentWorkspace;
 		const runner = new DelegateSubagentRunner({
 			workspace,
 			bus: gatewayService.messageBusInstance,
 			agentId: profileAgentId,
-			getDefaultModel: () => resolveModel(gatewayService.agentService.getModelForSession(params.sessionKey)),
+			getDefaultModel: () => resolveModel(gatewayService.agentService.getModelForSession(params.conversationId)),
 			getConfig: () => gatewayService.currentConfig,
 			sessionStore: gatewayService.sessionIndexInstance.getStore(),
 			buildChildTools: (childOptions) => this.options.buildChildTools({
@@ -583,9 +586,17 @@ var WorkflowRunService = class {
 			resolveModelId: (modelId) => {
 				return resolveModel(resolveModelSelector(gatewayService.currentConfig, profileAgentId, modelId));
 			},
-			parentSessionKey: params.sessionKey,
-			subagentSessionKeyFactory: ({ runId, agentId }) => {
-				return `agent:${profileAgentId}:workflow:${runId}:subagent:${agentId}`;
+			parentConversationId: params.conversationId,
+			subagentConversationIdFactory: ({ runId, agentId }) => {
+				return resolveRoutedConversation({
+					agentId: profileAgentId,
+					source: "workflow",
+					peerKind: "direct",
+					peerId: `${runId}/${agentId}`
+				}, {
+					sessionType: "workflow-subagent",
+					parentConversationId: params.conversationId
+				});
 			},
 			onEventAppended: (event) => {
 				gatewayService.emit("workflow.event.appended", {
@@ -615,21 +626,21 @@ var WorkflowRunService = class {
 				status: view.run.status,
 				definitionId: view.run.definitionId,
 				title: view.run.title,
-				sessionKey: view.run.metadata?.sessionKey,
+				conversationId: view.run.metadata?.conversationId,
 				sourceKind: view.run.source.kind
 			},
 			occurredAtMs: view.run.completedAtMs ?? Date.now()
 		});
 	}
 };
-function normalizeWorkflowRunSourceForSession(source, workflowSessionKey, parentSessionKey) {
-	if (parentSessionKey?.trim()) return {
+function normalizeWorkflowRunSourceForSession(source, workflowConversationId, parentConversationId) {
+	if (parentConversationId?.trim()) return {
 		kind: "chat",
-		sessionKey: parentSessionKey.trim()
+		conversationId: parentConversationId.trim()
 	};
 	if (source.kind === "webui") return {
 		...source,
-		sessionKey: workflowSessionKey
+		conversationId: workflowConversationId
 	};
 	if (source.kind === "chat") return source;
 	return source;
@@ -655,7 +666,7 @@ function buildWorkflowRunMetadata(params) {
 		taskId
 	});
 	return {
-		sessionKey: params.sessionKey,
+		conversationId: params.conversationId,
 		...params.preparationOnly ? { preparationOnly: true } : {},
 		triggerSource: params.source.kind,
 		agentId: params.agentId,
@@ -691,7 +702,7 @@ function buildDefaultWorkflowContextRefs(params) {
 	});
 	if (params.source.kind === "chat") refs.push({
 		kind: "session",
-		id: params.source.sessionKey,
+		id: params.source.conversationId,
 		role: "parent_session"
 	});
 	return refs;
@@ -770,20 +781,20 @@ function normalizePositiveInt(value, fallback) {
 function buildReplayGoal(view, scope, targetCount) {
 	return `Replay ${targetCount} ${scope === "failed_phases" ? "failed phase" : "failed agent"}${targetCount === 1 ? "" : "s"} from workflow run ${view.run.id}: ${view.run.goal}`;
 }
-function extractWorkflowRunSessionKey(source) {
-	if ("sessionKey" in source && typeof source.sessionKey === "string" && source.sessionKey.trim()) return source.sessionKey.trim();
+function extractWorkflowRunConversationId(source) {
+	if ("conversationId" in source && typeof source.conversationId === "string" && source.conversationId.trim()) return source.conversationId.trim();
 	return null;
 }
 function buildWorkflowRunOrigin(source) {
 	switch (source.kind) {
 		case "chat": return {
 			channel: "chat",
-			sessionKey: source.sessionKey,
+			conversationId: source.conversationId,
 			messageId: source.messageId
 		};
 		case "webui": return {
 			channel: "webui",
-			sessionKey: source.sessionKey
+			conversationId: source.conversationId
 		};
 		case "automation": return {
 			channel: "automation",
@@ -818,4 +829,4 @@ function preparationDefinition(original) {
 	return definition;
 }
 //#endregion
-export { WorkflowRunService, buildWorkflowRunDefinitionSnapshot, buildWorkflowRunInputEnvelope, buildWorkflowRunMetadata, extractWorkflowRunSessionKey, preparationDefinition, resolveWorkflowReplayTargets };
+export { WorkflowRunService, buildWorkflowRunDefinitionSnapshot, buildWorkflowRunInputEnvelope, buildWorkflowRunMetadata, extractWorkflowRunConversationId, preparationDefinition, resolveWorkflowReplayTargets };

package/dist/src/workflows/service/workflow-run-service.types.d.ts

@@ -4,7 +4,7 @@ export interface StartWorkflowRunServiceParams {
     agentId: string;
     definitionId: string;
     taskRunId?: string;
-    parentSessionKey?: string;
+    parentConversationId?: string;
     projectId?: string;
     contextRefs?: WorkflowRunContextRef[];
     contextSnapshotId?: string;
@@ -22,7 +22,7 @@ export interface StartWorkflowRunServiceParams {
 export interface StartWorkflowRunServiceResult {
     ok: true;
     runId: string;
-    sessionKey: string;
+    conversationId: string;
 }
 export type WorkflowRunServiceErrorCode = 'definition_not_found' | 'run_not_found' | 'invalid_input' | 'policy_denied' | 'connector_preflight_failed' | 'invalid_state';
 export interface WorkflowRunServiceErrorResult {

package/dist/src/workflows/service/workflow-session-bridge.d.ts

@@ -8,12 +8,12 @@ export interface PrepareWorkflowRunSessionParams {
     definitionId: string;
     definitionTitle: string;
     goal: string;
-    parentSessionKey?: string;
+    parentConversationId?: string;
     projectId?: string;
     triggerSource?: string;
 }
 export interface PrepareWorkflowRunSessionResult {
-    sessionKey: string;
+    conversationId: string;
 }
 export declare class WorkflowSessionBridge {
     private readonly gateway;