more coderabbit

Author: ericallam

apps/webapp/app/routes/api.v1.orgs.$orgParam.projects.ts

@@ -10,6 +10,7 @@ import { prisma } from "~/db.server";
 import { createProject } from "~/models/project.server";
 import { logger } from "~/services/logger.server";
 import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
+import { isCuid } from "cuid";
 
 const ParamsSchema = z.object({
   orgParam: z.string(),
@@ -135,7 +136,3 @@ function orgParamWhereClause(orgParam: string) {
     slug: orgParam,
   };
 }
-
-function isCuid(orgParam: string): boolean {
-  return /^[0-9A-HJ-NP-TV-Z]{25}$/.test(orgParam);
-}

apps/webapp/app/routes/api.v1.projects.$projectRef.$env.jwt.ts

@@ -1,4 +1,4 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { ActionFunctionArgs, json } from "@remix-run/node";
 import { generateJWT as internal_generateJWT } from "@trigger.dev/core/v3";
 import { z } from "zod";
 import { prisma } from "~/db.server";
@@ -10,8 +10,6 @@ const ParamsSchema = z.object({
   env: z.enum(["dev", "staging", "prod", "preview"]),
 });
 
-type ParamsSchema = z.infer<typeof ParamsSchema>;
-
 const RequestBodySchema = z.object({
   claims: z
     .object({
@@ -21,7 +19,7 @@ const RequestBodySchema = z.object({
   expirationTime: z.union([z.number(), z.string()]).optional(),
 });
 
-export async function action({ request, params }: LoaderFunctionArgs) {
+export async function action({ request, params }: ActionFunctionArgs) {
   const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
 
   if (!authenticationResult) {

apps/webapp/app/routes/api.v1.runs.ts

@@ -18,9 +18,7 @@ export const loader = createLoaderApiRoute(
     },
     findResource: async () => 1, // This is a dummy function, we don't need to find a resource
   },
-  async ({ searchParams, authentication, apiVersion, headers }) => {
-    logger.info("api.v1.runs.loader", { searchParams, authentication, apiVersion, headers });
-
+  async ({ searchParams, authentication, apiVersion }) => {
     const presenter = new ApiRunListPresenter();
     const result = await presenter.call(
       authentication.environment.project,

apps/webapp/app/services/routeBuilders/apiBuilder.server.ts

@@ -703,6 +703,14 @@ export function createActionApiRoute<
         ? await options.findResource(parsedParams, authenticationResult, parsedSearchParams)
         : undefined;
 
+      if (options.findResource && !resource) {
+        return await wrapResponse(
+          request,
+          json({ error: "Resource not found" }, { status: 404 }),
+          corsStrategy !== "none"
+        );
+      }
+
       const result = await handler({
         params: parsedParams,
         searchParams: parsedSearchParams,

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

@@ -72,7 +72,7 @@ export async function mcpCommand(options: McpCommandOptions) {
   });
 
   server.server.oninitialized = async () => {
-    fileLogger?.log("initialized mcp command", { options, argv: process.argv, env: process.env });
+    fileLogger?.log("initialized mcp command", { options, argv: process.argv });
   };
 
   // Start receiving messages on stdin and sending messages on stdout

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

@@ -1,16 +1,17 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { FileLogger } from "./logger.js";
-import { createApiClientWithPublicJWT, mcpAuth } from "./auth.js";
+import { tryCatch } from "@trigger.dev/core/utils";
+import { ApiClient } from "@trigger.dev/core/v3";
+import path from "node:path";
 import { CliApiClient } from "../apiClient.js";
+import { loadConfig } from "../config.js";
+import { mcpAuth } from "./auth.js";
 import {
   hasElicitationCapability,
   hasRootsCapability,
   hasSamplingCapability,
 } from "./capabilities.js";
-import path from "node:path";
-import { tryCatch } from "@trigger.dev/core/utils";
-import { loadConfig } from "../config.js";
-import { ApiClient } from "@trigger.dev/core/v3";
+import { FileLogger } from "./logger.js";
+import { fileURLToPath } from "node:url";
 
 export type McpContextOptions = {
   projectRef?: string;
@@ -85,7 +86,7 @@ export class McpContext {
     const response = await this.server.server.listRoots();
 
     if (response.roots.length >= 1) {
-      return response.roots[0]?.uri ? fileUriToPath(response.roots[0].uri) : undefined;
+      return response.roots[0]?.uri ? fileURLToPath(response.roots[0].uri) : undefined;
     }
 
     return undefined;
@@ -184,7 +185,3 @@ export class McpContext {
     return hasElicitationCapability(this.server);
   }
 }
-
-function fileUriToPath(uri: string) {
-  return uri.replace("file://", "");
-}

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

@@ -7,6 +7,7 @@ import { x } from "tinyexec";
 import { getPackageJson, tryResolveTriggerPackageVersion } from "../../commands/update.js";
 import { VERSION } from "../../version.js";
 import { resolveSync as esmResolve } from "mlly";
+import { fileURLToPath } from "node:url";
 
 export const deployTool = {
   name: toolsMetadata.deploy.name,
@@ -171,7 +172,7 @@ async function tryResolveTriggerCLIPath(
       url: basedir,
     });
 
-    const resolvedPath = fileUriToPath(resolvedPathFileURI);
+    const resolvedPath = fileURLToPath(resolvedPathFileURI);
 
     context.logger?.log("resolve_cli_exec resolvedPathFileURI", { resolvedPathFileURI });
 
@@ -202,7 +203,3 @@ async function tryResolveTriggerCLIPath(
     return undefined;
   }
 }
-
-function fileUriToPath(uri: string) {
-  return uri.replace("file://", "");
-}