@mastra/factory 0.2.1-alpha.3 → 0.2.1-alpha.4

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

@@ -29,10 +29,7 @@ export interface MountGithubRoutesOptions {
      * respond 503.
      */
     fleet: SandboxFleet;
-    /**
-     * Factory storage backend. Supplies the cross-replica `withDistributedLock`
-     * capability for git write routes and the `appDbConfigured` diagnostic.
-     */
+    /** Factory storage backend used for the `appDbConfigured` diagnostic. */
     storage?: FactoryStorage;
     /**
      * The GitHub App integration the handlers operate on (Octokit access, token

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;AAmB1D,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;;;OAGG;IACH,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,CA4oB/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;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;AAwC1D,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,CA4oB/E"}

package/dist/integrations/github/routes.js

@@ -90,95 +90,8 @@ async function clearGithubPat(storage, orgId, kind = "default") {
   await storage.settings.save(orgId, PAT_SETTINGS_USER_ID, rest);
 }
 
-// src/integrations/github/project-lock.ts
-import { createHash } from "crypto";
-var inProcessLocks = /* @__PURE__ */ new Map();
-var DEFAULT_PROJECT_LOCK_TIMEOUT_MS = 6e4;
-var ProjectLockTimeoutError = class extends Error {
-  key;
-  timeoutMs;
-  constructor(key, timeoutMs) {
-    super(`Project lock critical section for "${key}" exceeded ${timeoutMs}ms`);
-    this.name = "ProjectLockTimeoutError";
-    this.key = key;
-    this.timeoutMs = timeoutMs;
-  }
-};
-async function runWithTimeout(key, timeoutMs, fn) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  const abortError = new Promise((_, reject) => {
-    controller.signal.addEventListener("abort", () => reject(new ProjectLockTimeoutError(key, timeoutMs)), {
-      once: true
-    });
-  });
-  const work = fn(controller.signal);
-  work.catch(() => {
-  });
-  try {
-    return await Promise.race([work, abortError]);
-  } finally {
-    clearTimeout(timer);
-  }
-}
-function hashKey(key) {
-  const digest = createHash("sha256").update(key).digest();
-  const a = digest.readInt32BE(0);
-  const b = digest.readInt32BE(4);
-  return [a, b];
-}
-function withProjectLock(options) {
-  const { key, storage, fn, pool, timeoutMs = DEFAULT_PROJECT_LOCK_TIMEOUT_MS } = options;
-  const prev = inProcessLocks.get(key) ?? Promise.resolve();
-  const run = () => withDbAdvisoryLock({ key, storage, fn, pool, timeoutMs });
-  const next = prev.then(run, run);
-  const tail = next.then(
-    () => void 0,
-    () => void 0
-  );
-  inProcessLocks.set(key, tail);
-  void tail.then(() => {
-    if (inProcessLocks.get(key) === tail) {
-      inProcessLocks.delete(key);
-    }
-  });
-  return next;
-}
-async function withDbAdvisoryLock(options) {
-  const { key, storage, fn, pool, timeoutMs = DEFAULT_PROJECT_LOCK_TIMEOUT_MS } = options;
-  if (process.env.MASTRACODE_DISTRIBUTED_LOCK === "0") {
-    return runWithTimeout(key, timeoutMs, fn);
-  }
-  if (pool) return advisoryLockOver(pool, key, timeoutMs, fn);
-  if (typeof storage?.withDistributedLock !== "function") {
-    return runWithTimeout(key, timeoutMs, fn);
-  }
-  return storage.withDistributedLock(key, () => runWithTimeout(key, timeoutMs, fn));
-}
-async function advisoryLockOver(pool, key, timeoutMs, fn) {
-  const [k1, k2] = hashKey(key);
-  const client = await pool.connect();
-  try {
-    await client.query("BEGIN");
-    await client.query("SELECT pg_advisory_xact_lock($1, $2)", [k1, k2]);
-    try {
-      const result = await runWithTimeout(key, timeoutMs, fn);
-      await client.query("COMMIT");
-      return result;
-    } catch (err) {
-      try {
-        await client.query("ROLLBACK");
-      } catch {
-      }
-      throw err;
-    }
-  } finally {
-    client.release();
-  }
-}
-
 // src/integrations/github/sandbox.ts
-import { createHash as createHash2 } from "crypto";
+import { createHash } from "crypto";
 function bindingStore(row, storage) {
   return {
     sandboxId: row.sandboxId,
@@ -374,7 +287,7 @@ var WorktreeError = class extends Error {
 function safeBranchDir(branch) {
   const sanitized = branch.replace(/[^A-Za-z0-9._-]+/g, "-").replace(/\/+/g, "-").replace(/^[-.]+|[-.]+$/g, "").slice(0, 100) || "work";
   if (sanitized === branch) return sanitized;
-  const hash = createHash2("sha256").update(branch).digest("hex").slice(0, 8);
+  const hash = createHash("sha256").update(branch).digest("hex").slice(0, 8);
   return `${sanitized}-${hash}`;
 }
 function computeWorktreePath(repoWorkdir, branch) {
@@ -792,6 +705,20 @@ async function handleGithubWebhook(c, options) {
 }
 
 // src/integrations/github/routes.ts
+var sessionOperationLocks = /* @__PURE__ */ new Map();
+function withSessionOperationLock(sessionId, fn) {
+  const previous = sessionOperationLocks.get(sessionId) ?? Promise.resolve();
+  const next = previous.then(fn, fn);
+  const tail = next.then(
+    () => void 0,
+    () => void 0
+  );
+  sessionOperationLocks.set(sessionId, tail);
+  void tail.then(() => {
+    if (sessionOperationLocks.get(sessionId) === tail) sessionOperationLocks.delete(sessionId);
+  });
+  return next;
+}
 function loose(c) {
   return c;
 }
@@ -1476,7 +1403,7 @@ function buildGithubRoutes(options) {
       }
     })
   );
-  routes.push(...buildProjectGitRoutes({ github, auth, fleet, storage, emitAudit }));
+  routes.push(...buildProjectGitRoutes({ github, auth, fleet, emitAudit }));
   return routes;
 }
 async function loadOrgProject(options) {
@@ -1593,7 +1520,6 @@ function buildProjectGitRoutes({
   github,
   auth,
   fleet,
-  storage,
   emitAudit
 }) {
   return [
@@ -1714,31 +1640,27 @@ function buildProjectGitRoutes({
         }
         const { workdir, sandboxBinding } = sessionWorkspace;
         try {
-          return await withProjectLock({
-            key: `${project.id}:${userId}`,
-            storage,
-            fn: async () => {
-              const sandbox = await resolveProjectSandbox({ fleet, sandboxRow: sandboxBinding });
-              const result = await commitAll(
-                sandbox,
-                workdir,
-                body.message,
-                identityFromUser(await auth.ensureUser(loose(c)))
-              );
-              if (result.committed) {
-                await emitAudit?.({
-                  context: loose(c),
-                  input: {
-                    action: "factory.git.commit",
-                    factoryProjectId: project.factoryProjectId,
-                    projectRepositoryId: project.id,
-                    targets: [{ type: "session", id: sessionWorkspace.session.sessionId }],
-                    metadata: { sessionId: sessionWorkspace.session.sessionId }
-                  }
-                });
-              }
-              return c.json({ committed: result.committed });
+          return await withSessionOperationLock(sessionWorkspace.session.sessionId, async () => {
+            const sandbox = await resolveProjectSandbox({ fleet, sandboxRow: sandboxBinding });
+            const result = await commitAll(
+              sandbox,
+              workdir,
+              body.message,
+              identityFromUser(await auth.ensureUser(loose(c)))
+            );
+            if (result.committed) {
+              await emitAudit?.({
+                context: loose(c),
+                input: {
+                  action: "factory.git.commit",
+                  factoryProjectId: project.factoryProjectId,
+                  projectRepositoryId: project.id,
+                  targets: [{ type: "session", id: sessionWorkspace.session.sessionId }],
+                  metadata: { sessionId: sessionWorkspace.session.sessionId }
+                }
+              });
             }
+            return c.json({ committed: result.committed });
           });
         } catch (err) {
           return gitErrorResponse(loose(c), err);
@@ -1769,29 +1691,25 @@ function buildProjectGitRoutes({
         }
         const { workdir, sandboxBinding } = sessionWorkspace;
         try {
-          return await withProjectLock({
-            key: `${project.id}:${userId}`,
-            storage,
-            fn: async () => {
-              const sandbox = await resolveProjectSandbox({ fleet, sandboxRow: sandboxBinding });
-              const access = await github.versionControl.getRepositoryAccess({
-                orgId,
-                repositoryId: project.repository.id
-              });
-              if (!access.authorization) throw new Error("Repository access did not include a bearer token.");
-              await pushBranch(sandbox, workdir, branch, access.authorization.token, project.repository.slug);
-              await emitAudit?.({
-                context: loose(c),
-                input: {
-                  action: "factory.git.push",
-                  factoryProjectId: project.factoryProjectId,
-                  projectRepositoryId: project.id,
-                  targets: [{ type: "branch", id: branch }],
-                  metadata: { branch, sessionId: sessionWorkspace.session.sessionId }
-                }
-              });
-              return c.json({ pushed: true, branch });
-            }
+          return await withSessionOperationLock(sessionWorkspace.session.sessionId, async () => {
+            const sandbox = await resolveProjectSandbox({ fleet, sandboxRow: sandboxBinding });
+            const access = await github.versionControl.getRepositoryAccess({
+              orgId,
+              repositoryId: project.repository.id
+            });
+            if (!access.authorization) throw new Error("Repository access did not include a bearer token.");
+            await pushBranch(sandbox, workdir, branch, access.authorization.token, project.repository.slug);
+            await emitAudit?.({
+              context: loose(c),
+              input: {
+                action: "factory.git.push",
+                factoryProjectId: project.factoryProjectId,
+                projectRepositoryId: project.id,
+                targets: [{ type: "branch", id: branch }],
+                metadata: { branch, sessionId: sessionWorkspace.session.sessionId }
+              }
+            });
+            return c.json({ pushed: true, branch });
           });
         } catch (err) {
           return gitErrorResponse(loose(c), err);
@@ -1833,60 +1751,56 @@ function buildProjectGitRoutes({
           return c.json({ error: "Invalid sessionId" }, 400);
         }
         try {
-          return await withProjectLock({
-            key: `${project.id}:${userId}`,
-            storage,
-            fn: async () => {
-              const result = await github.versionControl.createPullRequest({
-                connection: {
-                  type: "app-installation",
-                  installationId: Number(project.installation.externalId)
-                },
-                sourceId: project.repository.slug,
-                baseBranch: base,
-                headBranch: head,
-                title,
-                body: prBody,
-                actingUserId: userId
-              });
-              await emitAudit?.({
-                context: loose(c),
-                input: {
-                  action: "factory.git.pr_opened",
-                  factoryProjectId: project.factoryProjectId,
+          return await withSessionOperationLock(sessionWorkspace.session.sessionId, async () => {
+            const result = await github.versionControl.createPullRequest({
+              connection: {
+                type: "app-installation",
+                installationId: Number(project.installation.externalId)
+              },
+              sourceId: project.repository.slug,
+              baseBranch: base,
+              headBranch: head,
+              title,
+              body: prBody,
+              actingUserId: userId
+            });
+            await emitAudit?.({
+              context: loose(c),
+              input: {
+                action: "factory.git.pr_opened",
+                factoryProjectId: project.factoryProjectId,
+                projectRepositoryId: project.id,
+                targets: [{ type: "pull_request", id: result.url, name: title }],
+                metadata: { branch: head, base, url: result.url }
+              }
+            });
+            const pullRequestNumber = pullRequestNumberFromUrl(result.url, project.repository.slug);
+            if (pullRequestNumber) {
+              const sessionId = sessionWorkspace.session.sessionId;
+              await subscribeToPullRequest(
+                {
+                  orgId,
+                  installationExternalId: project.installation.externalId,
                   projectRepositoryId: project.id,
-                  targets: [{ type: "pull_request", id: result.url, name: title }],
-                  metadata: { branch: head, base, url: result.url }
-                }
+                  repositoryExternalId: project.repository.externalId,
+                  repositorySlug: project.repository.slug,
+                  changeRequestId: pullRequestNumber.toString(),
+                  sessionId,
+                  ownerId: userId,
+                  resourceId: sessionId,
+                  threadId: sessionId,
+                  source: "factory-pr-create",
+                  subscribedByUserId: userId
+                },
+                github.integrationStorage
+              ).catch((error) => {
+                console.warn(
+                  `[GitHub] Pull request ${result.url} was created but automatic subscription failed.`,
+                  error
+                );
               });
-              const pullRequestNumber = pullRequestNumberFromUrl(result.url, project.repository.slug);
-              if (pullRequestNumber) {
-                const sessionId = sessionWorkspace.session.sessionId;
-                await subscribeToPullRequest(
-                  {
-                    orgId,
-                    installationExternalId: project.installation.externalId,
-                    projectRepositoryId: project.id,
-                    repositoryExternalId: project.repository.externalId,
-                    repositorySlug: project.repository.slug,
-                    changeRequestId: pullRequestNumber.toString(),
-                    sessionId,
-                    ownerId: userId,
-                    resourceId: sessionId,
-                    threadId: sessionId,
-                    source: "factory-pr-create",
-                    subscribedByUserId: userId
-                  },
-                  github.integrationStorage
-                ).catch((error) => {
-                  console.warn(
-                    `[GitHub] Pull request ${result.url} was created but automatic subscription failed.`,
-                    error
-                  );
-                });
-              }
-              return c.json({ url: result.url });
             }
+            return c.json({ url: result.url });
           });
         } catch (err) {
           return c.json(
@@ -1906,24 +1820,20 @@ function buildProjectGitRoutes({
       handler: async (c) => {
         const owned = await loadOwnedProject({ github, auth, fleet, c: loose(c) });
         if ("response" in owned) return owned.response;
-        const { userId, project, sandboxRow } = owned;
+        const { sandboxRow } = owned;
         if (!sandboxRow.sandboxId) {
           return c.json({ tornDown: false });
         }
         try {
-          return await withProjectLock({
-            key: `${project.id}:${userId}`,
-            storage,
-            fn: async () => {
-              const sandbox = await fleet.reattachSandbox(sandboxRow.sandboxId);
-              await teardownProjectSandbox({
-                fleet,
-                row: sandboxRow,
-                storage: github.sourceControlStorage.sandboxes,
-                sandbox
-              });
-              return c.json({ tornDown: true });
-            }
+          return await withSessionOperationLock(`sandbox:${sandboxRow.id}`, async () => {
+            const sandbox = await fleet.reattachSandbox(sandboxRow.sandboxId);
+            await teardownProjectSandbox({
+              fleet,
+              row: sandboxRow,
+              storage: github.sourceControlStorage.sandboxes,
+              sandbox
+            });
+            return c.json({ tornDown: true });
           });
         } catch (err) {
           return gitErrorResponse(loose(c), err);