@sanity/ailf 4.0.3 → 4.0.5

package/dist/orchestration/load-pipeline-tasks.d.ts

@@ -22,6 +22,12 @@ export interface LoadPipelineTasksOptions {
     mode: string;
     /** Optional extra directory for repo-based tasks (--repo-tasks-path) */
     repoTasksPath?: string;
+    /**
+     * When `"repo"`, load ONLY from `repoTasksPath` and skip the AILF
+     * bundled `tasks/${mode}/` directory. Mirrors the composition-root
+     * contract for `taskSourceType: "repo"` (see composition-root.ts).
+     */
+    taskSourceType?: "content-lake" | "repo";
 }
 /**
  * Load task definitions from the filesystem, matching the pipeline's

package/dist/orchestration/load-pipeline-tasks.js

@@ -26,8 +26,13 @@ import { resolveVendoredSubdir } from "../pipeline/compiler/config-loader.js";
  * match the requested mode are excluded.
  */
 export async function loadPipelineTasks(opts) {
-    const tasksDir = resolveVendoredSubdir(opts.rootDir, `tasks/${opts.mode}`);
-    const dirs = [tasksDir];
+    const dirs = [];
+    if (opts.taskSourceType !== "repo") {
+        dirs.push(resolveVendoredSubdir(opts.rootDir, `tasks/${opts.mode}`));
+    }
+    else if (!opts.repoTasksPath) {
+        throw new Error('taskSourceType "repo" requires repoTasksPath to be set (no AILF defaults loaded in repo-only mode)');
+    }
     if (opts.repoTasksPath) {
         const repoDir = resolve(opts.repoTasksPath);
         if (!dirs.includes(repoDir)) {

package/dist/orchestration/steps/fetch-docs-step.js

@@ -34,11 +34,16 @@ export class FetchDocsStep {
         // a mismatch where configs reference context files that were never
         // fetched.
         //
-        // Content Lake path: use ctx.taskSource (ContentLakeTaskSource) which
-        // loads Studio-owned ailf.task documents via GROQ.
-        // Filesystem path: load from .task.ts files (repo/inline tasks).
+        // Adapter path: ctx.taskSource handles both content-lake and repo modes.
+        // The composition root wires the right adapter (ContentLakeTaskSource
+        // or RepoTaskSource) per taskSourceType. RepoTaskSource loads BOTH
+        // .yaml and .task.ts files — necessary for external-consumer evals
+        // that materialize inline tasks as YAML (W0148).
+        // Filesystem path: load from .task.ts files (legacy unset path —
+        // AILF defaults from tasks/${mode}/ + optional repoTasksPath augment).
         let allTasks;
-        if (ctx.config.taskSourceType === "content-lake") {
+        if (ctx.config.taskSourceType === "content-lake" ||
+            ctx.config.taskSourceType === "repo") {
             const filter = {
                 ...(ctx.config.areas?.length ? { areas: ctx.config.areas } : {}),
                 ...(ctx.config.tasks?.length ? { taskIds: ctx.config.tasks } : {}),
@@ -51,6 +56,7 @@ export class FetchDocsStep {
                 rootDir: ctx.config.rootDir,
                 mode: ctx.config.mode,
                 repoTasksPath: ctx.config.repoTasksPath,
+                taskSourceType: ctx.config.taskSourceType,
             });
         }
         // Bridge: narrow to literacy tasks for canonical doc access

package/dist/orchestration/steps/generate-configs-step.d.ts

@@ -19,13 +19,14 @@ export declare class GenerateConfigsStep implements PipelineStep {
     private compileSingleMode;
     private loadTasks;
     /**
-     * Load tasks from the Content Lake via ctx.taskSource.
+     * Load tasks via ctx.taskSource (the composition-root-wired adapter).
      *
-     * The ContentLakeTaskSource adapter handles area/task/tag filtering
-     * in the GROQ query itself, so we build a FilterOptions and pass it
-     * through rather than filtering in-memory after loading.
+     * Used for both `taskSourceType === "content-lake"` (ContentLakeTaskSource)
+     * and `taskSourceType === "repo"` (RepoTaskSource). Filtering by
+     * area/task/tag is delegated to the adapter — ContentLakeTaskSource
+     * pushes it into the GROQ query, RepoTaskSource applies it in-memory.
      */
-    private loadTasksFromContentLake;
+    private loadTasksFromAdapter;
     /**
      * Load tasks from filesystem .task.ts files.
      *

package/dist/orchestration/steps/generate-configs-step.js

@@ -209,23 +209,30 @@ export class GenerateConfigsStep {
     // Task loading — unified for all modes
     // ---------------------------------------------------------------------------
     async loadTasks(ctx, mode, state) {
-        // Content Lake path — use ctx.taskSource (ContentLakeTaskSource) which
-        // loads ailf.task documents via GROQ. This is the only path that sees
-        // Studio-owned tasks (ownership: "studio").
-        if (ctx.config.taskSourceType === "content-lake") {
-            return this.loadTasksFromContentLake(ctx, state);
+        // Adapter path — use ctx.taskSource. The composition root wires the
+        // right adapter for each taskSourceType:
+        //   - "content-lake" → ContentLakeTaskSource (Studio-owned ailf.task docs)
+        //   - "repo"         → RepoTaskSource (loads .yaml AND .task.ts from repoTasksPath)
+        // Routing both through ctx.taskSource keeps the orchestration step
+        // file-format-agnostic (W0148: external-consumer evals materialize
+        // inline tasks as .yaml, which loadPipelineTasks can't read).
+        if (ctx.config.taskSourceType === "content-lake" ||
+            ctx.config.taskSourceType === "repo") {
+            return this.loadTasksFromAdapter(ctx, state);
         }
-        // Filesystem path — load from .task.ts files (repo tasks, inline tasks).
+        // Filesystem path — load from .task.ts files (legacy unset path:
+        // AILF defaults from tasks/${mode}/ + optional repoTasksPath augment).
         return this.loadTasksFromFilesystem(ctx, mode, state);
     }
     /**
-     * Load tasks from the Content Lake via ctx.taskSource.
+     * Load tasks via ctx.taskSource (the composition-root-wired adapter).
      *
-     * The ContentLakeTaskSource adapter handles area/task/tag filtering
-     * in the GROQ query itself, so we build a FilterOptions and pass it
-     * through rather than filtering in-memory after loading.
+     * Used for both `taskSourceType === "content-lake"` (ContentLakeTaskSource)
+     * and `taskSourceType === "repo"` (RepoTaskSource). Filtering by
+     * area/task/tag is delegated to the adapter — ContentLakeTaskSource
+     * pushes it into the GROQ query, RepoTaskSource applies it in-memory.
      */
-    async loadTasksFromContentLake(ctx, state) {
+    async loadTasksFromAdapter(ctx, state) {
         const filter = {
             ...(ctx.config.areas?.length ? { areas: ctx.config.areas } : {}),
             ...(ctx.config.tasks?.length ? { taskIds: ctx.config.tasks } : {}),
@@ -259,8 +266,17 @@ export class GenerateConfigsStep {
         // Discover task files from the mode-specific directory and --repo-tasks-path.
         // Use vendored copies in dist/ when @sanity/ailf-core isn't resolvable
         // (i.e., running outside the monorepo via npx).
-        const tasksDir = resolveVendoredSubdir(ctx.config.rootDir, `tasks/${mode}`);
-        const dirs = [tasksDir];
+        //
+        // When taskSourceType === "repo", skip the AILF-bundled tasks/${mode}/
+        // directory and load ONLY from repoTasksPath. Mirrors the composition-root
+        // contract for repo-only mode (see composition-root.ts:392-405).
+        const dirs = [];
+        if (ctx.config.taskSourceType !== "repo") {
+            dirs.push(resolveVendoredSubdir(ctx.config.rootDir, `tasks/${mode}`));
+        }
+        else if (!ctx.config.repoTasksPath) {
+            throw new Error('taskSourceType "repo" requires repoTasksPath to be set (no AILF defaults loaded in repo-only mode)');
+        }
         // Also search --repo-tasks-path (e.g., .ailf/tasks/) for repo-based tasks
         if (ctx.config.repoTasksPath) {
             const repoDir = resolve(ctx.config.repoTasksPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/ailf",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "private": false,
   "publishConfig": {
     "access": "public"