@mastra/platform-workspace 1.6.2-alpha.0 → 1.7.0-alpha.0

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export { PlatformClient, PlatformApiError, type PlatformClientOptions, type Plat
 export { PlatformFilesystem, type PlatformFilesystemOptions } from './filesystem.js';
 export { Template, type AptInstallOptions, type JsonPrimitive, type JsonValue, type NpmInstallOptions, type PipInstallOptions, type SandboxTemplateBuildOptions, type SandboxTemplateBuildResult, type SandboxTemplateBuilder, type SandboxTemplateMethod, type SetEnvsOptions, type SandboxTemplateOperation, type SerializedSandboxTemplate, } from './template.js';
 export { PlatformSandbox, SandboxExecTransportError, SandboxDestroyedError, type PlatformSandboxOptions, type PlatformSandboxNetworkIsolation, type PlatformSandboxTemplate, type SandboxAddressRegistry, type SandboxTemplatePending, } from './sandbox.js';
-export { createRepoTemplate, type PlatformRepoTemplateOptions, type PlatformRepoTemplateResolver, } from './repo-template.js';
+export { createRepoTemplate, type PlatformRepoTemplateOptions, type PlatformRepoTemplateRepository, type PlatformRepoTemplateResolver, } from './repo-template.js';
 export { platformFilesystemProvider, platformSandboxProvider } from './provider.js';
 export { execViaPrivateNetwork, PrivateNetExecHttpError, type PrivateNetExecOptions, type PrivateNetExecResult, type PrivateNetFetch, } from './private-net-exec.js';
 export { InProcessSandboxAddressRegistry } from './address-registry.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,KAAK,qBAAqB,EAC1B,KAAK,kBAAkB,EACvB,KAAK,eAAe,GACrB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,EACL,QAAQ,EACR,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,2BAA2B,EAChC,KAAK,0BAA0B,EAC/B,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EACnB,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,GAC/B,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,eAAe,EACf,yBAAyB,EACzB,qBAAqB,EACrB,KAAK,sBAAsB,EAC3B,KAAK,+BAA+B,EACpC,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,GAC5B,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,kBAAkB,EAClB,KAAK,2BAA2B,EAChC,KAAK,4BAA4B,GAClC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACpF,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,KAAK,eAAe,GACrB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,KAAK,qBAAqB,EAC1B,KAAK,kBAAkB,EACvB,KAAK,eAAe,GACrB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,EACL,QAAQ,EACR,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,2BAA2B,EAChC,KAAK,0BAA0B,EAC/B,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EACnB,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,GAC/B,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,eAAe,EACf,yBAAyB,EACzB,qBAAqB,EACrB,KAAK,sBAAsB,EAC3B,KAAK,+BAA+B,EACpC,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,GAC5B,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,kBAAkB,EAClB,KAAK,2BAA2B,EAChC,KAAK,8BAA8B,EACnC,KAAK,4BAA4B,GAClC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACpF,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,KAAK,eAAe,GACrB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/index.js

@@ -3,8 +3,8 @@ import nodePath from "path";
 import { FileExistsError, FileNotFoundError, MastraFilesystem, MastraSandbox, ProcessHandle, SandboxNotReadyError, SandboxProcessManager, UnsupportedStdinCloseError, WorkspaceReadOnlyError } from "@mastra/core/workspace";
 import { CommandExitError, Sandbox, TimeoutError } from "e2b";
 import { execFile } from "child_process";
-import { promisify } from "util";
 import { createHash } from "crypto";
+import { promisify } from "util";
 //#region src/client.ts
 const DEFAULT_PROXY_URL = "https://workspaces.mastra.ai";
 const REGIONAL_PROXY_URLS = {
@@ -1052,9 +1052,9 @@ var SandboxDestroyedError = class extends Error {
 * sandbox.
 */
 function buildCommand(command, args) {
-	return args?.length ? `${command} ${args.map(shellQuote$1).join(" ")}` : command;
+	return args?.length ? `${command} ${args.map(shellQuote$2).join(" ")}` : command;
 }
-function shellQuote$1(arg) {
+function shellQuote$2(arg) {
 	if (/^[a-zA-Z0-9._\-/=:@]+$/.test(arg)) return arg;
 	return `'${arg.replace(/'/g, `'\\''`)}'`;
 }
@@ -1972,6 +1972,8 @@ var PlatformSandbox = class PlatformSandbox extends MastraSandbox {
 };
 //#endregion
 //#region ../../packages/_internals/workspace/dist/index.js
+/** Directory, relative to the template's build cwd, that holds every marker below. */
+const SETUP_MARKER_DIR = ".mastra-sandbox";
 /**
 * Setup completion marker shared by repo templates and their consumers.
 *
@@ -1981,8 +1983,29 @@ var PlatformSandbox = class PlatformSandbox extends MastraSandbox {
 * booted from the image tell whether the setup it is about to run already
 * happened. Relative to the template's build cwd, which is also the runtime
 * working directory the repo was cloned into.
+*
+* This is the single-repository marker. Templates built from a repository
+* list write one marker per repository instead ({@link repoSetupMarkerPath}).
 */
 const SETUP_MARKER_PATH = ".mastra-sandbox/setup";
+/**
+* Marker for the workspace-level setup of a multi-repository template: the
+* commands that ran at the working directory after every repository was set
+* up. Written even when there were no such commands, so a consumer can tell
+* "ran nothing" from "never built".
+*/
+const WORKSPACE_SETUP_MARKER_PATH = ".mastra-sandbox/workspace-setup";
+/**
+* One line per repository directory whose setup failed while the build was
+* told to continue. Absent when nothing failed. Consumers check this before
+* trusting a per-repository marker: that marker means every step ran, not
+* that every step succeeded.
+*/
+const SETUP_FAILED_MARKER_PATH = ".mastra-sandbox/setup-failed";
+/** Per-repository marker of a multi-repository template, keyed by the clone directory name. */
+function repoSetupMarkerPath(repoDir) {
+	return `${SETUP_MARKER_DIR}/repos/${repoDir}`;
+}
 /** Blank entries never become build steps, so they never count toward the digest either. */
 function normalizeSetupCommands(setupCommand) {
 	return (setupCommand === void 0 ? [] : Array.isArray(setupCommand) ? setupCommand : [setupCommand]).filter((command) => command.trim() !== "");
@@ -1992,8 +2015,26 @@ function setupMarkerContent(setupCommand) {
 	return `sha256:${createHash("sha256").update(normalizeSetupCommands(setupCommand).join("\n")).digest("hex")}`;
 }
 /** Shell step that writes the marker relative to the cwd. `content` is a digest, so it is shell-safe. */
-function setupMarkerCommand(content) {
-	return `mkdir -p "$(dirname "${SETUP_MARKER_PATH}")" && printf '%s' '${content}' > "${SETUP_MARKER_PATH}"`;
+function setupMarkerCommand(content, markerPath = SETUP_MARKER_PATH) {
+	return `mkdir -p "$(dirname "${markerPath}")" && printf '%s' '${content}' > "${markerPath}"`;
+}
+/** A clone directory name is one path segment of word characters, dots and dashes, so it never needs quoting. */
+const REPO_DIR_PATTERN = /^[\w.-]+$/;
+/**
+* Shell step that runs one setup command inside a repository clone.
+*
+* Without the guard this is the plain `cd "<dir>" && <cmd>` step. With it,
+* the `cd` sits inside the parenthesized group so that the failure branch
+* runs back at the build cwd and the failure list lands at the workspace
+* level, never inside the repository.
+*/
+function guardedSetupCommand({ repoDir, command, continueOnFailure }) {
+	if (!REPO_DIR_PATTERN.test(repoDir)) throw new TypeError(`Repository directory "${repoDir}" must match ${REPO_DIR_PATTERN}.`);
+	if (!continueOnFailure) return `cd "${repoDir}" && ${command}`;
+	return `( cd "${repoDir}" && sh -c ${shellQuote$1(command)} ) || { mkdir -p "${SETUP_MARKER_DIR}" && grep -qxF -- '${repoDir}' "${SETUP_FAILED_MARKER_PATH}" 2>/dev/null || printf '%s\\n' '${repoDir}' >> "${SETUP_FAILED_MARKER_PATH}"; }`;
+}
+function shellQuote$1(value) {
+	return `'${value.replace(/'/g, `'\\''`)}'`;
 }
 function repoCloneCommand({ cloneUrl, destination, branch, tokenEnv }) {
 	return `git ${tokenEnv ? `${gitAuthFlag$1(tokenEnv)} ` : ""}clone --depth=1 --single-branch ${branch ? `--branch ${shellQuote(branch)} ` : ""}${shellQuote(cloneUrl)} ${shellQuote(destination)}`;
@@ -2046,77 +2087,126 @@ function rememberHead(cloneUrl, sha) {
 * requested size, and the caller's runtime setup materializes the checkout.
 */
 function createRepoTemplate(options) {
-	const getRepositoryAccess = options.getRepositoryAccess;
+	if (options.getRepositoryAccess && options.repos) throw new TypeError("createRepoTemplate: pass either getRepositoryAccess or repos, not both");
+	if (!options.repos && (options.workspaceSetupCommand !== void 0 || options.continueOnSetupFailure !== void 0)) throw new TypeError("createRepoTemplate: workspaceSetupCommand and continueOnSetupFailure require repos");
+	const isList = options.repos !== void 0;
+	const entries = options.repos ? options.repos : options.getRepositoryAccess ? [{
+		getRepositoryAccess: options.getRepositoryAccess,
+		setupCommand: options.setupCommand
+	}] : [];
 	const resourcesOnly = () => {
 		if (options.cpuCount === void 0 && options.memoryMB === void 0) return void 0;
 		return withResources(Template(), options);
 	};
-	if (!getRepositoryAccess) {
+	if (entries.length === 0) {
 		const template = resourcesOnly();
 		return template ? async () => template : void 0;
 	}
 	const resolveHead = options.resolveHead ?? resolveDefaultBranchHead;
+	const continueOnFailure = options.continueOnSetupFailure ?? false;
 	return async () => {
-		let accessError;
-		const access = await getRepositoryAccess().catch((error) => {
-			accessError = error;
-		});
-		if (!access?.cloneUrl) {
-			console.warn("[platform-workspace] repo template skipped: repository access unavailable", { error: redactSecrets(accessError) });
-			return resourcesOnly();
-		}
-		const cloneUrl = normalizeCloneUrl(access.cloneUrl);
-		if (!isValidCloneUrl(cloneUrl)) {
-			console.warn("[platform-workspace] repo template skipped: clone URL failed validation", { cloneUrl: redactSecrets(cloneUrl) });
-			return resourcesOnly();
-		}
-		const token = access.authorization?.token;
-		let headError;
-		const resolved = await (token ? resolveHead(cloneUrl, token) : resolveHead(cloneUrl)).catch((error) => {
-			headError = error;
-		});
-		let sha;
-		if (resolved && SHA_PATTERN.test(resolved)) {
-			sha = resolved;
-			rememberHead(cloneUrl, sha);
-		} else {
-			const lastKnown = lastKnownHeads.get(cloneUrl);
-			if (!lastKnown) {
-				console.warn("[platform-workspace] repo template skipped: could not resolve default-branch head", {
+		const repos = [];
+		for (const [index, entry] of entries.entries()) {
+			let accessError;
+			const access = await entry.getRepositoryAccess().catch((error) => {
+				accessError = error;
+			});
+			if (!access?.cloneUrl) {
+				console.warn("[platform-workspace] repo template skipped: repository access unavailable", {
+					...isList ? { index } : {},
+					error: redactSecrets(accessError)
+				});
+				return resourcesOnly();
+			}
+			const cloneUrl = normalizeCloneUrl(access.cloneUrl);
+			if (!isValidCloneUrl(cloneUrl)) {
+				console.warn("[platform-workspace] repo template skipped: clone URL failed validation", {
+					...isList ? { index } : {},
+					cloneUrl: redactSecrets(cloneUrl)
+				});
+				return resourcesOnly();
+			}
+			const token = access.authorization?.token;
+			let headError;
+			const resolved = await (token ? resolveHead(cloneUrl, token) : resolveHead(cloneUrl)).catch((error) => {
+				headError = error;
+			});
+			let sha;
+			if (resolved && SHA_PATTERN.test(resolved)) {
+				sha = resolved;
+				rememberHead(cloneUrl, sha);
+			} else {
+				const lastKnown = lastKnownHeads.get(cloneUrl);
+				if (lastKnown) {
+					console.warn("[platform-workspace] repo template pinned to the last known default-branch head", {
+						cloneUrl,
+						sha: lastKnown,
+						resolved,
+						error: redactSecrets(headError)
+					});
+					sha = lastKnown;
+				} else if (isList) console.warn("[platform-workspace] repo template clones unpinned: could not resolve default-branch head", {
 					cloneUrl,
 					sha: resolved,
 					error: redactSecrets(headError)
 				});
-				return resourcesOnly();
+				else {
+					console.warn("[platform-workspace] repo template skipped: could not resolve default-branch head", {
+						cloneUrl,
+						sha: resolved,
+						error: redactSecrets(headError)
+					});
+					return resourcesOnly();
+				}
 			}
-			console.warn("[platform-workspace] repo template pinned to the last known default-branch head", {
+			const repoDir = repoDirName(cloneUrl);
+			repos.push({
+				index,
 				cloneUrl,
-				sha: lastKnown,
-				resolved,
-				error: redactSecrets(headError)
+				repoDir,
+				token,
+				tokenEnv: token ? isList ? `${BUILD_TOKEN_ENV}_${index}` : BUILD_TOKEN_ENV : void 0,
+				sha,
+				setupCommands: normalizeSetupCommands(entry.setupCommand)
 			});
-			sha = lastKnown;
+		}
+		const seenDirs = /* @__PURE__ */ new Map();
+		for (const repo of repos) {
+			const other = seenDirs.get(repo.repoDir);
+			if (other) throw new Error(`createRepoTemplate: repositories ${other} and ${repo.cloneUrl} would both clone into "${repo.repoDir}"`);
+			seenDirs.set(repo.repoDir, repo.cloneUrl);
 		}
 		const workingDirectory = options.workingDirectory === void 0 ? void 0 : trimTrailingSlashes(assertWorkingDirectory(options.workingDirectory));
-		const repoDir = repoDirName(cloneUrl);
-		const auth = token ? `${gitAuthFlag()} ` : "";
-		const setupCommands = (options.setupCommand === void 0 ? [] : Array.isArray(options.setupCommand) ? options.setupCommand : [options.setupCommand]).filter((command) => command.trim() !== "");
-		const family = `repo:${cloneUrl}:${workingDirectory ?? ""}/${repoDir}`;
+		const family = isList ? `repos:${createHash("sha256").update(JSON.stringify([workingDirectory ?? "", repos.map((repo) => [repo.cloneUrl, repo.repoDir])])).digest("hex").slice(0, 32)}` : `repo:${repos[0].cloneUrl}:${workingDirectory ?? ""}/${repos[0].repoDir}`;
 		let template = Template();
-		const buildEnv = {
-			...options.buildEnv,
-			...token ? { [BUILD_TOKEN_ENV]: token } : {}
-		};
+		const buildEnv = { ...options.buildEnv };
+		for (const repo of repos) if (repo.tokenEnv && repo.token) buildEnv[repo.tokenEnv] = repo.token;
 		if (Object.keys(buildEnv).length > 0) template = template.setEnvs(buildEnv, { ephemeral: true });
 		template = withResources(template, options);
 		if (workingDirectory) template = template.runCmd(`mkdir -p "${workingDirectory}"`).setWorkdir(workingDirectory);
-		template = template.runCmd(repoCloneCommand({
-			cloneUrl,
-			destination: repoDir,
-			...token ? { tokenEnv: BUILD_TOKEN_ENV } : {}
-		})).runCmd(`git -C "${repoDir}" ${auth}fetch origin ${sha}`).runCmd(`git -C "${repoDir}" checkout ${sha}`);
-		for (const command of setupCommands) template = template.runCmd(`cd "${repoDir}" && ${command}`);
-		template = template.runCmd(setupMarkerCommand(setupMarkerContent(setupCommands)));
+		const ordered = [...repos.filter((repo) => !repo.token), ...repos.filter((repo) => repo.token)];
+		for (const repo of ordered) {
+			const { repoDir, sha, tokenEnv, setupCommands } = repo;
+			const auth = tokenEnv ? `${gitAuthFlag(tokenEnv)} ` : "";
+			template = template.runCmd(repoCloneCommand({
+				cloneUrl: repo.cloneUrl,
+				destination: repoDir,
+				...tokenEnv ? { tokenEnv } : {}
+			}));
+			if (sha) template = template.runCmd(`git -C "${repoDir}" ${auth}fetch origin ${sha}`).runCmd(`git -C "${repoDir}" checkout ${sha}`);
+			for (const command of setupCommands) template = template.runCmd(guardedSetupCommand({
+				repoDir,
+				command,
+				continueOnFailure
+			}));
+			const content = setupMarkerContent(setupCommands);
+			template = template.runCmd(isList ? setupMarkerCommand(content, repoSetupMarkerPath(repoDir)) : setupMarkerCommand(content));
+		}
+		if (isList) {
+			const workspaceCommands = normalizeSetupCommands(options.workspaceSetupCommand);
+			for (const command of workspaceCommands) template = template.runCmd(command);
+			template = template.runCmd(setupMarkerCommand(setupMarkerContent(workspaceCommands), WORKSPACE_SETUP_MARKER_PATH));
+		}
 		return template.withFamily(family);
 	};
 }
@@ -2171,8 +2261,8 @@ function redactSecrets(value) {
 	if (value === void 0 || value === null) return void 0;
 	return (value instanceof Error ? value.message : typeof value === "string" ? value : String(value)).replace(/\/\/[^/@\s]+@/g, "//***@").replace(/\b(bearer|basic)\s+[^\s"']+/gi, "$1 ***").replace(/\b(gh[pousr]_|github_pat_)[A-Za-z0-9_]+/g, "$1***");
 }
-function gitAuthFlag() {
-	return `-c http.extraheader="AUTHORIZATION: basic $(printf 'x-access-token:%s' "$${BUILD_TOKEN_ENV}" | base64 -w0)"`;
+function gitAuthFlag(tokenEnv) {
+	return `-c http.extraheader="AUTHORIZATION: basic $(printf 'x-access-token:%s' "$${tokenEnv}" | base64 -w0)"`;
 }
 /**
 * `owner/repo` for a github.com clone URL, else undefined. Only the public