@mastra/docker 0.9.4-alpha.0 → 0.10.0-alpha.1

package/dist/template/index.d.ts

@@ -1,4 +1,4 @@
 export { DockerTemplate, type DockerTemplateOptions, type DockerTemplateBuildOptions, type DockerTemplateBuildResult, type DockerTemplateSecrets, } from './template.js';
-export { createDockerRepoTemplate, type DockerRepoTemplateOptions, type DockerRepoTemplateResolveOptions, type DockerRepoTemplateResolver, type RepositoryAccess, } from './repo-template.js';
+export { createDockerRepoTemplate, type DockerRepoTemplateOptions, type DockerRepoTemplateRepository, type DockerRepoTemplateResolveOptions, type DockerRepoTemplateResolver, type RepositoryAccess, } from './repo-template.js';
 export { type AptInstallOptions, type DockerTemplateDefinition, type DockerTemplateOperation, type NpmInstallOptions, type PipInstallOptions, type RunWithSecretsOptions, secretNames, synthesizeDockerfile, templateIdentity, templateImageTag, TEMPLATE_IMAGE_REPO, } from './dockerfile.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/template/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/template/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,KAAK,qBAAqB,EAC1B,KAAK,0BAA0B,EAC/B,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,GAC3B,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,wBAAwB,EACxB,KAAK,yBAAyB,EAC9B,KAAK,gCAAgC,EACrC,KAAK,0BAA0B,EAC/B,KAAK,gBAAgB,GACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAC5B,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,EAC1B,WAAW,EACX,oBAAoB,EACpB,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/template/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,KAAK,qBAAqB,EAC1B,KAAK,0BAA0B,EAC/B,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,GAC3B,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,wBAAwB,EACxB,KAAK,yBAAyB,EAC9B,KAAK,4BAA4B,EACjC,KAAK,gCAAgC,EACrC,KAAK,0BAA0B,EAC/B,KAAK,gBAAgB,GACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAC5B,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,EAC1B,WAAW,EACX,oBAAoB,EACpB,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,cAAc,CAAC"}

package/dist/template/repo-template.d.ts

@@ -10,7 +10,11 @@
  * the template identity. A moved branch therefore yields a fresh image on the
  * next new sandbox, and an unmoved one reuses the cached image. When the head
  * cannot be resolved the resolver rejects: an unpinned clone cached under a
- * stable tag would otherwise serve stale repository state forever.
+ * stable tag would otherwise serve stale repository state forever. This holds
+ * for every entry of the `repos` form too, where the platform and E2B
+ * templates clone such a repository unpinned instead: those use a shallow
+ * clone whose tip the session fetches past, while this template clones full
+ * history and pins by `checkout`, so there is no cheap unpinned mode here.
  *
  * The clone runs in a throwaway build stage; the credential is passed by value
  * to that stage only and never enters the template identity or the image.
@@ -41,6 +45,15 @@ export interface RepositoryAccess {
         token: string;
     };
 }
+/** One repository of a multi-repository template. */
+export interface DockerRepoTemplateRepository {
+    /** Resolves this repository's clone URL and credential, as {@link DockerRepoTemplateOptions.getRepositoryAccess} does for one. */
+    getRepositoryAccess: (options?: DockerRepoTemplateResolveOptions) => Promise<RepositoryAccess | undefined>;
+    /** Branch, tag, or commit to prepare for this repository; see {@link DockerRepoTemplateOptions.ref}. */
+    ref?: string;
+    /** Setup command(s) run inside this repository's checkout. */
+    setupCommand?: string | string[];
+}
 export interface DockerRepoTemplateOptions {
     /**
      * Resolves the clone URL and, for private repositories, a short-lived
@@ -51,10 +64,11 @@ export interface DockerRepoTemplateOptions {
      *
      * Pass `undefined` for the function itself to mean "no repository":
      * {@link createDockerRepoTemplate} then returns undefined so
-     * `template: createDockerRepoTemplate(ctx)` needs no conditional. If the
-     * function resolves to `undefined` at start time, the resolver rejects.
+     * `template: createDockerRepoTemplate(ctx)` needs no conditional (unless
+     * `repos` is set). If the function resolves to `undefined` at start time,
+     * the resolver rejects.
      */
-    getRepositoryAccess: ((options?: DockerRepoTemplateResolveOptions) => Promise<RepositoryAccess | undefined>) | undefined;
+    getRepositoryAccess?: ((options?: DockerRepoTemplateResolveOptions) => Promise<RepositoryAccess | undefined>) | undefined;
     /**
      * Branch, tag, or commit to prepare. The current head of a branch/tag is
      * resolved at each template resolution and pinned into the identity.
@@ -63,6 +77,40 @@ export interface DockerRepoTemplateOptions {
     ref?: string;
     /** Setup command(s) run inside the checkout as separate cached build steps. */
     setupCommand?: string | string[];
+    /**
+     * Several repositories in one image, each with its own access resolver,
+     * `ref` and setup command, cloned to `<workingDirectory>/<repo>` in this
+     * order; the working directory itself becomes the build and runtime cwd.
+     * Public repositories (no `authorization`) are built before private ones in
+     * caller order within each group. Each repository writes
+     * `.mastra-sandbox/repos/<repo>` (`setupMarkerContent` of its commands)
+     * once every step for it ran.
+     *
+     * Each credential is passed to that repository's clone and pin steps only,
+     * as the secret `GH_TOKEN_<n>` (`n` = position in this list); setup
+     * commands never see it.
+     *
+     * Mutually exclusive with `getRepositoryAccess`. Any entry whose access or
+     * head cannot be resolved rejects the whole resolution, as the single form
+     * does. Two entries that would clone into the same directory reject the
+     * same way. An empty array behaves like no repository.
+     */
+    repos?: DockerRepoTemplateRepository[];
+    /**
+     * `repos` only. Command(s) run at the working directory after every
+     * repository is set up (install a shared toolchain, link packages). A
+     * failure fails the build. `.mastra-sandbox/workspace-setup` records the
+     * digest of the commands that ran, even when there were none.
+     */
+    workspaceSetupCommand?: string | string[];
+    /**
+     * `repos` only. When true a failing per-repository setup command records
+     * that repository's directory name in `.mastra-sandbox/setup-failed` (one
+     * line per repository) and the build continues; clone, pin, workspace and
+     * marker steps still fail the build. Default false: any failure fails the
+     * build.
+     */
+    continueOnSetupFailure?: boolean;
     /**
      * Extra environment for every build step, including `setupCommand`. Baked
      * into the image via `ENV` and hashed into the identity (keys and values),
@@ -73,6 +121,7 @@ export interface DockerRepoTemplateOptions {
     /**
      * Absolute parent for the checkout; the repo lands at
      * `<workingDirectory>/<repo>`, which becomes the build and runtime cwd.
+     * With `repos` the working directory itself is the cwd.
      * @default '/workspace'
      */
     workingDirectory?: string;
@@ -98,6 +147,14 @@ export interface DockerRepoTemplateResolveOptions {
 /** A resolver producing a fresh, head-pinned template on each call. */
 export type DockerRepoTemplateResolver = (options?: DockerRepoTemplateResolveOptions) => Promise<DockerTemplate>;
 export declare function createDockerRepoTemplate(options: DockerRepoTemplateOptions): DockerRepoTemplateResolver | undefined;
+/** One repository with its access and head resolved. */
+interface ResolvedRepository {
+    cloneUrl: string;
+    sha: string;
+    token?: string;
+    tokenEnv?: string;
+    setupCommand?: string | string[];
+}
 interface RepoTemplateInputs {
     cloneUrl: string;
     sha: string;
@@ -115,6 +172,23 @@ interface RepoTemplateInputs {
  * @internal
  */
 export declare function buildRepoTemplate(inputs: RepoTemplateInputs): DockerTemplate;
+interface MultiRepoTemplateInputs {
+    repos: ResolvedRepository[];
+    workspaceSetupCommand?: string | string[];
+    continueOnSetupFailure: boolean;
+    buildEnv?: Record<string, string>;
+    workingDirectory: string;
+    baseImage?: string;
+    owner?: string;
+    dockerOptions?: DockerOptions;
+}
+/**
+ * List-form assembly: the working directory is the cwd, every repository is
+ * laid out under it (public first) around its own pin, then the workspace
+ * steps and marker. Exported for tests.
+ * @internal
+ */
+export declare function buildMultiRepoTemplate(inputs: MultiRepoTemplateInputs): DockerTemplate;
 /**
  * Resolve `ref` (or the default branch) to a commit sha with `git ls-remote`
  * on the host, without cloning. A full sha is returned as is. Any failure

package/dist/template/repo-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repo-template.d.ts","sourceRoot":"","sources":["../../src/template/repo-template.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAkB5C;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,mEAAmE;IACnE,QAAQ,EAAE,MAAM,CAAC;IACjB,oGAAoG;IACpG,aAAa,CAAC,EAAE;QAAE,MAAM,EAAE,QAAQ,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CACrD;AAED,MAAM,WAAW,yBAAyB;IACxC;;;;;;;;;;;OAWG;IACH,mBAAmB,EACf,CAAC,CAAC,OAAO,CAAC,EAAE,gCAAgC,KAAK,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC,GACvF,SAAS,CAAC;IACd;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,+EAA+E;IAC/E,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACjC;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,gCAAgC,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IACtH;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iDAAiD;IACjD,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAED,MAAM,WAAW,gCAAgC;IAC/C,8EAA8E;IAC9E,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,uEAAuE;AACvE,MAAM,MAAM,0BAA0B,GAAG,CAAC,OAAO,CAAC,EAAE,gCAAgC,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;AAEjH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,GAAG,0BAA0B,GAAG,SAAS,CAUnH;AAkDD,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACjC,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CA4C5E;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA+B7B"}
+{"version":3,"file":"repo-template.d.ts","sourceRoot":"","sources":["../../src/template/repo-template.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/docker",
-  "version": "0.9.4-alpha.0",
+  "version": "0.10.0-alpha.1",
   "description": "Docker container sandbox provider for Mastra workspaces",
   "type": "module",
   "main": "dist/index.js",
@@ -34,10 +34,10 @@
     "tsdown": "0.22.9",
     "typescript": "^7.0.2",
     "vitest": "4.1.11",
+    "@internal/lint": "0.0.141",
     "@internal/types-builder": "0.0.116",
-    "@mastra/core": "1.76.0-alpha.1",
     "@internal/workspace-test-utils": "0.0.85",
-    "@internal/lint": "0.0.141",
+    "@mastra/core": "1.76.0-alpha.3",
     "@internal/workspace": "0.0.13"
   },
   "peerDependencies": {