trigger.dev 0.0.0-re2-20250203135244 → 0.0.0-re2-20250312163355

package/dist/esm/dev/devOutput.js

@@ -55,24 +55,22 @@ export function startDevOutput(options) {
             prettyError(`Build failed: ${errorText}`, stack);
         }
     };
-    const runStarted = (...[worker, payload]) => {
+    const runStarted = (...[worker, execution]) => {
         if (!worker.serverWorker) {
             return;
         }
-        const { execution } = payload;
         // ○ Mar 27 09:17:25.653 -> View logs | 20240326.20 | create-avatar | run_slufhjdfiv8ejnrkw9dsj.1
         const logsUrl = `${baseUrl}/runs/${execution.run.id}`;
         const pipe = chalkGrey("|");
         const bullet = chalkGrey("○");
         const link = chalkLink(cliLink("View logs", logsUrl));
-        let timestampPrefix = chalkGrey(prettyPrintDate(payload.execution.attempt.startedAt));
+        let timestampPrefix = chalkGrey(prettyPrintDate(execution.run.startedAt));
         const workerPrefix = chalkWorker(worker.serverWorker.version);
         const taskPrefix = chalkTask(execution.task.id);
         const runId = chalkRun(`${execution.run.id}.${execution.attempt.number}`);
         logger.log(`${bullet} ${timestampPrefix} ${chalkGrey("->")} ${isLinksSupported ? `${link} ${pipe}` : ""} ${workerPrefix} ${pipe} ${taskPrefix} ${pipe} ${runId}`);
     };
-    const runCompleted = (...[worker, payload, completion, durationMs]) => {
-        const { execution } = payload;
+    const runCompleted = (...[worker, execution, completion, durationMs]) => {
         const retryingText = chalkGrey(!completion.ok && completion.skippedRetrying
             ? " (retrying skipped)"
             : !completion.ok && completion.retry !== undefined
@@ -101,6 +99,12 @@ export function startDevOutput(options) {
         const runId = chalkRun(`${execution.run.id}.${execution.attempt.number}`);
         logger.log(`${bullet} ${timestampPrefix} ${chalkGrey("->")} ${isLinksSupported ? `${link} ${pipe}` : ""} ${workerPrefix} ${pipe} ${taskPrefix} ${pipe} ${runId} ${pipe} ${resultText} ${elapsedText}${errorText}`);
     };
+    const socketConnectionDisconnected = (reason) => {
+        logger.log(chalkGrey(`○ Connection was lost: ${reason}`));
+    };
+    const socketConnectionReconnected = (reason) => {
+        logger.log(chalkGrey(`○ Connection was restored`));
+    };
     eventBus.on("rebuildStarted", rebuildStarted);
     eventBus.on("buildStarted", buildStarted);
     eventBus.on("workerSkipped", workerSkipped);
@@ -108,6 +112,8 @@ export function startDevOutput(options) {
     eventBus.on("runStarted", runStarted);
     eventBus.on("runCompleted", runCompleted);
     eventBus.on("backgroundWorkerIndexingError", backgroundWorkerIndexingError);
+    eventBus.on("socketConnectionDisconnected", socketConnectionDisconnected);
+    eventBus.on("socketConnectionReconnected", socketConnectionReconnected);
     return () => {
         eventBus.off("rebuildStarted", rebuildStarted);
         eventBus.off("buildStarted", buildStarted);
@@ -116,6 +122,8 @@ export function startDevOutput(options) {
         eventBus.off("runStarted", runStarted);
         eventBus.off("runCompleted", runCompleted);
         eventBus.off("backgroundWorkerIndexingError", backgroundWorkerIndexingError);
+        eventBus.off("socketConnectionDisconnected", socketConnectionDisconnected);
+        eventBus.off("socketConnectionReconnected", socketConnectionReconnected);
     };
 }
 function formatErrorLog(error) {

package/dist/esm/dev/devOutput.js.map

@@ -1 +1 @@
-{"version":3,"file":"devOutput.js","sourceRoot":"","sources":["../../../src/dev/devOutput.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"devOutput.js","sourceRoot":"","sources":["../../../src/dev/devOutput.ts"],"names":[],"mappings":"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"}

package/dist/esm/dev/devSession.js

@@ -7,6 +7,7 @@ import { logger } from "../utilities/logger.js";
 import { clearTmpDirs, getTmpDir } from "../utilities/tempDirectories.js";
 import { startDevOutput } from "./devOutput.js";
 import { startWorkerRuntime } from "./devSupervisor.js";
+import { startMcpServer, stopMcpServer } from "./mcpServer.js";
 export async function startDevSession({ rawConfig, name, rawArgs, client, dashboardUrl, keepTmpFiles, }) {
     clearTmpDirs(rawConfig.workingDir);
     const destination = getTmpDir(rawConfig.workingDir, "build", keepTmpFiles);
@@ -17,6 +18,16 @@ export async function startDevSession({ rawConfig, name, rawArgs, client, dashbo
         client,
         dashboardUrl,
     });
+    if (rawArgs.mcp) {
+        await startMcpServer({
+            port: rawArgs.mcpPort,
+            cliApiClient: client,
+            devSession: {
+                dashboardUrl,
+                projectRef: rawConfig.project,
+            },
+        });
+    }
     const stopOutput = startDevOutput({
         name,
         dashboardUrl,
@@ -94,10 +105,8 @@ export async function startDevSession({ rawConfig, name, rawArgs, client, dashbo
                     // First bundle, no need to update bundle
                     bundled = true;
                 }
-                else {
-                    const workerDir = getTmpDir(rawConfig.workingDir, "build", keepTmpFiles);
-                    await updateBuild(result, workerDir);
-                }
+                const workerDir = getTmpDir(rawConfig.workingDir, "build", keepTmpFiles);
+                await updateBuild(result, workerDir);
             });
         },
     };
@@ -128,6 +137,7 @@ export async function startDevSession({ rawConfig, name, rawArgs, client, dashbo
             stopBundling?.().catch((error) => { });
             runtime.shutdown().catch((error) => { });
             stopOutput();
+            stopMcpServer();
         },
     };
 }

package/dist/esm/dev/devSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"devSession.js","sourceRoot":"","sources":["../../../src/dev/devSession.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"devSession.js","sourceRoot":"","sources":["../../../src/dev/devSession.ts"],"names":[],"mappings":"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"}

package/dist/esm/dev/devSupervisor.js

@@ -1,46 +1,72 @@
+import { setTimeout as awaitTimeout } from "node:timers/promises";
 import { SemanticInternalAttributes, } from "@trigger.dev/core/v3";
 import { resolveDotEnvVars } from "../utilities/dotEnv.js";
 import { eventBus } from "../utilities/eventBus.js";
 import { logger } from "../utilities/logger.js";
 import { sanitizeEnvVars } from "../utilities/sanitizeEnvVars.js";
 import { resolveSourceFiles } from "../utilities/sourceFiles.js";
-import { BackgroundWorkerEngine2 } from "./backgroundWorkerEngine2.js";
-import { chalkTask } from "../utilities/cliOutput.js";
+import { BackgroundWorker } from "./backgroundWorker.js";
+import { chalkTask, cliLink, prettyError } from "../utilities/cliOutput.js";
+import { DevRunController } from "../entryPoints/dev-run-controller.js";
+import { io } from "socket.io-client";
+import pLimit from "p-limit";
 export async function startWorkerRuntime(options) {
     const runtime = new DevSupervisor(options);
     await runtime.init();
     return runtime;
 }
+/**
+ * The DevSupervisor is used when you run the `trigger.dev dev` command (with engine 2.0+)
+ * It's responsible for:
+ *   - Creating/registering BackgroundWorkers
+ *   - Pulling runs from the queue
+ *   - Delegating executing the runs to DevRunController
+ *   - Receiving snapshot update pings (via socket)
+ */
 class DevSupervisor {
     options;
     config;
     disconnectPresence;
     lastManifest;
     latestWorkerId;
+    /** Receive notifications when runs change state */
+    socket;
+    socketIsReconnecting = false;
+    /** Workers are versions of the code */
     workers = new Map();
+    /** Map of run friendly id to run controller. They process runs from start to finish.  */
+    runControllers = new Map();
+    socketConnections = new Set();
+    runLimiter;
     constructor(options) {
         this.options = options;
     }
     async init() {
-        logger.debug("initialized worker runtime", { options: this.options });
+        logger.debug("[DevSupervisor] initialized worker runtime", { options: this.options });
         //get the settings for dev
-        const settings = await this.options.client.devConfig();
+        const settings = await this.options.client.dev.config();
         if (!settings.success) {
             throw new Error(`Failed to connect to ${this.options.client.apiURL}. Couldn't retrieve settings: ${settings.error}`);
         }
-        logger.debug("Got dev settings", { settings: settings.data });
+        logger.debug("[DevSupervisor] Got dev settings", { settings: settings.data });
         this.config = settings.data;
+        const maxConcurrentRuns = Math.min(this.config.maxConcurrentRuns, this.options.args.maxConcurrentRuns ?? this.config.maxConcurrentRuns);
+        logger.debug("[DevSupervisor] Using maxConcurrentRuns", { maxConcurrentRuns });
+        this.runLimiter = pLimit(maxConcurrentRuns);
+        this.#createSocket();
         //start an SSE connection for presence
         this.disconnectPresence = await this.#startPresenceConnection();
         //start dequeuing
         await this.#dequeueRuns();
-        //todo start dequeuing. Each time we dequeue:
-        // Before hitting the API we will see if there are enough resources to dequeue.
-        // 1. If there are messages we will wait a brief period of time and dequeue again
-        // 2. If there are no messages we will wait for a longer period of time and dequeue again
     }
     async shutdown() {
         this.disconnectPresence?.();
+        try {
+            this.socket.close();
+        }
+        catch (error) {
+            logger.debug("[DevSupervisor] shutdown, socket failed to close", { error });
+        }
     }
     async initializeWorker(manifest, stop) {
         if (this.lastManifest && this.lastManifest.contentHash === manifest.contentHash) {
@@ -49,7 +75,7 @@ class DevSupervisor {
             return;
         }
         const env = await this.#getEnvVars();
-        const backgroundWorker = new BackgroundWorkerEngine2(manifest, {
+        const backgroundWorker = new BackgroundWorker(manifest, {
             env,
             cwd: this.options.config.workingDir,
             stop,
@@ -59,9 +85,9 @@ class DevSupervisor {
             stop();
             throw new Error("Could not initialize worker");
         }
-        const issues = validateWorkerManifest(backgroundWorker.manifest);
-        if (issues.length > 0) {
-            issues.forEach((issue) => logger.error(issue));
+        const validationIssue = validateWorkerManifest(backgroundWorker.manifest);
+        if (validationIssue) {
+            prettyError(generationValidationIssueHeader(validationIssue), generateValidationIssueMessage(validationIssue, backgroundWorker.manifest, manifest), generateValidationIssueFooter(validationIssue));
             stop();
             return;
         }
@@ -96,62 +122,140 @@ class DevSupervisor {
     async #dequeueRuns() {
         if (!this.latestWorkerId) {
             //try again later
+            logger.debug(`[DevSupervisor] dequeueRuns. No latest worker ID, trying again later`);
             setTimeout(() => this.#dequeueRuns(), this.config.dequeueIntervalWithoutRun);
             return;
         }
+        if (this.runLimiter &&
+            this.runLimiter.activeCount + this.runLimiter.pendingCount > this.runLimiter.concurrency) {
+            logger.debug(`[DevSupervisor] dequeueRuns. Run limit reached, trying again later`);
+            setTimeout(() => this.#dequeueRuns(), this.config.dequeueIntervalWithoutRun);
+        }
         //get relevant versions
         //ignore deprecated and the latest worker
-        const oldWorkerIds = Array.from(this.workers.values())
-            .filter((worker) => !worker.deprecated && worker.serverWorker?.id !== this.latestWorkerId)
-            .map((worker) => worker.serverWorker?.id)
-            .filter((id) => id !== undefined);
+        const oldWorkerIds = this.#getActiveOldWorkers();
         try {
-            logger.debug(`Dequeue runs for versions`, {
-                oldWorkerIds,
-                latestWorkerId: this.latestWorkerId,
-            });
             //todo later we should track available resources and machines used, and pass them in here (it supports it)
-            const result = await this.options.client.devDequeue({
+            const result = await this.options.client.dev.dequeue({
                 currentWorker: this.latestWorkerId,
                 oldWorkers: oldWorkerIds,
             });
             if (!result.success) {
-                logger.error(`Failed to dequeue runs`, { error: result.error });
+                logger.debug(`[DevSupervisor] dequeueRuns. Failed to dequeue runs`, {
+                    error: result.error,
+                });
                 setTimeout(() => this.#dequeueRuns(), this.config.dequeueIntervalWithoutRun);
                 return;
             }
             //no runs, try again later
             if (result.data.dequeuedMessages.length === 0) {
-                logger.debug(`No runs dequeued`);
+                // logger.debug(`No dequeue runs for versions`, {
+                //   oldWorkerIds,
+                //   latestWorkerId: this.latestWorkerId,
+                // });
                 setTimeout(() => this.#dequeueRuns(), this.config.dequeueIntervalWithoutRun);
                 return;
             }
-            logger.debug(`Dequeued runs`, { dequeuedMessages: result.data.dequeuedMessages });
+            logger.debug(`[DevSupervisor] dequeueRuns. Results`, {
+                dequeuedMessages: JSON.stringify(result.data.dequeuedMessages),
+            });
+            //start runs
+            for (const message of result.data.dequeuedMessages) {
+                const worker = this.workers.get(message.backgroundWorker.friendlyId);
+                if (!worker) {
+                    logger.debug(`[DevSupervisor] dequeueRuns. Dequeued a run but there's no BackgroundWorker so we can't execute it`, {
+                        run: message.run.friendlyId,
+                        workerId: message.backgroundWorker.friendlyId,
+                    });
+                    //todo call the API to crash the run with a good message
+                    continue;
+                }
+                let runController = this.runControllers.get(message.run.friendlyId);
+                if (runController) {
+                    logger.debug(`[DevSupervisor] dequeueRuns. Dequeuing a run that already has a runController`, {
+                        runController: message.run.friendlyId,
+                    });
+                    //todo, what do we do here?
+                    //todo I think the run shouldn't exist and we should kill the process but TBC
+                    continue;
+                }
+                if (!worker.serverWorker) {
+                    logger.debug(`[DevSupervisor] dequeueRuns. Worker doesn't have a serverWorker`, {
+                        run: message.run.friendlyId,
+                        worker,
+                    });
+                    continue;
+                }
+                if (!worker.manifest) {
+                    logger.debug(`[DevSupervisor] dequeueRuns. Worker doesn't have a manifest`, {
+                        run: message.run.friendlyId,
+                        worker,
+                    });
+                    continue;
+                }
+                //new run
+                runController = new DevRunController({
+                    runFriendlyId: message.run.friendlyId,
+                    worker: worker,
+                    httpClient: this.options.client,
+                    logLevel: this.options.args.logLevel,
+                    onFinished: () => {
+                        logger.debug("[DevSupervisor] Run finished", { runId: message.run.friendlyId });
+                        //stop the run controller, and remove it
+                        runController?.stop();
+                        this.runControllers.delete(message.run.friendlyId);
+                        this.#unsubscribeFromRunNotifications(message.run.friendlyId);
+                        //stop the worker if it is deprecated and there are no more runs
+                        if (worker.deprecated) {
+                            this.#tryDeleteWorker(message.backgroundWorker.friendlyId).finally(() => { });
+                        }
+                    },
+                    onSubscribeToRunNotifications: async (run, snapshot) => {
+                        this.#subscribeToRunNotifications();
+                    },
+                    onUnsubscribeFromRunNotifications: async (run, snapshot) => {
+                        this.#unsubscribeFromRunNotifications(run.friendlyId);
+                    },
+                });
+                this.runControllers.set(message.run.friendlyId, runController);
+                if (this.runLimiter) {
+                    this.runLimiter(() => runController.start(message)).then(() => {
+                        logger.debug("[DevSupervisor] Run started", { runId: message.run.friendlyId });
+                    });
+                }
+                else {
+                    //don't await for run completion, we want to dequeue more runs
+                    runController.start(message).then(() => {
+                        logger.debug("[DevSupervisor] Run started", { runId: message.run.friendlyId });
+                    });
+                }
+            }
             setTimeout(() => this.#dequeueRuns(), this.config.dequeueIntervalWithRun);
         }
         catch (error) {
+            logger.debug(`[DevSupervisor] dequeueRuns. Error thrown`, { error });
             //dequeue again
             setTimeout(() => this.#dequeueRuns(), this.config.dequeueIntervalWithoutRun);
         }
     }
     async #startPresenceConnection() {
         try {
-            const eventSource = await this.options.client.devPresenceConnection();
+            const eventSource = await this.options.client.dev.presenceConnection();
             // Regular "ping" messages
             eventSource.addEventListener("presence", (event) => {
                 // logger.debug(`Presence ping received`, { event });
             });
             // Connection was lost and successfully reconnected
             eventSource.addEventListener("reconnect", (event) => {
-                logger.info("Presence connection restored");
+                logger.debug("[DevSupervisor] Presence connection restored");
             });
             // Handle messages that might have been missed during disconnection
             eventSource.addEventListener("missed_events", (event) => {
-                logger.warn("Missed some presence events during disconnection");
+                logger.debug("[DevSupervisor] Missed some presence events during disconnection");
             });
             // If you need to close it manually
             return () => {
-                logger.info("Closing presence connection");
+                logger.info("[DevSupervisor] Closing presence connection");
                 eventSource.close();
             };
         }
@@ -187,9 +291,143 @@ class DevSupervisor {
                 continue;
             }
             existingWorker.deprecate();
+            this.#tryDeleteWorker(workerId).finally(() => { });
         }
         this.workers.set(worker.serverWorker.id, worker);
     }
+    #createSocket() {
+        const wsUrl = new URL(this.options.client.apiURL);
+        wsUrl.pathname = "/dev-worker";
+        this.socket = io(wsUrl.href, {
+            transports: ["websocket"],
+            extraHeaders: {
+                Authorization: `Bearer ${this.options.client.accessToken}`,
+            },
+        });
+        this.socket.on("run:notify", async ({ version, run }) => {
+            logger.debug("[DevSupervisor] Received run notification", { version, run });
+            this.options.client.dev.sendDebugLog(run.friendlyId, {
+                time: new Date(),
+                message: "run:notify received by runner",
+            });
+            const controller = this.runControllers.get(run.friendlyId);
+            if (!controller) {
+                logger.debug("[DevSupervisor] Ignoring notification, no local run ID", {
+                    runId: run.friendlyId,
+                });
+                return;
+            }
+            await controller.getLatestSnapshot();
+        });
+        this.socket.on("connect", () => {
+            logger.debug("[DevSupervisor] Connected to supervisor");
+            if (this.socket.recovered || this.socketIsReconnecting) {
+                logger.debug("[DevSupervisor] Socket recovered");
+                eventBus.emit("socketConnectionReconnected", `Connection was recovered`);
+            }
+            this.socketIsReconnecting = false;
+            for (const controller of this.runControllers.values()) {
+                controller.resubscribeToRunNotifications();
+            }
+        });
+        this.socket.on("connect_error", (error) => {
+            logger.debug("[DevSupervisor] Connection error", { error });
+        });
+        this.socket.on("disconnect", (reason, description) => {
+            logger.debug("[DevSupervisor] socket was disconnected", {
+                reason,
+                description,
+                active: this.socket.active,
+            });
+            if (reason === "io server disconnect") {
+                // the disconnection was initiated by the server, you need to manually reconnect
+                this.socket.connect();
+            }
+            else {
+                this.socketIsReconnecting = true;
+                eventBus.emit("socketConnectionDisconnected", reason);
+            }
+        });
+        const interval = setInterval(() => {
+            logger.debug("[DevSupervisor] Socket connections", {
+                connections: Array.from(this.socketConnections),
+            });
+        }, 5000);
+    }
+    #subscribeToRunNotifications() {
+        const runFriendlyIds = Array.from(this.runControllers.keys());
+        if (!this.socket) {
+            logger.debug("[DevSupervisor] Socket not connected");
+            return;
+        }
+        for (const id of runFriendlyIds) {
+            this.socketConnections.add(id);
+        }
+        logger.debug("[DevSupervisor] Subscribing to run notifications", {
+            runFriendlyIds,
+            connections: Array.from(this.socketConnections),
+        });
+        this.socket.emit("run:subscribe", { version: "1", runFriendlyIds });
+    }
+    #unsubscribeFromRunNotifications(friendlyId) {
+        if (!this.socket) {
+            logger.debug("[DevSupervisor] Socket not connected");
+            return;
+        }
+        this.socketConnections.delete(friendlyId);
+        logger.debug("[DevSupervisor] Unsubscribing from run notifications", {
+            runFriendlyId: friendlyId,
+            connections: Array.from(this.socketConnections),
+        });
+        this.socket.emit("run:unsubscribe", { version: "1", runFriendlyIds: [friendlyId] });
+    }
+    #getActiveOldWorkers() {
+        return Array.from(this.workers.values())
+            .filter((worker) => {
+            //exclude the latest
+            if (worker.serverWorker?.id === this.latestWorkerId) {
+                return false;
+            }
+            //if it's deprecated AND there are no executing runs, then filter it out
+            if (worker.deprecated && worker.serverWorker?.id) {
+                return this.#workerHasInProgressRuns(worker.serverWorker.id);
+            }
+            return true;
+        })
+            .map((worker) => worker.serverWorker?.id)
+            .filter((id) => id !== undefined);
+    }
+    #workerHasInProgressRuns(friendlyId) {
+        for (const controller of this.runControllers.values()) {
+            logger.debug("[DevSupervisor] Checking controller", {
+                controllerFriendlyId: controller.workerFriendlyId,
+                friendlyId,
+            });
+            if (controller.workerFriendlyId === friendlyId) {
+                return true;
+            }
+        }
+        return false;
+    }
+    /** Deletes the worker if there are no active runs, after a delay */
+    async #tryDeleteWorker(friendlyId) {
+        await awaitTimeout(1_000);
+        this.#deleteWorker(friendlyId);
+    }
+    #deleteWorker(friendlyId) {
+        logger.debug("[DevSupervisor] Delete worker (if relevant)", {
+            workerId: friendlyId,
+        });
+        const worker = this.workers.get(friendlyId);
+        if (!worker) {
+            return;
+        }
+        if (this.#workerHasInProgressRuns(friendlyId)) {
+            return;
+        }
+        worker.stop();
+        this.workers.delete(friendlyId);
+    }
 }
 function gatherProcessEnv() {
     const $env = {
@@ -202,15 +440,63 @@ function gatherProcessEnv() {
 function validateWorkerManifest(manifest) {
     const issues = [];
     if (!manifest.tasks || manifest.tasks.length === 0) {
-        issues.push("No tasks defined. Make sure you are exporting tasks.");
+        return { type: "noTasksDefined" };
     }
     // Check for any duplicate task ids
     const taskIds = manifest.tasks.map((task) => task.id);
     const duplicateTaskIds = taskIds.filter((id, index) => taskIds.indexOf(id) !== index);
     if (duplicateTaskIds.length > 0) {
-        issues.push(createDuplicateTaskIdOutputErrorMessage(duplicateTaskIds, manifest.tasks));
+        return { type: "duplicateTaskId", duplicationTaskIds: duplicateTaskIds };
+    }
+    return undefined;
+}
+function generationValidationIssueHeader(issue) {
+    switch (issue.type) {
+        case "duplicateTaskId": {
+            return `Duplicate task ids detected`;
+        }
+        case "noTasksDefined": {
+            return `No tasks exported from your trigger files`;
+        }
+    }
+}
+function generateValidationIssueFooter(issue) {
+    switch (issue.type) {
+        case "duplicateTaskId": {
+            return cliLink("View the task docs", "https://trigger.dev/docs/tasks/overview");
+        }
+        case "noTasksDefined": {
+            return cliLink("View the task docs", "https://trigger.dev/docs/tasks/overview");
+        }
+    }
+}
+function generateValidationIssueMessage(issue, manifest, buildManifest) {
+    switch (issue.type) {
+        case "duplicateTaskId": {
+            return createDuplicateTaskIdOutputErrorMessage(issue.duplicationTaskIds, manifest.tasks);
+        }
+        case "noTasksDefined": {
+            return `
+        Files:
+        ${buildManifest.files.map((file) => file.entry).join("\n")}
+        Make sure you have at least one task exported from your trigger files.
+        You may have defined a task and forgot to add the export statement:
+        \`\`\`ts
+        import { task } from "@trigger.dev/sdk/v3";
+        👇 Don't forget this
+        export const myTask = task({
+          id: "myTask",
+          async run() {
+            // Your task logic here
+          }
+        });
+        \`\`\`
+      `.replace(/^ {8}/gm, "");
+        }
+        default: {
+            return `Unknown validation issue: ${issue}`;
+        }
     }
-    return issues;
 }
 function createDuplicateTaskIdOutputErrorMessage(duplicateTaskIds, tasks) {
     const duplicateTable = duplicateTaskIds
@@ -223,10 +509,4 @@ function createDuplicateTaskIdOutputErrorMessage(duplicateTaskIds, tasks) {
         .join("");
     return `Duplicate ${chalkTask("task id")} detected:${duplicateTable}`;
 }
-//todo ignore the dev queue pulling route in the rate limiter
-//todo the queue pull endpoint should just update the presence
-//todo ignore the dev presence
-//we will need to hit the presence endpoint if we aren't going to dequeue because of CPU/RAM
-//CLI hits an SSE endpoint, it will periodically update a last seen value in Redis. Look at how to do presence Redis.
-//Frontend will subscribe to Redis for this.
 //# sourceMappingURL=devSupervisor.js.map