fix: address review comments — key caches by project/env, fix profile persistence race, escape backslashes in markdown

Author: ericallam

.changeset/fix-dev-build-dir-leak.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fix dev CLI leaking build directories on rebuild, causing disk space accumulation. Deprecated workers are now pruned (capped at 2 retained) when no active runs reference them. The watchdog process also cleans up `.trigger/tmp/` when the dev CLI is killed ungracefully (e.g. SIGKILL from pnpm).

packages/cli-v3/src/mcp/context.ts

@@ -51,17 +51,24 @@ export type McpContextOptions = {
 export class McpContext {
   public readonly server: McpServer;
   public readonly options: McpContextOptions;
+  private _profileLoaded: Promise<void> | undefined;
+  private _resolveProfileLoaded: (() => void) | undefined;
 
   constructor(server: McpServer, options: McpContextOptions) {
     this.server = server;
     this.options = options;
+    this._profileLoaded = new Promise((resolve) => {
+      this._resolveProfileLoaded = resolve;
+    });
   }
 
   get logger() {
     return this.options.fileLogger;
   }
 
   public async getAuth() {
+    // Wait for project profile to be loaded before authenticating
+    await this._profileLoaded;
     const auth = await mcpAuth({
       server: this.server,
       defaultApiUrl: this.options.apiUrl,
@@ -212,15 +219,20 @@ export class McpContext {
   /**
    * Load the persisted profile from the project-scoped .trigger/mcp.json.
    * Overrides the default global profile with the project-scoped one.
+   * Must be called once after initialization — tools wait for this before authenticating.
    */
   public async loadProjectProfile() {
-    const cwd = await this.getCwd();
-    if (!cwd) return;
-
-    const config = readMcpProjectConfig(cwd);
-    if (config?.profile) {
-      this.options.profile = config.profile;
-      this.logger?.log("Loaded project profile", { profile: config.profile, cwd });
+    try {
+      const cwd = await this.getCwd();
+      if (!cwd) return;
+
+      const config = readMcpProjectConfig(cwd);
+      if (config?.profile) {
+        this.options.profile = config.profile;
+        this.logger?.log("Loaded project profile", { profile: config.profile, cwd });
+      }
+    } finally {
+      this._resolveProfileLoaded?.();
     }
   }
 

packages/cli-v3/src/mcp/tools/dashboards.ts

@@ -4,9 +4,8 @@ import { formatQueryResults } from "../formatters.js";
 import { ListDashboardsInput, RunDashboardQueryInput } from "../schemas.js";
 import { respondWithError, toolHandler } from "../utils.js";
 
-// Cache dashboard listings to avoid refetching on every run_dashboard_query call.
-// Dashboards are defined in server code and rarely change.
-let dashboardCache: { data: ListDashboardsResponseBody; expiresAt: number } | null = null;
+// Cache dashboard listings keyed by project/environment.
+const dashboardCache = new Map<string, { data: ListDashboardsResponseBody; expiresAt: number }>();
 const CACHE_TTL_MS = 5 * 60 * 1000; // 5 minutes
 
 export const listDashboardsTool = {
@@ -35,8 +34,9 @@ export const listDashboardsTool = {
       branch: input.branch,
     });
 
+    const cacheKey = `${projectRef}:${input.environment}:${input.branch ?? ""}`;
     const result = await apiClient.listDashboards();
-    dashboardCache = { data: result, expiresAt: Date.now() + CACHE_TTL_MS };
+    dashboardCache.set(cacheKey, { data: result, expiresAt: Date.now() + CACHE_TTL_MS });
 
     const content: string[] = ["## Available Dashboards", ""];
 
@@ -90,12 +90,14 @@ export const runDashboardQueryTool = {
     });
 
     // Use cached dashboard listing if available, otherwise fetch
+    const cacheKey = `${projectRef}:${input.environment}:${input.branch ?? ""}`;
+    const cached = dashboardCache.get(cacheKey);
     let dashboards: ListDashboardsResponseBody;
-    if (dashboardCache && Date.now() < dashboardCache.expiresAt) {
-      dashboards = dashboardCache.data;
+    if (cached && Date.now() < cached.expiresAt) {
+      dashboards = cached.data;
     } else {
       dashboards = await apiClient.listDashboards();
-      dashboardCache = { data: dashboards, expiresAt: Date.now() + CACHE_TTL_MS };
+      dashboardCache.set(cacheKey, { data: dashboards, expiresAt: Date.now() + CACHE_TTL_MS });
     }
     const dashboard = dashboards.dashboards.find((d) => d.key === input.dashboardKey);
 

packages/cli-v3/src/mcp/tools/profiles.ts

@@ -106,12 +106,19 @@ export const switchProfileTool = {
 
     const previousProfile = ctx.options.profile ?? readAuthConfigCurrentProfileName();
     const projectDir = await ctx.getCwd();
-    ctx.switchProfile(input.profile, projectDir);
+
+    // Switch in-memory first (don't persist until auth succeeds)
+    ctx.switchProfile(input.profile);
 
     // Verify the new profile works by fetching auth
     try {
       const auth = await ctx.getAuth();
 
+      // Auth succeeded — now persist to project config
+      if (projectDir) {
+        ctx.switchProfile(input.profile, projectDir);
+      }
+
       const persisted = projectDir ? " (saved to project)" : " (session only)";
 
       const content = [
@@ -125,8 +132,8 @@ export const switchProfileTool = {
         content: [{ type: "text" as const, text: content.join("\n") }],
       };
     } catch (error) {
-      // Revert on failure
-      ctx.switchProfile(previousProfile, projectDir);
+      // Revert in-memory only (nothing was persisted)
+      ctx.switchProfile(previousProfile);
       return respondWithError(
         `Failed to authenticate with profile "${input.profile}". Reverted to "${previousProfile}".`
       );

packages/cli-v3/src/mcp/tools/query.ts

@@ -4,8 +4,8 @@ import { formatQueryResults } from "../formatters.js";
 import { QueryInput, QuerySchemaInput } from "../schemas.js";
 import { respondWithError, toolHandler } from "../utils.js";
 
-// Cache query schema (rarely changes)
-let schemaCache: { data: QuerySchemaResponseBody; expiresAt: number } | null = null;
+// Cache query schema keyed by project/environment (rarely changes)
+const schemaCache = new Map<string, { data: QuerySchemaResponseBody; expiresAt: number }>();
 const SCHEMA_CACHE_TTL_MS = 60 * 60 * 1000; // 1 hour
 
 export const queryTool = {
@@ -93,7 +93,7 @@ function formatSchemaTable(table: QuerySchemaTable): string {
     }
 
     const core = col.coreColumn ? " *" : "";
-    const desc = parts.join(". ").replace(/\|/g, "\\|");
+    const desc = parts.join(". ").replace(/\\/g, "\\\\").replace(/\|/g, "\\|");
 
     lines.push(`| \`${col.name}\`${core} | ${col.type} | ${desc} |`);
   }
@@ -130,12 +130,14 @@ export const getQuerySchemaTool = {
       branch: input.branch,
     });
 
+    const cacheKey = `${projectRef}:${input.environment}:${input.branch ?? ""}`;
+    const cached = schemaCache.get(cacheKey);
     let schema: QuerySchemaResponseBody;
-    if (schemaCache && Date.now() < schemaCache.expiresAt) {
-      schema = schemaCache.data;
+    if (cached && Date.now() < cached.expiresAt) {
+      schema = cached.data;
     } else {
       schema = await apiClient.getQuerySchema();
-      schemaCache = { data: schema, expiresAt: Date.now() + SCHEMA_CACHE_TTL_MS };
+      schemaCache.set(cacheKey, { data: schema, expiresAt: Date.now() + SCHEMA_CACHE_TTL_MS });
     }
 
     const table = schema.tables.find((t) => t.name === input.table);