Merge branch 'main' into fix/transient-object-storage

Author: AarishMansur

.changeset/fuzzy-wolves-repeat.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fix for the MCP tool that gets run logs to help debugging

apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts

@@ -1,7 +1,6 @@
 import {
   DeploymentErrorData,
   ExternalBuildData,
-  logger,
   prepareDeploymentError,
 } from "@trigger.dev/core/v3";
 import { type RuntimeEnvironment, type WorkerDeployment } from "@trigger.dev/database";
@@ -16,6 +15,7 @@ import { S2 } from "@s2-dev/streamstore";
 import { env } from "~/env.server";
 import { createRedisClient } from "~/redis.server";
 import { tryCatch } from "@trigger.dev/core";
+import { logger } from "~/services/logger.server";
 
 const S2_TOKEN_KEY_PREFIX = "s2-token:project:";
 

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx

@@ -137,7 +137,10 @@ export default function Page() {
       } catch (error) {
         if (abortController.signal.aborted) return;
 
-        const isNotFoundError = error instanceof S2Error && error.code === "stream_not_found";
+        const isNotFoundError =
+          error instanceof S2Error &&
+          error.code &&
+          ["permission_denied", "stream_not_found"].includes(error.code);
         if (isNotFoundError) return;
 
         console.error("Failed to stream logs:", error);

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

@@ -238,7 +238,7 @@ function formatSpan(
   const duration = formatDuration(span.data.duration);
   const startTime = formatDateTime(span.data.startTime);
 
-  lines.push(`${indent}${prefix} ${span.message} ${statusIndicator}`);
+  lines.push(`${indent}${prefix} ${span.data.message} ${statusIndicator}`);
   lines.push(`${indent}   Duration: ${duration}`);
   lines.push(`${indent}   Started: ${startTime}`);
 

packages/core/src/v3/schemas/api.ts

@@ -1267,9 +1267,9 @@ export type ApiBranchListResponseBody = z.infer<typeof ApiBranchListResponseBody
 export const RetrieveRunTraceSpanSchema = z.object({
   id: z.string(),
   parentId: z.string().optional(),
-  message: z.string(),
+  runId: z.string(),
   data: z.object({
-    runId: z.string(),
+    message: z.string(),
     taskSlug: z.string().optional(),
     taskPath: z.string().optional(),
     events: z.array(z.any()).optional(),
@@ -1279,7 +1279,6 @@ export const RetrieveRunTraceSpanSchema = z.object({
     isPartial: z.boolean(),
     isCancelled: z.boolean(),
     level: z.string(),
-    environmentType: z.string(),
     workerVersion: z.string().optional(),
     queueName: z.string().optional(),
     machinePreset: z.string().optional(),