@mastra/factory 0.1.0-alpha.5 → 0.1.0-alpha.7

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @mastra/factory
 
+## 0.1.0-alpha.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - @mastra/code-sdk@1.0.0-alpha.18
+
+## 0.1.0-alpha.6
+
+### Patch Changes
+
+- The Factory's default `publicUrl` is now `http://localhost:4111` (the Factory server, which serves both the UI and the API) instead of `http://localhost:5173`. Generated Factory projects now run from a single server, so OAuth callback URLs and auth redirects derived from `publicUrl` point at the right origin out of the box. If you serve the SPA from a separate origin (for example a Vite dev server on :5173), set `publicUrl` (or `MASTRACODE_PUBLIC_URL`) explicitly. ([#20036](https://github.com/mastra-ai/mastra/pull/20036))
+
 ## 0.1.0-alpha.5
 
 ### Patch Changes

package/dist/factory.d.ts

@@ -70,7 +70,8 @@ export interface MastraFactoryConfig {
      * Browser-facing origin used to build integration OAuth/install callback
      * URLs and to derive the auth redirect URI. On the platform the SPA is
      * hosted separately, so this MUST be the public API origin.
-     * Default: `http://localhost:5173` (the local Factory UI origin).
+     * Default: `http://localhost:4111` (the local Factory server, which also
+     * serves the UI).
      */
     publicUrl?: string;
     /**

package/dist/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAIH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAS/D,OAAO,KAAK,EAAE,kBAAkB,EAAgD,MAAM,wBAAwB,CAAC;AAmB/G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAwBrD,8EAA8E;AAC9E,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC,qBAAqB,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9E,MAAM,WAAW,mBAAmB;IAClC;;;;;;;;;;;;;;OAcG;IACH,IAAI,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAClC;;;;;;;OAOG;IACH,OAAO,EAAE,cAAc,CAAC;IACxB;;;;OAIG;IACH,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,0EAA0E;IAC1E,OAAO,CAAC,EAAE,0BAA0B,CAAC;IACrC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACpC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,0BAA0B;IACzC;;;;;;OAMG;IACH,OAAO,EAAE,gBAAgB,CAAC;IAC1B;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAwFD,qBAAa,aAAa;;gBAOZ,MAAM,EAAE,mBAAmB;IAWvC;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC;IA6dpC;;;;OAIG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAS/B,iFAAiF;IAC3E,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAGhC"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAIH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAS/D,OAAO,KAAK,EAAE,kBAAkB,EAAgD,MAAM,wBAAwB,CAAC;AAmB/G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAwBrD,8EAA8E;AAC9E,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC,qBAAqB,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9E,MAAM,WAAW,mBAAmB;IAClC;;;;;;;;;;;;;;OAcG;IACH,IAAI,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAClC;;;;;;;OAOG;IACH,OAAO,EAAE,cAAc,CAAC;IACxB;;;;OAIG;IACH,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,0EAA0E;IAC1E,OAAO,CAAC,EAAE,0BAA0B,CAAC;IACrC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACpC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,0BAA0B;IACzC;;;;;;OAMG;IACH,OAAO,EAAE,gBAAgB,CAAC;IAC1B;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAwFD,qBAAa,aAAa;;gBAOZ,MAAM,EAAE,mBAAmB;IAWvC;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC;IA8dpC;;;;OAIG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAS/B,iFAAiF;IAC3E,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAGhC"}

package/dist/factory.js

@@ -24778,6 +24778,48 @@ function createFactoryAuthGate(provider) {
 import { createTool } from "@mastra/core/tools";
 import { z } from "zod";
 
+// src/integrations/github/pat.ts
+var PAT_SETTINGS_USER_ID = "__github_org_settings__";
+var FIELD_FOR_KIND = {
+  default: "pat",
+  reviewer: "reviewerPat"
+};
+function asToken(value) {
+  return typeof value === "string" && value.length > 0 ? value : null;
+}
+async function getGithubPat(getStorage, orgId, kind = "default") {
+  try {
+    const settings = await getStorage().settings.get(orgId, PAT_SETTINGS_USER_ID);
+    if (!settings) return null;
+    if (kind === "reviewer") return asToken(settings.reviewerPat) ?? asToken(settings.pat);
+    return asToken(settings.pat);
+  } catch {
+    return null;
+  }
+}
+async function getGithubPatStatus(getStorage, orgId) {
+  try {
+    const settings = await getStorage().settings.get(orgId, PAT_SETTINGS_USER_ID);
+    return {
+      configured: asToken(settings?.pat) !== null,
+      reviewerConfigured: asToken(settings?.reviewerPat) !== null
+    };
+  } catch {
+    return { configured: false, reviewerConfigured: false };
+  }
+}
+async function setGithubPat(storage, orgId, pat, kind = "default") {
+  const existing = await storage.settings.get(orgId, PAT_SETTINGS_USER_ID) ?? {};
+  await storage.settings.save(orgId, PAT_SETTINGS_USER_ID, { ...existing, [FIELD_FOR_KIND[kind]]: pat });
+}
+async function clearGithubPat(storage, orgId, kind = "default") {
+  const existing = await storage.settings.get(orgId, PAT_SETTINGS_USER_ID);
+  const field = FIELD_FOR_KIND[kind];
+  if (!existing?.[field]) return;
+  const { [field]: _removed, ...rest } = existing;
+  await storage.settings.save(orgId, PAT_SETTINGS_USER_ID, rest);
+}
+
 // src/integrations/github/subscriptions.ts
 function changeRequestTargetKey(input) {
   return `change-request:${input.installationExternalId}:${input.repositoryExternalId}:${input.changeRequestId}`;
@@ -24832,9 +24874,17 @@ function retirePullRequestSubscription(id, status, storage) {
 
 // src/integrations/github/token-refresh.ts
 var GITHUB_TOKEN_INJECTOR_CONTEXT_KEY = "factoryGithubTokenInjector";
+var GITHUB_PAT_KIND_CONTEXT_KEY = "factoryGithubPatKind";
 function registerGithubTokenInjector(requestContext, injector) {
   requestContext.set(GITHUB_TOKEN_INJECTOR_CONTEXT_KEY, injector);
 }
+function registerGithubPatKind(requestContext, kind) {
+  requestContext.set(GITHUB_PAT_KIND_CONTEXT_KEY, kind);
+}
+function getRegisteredGithubPatKind(requestContext) {
+  const kind = requestContext.get(GITHUB_PAT_KIND_CONTEXT_KEY);
+  return kind === "reviewer" ? "reviewer" : "default";
+}
 function injectGithubToken(requestContext, token) {
   const injector = requestContext.get(GITHUB_TOKEN_INJECTOR_CONTEXT_KEY);
   if (!injector) {
@@ -24932,6 +24982,15 @@ async function unsubscribeCurrentSessionFromPullRequest(requestContext, pullRequ
 }
 async function refreshGithubToken(requestContext, github) {
   const target = await resolveSessionTarget(requestContext, github);
+  const pat = await getGithubPat(
+    () => github.integrationStorage,
+    target.orgId,
+    getRegisteredGithubPatKind(requestContext)
+  );
+  if (pat) {
+    injectGithubToken(requestContext, pat);
+    return;
+  }
   const access = await github.versionControl.getRepositoryAccess({
     orgId: target.orgId,
     repositoryId: target.repository.id
@@ -26659,6 +26718,56 @@ function buildGithubRoutes(options) {
       }
     })
   );
+  const parsePatKind = (value) => {
+    if (value === void 0 || value === null || value === "default") return "default";
+    if (value === "reviewer") return "reviewer";
+    return null;
+  };
+  routes.push(
+    registerApiRoute2("/web/github/pat", {
+      method: "GET",
+      requiresAuth: false,
+      handler: async (c) => {
+        const resolved = await resolveOrgTenant(loose(c), auth);
+        if ("response" in resolved) return resolved.response;
+        return c.json(await getGithubPatStatus(() => github.integrationStorage, resolved.tenant.orgId));
+      }
+    }),
+    registerApiRoute2("/web/github/pat", {
+      method: "POST",
+      requiresAuth: false,
+      handler: async (c) => {
+        const resolved = await resolveOrgTenant(loose(c), auth);
+        if ("response" in resolved) return resolved.response;
+        let body;
+        try {
+          body = await c.req.json();
+        } catch {
+          return c.json({ error: "Invalid JSON body" }, 400);
+        }
+        const kind = parsePatKind(body.kind);
+        if (!kind) return c.json({ error: "kind must be 'default' or 'reviewer'" }, 400);
+        const token = typeof body.token === "string" ? body.token.trim() : "";
+        if (!token) return c.json({ error: "A token is required" }, 400);
+        if (token.length > 500) return c.json({ error: "Token too long (max 500 characters)" }, 400);
+        if (/\s/.test(token)) return c.json({ error: "Token must not contain whitespace" }, 400);
+        await setGithubPat(github.integrationStorage, resolved.tenant.orgId, token, kind);
+        return c.json(await getGithubPatStatus(() => github.integrationStorage, resolved.tenant.orgId));
+      }
+    }),
+    registerApiRoute2("/web/github/pat", {
+      method: "DELETE",
+      requiresAuth: false,
+      handler: async (c) => {
+        const resolved = await resolveOrgTenant(loose(c), auth);
+        if ("response" in resolved) return resolved.response;
+        const kind = parsePatKind(c.req.query("kind"));
+        if (!kind) return c.json({ error: "kind must be 'default' or 'reviewer'" }, 400);
+        await clearGithubPat(github.integrationStorage, resolved.tenant.orgId, kind);
+        return c.json(await getGithubPatStatus(() => github.integrationStorage, resolved.tenant.orgId));
+      }
+    })
+  );
   routes.push(...buildProjectGitRoutes({ github, auth, fleet, storage, emitAudit }));
   return routes;
 }
@@ -26701,11 +26810,12 @@ async function prepareProject(options) {
   if (!access.authorization) {
     throw new MaterializeError("Repository access did not include a bearer token.", "clone-failed");
   }
+  const ghCliToken = await getGithubPat(() => github.integrationStorage, project.installation.orgId) ?? access.authorization.token;
   const sandbox = await ensureProjectSandbox({
     fleet,
     row: sandboxRow,
     storage: github.sourceControlStorage.sandboxes,
-    token: access.authorization.token,
+    token: ghCliToken,
     onProgress
   });
   const fresh = await github.sourceControlStorage.sandboxes.getById({ id: sandboxRow.id });
@@ -27739,6 +27849,7 @@ var PlatformGithubIntegration = class {
     getRepositoryAccess: async ({ orgId, repositoryId }) => {
       const repository = await this.storage.repositories.get({ orgId, id: repositoryId });
       if (!repository) throw new Error("Version-control repository not found.");
+      const cloneUrl = `https://github.com/${repository.slug}.git`;
       const installation = await this.storage.installations.get({ orgId, id: repository.installationId });
       if (!installation) throw new Error("Version-control installation not found.");
       const installationId = parsePositiveInteger(installation.externalId);
@@ -27750,7 +27861,7 @@ var PlatformGithubIntegration = class {
         { repositories: [repositoryName], permissions: REPOSITORY_TOKEN_PERMISSIONS }
       );
       return {
-        cloneUrl: `https://github.com/${repository.slug}.git`,
+        cloneUrl,
         authorization: { scheme: "bearer", token: token.token }
       };
     },
@@ -30558,13 +30669,19 @@ var FactoryStartCoordinator = class {
     if (!request.requestContext) {
       requestContext.set("user", { workosId: request.userId, organizationId: request.orgId });
     }
+    const sessionState = {
+      factoryProjectId: request.factoryProjectId,
+      projectRepositoryId: sourceSession.projectRepositoryId
+    };
     const session = await this.#controller.createSession({
       id: sourceSession.sessionId,
       ownerId: request.userId,
       resourceId: sourceSession.sessionId,
       threadId: sourceSession.sessionId,
-      requestContext
+      requestContext,
+      tags: sessionState
     });
+    await session.state.set(sessionState);
     const threadId = await configureThread(session, request);
     const kickoffMessage = await resolveKickoffMessage(session, request.invocation);
     const prepared = await storage.prepareRunStart({
@@ -38391,7 +38508,7 @@ var factorySkillExtension = {
   createSource: (fallback, fallbackSkillRoots) => new FactorySkillSource(fallback, fallbackSkillRoots)
 };
 function createWorkspaceFactory(options = {}) {
-  const { sandbox: sandboxConfig, github, fleet } = options;
+  const { sandbox: sandboxConfig, github, fleet, workItems } = options;
   const isLocalSandbox = sandboxConfig?.machine instanceof LocalSandbox;
   const githubTokenInjectors = /* @__PURE__ */ new Map();
   return async ({ requestContext, mastra, skillExtension }) => {
@@ -38445,8 +38562,11 @@ function createWorkspaceFactory(options = {}) {
       const existing = mastra?.getWorkspaceById(workspaceId);
       if (existing) {
         existing.setToolsConfig(MASTRACODE_WORKSPACE_TOOLS);
-        const injectGithubToken3 = githubTokenInjectors.get(workspaceId);
-        if (injectGithubToken3) registerGithubTokenInjector(requestContext, injectGithubToken3);
+        const registered = githubTokenInjectors.get(workspaceId);
+        if (registered) {
+          registerGithubTokenInjector(requestContext, registered.inject);
+          registerGithubPatKind(requestContext, registered.patKind);
+        }
         return existing;
       }
     } catch {
@@ -38457,9 +38577,19 @@ function createWorkspaceFactory(options = {}) {
     });
     const token = access.authorization?.token;
     if (!token) throw new Error("Repository access did not include a bearer token for the Factory session");
+    let patKind = "default";
+    if (workItems) {
+      try {
+        const address = getFactorySessionAddress(requestContext);
+        const runBinding = address ? await workItems.findRunBindingBySession(address) : null;
+        if (runBinding?.role === "review" && runBinding.orgId === session.orgId) patKind = "reviewer";
+      } catch {
+      }
+    }
+    const ghCliToken = await getGithubPat(() => github.integrationStorage, session.orgId, patKind) ?? token;
     const sandbox = await fleet.ensureSandbox(
       binding,
-      { GH_TOKEN: token },
+      { GH_TOKEN: ghCliToken },
       void 0,
       isLocalSandbox ? { workingDirectory: workdir } : {}
     );
@@ -38483,8 +38613,9 @@ function createWorkspaceFactory(options = {}) {
       }
       sandbox.setEnvironmentVariable("GH_TOKEN", freshToken);
     };
-    githubTokenInjectors.set(workspaceId, injectGithubToken2);
+    githubTokenInjectors.set(workspaceId, { inject: injectGithubToken2, patKind });
     registerGithubTokenInjector(requestContext, injectGithubToken2);
+    registerGithubPatKind(requestContext, patKind);
     const filesystem = new SandboxFilesystem({ sandbox, workdir });
     const projectSkillPaths = [path2.join(configDir, "skills"), ".claude/skills", ".agents/skills"];
     const skillPaths = [...effectiveSkillExtension?.paths ?? [], ...projectSkillPaths];
@@ -38561,7 +38692,7 @@ var MastraFactory = class {
   async prepare() {
     if (this.#preparing) throw new Error("MastraFactory.prepare() called twice");
     this.#preparing = true;
-    const publicOrigin = (this.#config.publicUrl ?? "http://localhost:5173").replace(/\/+$/, "");
+    const publicOrigin = (this.#config.publicUrl ?? "http://localhost:4111").replace(/\/+$/, "");
     const allowedOrigins = (this.#config.allowedOrigins ?? []).map((o) => o.replace(/\/+$/, "")).filter(Boolean);
     const storage = this.#config.storage;
     const vector = this.#config.vector;
@@ -38721,6 +38852,7 @@ var MastraFactory = class {
       workspace: createWorkspaceFactory({
         ...this.#config.sandbox ? { sandbox: this.#config.sandbox } : {},
         ...githubIntegration ? { github: githubIntegration } : {},
+        ...workItemsStorage ? { workItems: workItemsStorage } : {},
         fleet
       }),
       disableGithubSignals: true,