@mastra/factory 0.9.0 → 0.10.0-alpha.10

package/dist/integrations/github/rules.js

@@ -1,6 +1,8 @@
 import { changeRequestTargetKey } from "./subscriptions.js";
 import { resolveFactoryGithubRule } from "../../rules/resolve.js";
+import { isTerminalFactoryRuleStage } from "../../rules/types.js";
 import { validateFactoryRuleDecisions } from "../../rules/validation.js";
+import { FACTORY_PULL_REQUEST_RECONCILIATION_KEY } from "../../storage/domains/work-items/base.js";
 //#region src/integrations/github/rules.ts
 const TRUSTED_PERMISSIONS = /* @__PURE__ */ new Set(["write", "admin"]);
 const RULE_TIMEOUT_MS = 5e3;
@@ -178,124 +180,148 @@ var GithubRules = class {
 			factoryAuthored: !senderIsResponder && provenance !== null || this.#isFactoryLogin(login)
 		});
 		if (actor.type === "github" && actor.factoryAuthored && (event === "issueCommentCreated" || event === "issueCommentEdited") && string(issueComment?.body)?.includes(FACTORY_TRIAGE_COMMENT_MARKER)) return { status: "ignored" };
-		const context = {
-			tenant: {
+		const evaluate = async (item, ingressIdentity) => {
+			const context = {
+				tenant: {
+					orgId: project.orgId,
+					projectId: project.factoryProjectId
+				},
+				actor,
+				ingress: {
+					type: "github",
+					id: ingressIdentity
+				},
+				cause: `github.${event}`,
+				causalChain: [],
+				ruleSetVersion: this.options.rules.version,
+				...item ? {
+					item: {
+						id: item.id,
+						source: workItemSource(item),
+						sourceKey: workItemSourceKey(item),
+						parentWorkItemId: item.parentWorkItemId,
+						title: item.title,
+						url: item.externalSource?.url ?? null,
+						stages: item.stages,
+						metadata: item.metadata
+					},
+					board: item.externalSource?.type === "pull-request" ? "review" : "work",
+					itemRevision: item.revision
+				} : {},
+				event,
+				deliveryId: parsed.deliveryId,
+				factory: { createdAt: factoryProject.createdAt.toISOString() },
+				repository: {
+					id: repositoryId,
+					fullName: repositoryName
+				},
+				...issueNumber && string(issue?.title) && string(issue?.html_url) ? { issue: {
+					number: issueNumber,
+					title: string(issue?.title),
+					url: string(issue?.html_url),
+					...string(issue?.created_at) ? { createdAt: string(issue?.created_at) } : {},
+					...string(issue?.updated_at) ? { updatedAt: string(issue?.updated_at) } : {},
+					assignees: actorLogins(issue?.assignees),
+					labels: labelNames(issue?.labels),
+					...string(issue?.state) === "closed" || string(issue?.state) === "open" ? { state: string(issue?.state) } : {},
+					...string(issue?.state_reason) ? { stateReason: string(issue?.state_reason) } : {}
+				} } : {},
+				...event === "issueEdited" ? { issueChange: {
+					title: Boolean(object(changes?.title)),
+					body: Boolean(object(changes?.body))
+				} } : {},
+				...number(issueComment?.id) ? { issueComment: {
+					id: number(issueComment?.id),
+					...string(issueComment?.body) ? { body: string(issueComment?.body) } : {},
+					...string(issueComment?.html_url) ? { url: string(issueComment?.html_url) } : {},
+					...string(object(issueComment?.user)?.login) ? { author: string(object(issueComment?.user)?.login) } : {},
+					...string(object(issueComment?.user)?.type) ? { authorType: string(object(issueComment?.user)?.type) } : {},
+					...string(issueComment?.created_at) ? { createdAt: string(issueComment?.created_at) } : {},
+					...string(issueComment?.updated_at) ? { updatedAt: string(issueComment?.updated_at) } : {}
+				} } : {},
+				...pullRequestNumber && string(pullRequest?.title) && string(pullRequest?.html_url) ? { pullRequest: {
+					number: pullRequestNumber,
+					title: string(pullRequest?.title),
+					url: string(pullRequest?.html_url),
+					...string(pullRequest?.created_at) ? { createdAt: string(pullRequest?.created_at) } : {},
+					state: string(pullRequest?.state) === "closed" ? "closed" : "open",
+					draft: boolean(pullRequest?.draft) ?? false,
+					merged: boolean(pullRequest?.merged) ?? false,
+					assignees: actorLogins(pullRequest?.assignees),
+					requestedReviewers: actorLogins(pullRequest?.requested_reviewers),
+					labels: labelNames(pullRequest?.labels),
+					headBranch: string(object(pullRequest?.head)?.ref) ?? "",
+					baseBranch: string(object(pullRequest?.base)?.ref) ?? ""
+				} } : {},
+				...reviewRequested && requestedReviewer ? { reviewRequest: {
+					reviewer: requestedReviewer,
+					factoryReviewer: this.#isFactoryLogin(requestedReviewer)
+				} } : {},
+				...object(parsed.payload.review) ? { review: {
+					id: number(object(parsed.payload.review)?.id) ?? 0,
+					state: string(object(parsed.payload.review)?.state) ?? "unknown",
+					url: string(object(parsed.payload.review)?.html_url) ?? ""
+				} } : {}
+			};
+			const rule = resolveFactoryGithubRule(this.options.rules, event);
+			let decision;
+			let decisions = [];
+			let outcome = { status: "accepted" };
+			try {
+				decision = rule ? await withRuleTimeout(Promise.resolve(rule(Object.freeze(context)))) : void 0;
+				if (decision?.type === "reject") outcome = {
+					status: "rejected",
+					code: decision.code,
+					reason: decision.reason
+				};
+				else if (decision) decisions = validateFactoryRuleDecisions([decision]).map((entry) => ({ ...entry }));
+			} catch (error) {
+				const timedOut = error instanceof Error && error.message === "FACTORY_RULE_TIMEOUT";
+				outcome = {
+					status: "rejected",
+					code: timedOut ? "timeout" : "rule_error",
+					reason: timedOut ? "Factory rule evaluation timed out." : error instanceof Error ? error.message.slice(0, 2e3) : "Factory GitHub rule failed."
+				};
+			}
+			return { status: (await this.options.storage.commitRuleEvaluation({
 				orgId: project.orgId,
-				projectId: project.factoryProjectId
-			},
-			actor,
-			ingress: {
-				type: "github",
-				id: `${installationId}:${parsed.deliveryId}`
-			},
-			cause: `github.${event}`,
-			causalChain: [],
-			ruleSetVersion: this.options.rules.version,
-			...relatedItem ? {
-				item: {
-					id: relatedItem.id,
-					source: workItemSource(relatedItem),
-					sourceKey: workItemSourceKey(relatedItem),
-					parentWorkItemId: relatedItem.parentWorkItemId,
-					title: relatedItem.title,
-					url: relatedItem.externalSource?.url ?? null,
-					stages: relatedItem.stages,
-					metadata: relatedItem.metadata
+				factoryProjectId: project.factoryProjectId,
+				workItemId: item?.id ?? null,
+				ingress: {
+					identity: ingressIdentity,
+					triggerType: `github.${event}`
 				},
-				board: relatedItem.externalSource?.type === "pull-request" ? "review" : "work",
-				itemRevision: relatedItem.revision
-			} : {},
-			event,
-			deliveryId: parsed.deliveryId,
-			factory: { createdAt: factoryProject.createdAt.toISOString() },
-			repository: {
-				id: repositoryId,
-				fullName: repositoryName
-			},
-			...issueNumber && string(issue?.title) && string(issue?.html_url) ? { issue: {
-				number: issueNumber,
-				title: string(issue?.title),
-				url: string(issue?.html_url),
-				...string(issue?.created_at) ? { createdAt: string(issue?.created_at) } : {},
-				...string(issue?.updated_at) ? { updatedAt: string(issue?.updated_at) } : {},
-				assignees: actorLogins(issue?.assignees),
-				labels: labelNames(issue?.labels),
-				...string(issue?.state) === "closed" || string(issue?.state) === "open" ? { state: string(issue?.state) } : {},
-				...string(issue?.state_reason) ? { stateReason: string(issue?.state_reason) } : {}
-			} } : {},
-			...event === "issueEdited" ? { issueChange: {
-				title: Boolean(object(changes?.title)),
-				body: Boolean(object(changes?.body))
-			} } : {},
-			...number(issueComment?.id) ? { issueComment: {
-				id: number(issueComment?.id),
-				...string(issueComment?.body) ? { body: string(issueComment?.body) } : {},
-				...string(issueComment?.html_url) ? { url: string(issueComment?.html_url) } : {},
-				...string(object(issueComment?.user)?.login) ? { author: string(object(issueComment?.user)?.login) } : {},
-				...string(object(issueComment?.user)?.type) ? { authorType: string(object(issueComment?.user)?.type) } : {},
-				...string(issueComment?.created_at) ? { createdAt: string(issueComment?.created_at) } : {},
-				...string(issueComment?.updated_at) ? { updatedAt: string(issueComment?.updated_at) } : {}
-			} } : {},
-			...pullRequestNumber && string(pullRequest?.title) && string(pullRequest?.html_url) ? { pullRequest: {
-				number: pullRequestNumber,
-				title: string(pullRequest?.title),
-				url: string(pullRequest?.html_url),
-				...string(pullRequest?.created_at) ? { createdAt: string(pullRequest?.created_at) } : {},
-				state: string(pullRequest?.state) === "closed" ? "closed" : "open",
-				draft: boolean(pullRequest?.draft) ?? false,
-				merged: boolean(pullRequest?.merged) ?? false,
-				assignees: actorLogins(pullRequest?.assignees),
-				requestedReviewers: actorLogins(pullRequest?.requested_reviewers),
-				labels: labelNames(pullRequest?.labels),
-				headBranch: string(object(pullRequest?.head)?.ref) ?? "",
-				baseBranch: string(object(pullRequest?.base)?.ref) ?? ""
-			} } : {},
-			...reviewRequested && requestedReviewer ? { reviewRequest: {
-				reviewer: requestedReviewer,
-				factoryReviewer: this.#isFactoryLogin(requestedReviewer)
-			} } : {},
-			...object(parsed.payload.review) ? { review: {
-				id: number(object(parsed.payload.review)?.id) ?? 0,
-				state: string(object(parsed.payload.review)?.state) ?? "unknown",
-				url: string(object(parsed.payload.review)?.html_url) ?? ""
-			} } : {}
+				ruleSetVersion: this.options.rules.version,
+				expectedRevision: item?.revision ?? null,
+				actor: { ...actor },
+				outcome,
+				decisions,
+				causalChain: [],
+				now: /* @__PURE__ */ new Date()
+			})).status };
 		};
-		const rule = resolveFactoryGithubRule(this.options.rules, event);
-		let decision;
-		let decisions = [];
-		let outcome = { status: "accepted" };
-		try {
-			decision = rule ? await withRuleTimeout(Promise.resolve(rule(Object.freeze(context)))) : void 0;
-			if (decision?.type === "reject") outcome = {
-				status: "rejected",
-				code: decision.code,
-				reason: decision.reason
-			};
-			else if (decision) decisions = validateFactoryRuleDecisions([decision]).map((entry) => ({ ...entry }));
-		} catch (error) {
-			const timedOut = error instanceof Error && error.message === "FACTORY_RULE_TIMEOUT";
-			outcome = {
-				status: "rejected",
-				code: timedOut ? "timeout" : "rule_error",
-				reason: timedOut ? "Factory rule evaluation timed out." : error instanceof Error ? error.message.slice(0, 2e3) : "Factory GitHub rule failed."
-			};
-		}
-		return { status: (await this.options.storage.commitRuleEvaluation({
-			orgId: project.orgId,
-			factoryProjectId: project.factoryProjectId,
-			workItemId: relatedItem?.id ?? null,
-			ingress: {
-				identity: `${installationId}:${parsed.deliveryId}`,
-				triggerType: `github.${event}`
-			},
-			ruleSetVersion: this.options.rules.version,
-			expectedRevision: relatedItem?.revision ?? null,
-			actor: { ...actor },
-			outcome,
-			decisions,
-			causalChain: [],
-			now: /* @__PURE__ */ new Date()
-		})).status };
+		const deliveryIdentity = `${installationId}:${parsed.deliveryId}`;
+		const primary = await evaluate(relatedItem, deliveryIdentity);
+		const linked = event === "pullRequestMerged" && relatedItem && pullRequestNumber ? await this.#linkedClosureItem(project.orgId, project.factoryProjectId, repositoryId, repositoryName, pullRequestNumber, relatedItem) : void 0;
+		if (!linked) return primary;
+		const secondary = await evaluate(linked, `${deliveryIdentity}:${linked.id}`);
+		for (const status of ["committed", "replayed"]) if (primary.status === status || secondary.status === status) return { status };
+		return primary;
+	}
+	/**
+	* The other card a closed pull request concerns, joined through the Review
+	* card's `parentWorkItemId` — the link `upsertLinkedWorkItem` records when the
+	* pull request is opened, and therefore an exact join that needs no branch
+	* heuristics. Returns nothing when the pull request has only one card, which
+	* is every pull request Factory did not open from a work item's session.
+	*/
+	async #linkedClosureItem(orgId, projectId, repositoryId, repositoryFullName, pullRequestNumber, resolved) {
+		const items = await this.options.storage.list({
+			orgId,
+			factoryProjectId: projectId
+		});
+		const linked = resolved.externalSource?.type === "pull-request" ? items.find((item) => item.id === resolved.parentWorkItemId) : items.find((item) => item.parentWorkItemId === resolved.id && (item.externalSource?.externalId === canonicalSourceKey("pull-request", pullRequestNumber) || item.externalSource?.externalId === legacySourceKey(repositoryId, "pull-request", pullRequestNumber)) && cardBelongsToRepository(item, repositoryId, repositoryFullName));
+		return linked?.id === resolved.id ? void 0 : linked;
 	}
 	async #relatedItem(orgId, projectId, repositoryId, repositoryFullName, issueNumber, pullRequestNumber, pullRequestHeadBranch, provenance, preferAuthoringItem = false) {
 		const items = await this.options.storage.list({
@@ -418,6 +444,22 @@ function reconciledClosedEvent(repository, pullRequestNumber, state) {
 		}
 	};
 }
+function reconciledPullRequestMetadata(state, reconciliation) {
+	return {
+		state: state.state,
+		draft: state.draft,
+		merged: state.merged,
+		...state.author ? { author: state.author } : {},
+		...state.assignees ? { assignees: state.assignees } : {},
+		...state.requestedReviewers ? { requestedReviewers: state.requestedReviewers } : {},
+		...state.labels ? { labels: state.labels } : {},
+		[FACTORY_PULL_REQUEST_RECONCILIATION_KEY]: reconciliation === "settled" ? state.merged ? "merged" : "closed" : null
+	};
+}
+function reconciledPullRequestOutcome(metadata) {
+	if (metadata.state !== "closed" || typeof metadata.merged !== "boolean") return void 0;
+	return metadata.merged ? "merged" : "closed";
+}
 /**
 * The webhook handler retires subscriptions itself; the sweep replays only the
 * rules ingress, so without this the thread's PR chip and the workspace row
@@ -479,8 +521,9 @@ function createGithubPullRequestReconciler(options, fetchPullRequest) {
 						const pullRequestNumber = reconcilablePullRequestNumber(item, repository);
 						if (!pullRequestNumber) continue;
 						const metadata = item.metadata ?? {};
-						const pullRequestSettled = metadata.state === "closed" && typeof metadata.draft === "boolean" && typeof metadata.merged === "boolean" && typeof metadata.author === "string" && Array.isArray(metadata.assignees) && Array.isArray(metadata.requestedReviewers) && Array.isArray(metadata.labels);
-						if ((stage === "done" || stage === "canceled") && pullRequestSettled) continue;
+						const reconciliation = metadata[FACTORY_PULL_REQUEST_RECONCILIATION_KEY];
+						const reconciledOutcome = reconciledPullRequestOutcome(metadata);
+						if ((stage === "done" || stage === "canceled") && reconciledOutcome !== void 0 && reconciliation === reconciledOutcome) continue;
 						const cards = cardsByNumber.get(pullRequestNumber) ?? [];
 						cards.push(item);
 						cardsByNumber.set(pullRequestNumber, cards);
@@ -499,35 +542,58 @@ function createGithubPullRequestReconciler(options, fetchPullRequest) {
 				summary.checked += 1;
 				if (!state) continue;
 				for (const card of cards) {
+					if (state.state === "closed") continue;
 					const metadata = card.metadata ?? {};
 					const statusChanged = metadata.state !== state.state || metadata.draft !== state.draft || metadata.merged !== state.merged;
 					const authorChanged = state.author !== void 0 && metadata.author !== state.author;
 					const assigneesChanged = !sameStrings(metadata.assignees, state.assignees);
 					const reviewersChanged = !sameStrings(metadata.requestedReviewers, state.requestedReviewers);
 					const labelsChanged = !sameStrings(metadata.labels, state.labels);
-					if (!statusChanged && !authorChanged && !assigneesChanged && !reviewersChanged && !labelsChanged) continue;
+					const metadataChanged = statusChanged || authorChanged || assigneesChanged || reviewersChanged || labelsChanged;
+					const reconciliation = metadata[FACTORY_PULL_REQUEST_RECONCILIATION_KEY];
+					if (!metadataChanged && reconciliation !== "merged" && reconciliation !== "closed") continue;
 					try {
 						await options.storage.update({
 							orgId: card.orgId,
 							id: card.id,
 							userId: "factory-rule-dispatcher",
-							patch: { metadata: {
-								state: state.state,
-								draft: state.draft,
-								merged: state.merged,
-								...state.author ? { author: state.author } : {},
-								...state.assignees ? { assignees: state.assignees } : {},
-								...state.requestedReviewers ? { requestedReviewers: state.requestedReviewers } : {},
-								...state.labels ? { labels: state.labels } : {}
-							} }
+							patch: { metadata: reconciledPullRequestMetadata(state, "clear") }
 						});
 					} catch (error) {
 						recordFailure(repository, error, pullRequestNumber);
 					}
 				}
 				if (state.state !== "closed") continue;
+				const cleanupFailures = /* @__PURE__ */ new Set();
+				for (const card of cards) {
+					if (!isTerminalFactoryRuleStage(card.stages)) continue;
+					try {
+						await options.storage.supersedeDecisionsForWorkItem({
+							orgId: card.orgId,
+							factoryProjectId: card.factoryProjectId,
+							workItemId: card.id,
+							supersededAt: /* @__PURE__ */ new Date()
+						});
+					} catch (error) {
+						recordFailure(repository, error, pullRequestNumber);
+						cleanupFailures.add(card.id);
+					}
+				}
 				await rules.ingest(reconciledClosedEvent(repository, pullRequestNumber, state));
 				await retireReconciledSubscriptions(options.integrationStorage, repository, pullRequestNumber, state.merged);
+				for (const card of cards) {
+					if (cleanupFailures.has(card.id)) continue;
+					try {
+						await options.storage.update({
+							orgId: card.orgId,
+							id: card.id,
+							userId: "factory-rule-dispatcher",
+							patch: { metadata: reconciledPullRequestMetadata(state, "settled") }
+						});
+					} catch (error) {
+						recordFailure(repository, error, pullRequestNumber);
+					}
+				}
 				if (state.merged) summary.merged += 1;
 				else summary.closed += 1;
 			} catch (error) {