@mgsoftwarebv/mg-dashboard-mcp 2.2.1 → 2.2.3

package/dist/index.js

@@ -16,11 +16,14 @@ var TERMINAL_STATUSES = /* @__PURE__ */ new Set([
   "INTERRUPTED",
   "EXPIRED"
 ]);
-var DEFAULT_TRIGGER_SERVER_ID = "03659d55-e194-400d-b82a-bf6457371ded";
+var TRIGGER_SERVER_ID = "03659d55-e194-400d-b82a-bf6457371ded";
+var COMPOSE_PROJECT = "mg-dashboard-supabase-trigger";
+var PG_CONTAINER = `${COMPOSE_PROJECT}-postgres-1`;
+var WA_CONTAINER = `${COMPOSE_PROJECT}-webapp-1`;
 var TRIGGER_TOOLS = [
   {
     name: "trigger-list",
-    description: "List all Trigger.dev projects on the Trigger server. Returns the compose project name, webapp port, and status. Use the project name in other trigger-* tools.",
+    description: 'List all Trigger.dev projects. Returns the project slug and name. Use the slug as the "project" parameter in other trigger-* tools.',
     inputSchema: {
       type: "object",
       properties: {}
@@ -32,7 +35,7 @@ var TRIGGER_TOOLS = [
     inputSchema: {
       type: "object",
       properties: {
-        project: { type: "string", description: "Compose project name (from trigger-list)" },
+        project: { type: "string", description: 'Project slug from trigger-list (e.g. "mg-dashboard-bHfS")' },
         status: {
           type: "string",
           description: "Comma-separated status filter: QUEUED,EXECUTING,COMPLETED,FAILED,CRASHED,CANCELED,SYSTEM_FAILURE"
@@ -49,7 +52,7 @@ var TRIGGER_TOOLS = [
     inputSchema: {
       type: "object",
       properties: {
-        project: { type: "string", description: "Compose project name" },
+        project: { type: "string", description: "Project slug from trigger-list" },
         runId: { type: "string", description: "Run ID (e.g. run_xxxxx)" }
       },
       required: ["project", "runId"]
@@ -61,7 +64,7 @@ var TRIGGER_TOOLS = [
     inputSchema: {
       type: "object",
       properties: {
-        project: { type: "string", description: "Compose project name" },
+        project: { type: "string", description: "Project slug from trigger-list" },
         taskId: { type: "string", description: 'Task identifier (e.g. "hello-world", "execute-pipeline")' },
         payload: { type: "string", description: "JSON payload string to pass to the task (optional)" },
         waitSeconds: { type: "number", description: "Max seconds to wait for completion (default 60, max 300)" }
@@ -75,7 +78,7 @@ var TRIGGER_TOOLS = [
     inputSchema: {
       type: "object",
       properties: {
-        project: { type: "string", description: "Compose project name" },
+        project: { type: "string", description: "Project slug from trigger-list" },
         runId: { type: "string", description: "Run ID to cancel (e.g. run_xxxxx)" }
       },
       required: ["project", "runId"]
@@ -87,7 +90,7 @@ var TRIGGER_TOOLS = [
     inputSchema: {
       type: "object",
       properties: {
-        project: { type: "string", description: "Compose project name" },
+        project: { type: "string", description: "Project slug from trigger-list" },
         runId: { type: "string", description: "Run ID to replay (e.g. run_xxxxx)" }
       },
       required: ["project", "runId"]
@@ -103,12 +106,11 @@ var TRIGGER_TOOL_MODULE_MAP = {
   "trigger-cancel-run": "ci_cd",
   "trigger-replay-run": "ci_cd"
 };
-async function discoverInstance(project, conn, proxy, sshExec2) {
-  const pg = `${project}-postgres-1`;
-  const wa = `${project}-webapp-1`;
+async function discoverInstance(projectSlug, conn, proxy, sshExec2) {
+  const sql = `SELECT re.\\"apiKey\\" FROM \\"RuntimeEnvironment\\" re JOIN \\"Project\\" p ON re.\\"projectId\\" = p.id WHERE p.slug='${projectSlug}' AND re.slug='prod' LIMIT 1`;
   const cmd = [
-    `PORT=$(docker port "${wa}" 3000/tcp 2>/dev/null | head -1 | sed 's/.*://')`,
-    `KEY=$(docker exec "${pg}" psql -U postgres -d main -t -A -c "SELECT \\"apiKey\\" FROM \\"RuntimeEnvironment\\" WHERE slug='prod' LIMIT 1" 2>/dev/null | tr -d '[:space:]')`,
+    `PORT=$(docker port "${WA_CONTAINER}" 3000/tcp 2>/dev/null | head -1 | sed 's/.*://')`,
+    `KEY=$(docker exec "${PG_CONTAINER}" psql -U postgres -d main -t -A -c "${sql}" 2>/dev/null | tr -d '[:space:]')`,
     'echo "$PORT|$KEY"'
   ].join(" && ");
   const result = await sshExec2(conn, cmd, proxy);
@@ -118,18 +120,35 @@ async function discoverInstance(project, conn, proxy, sshExec2) {
   const apiKey2 = sepIdx > 0 ? output.substring(sepIdx + 1) : "";
   if (!port) {
     throw new Error(
-      `Could not find webapp port for ${wa}. Is the container running? Use trigger-list to see available instances.`
+      `Could not find webapp port for ${WA_CONTAINER}. Is the container running?`
     );
   }
   if (!apiKey2) {
     throw new Error(
-      `Could not get API key from ${pg}. Check if the Trigger.dev database is accessible and the RuntimeEnvironment table exists.`
+      `Could not get API key for project "${projectSlug}". Check if the project slug is correct (use trigger-list).`
     );
   }
   return { port, apiKey: apiKey2 };
 }
+async function fetchRunLogs(runId, conn, proxy, sshExec2) {
+  const sql = `SELECT level, message, \\"isError\\", \\"createdAt\\" FROM \\"TaskEvent\\" WHERE \\"runId\\" = '${runId}' AND level IN ('INFO','WARN','ERROR','DEBUG','LOG','TRACE') ORDER BY \\"startTime\\" ASC LIMIT 200`;
+  const cmd = `docker exec "${PG_CONTAINER}" psql -U postgres -d main -t -A -c "${sql}" 2>/dev/null`;
+  const result = await sshExec2(conn, cmd, proxy);
+  const output = result.stdout.trim();
+  if (!output) return "";
+  return output.split("\n").map((line) => {
+    const parts = line.split("|");
+    const level = (parts[0] || "").padEnd(5);
+    const message = parts[1] || "";
+    const isError = parts[2] === "t";
+    const ts = parts[3] || "";
+    const time = ts ? ts.split(" ")[1]?.substring(0, 8) || "" : "";
+    const prefix = isError ? "!" : " ";
+    return `${prefix}${time} [${level}] ${message}`;
+  }).join("\n");
+}
 async function triggerApi(conn, proxy, sshExec2, instance, method, path, body) {
-  const parts = ["curl", "-s", "--max-time", "30"];
+  const parts = ["curl", "-s", "-g", "--max-time", "30"];
   if (method !== "GET") parts.push("-X", method);
   parts.push(`"http://localhost:${instance.port}${path}"`);
   parts.push(`-H "Authorization: Bearer ${instance.apiKey}"`);
@@ -191,35 +210,22 @@ function formatRunDetail(run) {
 }
 async function handleTriggerTool(name, args2, deps) {
   const { sshExec: sshExec2, getServerConnection: getServerConnection2 } = deps;
-  const serverId = DEFAULT_TRIGGER_SERVER_ID;
+  const { conn, proxy } = await getServerConnection2(TRIGGER_SERVER_ID);
   switch (name) {
     // -----------------------------------------------------------------
     case "trigger-list": {
-      const { conn, proxy } = await getServerConnection2(serverId);
-      const script = [
-        "FOUND=0",
-        "for PG in $(docker ps --format '{{.Names}}' | grep -E 'trigger.*-postgres-[0-9]+$'); do",
-        `  PROJECT=$(echo "$PG" | sed 's/-postgres-[0-9]*$//')`,
-        '  WA="${PROJECT}-webapp-1"',
-        `  PORT=$(docker port "$WA" 3000/tcp 2>/dev/null | head -1 | sed 's/.*://')`,
-        `  STATUS=$(docker inspect -f '{{.State.Status}}' "$WA" 2>/dev/null || echo 'not_found')`,
-        `  RUNNING=$(docker ps --filter "label=com.docker.compose.project=\${PROJECT}" --format '{{.Names}}' 2>/dev/null | wc -l)`,
-        `  TOTAL=$(docker ps -a --filter "label=com.docker.compose.project=\${PROJECT}" --format '{{.Names}}' 2>/dev/null | wc -l)`,
-        '  echo "${PROJECT}|${PORT:-?}|${STATUS}|${RUNNING}/${TOTAL}"',
-        "  FOUND=1",
-        "done",
-        '[ "$FOUND" = "0" ] && echo "NO_INSTANCES"'
-      ].join("\n");
-      const result = await sshExec2(conn, script, proxy);
+      const sql = 'SELECT slug, name FROM \\"Project\\" ORDER BY name';
+      const cmd = `docker exec "${PG_CONTAINER}" psql -U postgres -d main -t -A -c "${sql}" 2>/dev/null`;
+      const result = await sshExec2(conn, cmd, proxy);
       const output = result.stdout.trim();
-      if (!output || output === "NO_INSTANCES") {
-        return { content: [{ type: "text", text: "No Trigger.dev instances found on this server. Check if Docker containers are running." }] };
+      if (!output) {
+        return { content: [{ type: "text", text: "No Trigger.dev projects found." }] };
       }
-      const header = `${"PROJECT".padEnd(45)}  ${"PORT".padEnd(6)}  ${"WEBAPP".padEnd(12)}  CONTAINERS`;
-      const sep = "-".repeat(85);
+      const header = `${"SLUG".padEnd(25)}  NAME`;
+      const sep = "-".repeat(55);
       const lines = output.split("\n").map((line) => {
-        const [project, port, status, containers] = line.split("|");
-        return `${(project || "").padEnd(45)}  ${(port || "?").padEnd(6)}  ${(status || "?").padEnd(12)}  ${containers || "?"}`;
+        const [slug, name2] = line.split("|");
+        return `${(slug || "").padEnd(25)}  ${name2 || ""}`;
       });
       return { content: [{ type: "text", text: `${header}
 ${sep}
@@ -228,12 +234,11 @@ ${lines.join("\n")}` }] };
     // -----------------------------------------------------------------
     case "trigger-runs": {
       const project = String(args2.project);
-      const { conn, proxy } = await getServerConnection2(serverId);
       const instance = await discoverInstance(project, conn, proxy, sshExec2);
       const limit = Math.min(Math.max(Number(args2.limit) || 20, 1), 100);
-      const queryParts = [`page[size]=${limit}`];
-      if (args2.status) queryParts.push(`filter[status]=${String(args2.status)}`);
-      if (args2.taskIdentifier) queryParts.push(`filter[taskIdentifier]=${String(args2.taskIdentifier)}`);
+      const queryParts = [`page%5Bsize%5D=${limit}`];
+      if (args2.status) queryParts.push(`filter%5Bstatus%5D=${String(args2.status)}`);
+      if (args2.taskIdentifier) queryParts.push(`filter%5BtaskIdentifier%5D=${String(args2.taskIdentifier)}`);
       const rawJson = await triggerApi(
         conn,
         proxy,
@@ -256,7 +261,6 @@ ${rawJson.substring(0, 500)}` }] };
     case "trigger-run-detail": {
       const project = String(args2.project);
       const runId = String(args2.runId);
-      const { conn, proxy } = await getServerConnection2(serverId);
       const instance = await discoverInstance(project, conn, proxy, sshExec2);
       const rawJson = await triggerApi(
         conn,
@@ -273,14 +277,18 @@ ${rawJson.substring(0, 500)}` }] };
         return { content: [{ type: "text", text: `Invalid API response:
 ${rawJson.substring(0, 500)}` }] };
       }
-      return { content: [{ type: "text", text: formatRunDetail(run) }] };
+      const logs = await fetchRunLogs(runId, conn, proxy, sshExec2);
+      let text = formatRunDetail(run);
+      if (logs) {
+        text += "\n\n--- Logs ---\n" + logs;
+      }
+      return { content: [{ type: "text", text }] };
     }
     // -----------------------------------------------------------------
     case "trigger-test-task": {
       const project = String(args2.project);
       const taskId = String(args2.taskId);
       const waitSeconds = Math.min(Math.max(Number(args2.waitSeconds) || 60, 5), 300);
-      const { conn, proxy } = await getServerConnection2(serverId);
       conn.timeout = (waitSeconds + 30) * 1e3;
       const instance = await discoverInstance(project, conn, proxy, sshExec2);
       let payload = "{}";
@@ -336,7 +344,10 @@ ${triggerJson.substring(0, 500)}` }] };
           continue;
         }
         if (TERMINAL_STATUSES.has(run.status)) {
-          return { content: [{ type: "text", text: formatRunDetail(run) }] };
+          let text = formatRunDetail(run);
+          const logs = await fetchRunLogs(runId, conn, proxy, sshExec2);
+          if (logs) text += "\n\n--- Logs ---\n" + logs;
+          return { content: [{ type: "text", text }] };
         }
       }
       return {
@@ -350,7 +361,6 @@ ${triggerJson.substring(0, 500)}` }] };
     case "trigger-cancel-run": {
       const project = String(args2.project);
       const runId = String(args2.runId);
-      const { conn, proxy } = await getServerConnection2(serverId);
       const instance = await discoverInstance(project, conn, proxy, sshExec2);
       const rawJson = await triggerApi(
         conn,
@@ -378,7 +388,6 @@ ${rawJson.substring(0, 500)}` }] };
     case "trigger-replay-run": {
       const project = String(args2.project);
       const runId = String(args2.runId);
-      const { conn, proxy } = await getServerConnection2(serverId);
       const instance = await discoverInstance(project, conn, proxy, sshExec2);
       const rawJson = await triggerApi(
         conn,