@mastra/factory 0.24.0-alpha.9 → 0.25.0-alpha.0

package/dist/rules/binding-context.js

@@ -4,18 +4,19 @@ function getFactorySessionCoordinates(requestContext) {
 	if (!requestContext || typeof requestContext.get !== "function") return null;
 	const context = requestContext.get("controller");
 	const factoryProjectId = context?.getState().factoryProjectId;
-	if (!context?.threadId || !context.resourceId || !factoryProjectId) return null;
+	if (!context?.threadId || !context.resourceId || !context.sessionId || !factoryProjectId) return null;
 	return {
 		factoryProjectId,
 		threadId: context.threadId,
 		resourceId: context.resourceId,
-		sessionId: context.resourceId
+		sessionId: context.sessionId
 	};
 }
 function getFactorySessionAddress(requestContext) {
 	const coordinates = getFactorySessionCoordinates(requestContext);
 	if (!coordinates || !requestContext || typeof requestContext.get !== "function") return null;
-	const orgId = getFactoryAuthOrgId(getFactoryAuthUserFromContext(requestContext));
+	const user = getFactoryAuthUserFromContext(requestContext);
+	const orgId = getFactoryAuthOrgId(user);
 	if (!orgId) return null;
 	return {
 		orgId,
@@ -50,14 +51,14 @@ function readFactorySessionScope(requestContext) {
 async function findSessionRunBinding(requestContext, storage) {
 	if (!requestContext || typeof requestContext.get !== "function") return null;
 	const context = requestContext.get("controller");
-	if (!context?.threadId || !context.resourceId) return null;
+	if (!context?.threadId || !context.resourceId || !context.sessionId) return null;
 	const orgId = getFactoryAuthOrgId(getFactoryAuthUserFromContext(requestContext));
 	if (!orgId) return null;
 	return storage.findActiveRunBindingByThread({
 		orgId,
 		threadId: context.threadId,
 		resourceId: context.resourceId,
-		sessionId: context.resourceId
+		sessionId: context.sessionId
 	});
 }
 /**
@@ -75,14 +76,15 @@ async function resolveFactorySessionAddress(options) {
 	const requestContext = options.requestContext;
 	if (!requestContext || typeof requestContext.get !== "function") return null;
 	const context = requestContext.get("controller");
-	if (!context?.threadId || !context.resourceId) return null;
-	const orgId = getFactoryAuthOrgId(getFactoryAuthUserFromContext(requestContext));
+	if (!context?.threadId || !context.resourceId || !context.sessionId) return null;
+	const user = getFactoryAuthUserFromContext(requestContext);
+	const orgId = getFactoryAuthOrgId(user);
 	if (!orgId) return null;
 	const binding = await options.storage.findActiveRunBindingByThread({
 		orgId,
 		threadId: context.threadId,
 		resourceId: context.resourceId,
-		sessionId: context.resourceId
+		sessionId: context.sessionId
 	});
 	if (!binding) return null;
 	await healRecoveredSessionState({
@@ -97,7 +99,7 @@ async function resolveFactorySessionAddress(options) {
 			factoryProjectId: binding.factoryProjectId,
 			threadId: context.threadId,
 			resourceId: context.resourceId,
-			sessionId: context.resourceId
+			sessionId: context.sessionId
 		},
 		binding
 	};

package/dist/rules/binding-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"binding-context.js","names":[],"sources":["../../src/rules/binding-context.ts"],"sourcesContent":["import type { AgentControllerRequestContext } from '@mastra/core/agent-controller';\nimport type { RequestContext } from '@mastra/core/request-context';\n\nimport { getFactoryAuthOrgId, getFactoryAuthUserFromContext } from '../auth.js';\nimport type {\n  FactoryRunBindingAddress,\n  FactoryRunBindingRecord,\n  FactoryRunBindingSessionAddress,\n  WorkItemsStorage,\n} from '../storage/domains/work-items/base.js';\n\ninterface FactorySessionState {\n  factoryProjectId?: string;\n  factoryOrgId?: string;\n  projectRepositoryId?: string;\n  untrustedCheckout?: boolean;\n  baseRef?: string;\n}\n\ntype FactorySessionControllerContext = AgentControllerRequestContext<FactorySessionState>;\n\n/** Minimal source-control session lookup used to heal recovered session state. */\nexport interface FactorySessionSourceLookup {\n  getBySessionId(\n    sessionId: string,\n  ): Promise<{ orgId: string; projectRepositoryId: string | null; baseBranch: string } | null>;\n}\n\nexport function getFactorySessionCoordinates(\n  requestContext: RequestContext | undefined,\n): FactoryRunBindingSessionAddress | null {\n  if (!requestContext || typeof requestContext.get !== 'function') return null;\n  const context = requestContext.get('controller') as FactorySessionControllerContext | undefined;\n  const factoryProjectId = context?.getState().factoryProjectId;\n  if (!context?.threadId || !context.resourceId || !factoryProjectId) return null;\n  return {\n    factoryProjectId,\n    threadId: context.threadId,\n    resourceId: context.resourceId,\n    sessionId: context.resourceId,\n  };\n}\n\nexport function getFactorySessionAddress(requestContext: RequestContext | undefined): FactoryRunBindingAddress | null {\n  const coordinates = getFactorySessionCoordinates(requestContext);\n  if (!coordinates || !requestContext || typeof requestContext.get !== 'function') return null;\n  const user = getFactoryAuthUserFromContext(requestContext);\n  const orgId = getFactoryAuthOrgId(user);\n  if (!orgId) return null;\n  return { orgId, ...coordinates };\n}\n\n/**\n * Read the session's factory scoping off controller state: the project whose\n * shared settings row applies to its runs, plus the org rung that row is keyed\n * by (`factoryOrgId` is seeded at session start and is authoritative for\n * downstream identity reads — the owner id is a user, never an org).\n */\nexport function readFactorySessionScope(\n  requestContext: RequestContext | undefined,\n): { factoryProjectId: string; factoryOrgId?: string } | null {\n  if (!requestContext || typeof requestContext.get !== 'function') return null;\n  const context = requestContext.get('controller') as FactorySessionControllerContext | undefined;\n  const state = context?.getState();\n  const factoryProjectId = state?.factoryProjectId;\n  if (typeof factoryProjectId !== 'string' || factoryProjectId.length === 0) return null;\n  const factoryOrgId = state?.factoryOrgId;\n  return {\n    factoryProjectId,\n    ...(typeof factoryOrgId === 'string' && factoryOrgId.length > 0 ? { factoryOrgId } : {}),\n  };\n}\n\n/**\n * Read the active run binding for this session when controller state has lost\n * `factoryProjectId` — a crash-recovered session (\"Continue\") is recreated with\n * empty state, so the binding table is the only remaining source of the project\n * whose shared settings row applies to the run. Read-only, unlike\n * `resolveFactorySessionAddress`: it neither heals state nor touches source\n * control, so input processors can call it before any tool has run.\n */\nexport async function findSessionRunBinding(\n  requestContext: RequestContext | undefined,\n  storage: Pick<WorkItemsStorage, 'findActiveRunBindingByThread'>,\n): Promise<FactoryRunBindingRecord | null> {\n  if (!requestContext || typeof requestContext.get !== 'function') return null;\n  const context = requestContext.get('controller') as FactorySessionControllerContext | undefined;\n  if (!context?.threadId || !context.resourceId) return null;\n  const orgId = getFactoryAuthOrgId(getFactoryAuthUserFromContext(requestContext));\n  if (!orgId) return null;\n  return storage.findActiveRunBindingByThread({\n    orgId,\n    threadId: context.threadId,\n    resourceId: context.resourceId,\n    sessionId: context.resourceId,\n  });\n}\n\nexport interface FactorySessionAddressResolution {\n  address: FactoryRunBindingAddress;\n  /** Present only when the address was recovered from the binding table. */\n  binding?: FactoryRunBindingRecord;\n}\n\n/**\n * Resolve the bound session address, falling back to the active binding row\n * when the in-memory session state is missing `factoryProjectId` — a server\n * crash drops controller sessions, and a resumed session (\"Continue\") is\n * recreated with empty state, which silently unregistered the transition\n * tool. On recovery the lost state is healed back onto the session (including\n * the `untrustedCheckout`/`baseRef` security posture the start coordinator\n * originally seeded) so later reads resolve directly.\n */\nexport async function resolveFactorySessionAddress(options: {\n  requestContext: RequestContext | undefined;\n  storage: Pick<WorkItemsStorage, 'findActiveRunBindingByThread' | 'get'>;\n  sessions?: FactorySessionSourceLookup;\n  /**\n   * Resolve through the binding table even when state already carries\n   * `factoryProjectId`, so the row heals the rest of the session state. Prompt\n   * creation uses this: a partially persisted state can keep the project id\n   * while the untrusted-checkout posture is gone, and the direct short-circuit\n   * would take that id as proof the session is intact.\n   */\n  forceBindingLookup?: boolean;\n}): Promise<FactorySessionAddressResolution | null> {\n  const direct = options.forceBindingLookup ? null : getFactorySessionAddress(options.requestContext);\n  if (direct) return { address: direct };\n\n  const requestContext = options.requestContext;\n  if (!requestContext || typeof requestContext.get !== 'function') return null;\n  const context = requestContext.get('controller') as FactorySessionControllerContext | undefined;\n  if (!context?.threadId || !context.resourceId) return null;\n  const user = getFactoryAuthUserFromContext(requestContext);\n  const orgId = getFactoryAuthOrgId(user);\n  if (!orgId) return null;\n\n  const binding = await options.storage.findActiveRunBindingByThread({\n    orgId,\n    threadId: context.threadId,\n    resourceId: context.resourceId,\n    sessionId: context.resourceId,\n  });\n  if (!binding) return null;\n\n  await healRecoveredSessionState({ context, binding, storage: options.storage, sessions: options.sessions });\n\n  return {\n    address: {\n      orgId,\n      factoryProjectId: binding.factoryProjectId,\n      threadId: context.threadId,\n      resourceId: context.resourceId,\n      sessionId: context.resourceId,\n    },\n    binding,\n  };\n}\n\nasync function healRecoveredSessionState(options: {\n  context: FactorySessionControllerContext;\n  binding: FactoryRunBindingRecord;\n  storage: Pick<WorkItemsStorage, 'get'>;\n  sessions?: FactorySessionSourceLookup;\n}): Promise<void> {\n  const { binding } = options;\n  // `factoryOrgId` mirrors the start coordinator's seed: the binding row holds\n  // the authoritative org id, so crash-recovered sessions heal it for free.\n  const updates: FactorySessionState = { factoryProjectId: binding.factoryProjectId, factoryOrgId: binding.orgId };\n  // Security posture first, from the binding row alone (no I/O): review-bound\n  // sessions run against attacker-writable checkouts, so `untrustedCheckout`\n  // must survive even if the enrichment lookups below fail transiently.\n  if (binding.role === 'review') {\n    updates.untrustedCheckout = true;\n  }\n  // Best-effort enrichment mirroring the start coordinator's original seed:\n  // PR-sourced work items are untrusted regardless of role, and `baseRef`\n  // restores the trusted instruction source for untrusted checkouts.\n  try {\n    const item = await options.storage.get({ orgId: binding.orgId, id: binding.workItemId });\n    const foundSession = (await options.sessions?.getBySessionId(binding.sessionId)) ?? null;\n    const sourceSession = foundSession?.orgId === binding.orgId ? foundSession : null;\n    if (sourceSession?.projectRepositoryId) {\n      updates.projectRepositoryId = sourceSession.projectRepositoryId;\n    }\n    const untrusted = updates.untrustedCheckout === true || item?.externalSource?.type === 'pull-request';\n    if (untrusted) {\n      updates.untrustedCheckout = true;\n      const metadataBaseBranch = item?.metadata?.baseBranch;\n      const baseRef =\n        sourceSession?.baseBranch ||\n        (typeof metadataBaseBranch === 'string' && metadataBaseBranch ? metadataBaseBranch : undefined);\n      if (baseRef) updates.baseRef = baseRef;\n    } else {\n      // Record the trusted verdict explicitly so a healed session carries every\n      // trust field; the prompt-time recovery check treats a missing flag as\n      // \"not yet verified\" and would otherwise re-run on every prompt. Left\n      // unset when enrichment fails so the next prompt retries the lookup.\n      updates.untrustedCheckout = false;\n    }\n  } catch {\n    // Enrichment is best-effort; the address itself only needs the binding.\n  }\n  try {\n    await options.context.setState(updates);\n  } catch {\n    // State healing must never block tool registration on the recovered address.\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"binding-context.js","names":[],"sources":["../../src/rules/binding-context.ts"],"sourcesContent":["import type { AgentControllerRequestContext } from '@mastra/core/agent-controller';\nimport type { RequestContext } from '@mastra/core/request-context';\n\nimport { getFactoryAuthOrgId, getFactoryAuthUserFromContext } from '../auth.js';\nimport type {\n  FactoryRunBindingAddress,\n  FactoryRunBindingRecord,\n  FactoryRunBindingSessionAddress,\n  WorkItemsStorage,\n} from '../storage/domains/work-items/base.js';\n\ninterface FactorySessionState {\n  factoryProjectId?: string;\n  factoryOrgId?: string;\n  projectRepositoryId?: string;\n  untrustedCheckout?: boolean;\n  baseRef?: string;\n}\n\ntype FactorySessionControllerContext = AgentControllerRequestContext<FactorySessionState>;\n\n/** Minimal source-control session lookup used to heal recovered session state. */\nexport interface FactorySessionSourceLookup {\n  getBySessionId(\n    sessionId: string,\n  ): Promise<{ orgId: string; projectRepositoryId: string | null; baseBranch: string } | null>;\n}\n\nexport function getFactorySessionCoordinates(\n  requestContext: RequestContext | undefined,\n): FactoryRunBindingSessionAddress | null {\n  if (!requestContext || typeof requestContext.get !== 'function') return null;\n  const context = requestContext.get('controller') as FactorySessionControllerContext | undefined;\n  const factoryProjectId = context?.getState().factoryProjectId;\n  if (!context?.threadId || !context.resourceId || !context.sessionId || !factoryProjectId) return null;\n  return {\n    factoryProjectId,\n    threadId: context.threadId,\n    resourceId: context.resourceId,\n    sessionId: context.sessionId,\n  };\n}\n\nexport function getFactorySessionAddress(requestContext: RequestContext | undefined): FactoryRunBindingAddress | null {\n  const coordinates = getFactorySessionCoordinates(requestContext);\n  if (!coordinates || !requestContext || typeof requestContext.get !== 'function') return null;\n  const user = getFactoryAuthUserFromContext(requestContext);\n  const orgId = getFactoryAuthOrgId(user);\n  if (!orgId) return null;\n  return { orgId, ...coordinates };\n}\n\n/**\n * Read the session's factory scoping off controller state: the project whose\n * shared settings row applies to its runs, plus the org rung that row is keyed\n * by (`factoryOrgId` is seeded at session start and is authoritative for\n * downstream identity reads — the owner id is a user, never an org).\n */\nexport function readFactorySessionScope(\n  requestContext: RequestContext | undefined,\n): { factoryProjectId: string; factoryOrgId?: string } | null {\n  if (!requestContext || typeof requestContext.get !== 'function') return null;\n  const context = requestContext.get('controller') as FactorySessionControllerContext | undefined;\n  const state = context?.getState();\n  const factoryProjectId = state?.factoryProjectId;\n  if (typeof factoryProjectId !== 'string' || factoryProjectId.length === 0) return null;\n  const factoryOrgId = state?.factoryOrgId;\n  return {\n    factoryProjectId,\n    ...(typeof factoryOrgId === 'string' && factoryOrgId.length > 0 ? { factoryOrgId } : {}),\n  };\n}\n\n/**\n * Read the active run binding for this session when controller state has lost\n * `factoryProjectId` — a crash-recovered session (\"Continue\") is recreated with\n * empty state, so the binding table is the only remaining source of the project\n * whose shared settings row applies to the run. Read-only, unlike\n * `resolveFactorySessionAddress`: it neither heals state nor touches source\n * control, so input processors can call it before any tool has run.\n */\nexport async function findSessionRunBinding(\n  requestContext: RequestContext | undefined,\n  storage: Pick<WorkItemsStorage, 'findActiveRunBindingByThread'>,\n): Promise<FactoryRunBindingRecord | null> {\n  if (!requestContext || typeof requestContext.get !== 'function') return null;\n  const context = requestContext.get('controller') as FactorySessionControllerContext | undefined;\n  if (!context?.threadId || !context.resourceId || !context.sessionId) return null;\n  const orgId = getFactoryAuthOrgId(getFactoryAuthUserFromContext(requestContext));\n  if (!orgId) return null;\n  return storage.findActiveRunBindingByThread({\n    orgId,\n    threadId: context.threadId,\n    resourceId: context.resourceId,\n    sessionId: context.sessionId,\n  });\n}\n\nexport interface FactorySessionAddressResolution {\n  address: FactoryRunBindingAddress;\n  /** Present only when the address was recovered from the binding table. */\n  binding?: FactoryRunBindingRecord;\n}\n\n/**\n * Resolve the bound session address, falling back to the active binding row\n * when the in-memory session state is missing `factoryProjectId` — a server\n * crash drops controller sessions, and a resumed session (\"Continue\") is\n * recreated with empty state, which silently unregistered the transition\n * tool. On recovery the lost state is healed back onto the session (including\n * the `untrustedCheckout`/`baseRef` security posture the start coordinator\n * originally seeded) so later reads resolve directly.\n */\nexport async function resolveFactorySessionAddress(options: {\n  requestContext: RequestContext | undefined;\n  storage: Pick<WorkItemsStorage, 'findActiveRunBindingByThread' | 'get'>;\n  sessions?: FactorySessionSourceLookup;\n  /**\n   * Resolve through the binding table even when state already carries\n   * `factoryProjectId`, so the row heals the rest of the session state. Prompt\n   * creation uses this: a partially persisted state can keep the project id\n   * while the untrusted-checkout posture is gone, and the direct short-circuit\n   * would take that id as proof the session is intact.\n   */\n  forceBindingLookup?: boolean;\n}): Promise<FactorySessionAddressResolution | null> {\n  const direct = options.forceBindingLookup ? null : getFactorySessionAddress(options.requestContext);\n  if (direct) return { address: direct };\n\n  const requestContext = options.requestContext;\n  if (!requestContext || typeof requestContext.get !== 'function') return null;\n  const context = requestContext.get('controller') as FactorySessionControllerContext | undefined;\n  if (!context?.threadId || !context.resourceId || !context.sessionId) return null;\n  const user = getFactoryAuthUserFromContext(requestContext);\n  const orgId = getFactoryAuthOrgId(user);\n  if (!orgId) return null;\n\n  const binding = await options.storage.findActiveRunBindingByThread({\n    orgId,\n    threadId: context.threadId,\n    resourceId: context.resourceId,\n    sessionId: context.sessionId,\n  });\n  if (!binding) return null;\n\n  await healRecoveredSessionState({ context, binding, storage: options.storage, sessions: options.sessions });\n\n  return {\n    address: {\n      orgId,\n      factoryProjectId: binding.factoryProjectId,\n      threadId: context.threadId,\n      resourceId: context.resourceId,\n      sessionId: context.sessionId,\n    },\n    binding,\n  };\n}\n\nasync function healRecoveredSessionState(options: {\n  context: FactorySessionControllerContext;\n  binding: FactoryRunBindingRecord;\n  storage: Pick<WorkItemsStorage, 'get'>;\n  sessions?: FactorySessionSourceLookup;\n}): Promise<void> {\n  const { binding } = options;\n  // `factoryOrgId` mirrors the start coordinator's seed: the binding row holds\n  // the authoritative org id, so crash-recovered sessions heal it for free.\n  const updates: FactorySessionState = { factoryProjectId: binding.factoryProjectId, factoryOrgId: binding.orgId };\n  // Security posture first, from the binding row alone (no I/O): review-bound\n  // sessions run against attacker-writable checkouts, so `untrustedCheckout`\n  // must survive even if the enrichment lookups below fail transiently.\n  if (binding.role === 'review') {\n    updates.untrustedCheckout = true;\n  }\n  // Best-effort enrichment mirroring the start coordinator's original seed:\n  // PR-sourced work items are untrusted regardless of role, and `baseRef`\n  // restores the trusted instruction source for untrusted checkouts.\n  try {\n    const item = await options.storage.get({ orgId: binding.orgId, id: binding.workItemId });\n    const foundSession = (await options.sessions?.getBySessionId(binding.sessionId)) ?? null;\n    const sourceSession = foundSession?.orgId === binding.orgId ? foundSession : null;\n    if (sourceSession?.projectRepositoryId) {\n      updates.projectRepositoryId = sourceSession.projectRepositoryId;\n    }\n    const untrusted = updates.untrustedCheckout === true || item?.externalSource?.type === 'pull-request';\n    if (untrusted) {\n      updates.untrustedCheckout = true;\n      const metadataBaseBranch = item?.metadata?.baseBranch;\n      const baseRef =\n        sourceSession?.baseBranch ||\n        (typeof metadataBaseBranch === 'string' && metadataBaseBranch ? metadataBaseBranch : undefined);\n      if (baseRef) updates.baseRef = baseRef;\n    } else {\n      // Record the trusted verdict explicitly so a healed session carries every\n      // trust field; the prompt-time recovery check treats a missing flag as\n      // \"not yet verified\" and would otherwise re-run on every prompt. Left\n      // unset when enrichment fails so the next prompt retries the lookup.\n      updates.untrustedCheckout = false;\n    }\n  } catch {\n    // Enrichment is best-effort; the address itself only needs the binding.\n  }\n  try {\n    await options.context.setState(updates);\n  } catch {\n    // State healing must never block tool registration on the recovered address.\n  }\n}\n"],"mappings":"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"}

package/dist/rules/dispatcher.d.ts

@@ -7,7 +7,7 @@ import type { FactoryDeferredDecisionRecord, WorkItemRow, WorkItemsStorage } fro
 import type { FactoryRunEndReporter } from '../tools/reports.js';
 import type { FactoryTransitionService } from './transition-service.js';
 import type { FactoryCommitDecision } from './types.js';
-type FactoryController = Pick<AgentController<MastraCodeState>, 'getSessionByResource' | 'listActiveThreadRuns'>;
+type FactoryController = Pick<AgentController<MastraCodeState>, 'getSession' | 'listActiveThreadRuns'>;
 export interface FactoryBindingPreparationInput {
     record: FactoryDeferredDecisionRecord;
     item: WorkItemRow;

package/dist/rules/dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/rules/dispatcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/rules/dispatcher.ts"],"names":[],"mappings":"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"}

package/dist/rules/dispatcher.js

@@ -20,8 +20,8 @@ const MAX_ATTEMPTS = 5;
 const MAX_PLAN_APPROVALS = 3;
 const MAX_ERROR_LENGTH = 512;
 const MAX_BACKOFF_MS = 6e4;
-const RUN_REGISTRY_HEARTBEAT_MS = 10 * 6e4;
-const SKILL_COMPLETION_OBSERVATION_TIMEOUT_MS = 360 * 6e4;
+const RUN_REGISTRY_HEARTBEAT_MS = 6e5;
+const SKILL_COMPLETION_OBSERVATION_TIMEOUT_MS = 216e5;
 const MAX_IN_FLIGHT = 25;
 /**
 * Decisions that may start or wake an agent run and so hold a run slot. A
@@ -31,8 +31,8 @@ const MAX_IN_FLIGHT = 25;
 const isRunBearingDecision = (decision) => decision.type === "invokeSkill" || decision.type === "sendMessage";
 const isBookkeepingDecision = (decision) => !isRunBearingDecision(decision);
 const BOOKKEEPING_MAX_IN_FLIGHT = 4;
-const STALE_BINDING_SWEEP_INTERVAL_MS = 10 * 6e4;
-const STALE_BINDING_TTL_MS = 1440 * 6e4;
+const STALE_BINDING_SWEEP_INTERVAL_MS = 6e5;
+const STALE_BINDING_TTL_MS = 864e5;
 const RECONCILE_INTERVAL_MS = 3e4;
 /** The card moved on before this run could act; it settles as superseded, not succeeded. */
 var FactoryDecisionSuperseded = class extends Error {};
@@ -177,6 +177,7 @@ function factoryRequestContext(input) {
 	requestContext.set("controller", {
 		state: session.state.get(),
 		getState: () => session.state.get(),
+		sessionId: binding.sessionId,
 		threadId: binding.threadId,
 		resourceId: binding.resourceId,
 		session: {
@@ -424,7 +425,7 @@ var FactoryDecisionDispatcher = class {
 				now,
 				keep: async (binding) => {
 					try {
-						const session = await this.#controller.getSessionByResource(binding.resourceId);
+						const session = await this.#controller.getSession(binding.sessionId);
 						if (session?.thread.getId() !== binding.threadId) return false;
 						return session.suspensions.hasPending() || session.run.isRunning();
 					} catch {
@@ -645,14 +646,14 @@ var FactoryDecisionDispatcher = class {
 						orgId: record.orgId
 					});
 					const resolved = decision.skillName === void 0 ? await resolvePromptInvocation(this.#controller, {
-						resourceId: binding.resourceId,
+						sessionId: binding.sessionId,
 						prompt: decision.prompt
 					}) : decision.resume === true ? await resolveSkillResumeInvocation(this.#controller, {
-						resourceId: binding.resourceId,
+						sessionId: binding.sessionId,
 						name: decision.skillName,
 						arguments: decision.arguments
 					}) : await resolveSkillInvocation(this.#controller, {
-						resourceId: binding.resourceId,
+						sessionId: binding.sessionId,
 						name: decision.skillName,
 						arguments: decision.arguments
 					});
@@ -687,7 +688,15 @@ var FactoryDecisionDispatcher = class {
 						orgId: record.orgId,
 						factoryProjectId: record.factoryProjectId,
 						workItemId: record.workItemId
-					}, resolved.message);
+					}, resolved.contents);
+					const kickoffSignal = resolved.skillName !== void 0 ? {
+						type: "reactive",
+						tagName: "skill",
+						attributes: { name: resolved.skillName }
+					} : {
+						type: "user",
+						tagName: "user"
+					};
 					if (await kickoffLanded()) return;
 					if (await kickoffStale()) throw new FactoryDecisionSuperseded();
 					if (decision.cancelInFlight && session.stream.isActive()) session.abort();
@@ -719,8 +728,7 @@ var FactoryDecisionDispatcher = class {
 					const sendKickoff = async () => {
 						const settled = await session.sendSignal({
 							id: deliveryId,
-							type: "user",
-							tagName: "user",
+							...kickoffSignal,
 							contents: kickoffContents
 						}, {
 							requestContext,
@@ -1031,7 +1039,7 @@ var FactoryDecisionDispatcher = class {
 	async #requireOrPrepareBinding(record, role) {
 		const binding = await this.#findBinding(record, role);
 		if (binding) {
-			if (await this.#controller.getSessionByResource(binding.resourceId)) return binding;
+			if (await this.#controller.getSession(binding.sessionId)) return binding;
 		}
 		if (!this.#prepareBinding) throw new FactoryDispatchError("session_unavailable", binding ? "Bound Factory session not found." : `No active Factory binding for role ${role}.`);
 		const item = await this.#requireItem(record);
@@ -1043,7 +1051,7 @@ var FactoryDecisionDispatcher = class {
 		return this.#requireBinding(record, role);
 	}
 	async #findSession(binding) {
-		const session = await this.#controller.getSessionByResource(binding.resourceId);
+		const session = await this.#controller.getSession(binding.sessionId);
 		if (!session) return void 0;
 		await this.#switchThread(session, binding);
 		return session;