@mastra/factory 0.10.0-alpha.2 → 0.10.0-alpha.7

package/CHANGELOG.md

@@ -1,5 +1,85 @@
 # @mastra/factory
 
+## 0.10.0-alpha.7
+
+### Patch Changes
+
+- Factory pull request review reports now show their selected model and reasoning setting: ([#22238](https://github.com/mastra-ai/mastra/pull/22238))
+
+  ```text
+  Review runtime: openai/gpt-5.6-sol, reasoning setting: high.
+  ```
+
+- Fixed retried Factory skill runs so they deliver a fresh kickoff after execution errors while preserving duplicate protection during lease recovery. ([#21926](https://github.com/mastra-ai/mastra/pull/21926))
+
+- Fixed session timing measurements that started too early or missed workspace tool activity. ([#22213](https://github.com/mastra-ai/mastra/pull/22213))
+
+  **First interaction time**
+  Starts on the first user or assistant message. Signal-only messages (skill loads, phase markers, memory reminders) and sessions that fail before a message no longer affect this metric.
+
+  **First meaningful tool time**
+  Starts when the first workspace tool completes successfully. File operations and workspace searches count even when no shell command runs. Approval-denied and abort-while-parked tool completions are excluded because the tool never actually ran.
+
+- Updated dependencies [[`ae8790c`](https://github.com/mastra-ai/mastra/commit/ae8790c4bfaa088d2ab279d1dcc06f326b9fd109), [`04a815f`](https://github.com/mastra-ai/mastra/commit/04a815fc8971d29e97fcdcc5008a1eb472fc00ff), [`04a815f`](https://github.com/mastra-ai/mastra/commit/04a815fc8971d29e97fcdcc5008a1eb472fc00ff), [`cced745`](https://github.com/mastra-ai/mastra/commit/cced745a056ec2225c5bc702e32d848847aa8b65)]:
+  - @mastra/core@1.62.0-alpha.7
+  - @mastra/code-sdk@1.5.0-alpha.7
+
+## 0.10.0-alpha.6
+
+### Patch Changes
+
+- Updated dependencies [[`c8e4cea`](https://github.com/mastra-ai/mastra/commit/c8e4ceac9a390d78c8327dff3cdb2861dd71957f), [`ed01e9a`](https://github.com/mastra-ai/mastra/commit/ed01e9a807514a904374bf687a7b8f18750f6f78), [`4e9a228`](https://github.com/mastra-ai/mastra/commit/4e9a2283d5fd6ed1b70a2751eb3dc2cbf82ada20), [`63041eb`](https://github.com/mastra-ai/mastra/commit/63041eb4c50b520a0a80e03d4cd6ea99f67715a0)]:
+  - @mastra/core@1.62.0-alpha.6
+  - @mastra/code-sdk@1.5.0-alpha.6
+
+## 0.10.0-alpha.5
+
+### Patch Changes
+
+- Fixed automated runs for manually created board cards. Moving a manual card into Planning or Building no longer fails with 'Factory skill invocation requires a supported issue or pull request identifier'. Manual cards now start on a stable `factory/item-<id>` branch, even without a provider identity. ([#22114](https://github.com/mastra-ai/mastra/pull/22114))
+
+- Updated dependencies [[`65edab1`](https://github.com/mastra-ai/mastra/commit/65edab1c233d17b8f163bad12fca410d0e6f16b1), [`ab20a38`](https://github.com/mastra-ai/mastra/commit/ab20a38d0275f8d85e0f3833bd87ef487bcc609f), [`dbbfeb8`](https://github.com/mastra-ai/mastra/commit/dbbfeb85ec949dc9ebc0755e1ad262e4f5eba8db), [`3cc9d00`](https://github.com/mastra-ai/mastra/commit/3cc9d00b2b4333e0377a5e9df5eff92c17ce7630), [`733a537`](https://github.com/mastra-ai/mastra/commit/733a537489a858b5880b2e98809334fba895a221), [`9207dfa`](https://github.com/mastra-ai/mastra/commit/9207dfab8062e5fc68b751684797ff86fe0b4e70), [`12c61d2`](https://github.com/mastra-ai/mastra/commit/12c61d280c8cb208bc3c8dbcbe5dcc60cf9d1cd0), [`9a12ef3`](https://github.com/mastra-ai/mastra/commit/9a12ef3fccf3f4186db0f294f4ee1f02cf4d8db2)]:
+  - @mastra/core@1.62.0-alpha.5
+  - @mastra/code-sdk@1.5.0-alpha.5
+
+## 0.10.0-alpha.4
+
+### Patch Changes
+
+- Updated dependencies [[`79f04a7`](https://github.com/mastra-ai/mastra/commit/79f04a7f6c6829da541139f638f2f1d267916e08), [`fd4d5fe`](https://github.com/mastra-ai/mastra/commit/fd4d5fe4f943699b85db5e74404f190d5a6b8c2a), [`f591643`](https://github.com/mastra-ai/mastra/commit/f591643becdf0be9bddce6ba1748e64bc30d77f1), [`b1ad324`](https://github.com/mastra-ai/mastra/commit/b1ad324d657f3544b0701332aef7eb10e9a36258), [`61c566d`](https://github.com/mastra-ai/mastra/commit/61c566dd2f2cde2b23ed8f139924e530d4202214)]:
+  - @mastra/core@1.62.0-alpha.4
+  - @mastra/code-sdk@1.5.0-alpha.4
+
+## 0.10.0-alpha.3
+
+### Minor Changes
+
+- Added a durable Factory action center for unresolved automation failures and proposed work waiting for approval. Per-user read/archive receipts survive reloads, while retries and canonical reconciliation resolve failures for every project member. ([#22021](https://github.com/mastra-ai/mastra/pull/22021))
+
+  Historical decision state is repaired on startup: accepted transitions become `succeeded`, obsolete terminal work and proposals become `superseded`, and active unresolved failures remain `failed`. Retry is offered only when the persisted failure code allows it.
+
+  **Before**
+
+  ```ts
+  // Failed automation and proposed runs were visible only on their board cards.
+  ```
+
+  **After**
+
+  ```ts
+  const attention = await fetch(`/web/factory/projects/${factoryId}/attention`).then(response => response.json());
+  // attention.items: per-user unresolved failures
+  // attention.approvalCount: project-wide proposed work
+  ```
+
+### Patch Changes
+
+- Fixed merged pull requests only reaching one of the two Factory cards that track them. A merge now both moves the Review card to Done and asks the work item that opened the pull request to assess whether its work is finished, no matter which card the merge event resolved to. ([#22135](https://github.com/mastra-ai/mastra/pull/22135))
+
+- Updated dependencies [[`2c85f42`](https://github.com/mastra-ai/mastra/commit/2c85f428e04ccd63ea31a7ec80b5b327afdad555), [`11bbeb9`](https://github.com/mastra-ai/mastra/commit/11bbeb9b108ef2264e05acefc6dafb9cbb342921), [`1a485f3`](https://github.com/mastra-ai/mastra/commit/1a485f3538f5ec64d58bd8b5e1e99de0c695c87b), [`0d37487`](https://github.com/mastra-ai/mastra/commit/0d37487d9f349388a3f1cef6a536cf9dcc4b6273), [`8661d7d`](https://github.com/mastra-ai/mastra/commit/8661d7d7179f0a024456aabdd8679bcecd09ac28), [`575e343`](https://github.com/mastra-ai/mastra/commit/575e343900451021d96110916497d334af7bc252), [`cacb839`](https://github.com/mastra-ai/mastra/commit/cacb8392d9e74189b56d857290b0615f98a2683d), [`b47b26e`](https://github.com/mastra-ai/mastra/commit/b47b26e6fe95cb8a3482be2c5e52de157fe59d0b), [`0d37487`](https://github.com/mastra-ai/mastra/commit/0d37487d9f349388a3f1cef6a536cf9dcc4b6273), [`c46eb09`](https://github.com/mastra-ai/mastra/commit/c46eb09ce4987509af57a0ac582c61241a6dd2f1), [`30ed33e`](https://github.com/mastra-ai/mastra/commit/30ed33ee14084a26019aba15fceadda6d6ddefaf), [`91ad69d`](https://github.com/mastra-ai/mastra/commit/91ad69d64994c89199b0c55399e64ed91c61df2f), [`8dc408d`](https://github.com/mastra-ai/mastra/commit/8dc408d34438f9e13297f792c11a5cfd6cf952e1), [`c92def1`](https://github.com/mastra-ai/mastra/commit/c92def10a13c822972c96f0a4ca6ffc1f4258aed), [`c5eaec5`](https://github.com/mastra-ai/mastra/commit/c5eaec5a860d80d0e3805e67db0414b87ac8cbed), [`e66b2ba`](https://github.com/mastra-ai/mastra/commit/e66b2ba100db63eaeab6e21e1ea34b113f2ec781)]:
+  - @mastra/core@1.62.0-alpha.3
+  - @mastra/code-sdk@1.5.0-alpha.3
+
 ## 0.10.0-alpha.2
 
 ### Patch Changes

package/dist/factory.js

@@ -5,6 +5,7 @@ import { SandboxFleet } from "./sandbox/fleet.js";
 import { BaseCheckpointBuilder } from "./sandbox/base-checkpoint.js";
 import { createBaseCheckpointTriggers } from "./sandbox/base-checkpoint-triggers.js";
 import { assertFactoryRules } from "./rules/validation.js";
+import { WorkItemsStorage } from "./storage/domains/work-items/base.js";
 import { PlatformGithubIntegration } from "./integrations/platform/github/integration.js";
 import { PlatformLinearIntegration } from "./integrations/platform/linear/integration.js";
 import { createCustomProvidersPrimer, registerCustomProvidersSource } from "./routes/custom-provider-source.js";
@@ -12,13 +13,13 @@ import { ProjectRoutes } from "./routes/projects.js";
 import { MemorySettingsStorage } from "./storage/domains/memory-settings/base.js";
 import { hydrateSessionMemorySettings } from "./session/memory-settings-hydration.js";
 import { FactoryTransitionService } from "./rules/transition-service.js";
+import { SourceControlStorage } from "./storage/domains/source-control/base.js";
 import { hydrateSessionModelPack } from "./session/model-pack-hydration.js";
 import { observeSessionFilesystem } from "./session/filesystem-capture.js";
 import { ModelCredentialsStorage } from "./storage/domains/credentials/base.js";
 import { FactoryWorkspaceRegistry, createWorkspaceFactory } from "./workspace.js";
 import { createTenantCredentialPrimer, primeTenantCredentials, registerTenantCredentialResolver } from "./routes/tenant-credentials.js";
 import { QueueHealthStorage } from "./storage/domains/queue-health/base.js";
-import { WorkItemsStorage } from "./storage/domains/work-items/base.js";
 import { assembleFactoryApiRoutes, buildIntegrationContext } from "./routes/surface.js";
 import { builtInFactoryRules } from "./rules/defaults.js";
 import { FactoryDecisionDispatcher } from "./rules/dispatcher.js";
@@ -43,7 +44,6 @@ import { IntakeStorage } from "./storage/domains/intake/base.js";
 import { IntegrationStorage } from "./storage/domains/integrations/base.js";
 import { ModelPacksStorage } from "./storage/domains/model-packs/base.js";
 import { FactoryProjectsStorage } from "./storage/domains/projects/base.js";
-import { SourceControlStorage } from "./storage/domains/source-control/base.js";
 import { hasAuthInit, isUserProvider } from "@mastra/core/server";
 import { MastraAuthStudio } from "@mastra/auth-studio";
 import { prepareAgentControllerMount } from "@mastra/code-sdk";

package/dist/integrations/github/rules.d.ts.map

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

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) {