@mastra/factory 0.17.3-alpha.4 → 0.17.3-alpha.5

package/dist/rules/dispatcher.js

@@ -23,6 +23,14 @@ const MAX_BACKOFF_MS = 6e4;
 const RUN_REGISTRY_HEARTBEAT_MS = 10 * 6e4;
 const SKILL_COMPLETION_OBSERVATION_TIMEOUT_MS = 360 * 6e4;
 const MAX_IN_FLIGHT = 25;
+/**
+* Decisions that may start or wake an agent run and so hold a run slot. A
+* transition's message is queued as a separate sendMessage, so the transition
+* itself stays bookkeeping.
+*/
+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 RECONCILE_INTERVAL_MS = 3e4;
@@ -243,7 +251,12 @@ var FactoryDecisionDispatcher = class {
 	#reconcileInFlight;
 	#timer;
 	#activeClaim;
-	#inFlight = /* @__PURE__ */ new Set();
+	/** Starts and run-bearing decisions; capped by `maxInFlight`. */
+	#runInFlight = /* @__PURE__ */ new Set();
+	/** Fast board bookkeeping (transitions, linked-card upserts); its own small cap. */
+	#bookkeepingInFlight = /* @__PURE__ */ new Set();
+	/** Background work awaited on stop but outside both caps. */
+	#backgroundInFlight = /* @__PURE__ */ new Set();
 	#bindingSkillRuns = /* @__PURE__ */ new Map();
 	constructor(options) {
 		this.#audit = options.audit;
@@ -277,7 +290,11 @@ var FactoryDecisionDispatcher = class {
 		if (this.#timer) clearInterval(this.#timer);
 		this.#timer = void 0;
 		await this.#activeClaim;
-		await Promise.allSettled([...this.#inFlight]);
+		await Promise.allSettled([
+			...this.#runInFlight,
+			...this.#bookkeepingInFlight,
+			...this.#backgroundInFlight
+		]);
 	}
 	async runOnce(now = /* @__PURE__ */ new Date()) {
 		await Promise.all(await this.#claimAndStart(now));
@@ -292,24 +309,39 @@ var FactoryDecisionDispatcher = class {
 	async #claimAndStart(now) {
 		this.#maybeSweepStaleBindings(now);
 		this.#maybeReconcileToolResults(now);
-		const capacity = this.#maxInFlight - this.#inFlight.size;
-		if (capacity <= 0) return [];
-		const limit = Math.min(BATCH_SIZE, capacity);
 		const leaseExpiresAt = new Date(now.getTime() + LEASE_MS);
-		const starts = await this.#storage.claimPendingStarts({
-			ownerId: this.#ownerId,
-			now,
-			leaseExpiresAt,
-			limit
-		});
-		const decisionsLimit = limit - starts.length;
-		const decisions = decisionsLimit > 0 ? await this.#storage.claimDeferredDecisions({
-			ownerId: this.#ownerId,
-			now,
-			leaseExpiresAt,
-			limit: decisionsLimit
-		}) : [];
-		return [...starts.map((start) => this.#track(this.#dispatchPendingStart(start, now))), ...decisions.map((decision) => this.#track(this.#dispatchDecision(decision, now)))];
+		const dispatches = [];
+		const runCapacity = this.#maxInFlight - this.#runInFlight.size;
+		if (runCapacity > 0) {
+			const limit = Math.min(BATCH_SIZE, runCapacity);
+			const starts = await this.#storage.claimPendingStarts({
+				ownerId: this.#ownerId,
+				now,
+				leaseExpiresAt,
+				limit
+			});
+			const decisionsLimit = limit - starts.length;
+			const decisions = decisionsLimit > 0 ? await this.#storage.claimDeferredDecisions({
+				ownerId: this.#ownerId,
+				now,
+				leaseExpiresAt,
+				limit: decisionsLimit,
+				decisionFilter: isRunBearingDecision
+			}) : [];
+			dispatches.push(...starts.map((start) => this.#track(this.#runInFlight, this.#dispatchPendingStart(start, now))), ...decisions.map((decision) => this.#track(this.#runInFlight, this.#dispatchDecision(decision, now))));
+		}
+		const bookkeepingCapacity = BOOKKEEPING_MAX_IN_FLIGHT - this.#bookkeepingInFlight.size;
+		if (bookkeepingCapacity > 0) {
+			const decisions = await this.#storage.claimDeferredDecisions({
+				ownerId: this.#ownerId,
+				now,
+				leaseExpiresAt,
+				limit: Math.min(BATCH_SIZE, bookkeepingCapacity),
+				decisionFilter: isBookkeepingDecision
+			});
+			dispatches.push(...decisions.map((decision) => this.#track(this.#bookkeepingInFlight, this.#dispatchDecision(decision, now))));
+		}
+		return dispatches;
 	}
 	/**
 	* Throttled, coalesced, non-blocking bound-thread reconcile: dispatch
@@ -326,7 +358,7 @@ var FactoryDecisionDispatcher = class {
 			this.#reconcileInFlight = void 0;
 		});
 		this.#reconcileInFlight = run;
-		this.#track(run);
+		this.#track(this.#backgroundInFlight, run);
 	}
 	/** Slow-cadence revocation of leaked/legacy bindings; failures never block the claim path. */
 	async #maybeSweepStaleBindings(now) {
@@ -346,9 +378,9 @@ var FactoryDecisionDispatcher = class {
 			console.error("Factory stale-binding sweep failed", sanitizeDispatchError(error));
 		}
 	}
-	#track(dispatch) {
-		this.#inFlight.add(dispatch);
-		dispatch.catch(() => {}).then(() => this.#inFlight.delete(dispatch));
+	#track(pool, dispatch) {
+		pool.add(dispatch);
+		dispatch.catch(() => {}).then(() => pool.delete(dispatch));
 		return dispatch;
 	}
 	async #tick() {
@@ -486,35 +518,41 @@ var FactoryDecisionDispatcher = class {
 				if (result.status === "rejected") throw new Error(`${result.code}: ${result.reason}`);
 				const transitionMessage = decision.message;
 				if (!transitionMessage) return;
-				const binding = await this.#findBinding(record, transitionMessage.role);
-				if (!binding) return;
-				const startedBy = item.sessions[binding.role]?.startedBy;
-				if (!startedBy) return;
-				await this.#primeCredentials?.({
+				const moved = await this.#storage.get({
 					orgId: record.orgId,
-					userId: startedBy
+					id: item.id
 				});
-				const session = await this.#findSession(binding);
-				if (!session) return;
-				const requestContext = factoryRequestContext({
-					session,
-					binding,
-					userId: startedBy,
-					orgId: record.orgId
+				if (!moved) return;
+				const messageKey = `${record.idempotencyKey}:message`;
+				const queued = await this.#storage.commitRuleEvaluation({
+					orgId: record.orgId,
+					factoryProjectId: record.factoryProjectId,
+					workItemId: item.id,
+					ingress: {
+						identity: `decision:${messageKey}@${moved.revision}`,
+						triggerType: "transition.message"
+					},
+					configVersion: this.#transitionService.configVersion,
+					expectedRevision: moved.revision,
+					actor: record.actor ?? {
+						type: "system",
+						id: "factory-rule-dispatcher"
+					},
+					outcome: { status: "accepted" },
+					decisions: [{
+						type: "sendMessage",
+						idempotencyKey: messageKey,
+						message: transitionMessage.text,
+						priority: "high",
+						idleBehavior: "wake",
+						...transitionMessage.role !== void 0 ? { role: transitionMessage.role } : {}
+					}],
+					causalChain: nextChain,
+					now: /* @__PURE__ */ new Date()
 				});
-				await awaitNotification(() => session.sendNotificationSignal({
-					source: "factory",
-					kind: "rule-message",
-					summary: transitionMessage.text,
-					priority: "high",
-					payload: { message: transitionMessage.text },
-					sourceId: record.id,
-					dedupeKey: record.idempotencyKey
-				}, {
-					ifActive: { behavior: "deliver" },
-					ifIdle: { behavior: "wake" },
-					requestContext
-				}), true);
+				if (queued.status === "missing") return;
+				const queuedStatus = queued.result.status;
+				if (queuedStatus !== "accepted") throw new Error(`Factory transition message was not queued: ${queuedStatus ?? "unknown"}.`);
 				return;
 			}
 			case "upsertLinkedWorkItem":
@@ -555,6 +593,22 @@ var FactoryDecisionDispatcher = class {
 					});
 					await this.#switchThread(session, binding);
 					const deliveryId = record.deliveryGeneration === 0 ? record.id : `${record.id}:retry:${record.deliveryGeneration}`;
+					const kickoffLanded = async () => (await session.thread.listActiveMessages()).some((message) => message.id === deliveryId);
+					const kickoffStale = async () => {
+						if (await this.#roleSuperseded(record, decision.role)) return true;
+						if ((await this.#findBinding(record, decision.role))?.id !== binding.id) return true;
+						if (!record.workItemId) return false;
+						const current = await this.#storage.get({
+							orgId: record.orgId,
+							id: record.workItemId
+						});
+						if (current === null) return true;
+						const decidedAt = record.createdAt.getTime();
+						const enteredSince = current.stageHistory.filter((entry) => entry.exitedAt === void 0 && new Date(entry.enteredAt).getTime() > decidedAt);
+						if (enteredSince.length === 0) return false;
+						const siblingStages = new Set((await this.#storage.listDeferredDecisions(record.orgId, record.factoryProjectId)).filter((sibling) => sibling.evaluationId === record.evaluationId && sibling.decision.type === "transition").map((sibling) => sibling.decision.stage));
+						return enteredSince.some((entry) => !siblingStages.has(entry.stage));
+					};
 					const runStillActive = () => this.#controller.listActiveThreadRuns().some((active) => active.threadId === binding.threadId);
 					while (true) {
 						const openRun = watchRun(session, {
@@ -576,7 +630,8 @@ var FactoryDecisionDispatcher = class {
 					}
 					if (await this.#roleSuperseded(record, decision.role)) return;
 					if ((await this.#requireBinding(record, decision.role)).id !== binding.id) throw new FactoryDispatchError("session_unavailable", `Factory binding ${binding.id} changed while waiting for its open run to end.`);
-					if ((await session.thread.listActiveMessages()).some((message) => message.id === deliveryId)) return;
+					if (await kickoffLanded()) return;
+					if (await kickoffStale()) return;
 					const kickoffContents = await withWorkItemFeed(this.#feedReader, {
 						orgId: record.orgId,
 						factoryProjectId: record.factoryProjectId,
@@ -620,8 +675,10 @@ var FactoryDecisionDispatcher = class {
 					try {
 						let settled = await sendKickoff();
 						while (settled.action === "deliver") {
-							if ((await session.thread.listActiveMessages()).some((message) => message.id === deliveryId)) break;
+							if (await kickoffLanded()) break;
 							if (!await run.wait()) throw new FactoryDispatchError("run_terminal_event_missing", "Factory skill invocation is waiting on a run whose terminal event was not observed.");
+							if (await kickoffLanded()) break;
+							if (await kickoffStale()) return;
 							run.arm();
 							settled = await sendKickoff();
 						}