@mastra/factory 0.5.1-alpha.0 → 0.6.0-alpha.3

package/dist/integrations/github/reconcile-worker.js

@@ -13,6 +13,7 @@ const LEASE_KEY = "github:pull-request-reconcile";
 var GithubReconcileWorker = class extends MastraWorker {
 	name = "github-pull-request-reconcile";
 	#reconcile;
+	#reconcileIssues;
 	#sourceControl;
 	#intervalMs;
 	#leaseTtlMs;
@@ -24,6 +25,7 @@ var GithubReconcileWorker = class extends MastraWorker {
 	constructor(config) {
 		super();
 		this.#reconcile = config.reconcile;
+		this.#reconcileIssues = config.reconcileIssues;
 		this.#sourceControl = config.sourceControl;
 		this.#intervalMs = config.intervalMs ?? 3e5;
 		if (!Number.isFinite(this.#intervalMs) || this.#intervalMs <= 0) throw new Error("GitHub pull request reconcile interval must be a positive number.");
@@ -64,6 +66,21 @@ var GithubReconcileWorker = class extends MastraWorker {
 	}
 	async #tick() {
 		if (!(await this.#leaseProvider.acquireLease(LEASE_KEY, this.#leaseOwner, this.#leaseTtlMs).catch(() => ({ acquired: false }))).acquired) return;
+		let hasLease = true;
+		const renewalTimer = setInterval(() => {
+			this.#leaseProvider.renewLease(LEASE_KEY, this.#leaseOwner, this.#leaseTtlMs).then((renewed) => {
+				if (!renewed) {
+					hasLease = false;
+					clearInterval(renewalTimer);
+					this.deps?.logger.warn("GitHub reconcile lease was lost mid-sweep; aborting further writes");
+				}
+			}).catch((error) => {
+				hasLease = false;
+				clearInterval(renewalTimer);
+				this.deps?.logger.warn("GitHub reconcile lease renewal failed; aborting further writes", { error: error instanceof Error ? error.message : String(error) });
+			});
+		}, Math.max(1e3, Math.floor(this.#leaseTtlMs / 3)));
+		renewalTimer.unref?.();
 		try {
 			const targets = await this.#targets();
 			if (targets.length === 0) return;
@@ -80,10 +97,30 @@ var GithubReconcileWorker = class extends MastraWorker {
 			});
 			else if (counts.merged > 0 || counts.closed > 0) this.deps?.logger.info("GitHub pull request reconcile replayed missed merges/closes", context);
 			else this.deps?.logger.debug("GitHub pull request reconcile sweep completed", context);
+			if (this.#reconcileIssues && hasLease) {
+				const issueStartedAt = Date.now();
+				try {
+					const { errors: issueErrors, ...issueCounts } = await this.#reconcileIssues(targets);
+					const issueContext = {
+						...issueCounts,
+						candidateRepositories: targets.length,
+						durationMs: Date.now() - issueStartedAt
+					};
+					if (issueCounts.failed > 0) this.deps?.logger.warn("GitHub issue reconcile sweep completed with failures", {
+						...issueContext,
+						errors: issueErrors
+					});
+					else if (issueCounts.updated > 0) this.deps?.logger.info("GitHub issue reconcile patched stale metadata", issueContext);
+					else this.deps?.logger.debug("GitHub issue reconcile sweep completed", issueContext);
+				} catch (issueError) {
+					this.deps?.logger.warn("GitHub issue reconcile sweep failed", { error: issueError instanceof Error ? issueError.message : String(issueError) });
+				}
+			} else if (this.#reconcileIssues && !hasLease) this.deps?.logger.debug("GitHub issue reconcile skipped: lease lost during pull-request sweep");
 		} catch (error) {
 			this.deps?.logger.warn("GitHub pull request reconcile sweep failed", { error: error instanceof Error ? error.message : String(error) });
 		} finally {
-			await this.#leaseProvider.releaseLease(LEASE_KEY, this.#leaseOwner).catch(() => void 0);
+			clearInterval(renewalTimer);
+			if (hasLease) await this.#leaseProvider.releaseLease(LEASE_KEY, this.#leaseOwner).catch(() => void 0);
 		}
 	}
 	/**

package/dist/integrations/github/reconcile-worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"reconcile-worker.js","names":["#reconcile","#sourceControl","#intervalMs","#leaseTtlMs","#leaseOwner","#leaseProvider","#running","#schedule","#timer","#inFlight","#tick","#targets"],"sources":["../../../src/integrations/github/reconcile-worker.ts"],"sourcesContent":["import { randomUUID } from 'node:crypto';\n\nimport { isLeaseProvider, NoopLeaseProvider } from '@mastra/core/events';\nimport type { LeaseProvider, PubSub } from '@mastra/core/events';\nimport { MastraWorker } from '@mastra/core/worker';\nimport type { WorkerDeps } from '@mastra/core/worker';\n\nimport type {\n  ConfiguredExternalRepositoryKey,\n  ExternalRepositoryProjectTarget,\n  SourceControlRepository,\n} from '../../storage/domains/source-control/base.js';\nimport type { GithubPullRequestReconciler, ReconcileRepository } from './rules.js';\n\nexport const DEFAULT_GITHUB_RECONCILE_INTERVAL_MS = 5 * 60_000;\nconst MIN_LEASE_TTL_MS = 30_000;\nconst LEASE_KEY = 'github:pull-request-reconcile';\n\n/** Storage slice the sweep needs to turn configured repositories into targets. */\nexport interface GithubReconcileRepositorySource {\n  projectRepositories: {\n    listConfiguredExternalKeys(): Promise<ConfiguredExternalRepositoryKey[]>;\n    listByExternalRepository(args: {\n      installationExternalId: string;\n      repositoryExternalId: string;\n    }): Promise<ExternalRepositoryProjectTarget[]>;\n  };\n  repositories: {\n    findByExternalId(args: { orgId: string; externalId: string }): Promise<SourceControlRepository | null>;\n  };\n}\n\nexport interface GithubReconcileWorkerConfig {\n  reconcile: GithubPullRequestReconciler;\n  sourceControl: GithubReconcileRepositorySource;\n  intervalMs?: number;\n}\n\n/**\n * Periodic merge-state sweep for the self-hosted GitHub integration: webhooks\n * are the only other writer of merge state, and a deployment GitHub cannot\n * reach never receives one, so cards would stay open forever.\n */\nexport class GithubReconcileWorker extends MastraWorker {\n  readonly name = 'github-pull-request-reconcile';\n\n  readonly #reconcile: GithubPullRequestReconciler;\n  readonly #sourceControl: GithubReconcileRepositorySource;\n  readonly #intervalMs: number;\n  readonly #leaseTtlMs: number;\n  readonly #leaseOwner = randomUUID();\n\n  #running = false;\n  #timer: ReturnType<typeof setTimeout> | undefined;\n  #inFlight: Promise<void> | undefined;\n  #leaseProvider: LeaseProvider = NoopLeaseProvider;\n\n  constructor(config: GithubReconcileWorkerConfig) {\n    super();\n    this.#reconcile = config.reconcile;\n    this.#sourceControl = config.sourceControl;\n    this.#intervalMs = config.intervalMs ?? DEFAULT_GITHUB_RECONCILE_INTERVAL_MS;\n    if (!Number.isFinite(this.#intervalMs) || this.#intervalMs <= 0) {\n      throw new Error('GitHub pull request reconcile interval must be a positive number.');\n    }\n    this.#leaseTtlMs = Math.max(MIN_LEASE_TTL_MS, this.#intervalMs * 3);\n  }\n\n  async init(deps: WorkerDeps): Promise<void> {\n    await super.init(deps);\n    this.#leaseProvider = getLeaseProvider(deps.pubsub);\n  }\n\n  async start(): Promise<void> {\n    if (this.#running) return;\n    if (!this.deps) throw new Error('GithubReconcileWorker: call init() before start()');\n    this.#running = true;\n    this.deps.logger.info('GitHub pull request reconcile worker started', { intervalMs: this.#intervalMs });\n    // Sweep on boot: a restart is exactly when webhooks were most likely missed.\n    this.#schedule(0);\n  }\n\n  async stop(): Promise<void> {\n    if (!this.#running) return;\n    this.#running = false;\n    if (this.#timer) clearTimeout(this.#timer);\n    this.#timer = undefined;\n    await this.#inFlight;\n  }\n\n  get isRunning(): boolean {\n    return this.#running;\n  }\n\n  #schedule(delayMs: number): void {\n    if (!this.#running) return;\n    this.#timer = setTimeout(() => {\n      this.#timer = undefined;\n      const run = this.#tick().finally(() => {\n        this.#inFlight = undefined;\n        this.#schedule(this.#intervalMs);\n      });\n      this.#inFlight = run;\n    }, delayMs);\n    this.#timer.unref?.();\n  }\n\n  async #tick(): Promise<void> {\n    // Replicas share one sweep: the ingress dedupes duplicate writes, but the\n    // reads still burn the installation's rate limit.\n    const lease = await this.#leaseProvider\n      .acquireLease(LEASE_KEY, this.#leaseOwner, this.#leaseTtlMs)\n      .catch(() => ({ acquired: false }));\n    if (!lease.acquired) return;\n\n    try {\n      const targets = await this.#targets();\n      if (targets.length === 0) return;\n      const startedAt = Date.now();\n      const { errors, ...counts } = await this.#reconcile(targets);\n      const context = { ...counts, candidateRepositories: targets.length, durationMs: Date.now() - startedAt };\n      if (counts.failed > 0) {\n        this.deps?.logger.warn('GitHub pull request reconcile sweep completed with failures', { ...context, errors });\n      } else if (counts.merged > 0 || counts.closed > 0) {\n        this.deps?.logger.info('GitHub pull request reconcile replayed missed merges/closes', context);\n      } else {\n        this.deps?.logger.debug('GitHub pull request reconcile sweep completed', context);\n      }\n    } catch (error) {\n      this.deps?.logger.warn('GitHub pull request reconcile sweep failed', {\n        error: error instanceof Error ? error.message : String(error),\n      });\n    } finally {\n      await this.#leaseProvider.releaseLease(LEASE_KEY, this.#leaseOwner).catch(() => undefined);\n    }\n  }\n\n  /**\n   * Configured (installation, repository) pairs resolved to the numeric ids and\n   * slug the sweep addresses GitHub with. A pair whose repository row is gone\n   * is skipped rather than failing the sweep for the others.\n   */\n  async #targets(): Promise<ReconcileRepository[]> {\n    const keys = await this.#sourceControl.projectRepositories.listConfiguredExternalKeys();\n    const targets: ReconcileRepository[] = [];\n    for (const key of keys) {\n      const installationId = Number(key.installationExternalId);\n      const repositoryId = Number(key.repositoryExternalId);\n      if (!Number.isSafeInteger(installationId) || !Number.isSafeInteger(repositoryId)) continue;\n      const projects = await this.#sourceControl.projectRepositories.listByExternalRepository(key);\n      const orgId = projects[0]?.orgId;\n      if (!orgId) continue;\n      const repository = await this.#sourceControl.repositories.findByExternalId({\n        orgId,\n        externalId: key.repositoryExternalId,\n      });\n      if (!repository?.slug) continue;\n      targets.push({ id: repositoryId, fullName: repository.slug, installationId });\n    }\n    return targets;\n  }\n}\n\nfunction getLeaseProvider(pubsub: PubSub): LeaseProvider {\n  const getProvider = (pubsub as PubSub & { getLeaseProvider?: () => LeaseProvider | undefined }).getLeaseProvider;\n  if (typeof getProvider === 'function') return getProvider.call(pubsub) ?? NoopLeaseProvider;\n  return isLeaseProvider(pubsub) ? pubsub : NoopLeaseProvider;\n}\n"],"mappings":"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"}
+{"version":3,"file":"reconcile-worker.js","names":["#reconcile","#reconcileIssues","#sourceControl","#intervalMs","#leaseTtlMs","#leaseOwner","#leaseProvider","#running","#schedule","#timer","#inFlight","#tick","#targets"],"sources":["../../../src/integrations/github/reconcile-worker.ts"],"sourcesContent":["import { randomUUID } from 'node:crypto';\n\nimport { isLeaseProvider, NoopLeaseProvider } from '@mastra/core/events';\nimport type { LeaseProvider, PubSub } from '@mastra/core/events';\nimport { MastraWorker } from '@mastra/core/worker';\nimport type { WorkerDeps } from '@mastra/core/worker';\n\nimport type {\n  ConfiguredExternalRepositoryKey,\n  ExternalRepositoryProjectTarget,\n  SourceControlRepository,\n} from '../../storage/domains/source-control/base.js';\nimport type { GithubIssueReconciler } from './issue-reconciler.js';\nimport type { GithubPullRequestReconciler, ReconcileRepository } from './rules.js';\n\nexport const DEFAULT_GITHUB_RECONCILE_INTERVAL_MS = 5 * 60_000;\nconst MIN_LEASE_TTL_MS = 30_000;\nconst LEASE_KEY = 'github:pull-request-reconcile';\n\n/** Storage slice the sweep needs to turn configured repositories into targets. */\nexport interface GithubReconcileRepositorySource {\n  projectRepositories: {\n    listConfiguredExternalKeys(): Promise<ConfiguredExternalRepositoryKey[]>;\n    listByExternalRepository(args: {\n      installationExternalId: string;\n      repositoryExternalId: string;\n    }): Promise<ExternalRepositoryProjectTarget[]>;\n  };\n  repositories: {\n    findByExternalId(args: { orgId: string; externalId: string }): Promise<SourceControlRepository | null>;\n  };\n}\n\nexport interface GithubReconcileWorkerConfig {\n  reconcile: GithubPullRequestReconciler;\n  /**\n   * Optional issue-metadata sweep. When provided, the worker folds it into the\n   * same tick as the PR reconciler, sharing the lease and the same\n   * `ReconcileRepository` target discovery. Mirrors how webhook-driven ingress\n   * flows both issues and PRs through one path.\n   */\n  reconcileIssues?: GithubIssueReconciler;\n  sourceControl: GithubReconcileRepositorySource;\n  intervalMs?: number;\n}\n\n/**\n * Periodic merge-state sweep for the self-hosted GitHub integration: webhooks\n * are the only other writer of merge state, and a deployment GitHub cannot\n * reach never receives one, so cards would stay open forever.\n */\nexport class GithubReconcileWorker extends MastraWorker {\n  readonly name = 'github-pull-request-reconcile';\n\n  readonly #reconcile: GithubPullRequestReconciler;\n  readonly #reconcileIssues: GithubIssueReconciler | undefined;\n  readonly #sourceControl: GithubReconcileRepositorySource;\n  readonly #intervalMs: number;\n  readonly #leaseTtlMs: number;\n  readonly #leaseOwner = randomUUID();\n\n  #running = false;\n  #timer: ReturnType<typeof setTimeout> | undefined;\n  #inFlight: Promise<void> | undefined;\n  #leaseProvider: LeaseProvider = NoopLeaseProvider;\n\n  constructor(config: GithubReconcileWorkerConfig) {\n    super();\n    this.#reconcile = config.reconcile;\n    this.#reconcileIssues = config.reconcileIssues;\n    this.#sourceControl = config.sourceControl;\n    this.#intervalMs = config.intervalMs ?? DEFAULT_GITHUB_RECONCILE_INTERVAL_MS;\n    if (!Number.isFinite(this.#intervalMs) || this.#intervalMs <= 0) {\n      throw new Error('GitHub pull request reconcile interval must be a positive number.');\n    }\n    this.#leaseTtlMs = Math.max(MIN_LEASE_TTL_MS, this.#intervalMs * 3);\n  }\n\n  async init(deps: WorkerDeps): Promise<void> {\n    await super.init(deps);\n    this.#leaseProvider = getLeaseProvider(deps.pubsub);\n  }\n\n  async start(): Promise<void> {\n    if (this.#running) return;\n    if (!this.deps) throw new Error('GithubReconcileWorker: call init() before start()');\n    this.#running = true;\n    this.deps.logger.info('GitHub pull request reconcile worker started', { intervalMs: this.#intervalMs });\n    // Sweep on boot: a restart is exactly when webhooks were most likely missed.\n    this.#schedule(0);\n  }\n\n  async stop(): Promise<void> {\n    if (!this.#running) return;\n    this.#running = false;\n    if (this.#timer) clearTimeout(this.#timer);\n    this.#timer = undefined;\n    await this.#inFlight;\n  }\n\n  get isRunning(): boolean {\n    return this.#running;\n  }\n\n  #schedule(delayMs: number): void {\n    if (!this.#running) return;\n    this.#timer = setTimeout(() => {\n      this.#timer = undefined;\n      const run = this.#tick().finally(() => {\n        this.#inFlight = undefined;\n        this.#schedule(this.#intervalMs);\n      });\n      this.#inFlight = run;\n    }, delayMs);\n    this.#timer.unref?.();\n  }\n\n  async #tick(): Promise<void> {\n    // Replicas share one sweep: the ingress dedupes duplicate writes, but the\n    // reads still burn the installation's rate limit.\n    const lease = await this.#leaseProvider\n      .acquireLease(LEASE_KEY, this.#leaseOwner, this.#leaseTtlMs)\n      .catch(() => ({ acquired: false }));\n    if (!lease.acquired) return;\n\n    // Track whether this owner still holds the lease. A `renewLease` result\n    // of `false` (or a renewal error) means another replica has taken the\n    // lease. Once that happens the folded issue sweep must not run — it\n    // would race the new owner's writes.\n    let hasLease = true;\n    // Folding the issue sweep into the same tick extends how long we hold the\n    // lease. Renew periodically so a replica can't grab the expired lease and\n    // start an overlapping sweep partway through this one.\n    const renewalTimer = setInterval(\n      () => {\n        void this.#leaseProvider\n          .renewLease(LEASE_KEY, this.#leaseOwner, this.#leaseTtlMs)\n          .then(renewed => {\n            if (!renewed) {\n              hasLease = false;\n              clearInterval(renewalTimer);\n              this.deps?.logger.warn('GitHub reconcile lease was lost mid-sweep; aborting further writes');\n            }\n          })\n          .catch(error => {\n            hasLease = false;\n            clearInterval(renewalTimer);\n            this.deps?.logger.warn('GitHub reconcile lease renewal failed; aborting further writes', {\n              error: error instanceof Error ? error.message : String(error),\n            });\n          });\n      },\n      Math.max(1_000, Math.floor(this.#leaseTtlMs / 3)),\n    );\n    renewalTimer.unref?.();\n\n    try {\n      const targets = await this.#targets();\n      if (targets.length === 0) return;\n      const startedAt = Date.now();\n      const { errors, ...counts } = await this.#reconcile(targets);\n      const context = { ...counts, candidateRepositories: targets.length, durationMs: Date.now() - startedAt };\n      if (counts.failed > 0) {\n        this.deps?.logger.warn('GitHub pull request reconcile sweep completed with failures', { ...context, errors });\n      } else if (counts.merged > 0 || counts.closed > 0) {\n        this.deps?.logger.info('GitHub pull request reconcile replayed missed merges/closes', context);\n      } else {\n        this.deps?.logger.debug('GitHub pull request reconcile sweep completed', context);\n      }\n      // Fold the issue-metadata sweep into the same tick so a single lease\n      // covers both writers of card state for these repositories. Skip it\n      // if the lease was lost during the PR sweep — running would race a\n      // replica that already re-acquired the lease.\n      if (this.#reconcileIssues && hasLease) {\n        const issueStartedAt = Date.now();\n        try {\n          const { errors: issueErrors, ...issueCounts } = await this.#reconcileIssues(targets);\n          const issueContext = {\n            ...issueCounts,\n            candidateRepositories: targets.length,\n            durationMs: Date.now() - issueStartedAt,\n          };\n          if (issueCounts.failed > 0) {\n            this.deps?.logger.warn('GitHub issue reconcile sweep completed with failures', {\n              ...issueContext,\n              errors: issueErrors,\n            });\n          } else if (issueCounts.updated > 0) {\n            this.deps?.logger.info('GitHub issue reconcile patched stale metadata', issueContext);\n          } else {\n            this.deps?.logger.debug('GitHub issue reconcile sweep completed', issueContext);\n          }\n        } catch (issueError) {\n          this.deps?.logger.warn('GitHub issue reconcile sweep failed', {\n            error: issueError instanceof Error ? issueError.message : String(issueError),\n          });\n        }\n      } else if (this.#reconcileIssues && !hasLease) {\n        this.deps?.logger.debug('GitHub issue reconcile skipped: lease lost during pull-request sweep');\n      }\n    } catch (error) {\n      this.deps?.logger.warn('GitHub pull request reconcile sweep failed', {\n        error: error instanceof Error ? error.message : String(error),\n      });\n    } finally {\n      clearInterval(renewalTimer);\n      if (hasLease) {\n        await this.#leaseProvider.releaseLease(LEASE_KEY, this.#leaseOwner).catch(() => undefined);\n      }\n    }\n  }\n\n  /**\n   * Configured (installation, repository) pairs resolved to the numeric ids and\n   * slug the sweep addresses GitHub with. A pair whose repository row is gone\n   * is skipped rather than failing the sweep for the others.\n   */\n  async #targets(): Promise<ReconcileRepository[]> {\n    const keys = await this.#sourceControl.projectRepositories.listConfiguredExternalKeys();\n    const targets: ReconcileRepository[] = [];\n    for (const key of keys) {\n      const installationId = Number(key.installationExternalId);\n      const repositoryId = Number(key.repositoryExternalId);\n      if (!Number.isSafeInteger(installationId) || !Number.isSafeInteger(repositoryId)) continue;\n      const projects = await this.#sourceControl.projectRepositories.listByExternalRepository(key);\n      const orgId = projects[0]?.orgId;\n      if (!orgId) continue;\n      const repository = await this.#sourceControl.repositories.findByExternalId({\n        orgId,\n        externalId: key.repositoryExternalId,\n      });\n      if (!repository?.slug) continue;\n      targets.push({ id: repositoryId, fullName: repository.slug, installationId });\n    }\n    return targets;\n  }\n}\n\nfunction getLeaseProvider(pubsub: PubSub): LeaseProvider {\n  const getProvider = (pubsub as PubSub & { getLeaseProvider?: () => LeaseProvider | undefined }).getLeaseProvider;\n  if (typeof getProvider === 'function') return getProvider.call(pubsub) ?? NoopLeaseProvider;\n  return isLeaseProvider(pubsub) ? pubsub : NoopLeaseProvider;\n}\n"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../src/integrations/github/routes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAuD,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAChH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AASrF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAyC1D,OAAO,KAAK,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAgB/G,MAAM,WAAW,wBAAwB;IACvC,4EAA4E;IAC5E,IAAI,EAAE,SAAS,CAAC;IAChB;;;;OAIG;IACH,KAAK,EAAE,YAAY,CAAC;IACpB,yEAAyE;IACzE,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB;;;;OAIG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B;;;;OAIG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,UAAU,CAAC,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC7C,iEAAiE;IACjE,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAC3F,6EAA6E;IAC7E,SAAS,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACjC,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,+FAA+F;IAC/F,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACvE;AAuPD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,QAAQ,EAAE,CA8pB/E"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../../src/integrations/github/routes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAuD,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEhH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AASrF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AA4C1D,OAAO,KAAK,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAgB/G,MAAM,WAAW,wBAAwB;IACvC,4EAA4E;IAC5E,IAAI,EAAE,SAAS,CAAC;IAChB;;;;OAIG;IACH,KAAK,EAAE,YAAY,CAAC;IACpB,yEAAyE;IACzE,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB;;;;OAIG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B;;;;OAIG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,UAAU,CAAC,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC7C,iEAAiE;IACjE,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAC3F,6EAA6E;IAC7E,SAAS,CAAC,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACjC,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,+FAA+F;IAC/F,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACvE;AAuPD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,QAAQ,EAAE,CAsqB/E"}

package/dist/integrations/github/routes.js

@@ -2,11 +2,13 @@ import { clearGithubPat, getGithubPat, getGithubPatStatus, setGithubPat } from "
 import { listPullRequestSubscriptionsForThread, subscribeToPullRequest } from "./subscriptions.js";
 import { SandboxBudgetError } from "../../sandbox/fleet.js";
 import { MaterializeError, WorktreeError, commitAll, computeWorktreePath, ensureProjectSandbox, isValidGitRef as isValidGitRef$1, materializeRepo, pushBranch, teardownProjectSandbox } from "./sandbox.js";
-import { cleanReleasedSandbox } from "./sandbox-release.js";
+import { reclaimDeletedSessionSandbox } from "./sandbox-release.js";
+import { resolveFactoryDefaultModelId } from "../../session/factory-session.js";
 import { getGithubFeatureDiagnostics, isGithubFeatureEnabled } from "./config.js";
 import { handleGithubWebhook } from "./webhook.js";
 import { registerApiRoute } from "@mastra/core/server";
 import { randomUUID } from "crypto";
+import { UniqueViolationError } from "@mastra/core/storage";
 import { streamSSE } from "hono/streaming";
 //#region src/integrations/github/routes.ts
 /**
@@ -22,6 +24,9 @@ import { streamSSE } from "hono/streaming";
 * so the SPA can cleanly hide all GitHub UI.
 */
 const sessionOperationLocks = /* @__PURE__ */ new Map();
+const MAX_SESSION_TITLE_LENGTH = 80;
+const USER_SESSION_BRANCH_PREFIX = "user/session-";
+const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
 /**
 * Serialize same-session mutations within one Factory process. Factory sessions
 * normally issue these operations sequentially, so this lock is probably not
@@ -41,19 +46,6 @@ function withSessionOperationLock(sessionId, fn) {
 function loose(c) {
 	return c;
 }
-/**
-* Resolve the Factory project's default model for a triage run. Best-effort:
-* a missing project or an uninitialized storage domain simply means "no
-* default", never a failed run.
-*/
-async function resolveFactoryDefaultModelId(projects, factoryProjectId) {
-	if (!projects || !factoryProjectId) return void 0;
-	try {
-		return (await projects.getById({ id: factoryProjectId }))?.defaultModelId ?? void 0;
-	} catch {
-		return;
-	}
-}
 function pullRequestNumberFromUrl(value, expectedRepo) {
 	try {
 		const url = new URL(value);
@@ -83,6 +75,12 @@ function isCanonicalGithubIssueUrl(value, repoFullName, issueNumber) {
 function isValidGitRef(value) {
 	return typeof value === "string" && value.length > 0 && value.length <= 255 && /^[A-Za-z0-9_./-]+$/.test(value);
 }
+function isJsonObject(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function normalizeSessionTitle(title) {
+	return [...title.replace(/\s+/g, " ").trim()].slice(0, MAX_SESSION_TITLE_LENGTH).join("").trimEnd() || null;
+}
 /**
 * Resolve the org-scoped tenant for a GitHub request. GitHub project features
 * are org-owned, so they require both a signed-in user and a WorkOS
@@ -166,6 +164,7 @@ async function resolveProjectRepository(args) {
 }
 function polledIssueEvent(project, issue) {
 	const repositoryId = Number(project.repository.externalId);
+	const assigneeLogins = issue.assignees ?? (issue.assignee ? [issue.assignee] : []);
 	return {
 		event: "issues",
 		deliveryId: `poll:${repositoryId}:issue:${issue.number}:${issue.createdAt}`,
@@ -182,6 +181,7 @@ function polledIssueEvent(project, issue) {
 				title: issue.title,
 				html_url: issue.url,
 				created_at: issue.createdAt,
+				assignees: assigneeLogins.map((login) => ({ login })),
 				labels: issue.labels.map((name) => ({ name }))
 			}
 		}
@@ -207,6 +207,8 @@ function polledPullRequestEvent(project, pullRequest) {
 				created_at: pullRequest.createdAt,
 				state: "open",
 				merged: false,
+				assignees: pullRequest.assignees.map((login) => ({ login })),
+				requested_reviewers: pullRequest.requestedReviewers.map((login) => ({ login })),
 				head: { ref: pullRequest.headBranch },
 				base: { ref: pullRequest.baseBranch }
 			}
@@ -287,10 +289,12 @@ function buildGithubRoutes(options) {
 	const runBoardIssueTriage = runIssueTriage ? async (input) => {
 		if (!input.resourceId || !input.projectPath) throw new Error("GitHub issue triage requires an explicit Factory project repository");
 		await github.addIssueLabels(input.installationId, input.repository, input.issueNumber, ["auto-triaged"]);
+		if (input.labels.includes("status: needs triage")) await github.removeIssueLabel(input.installationId, input.repository, input.issueNumber, "status: needs triage");
+		const labels = input.labels.filter((label) => label !== "status: needs triage");
 		return runIssueTriage({
 			...input,
 			defaultModelId: input.defaultModelId ?? await resolveFactoryDefaultModelId(options.projects, input.resourceId),
-			labels: input.labels.includes("auto-triaged") ? input.labels : [...input.labels, "auto-triaged"]
+			labels: labels.includes("auto-triaged") ? labels : [...labels, "auto-triaged"]
 		});
 	} : void 0;
 	routes.push(registerApiRoute("/web/github/subscriptions", {
@@ -538,6 +542,8 @@ function buildGithubRoutes(options) {
 					title: issue.title,
 					url: issue.url,
 					author: issue.author,
+					assignee: issue.assignee,
+					assignees: issue.assignees,
 					labels: issue.labels,
 					comments: issue.commentCount ?? 0,
 					createdAt: issue.createdAt,
@@ -645,6 +651,8 @@ function buildGithubRoutes(options) {
 					title: pr.title,
 					url: pr.url,
 					author: pr.author,
+					assignees: pr.assignees ?? [],
+					requestedReviewers: pr.requestedReviewers ?? [],
 					baseBranch: pr.baseBranch,
 					headBranch: pr.headBranch,
 					createdAt: pr.createdAt,
@@ -999,17 +1007,44 @@ function buildProjectGitRoutes({ github, auth, fleet, emitAudit }) {
 				} catch {
 					return c.json({ error: "Invalid JSON body" }, 400);
 				}
-				if (!isValidGitRef$1(body.branch)) return c.json({ error: "Invalid branch" }, 400);
-				const baseBranch = body.baseBranch === void 0 ? project.defaultBranch : body.baseBranch;
+				if (!isJsonObject(body)) return c.json({ error: "Invalid JSON body" }, 400);
+				const requestedBaseBranch = body.baseBranch;
+				if (requestedBaseBranch !== void 0 && typeof requestedBaseBranch !== "string") return c.json({ error: "Invalid baseBranch" }, 400);
+				const baseBranch = requestedBaseBranch ?? project.defaultBranch;
 				if (!isValidGitRef$1(baseBranch)) return c.json({ error: "Invalid baseBranch" }, 400);
+				const requestedSessionId = body.sessionId;
+				if (requestedSessionId !== void 0 && (typeof requestedSessionId !== "string" || !UUID_PATTERN.test(requestedSessionId))) return c.json({ error: "Invalid sessionId" }, 400);
+				const sessionId = requestedSessionId ?? randomUUID();
+				const requestedTitle = body.title;
+				if (requestedTitle !== void 0 && typeof requestedTitle !== "string") return c.json({ error: "Invalid title" }, 400);
+				const normalizedTitle = requestedTitle === void 0 ? null : normalizeSessionTitle(requestedTitle);
+				const requestedBranch = body.branch;
+				let branch;
+				if (requestedBranch === void 0) branch = `${USER_SESSION_BRANCH_PREFIX}${sessionId}`;
+				else if (typeof requestedBranch === "string" && isValidGitRef$1(requestedBranch)) branch = requestedBranch;
+				else return c.json({ error: "Invalid branch" }, 400);
+				if (requestedSessionId !== void 0) {
+					const existing = await github.sourceControlStorage.sessions.getBySessionId(sessionId);
+					if (existing) {
+						if (existing.projectRepositoryId !== project.id || existing.orgId !== orgId || existing.userId !== userId || existing.branch !== branch) return c.json({ error: "Session ID conflict" }, 409);
+						return c.json({ session: existing });
+					}
+				}
 				const session = await github.sourceControlStorage.sessions.create({
-					sessionId: randomUUID(),
+					sessionId,
 					projectRepositoryId: project.id,
 					orgId,
 					userId,
-					branch: body.branch,
-					baseBranch
+					branch,
+					baseBranch,
+					title: normalizedTitle
+				}).catch(async (error) => {
+					if (!(error instanceof UniqueViolationError) || requestedSessionId === void 0) throw error;
+					const conflict = await github.sourceControlStorage.sessions.getBySessionId(sessionId);
+					if (!conflict) throw error;
+					return conflict;
 				});
+				if (requestedSessionId !== void 0 && (session.sessionId !== sessionId || session.projectRepositoryId !== project.id || session.orgId !== orgId || session.userId !== userId || session.branch !== branch)) return c.json({ error: "Session ID conflict" }, 409);
 				return c.json({ session });
 			}
 		}),
@@ -1032,40 +1067,18 @@ function buildProjectGitRoutes({ github, auth, fleet, emitAudit }) {
 				if ("response" in resolved) return resolved.response;
 				const session = await github.sourceControlStorage.sessions.getBySessionId(c.req.param("sessionId"));
 				if (!session || session.orgId !== resolved.tenant.orgId || session.userId !== resolved.tenant.userId) return c.json({ error: "Session not found" }, 404);
-				if (session.sandboxId && fleet.provider !== "local" && session.sandboxWorkdir) {
-					await cleanReleasedSandbox({
-						fleet,
-						sourceControl: github.sourceControlStorage,
-						orgId: session.orgId,
-						projectRepositoryId: session.projectRepositoryId,
-						sandboxId: session.sandboxId,
-						sandboxWorkdir: session.sandboxWorkdir
-					});
-					await github.sourceControlStorage.sandboxPool.release({
-						orgId: session.orgId,
-						projectRepositoryId: session.projectRepositoryId,
-						userId: session.userId,
+				await github.sourceControlStorage.sessions.delete(session.id);
+				reclaimDeletedSessionSandbox({
+					fleet,
+					sourceControl: github.sourceControlStorage,
+					session
+				}).catch((error) => {
+					console.error("[GitHub Sessions] Failed to reclaim sandbox for deleted session", {
+						sessionId: session.sessionId,
 						sandboxId: session.sandboxId,
-						sandboxWorkdir: session.sandboxWorkdir
+						error
 					});
-				} else if (session.sandboxId) {
-					let sandbox;
-					try {
-						sandbox = await fleet.reattachSandbox(session.sandboxId);
-					} catch {}
-					await fleet.teardownSandbox({
-						sandboxId: session.sandboxId,
-						setSandboxId: async () => {},
-						clear: async () => {
-							await github.sourceControlStorage.sessions.setSandbox({
-								id: session.id,
-								sandboxId: null,
-								sandboxWorkdir: session.sandboxWorkdir ?? ""
-							});
-						}
-					}, sandbox);
-				}
-				await github.sourceControlStorage.sessions.delete(session.id);
+				});
 				return c.json({ removed: true });
 			}
 		}),