@mrrlin-dev/mcp 0.4.55 → 0.4.59

package/dist/bin.cjs

@@ -21134,7 +21134,7 @@ function browserTable(binPath, distribution, homeDir) {
 }
 function blockRegex(id) {
   const escaped = id.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  return new RegExp(`(^|\\n)\\[mcp_servers\\.${escaped}\\][\\s\\S]*?(?=\\n\\[|$)`);
+  return new RegExp(`(^|\\n)\\[mcp_servers\\.${escaped}\\][\\s\\S]*?(?=\\n\\[(?!\\]|mcp_servers\\.${escaped}\\.)|$)`);
 }
 function renderBlock(id, expected) {
   const lines2 = [
@@ -36969,7 +36969,7 @@ var ARTIFACT_CHECKS = {
 var ARTIFACT_DESTINATIONS = {
   document: "wiki",
   page: "git",
-  file_set: null,
+  file_set: "artifacts",
   code_change: "git",
   structured_data: null,
   message: null
@@ -36978,6 +36978,52 @@ function resolveKindCapability(kind) {
   return ARTIFACT_DESTINATIONS[kind];
 }
 
+// ../../packages/schemas/dist/capability-refusal.js
+var REFUSAL_TEMPLATES = {
+  no_route: {
+    happened: ({ artifactKind, projectSlug }) => `Nothing is configured to deliver \`${artifactKind}\` for project \`${projectSlug}\`.`,
+    action: ({ capability }) => `Grant an MCP server that provides the "${capability}" capability and route it on the Integrations page. Retrying before that will refuse identically.`
+  },
+  no_grant: {
+    happened: ({ projectSlug, capability }) => `Project \`${projectSlug}\` routes "${capability}" to a server whose access has been revoked.`,
+    action: () => "Grant that server again on the Integrations page, or re-point the route. Retrying before that will refuse identically."
+  },
+  project_mismatch: {
+    happened: ({ capability }) => `The route for "${capability}" belongs to a different project than this task does.`,
+    action: () => "Mrrlin refuses rather than delivering one project's work into another project's destination. Re-point the route in the task's own project."
+  },
+  ambiguous_route: {
+    happened: ({ projectSlug, artifactKind }) => `Project \`${projectSlug}\` has more than one route that delivers \`${artifactKind}\`.`,
+    action: () => "Mrrlin will not guess which one. Name the capability explicitly, or remove the route you do not want."
+  },
+  blocked_kind: {
+    happened: ({ artifactKind }) => `Mrrlin has no destination for \`${artifactKind}\` yet.`,
+    action: () => "Produce a kind that does have one, or record the result on the task instead."
+  },
+  gate_refused: {
+    happened: ({ projectSlug }) => `The operator declined this action for project \`${projectSlug}\`.`,
+    action: () => "This is an answer, not a failure \u2014 do not retry it. Ask the operator directly if it should be allowed."
+  },
+  transport_error: {
+    happened: () => "Mrrlin could not reach the service that decides whether this delivery is allowed, so nothing was sent.",
+    action: () => "This is safe to retry."
+  },
+  delivery_failed: {
+    happened: ({ projectSlug }) => `The delivery was allowed, but the destination itself failed for project \`${projectSlug}\`.`,
+    action: () => "It may have partly completed, so do not blindly retry \u2014 check whether the result already exists first."
+  }
+};
+function describeCapabilityRefusal(input) {
+  const ctx = {
+    projectSlug: input.projectSlug,
+    capability: input.capability ?? "the requested capability",
+    artifactKind: input.artifactKind ?? "this artifact kind"
+  };
+  const template = REFUSAL_TEMPLATES[input.reason];
+  const happened = typeof input.detail === "string" && input.detail.length > 0 ? input.detail : template.happened(ctx);
+  return `${happened} ${template.action(ctx)}`;
+}
+
 // ../../packages/schemas/dist/operationIds.js
 var openApiOperationIds = {
   appendExecutionArtifact: "appendExecutionArtifact",
@@ -42488,7 +42534,7 @@ Do NOT derail the current task - if the operator has an in-flight question, answ
 }
 
 // src/_generated/version.ts
-var PKG_VERSION = "0.4.55";
+var PKG_VERSION = "0.4.59";
 
 // src/api-base-url-migrate.ts
 var import_node_fs4 = __toESM(require("node:fs"), 1);
@@ -42758,7 +42804,7 @@ function migrateCodexConfig(deps = {}) {
   const text = d.readFile(file2);
   const host = findRetiredHost(text);
   if (!host && !hasLiveLegacyStagingFlag(text, "toml")) return { file: file2, status: "clean" };
-  const managedBlockRe = /^\[mcp_servers\.mrrlin\][^\n]*\n(?:(?!\[)[^\n]*\n?)*/gm;
+  const managedBlockRe = /^\[mcp_servers\.mrrlin(?:\]|\.env\])[^\n]*\n(?:(?!\[)[^\n]*\n?)*/gm;
   const blocks = text.match(managedBlockRe) ?? [];
   if (blocks.length === 0) {
     return {
@@ -42773,34 +42819,52 @@ function migrateCodexConfig(deps = {}) {
   let out = text;
   let changed = 0;
   for (const block of blocks) {
+    let blockNextApiUrl;
+    const urlMatch = /MRRLIN_API_BASE_URL\s*=\s*"([^"]*)"/.exec(block);
+    const matchedUrl = urlMatch?.[1];
+    if (matchedUrl !== void 0) {
+      const successor = migratedApiUrl(matchedUrl);
+      if (successor) blockNextApiUrl = successor;
+    }
+    if (!blockNextApiUrl && /MRRLIN_STAGING\s*=\s*"1"/.test(block)) {
+      blockNextApiUrl = STAGING_API_BASE_URL;
+    }
     let blockChanged = false;
     const healedBlock = block.split("\n").map((line) => {
       if (line.trimStart().startsWith("#")) return line;
-      let nextApiUrl;
       let healedLine = line.replace(assignRe, (match, url2) => {
         const successor = migratedApiUrl(url2);
         if (!successor) return match;
-        nextApiUrl = successor;
         return `MRRLIN_API_BASE_URL = ${JSON.stringify(successor)}`;
       });
       healedLine = healedLine.replace(stagingAssignRe, () => {
-        nextApiUrl = STAGING_API_BASE_URL;
         return `MRRLIN_API_BASE_URL = ${JSON.stringify(STAGING_API_BASE_URL)}`;
       });
-      if (nextApiUrl && isFirstPartyOrLoopbackUrl(nextApiUrl)) {
+      if (blockNextApiUrl && isFirstPartyOrLoopbackUrl(blockNextApiUrl)) {
         healedLine = healedLine.replace(
           allowRemoteAssignRe,
           (match) => match.startsWith(",") && match.endsWith(",") ? "," : ""
         ).replace(/\{\s*,\s*/, "{ ").replace(/,\s*\}/, " }").replace(/,\s*,/g, ",");
+        if (/^[ \t]*MRRLIN_API_ALLOW_REMOTE\s*=\s*"1"[ \t]*$/.test(healedLine)) {
+          healedLine = "";
+        }
       }
       if (healedLine !== line) blockChanged = true;
       return healedLine;
+    }).filter((line, i) => {
+      if (line === "" && block.split("\n")[i] !== "") return false;
+      return true;
     }).join("\n");
     if (!blockChanged) continue;
-    const deduped = healedBlock.replace(
+    let deduped = healedBlock.replace(
       /MRRLIN_API_BASE_URL = "https:\/\/api-staging\.mrrlin\.com"\s*,\s*MRRLIN_API_BASE_URL = "https:\/\/api-staging\.mrrlin\.com"/g,
       `MRRLIN_API_BASE_URL = "https://api-staging.mrrlin.com"`
     );
+    deduped = deduped.replace(
+      /^[ \t]*MRRLIN_API_BASE_URL\s*=\s*"https:\/\/api-staging\.mrrlin\.com"[ \t]*\r?\n([\s\S]*?)^[ \t]*MRRLIN_API_BASE_URL\s*=\s*"https:\/\/api-staging\.mrrlin\.com"[ \t]*\r?\n/gm,
+      `MRRLIN_API_BASE_URL = "https://api-staging.mrrlin.com"
+$1`
+    );
     out = out.replace(block, () => deduped);
     changed += 1;
   }
@@ -48117,7 +48181,7 @@ async function driveRun(deps, projectSlug, runId) {
           task,
           runId,
           leaseId,
-          `capability_not_routed: run ${runId} targets ${task.id}, which requires artifact kind "${kind}" -- that kind has no capability at all`,
+          `capability_not_routed: run ${runId} targets ${task.id}, ${describeCapabilityRefusal({ reason: "blocked_kind", projectSlug, artifactKind: kind })}`,
           "capability_not_routed"
         );
         return;
@@ -48130,7 +48194,12 @@ async function driveRun(deps, projectSlug, runId) {
           task,
           runId,
           leaseId,
-          `capability_not_routed: run ${runId} targets ${task.id}, which requires artifact kind "${kind}" -- no route (${routeResolution.reason})`,
+          // Consensus round 1 (chunk 4): capability was omitted here, so no_route/no_grant/
+          // project_mismatch's action text (which interpolates it) fell back to the literal string
+          // "the requested capability" instead of naming "wiki"/"artifacts"/"git" -- resolveKindCapability
+          // is non-null on this branch (the blocked_kind check above already returned if it were),
+          // matching deliverBuiltIn's identical call in tools.ts.
+          `capability_not_routed: run ${runId} targets ${task.id}, ${describeCapabilityRefusal({ reason: routeResolution.reason, projectSlug, artifactKind: kind, capability: resolveKindCapability(kind), detail: routeResolution.message })}`,
           "capability_not_routed"
         );
         return;
@@ -64906,6 +64975,81 @@ async function deliverToGit(server, toolName, payload) {
   return invokeCapability(server, toolName, args);
 }
 
+// src/mcp-tool-error.ts
+var McpToolCodedError = class extends Error {
+  code;
+  violations;
+  constructor(code, message, violations) {
+    super(message);
+    this.name = "McpToolCodedError";
+    this.code = code;
+    this.violations = violations;
+  }
+};
+
+// src/delivery/artifacts.ts
+async function deliverToArtifacts(client, projectSlug, payload, bareFetch) {
+  const { bytes: bytes3, class: artifactClass, contentType, description, filename, runId, taskId } = payload;
+  const created = await client.createArtifactFile(projectSlug, {
+    class: artifactClass,
+    contentType,
+    filename,
+    runId,
+    sizeBytes: bytes3.byteLength,
+    taskId
+  });
+  let stage = "upload";
+  try {
+    if (created.upload.kind === "presigned-post") {
+      const form = new FormData();
+      for (const [field, value] of Object.entries(created.upload.fields)) {
+        form.append(field, value);
+      }
+      form.append("file", new Blob([bytes3], { type: contentType }), filename);
+      const fetchImpl = bareFetch ?? globalThis.fetch;
+      const uploadResponse = await fetchImpl(created.upload.url, { body: form, method: "POST" });
+      if (!uploadResponse.ok) {
+        throw new Error(`Presigned upload failed: ${uploadResponse.status} ${await uploadResponse.text()}`);
+      }
+    } else {
+      await client.uploadArtifactFileContent(projectSlug, created.artifact.id, bytes3, contentType);
+    }
+    stage = "complete";
+    const completed = await client.completeArtifactFile(projectSlug, created.artifact.id);
+    if (completed.runId) {
+      stage = "append-run-artifact";
+      await client.appendExecutionArtifact(projectSlug, completed.runId, {
+        id: `EA-${completed.id}`,
+        kind: "file",
+        payload: {
+          artifactFileId: completed.id,
+          class: completed.class,
+          contentType: completed.contentType,
+          description: description ?? null,
+          filename: completed.filename,
+          sizeBytes: completed.sizeBytes,
+          stableUrl: created.stableUrl
+        }
+      });
+    }
+    const markdown = contentType.startsWith("image/") ? `![${completed.filename}](${created.stableUrl})` : `[${completed.filename}](${created.stableUrl})`;
+    return {
+      artifactFile: completed,
+      markdown,
+      stableUrl: created.stableUrl
+    };
+  } catch (error51) {
+    const original = error51 instanceof MrrlinApiError ? error51.code : error51 instanceof McpToolCodedError ? error51.code : "ARTIFACT_FILE_UPLOAD_FAILED";
+    const message = error51 instanceof Error ? error51.message : String(error51);
+    const note = stage === "append-run-artifact" ? "file uploaded and completed successfully; only the run-history append failed \u2014 do NOT re-upload, reference the stableUrl directly" : "a pending row may remain; it is reaped automatically after 1h";
+    throw new McpToolCodedError(
+      original,
+      `artifactFileId=${created.artifact.id} stableUrl=${created.stableUrl} (failed at ${stage}; ${note}): ${message}`,
+      error51 instanceof MrrlinApiError ? error51.violations ?? void 0 : error51 instanceof McpToolCodedError ? error51.violations : void 0
+    );
+  }
+}
+
 // src/delivery/index.ts
 async function deliverThroughCapability(client, input) {
   if (resolveKindCapability(input.artifactKind) === null) {
@@ -64923,7 +65067,7 @@ async function deliverThroughCapability(client, input) {
     return { ok: false, reason: "transport_error" };
   }
   if (!resolution.ok) {
-    return { ok: false, reason: resolution.reason };
+    return { ok: false, reason: resolution.reason, message: resolution.message };
   }
   const { route, verdict } = resolution;
   if (verdict === "silent") {
@@ -64945,7 +65089,14 @@ var NoGrantForServerError = class extends Error {
 };
 async function proceedToDestination(client, route, input) {
   try {
-    const result = await callDestination(client, input.taskProjectSlug, route, input.payload, input.mcpConfigPath);
+    const result = await callDestination(
+      client,
+      input.taskProjectSlug,
+      route,
+      input.payload,
+      input.mcpConfigPath,
+      input.bareFetch
+    );
     const recorded = await recordUse(client, route, input, "ok");
     return { ok: true, use: recorded, result };
   } catch (error51) {
@@ -64954,7 +65105,15 @@ async function proceedToDestination(client, route, input) {
       return { ok: false, reason: "no_grant" };
     }
     await recordUse(client, route, input, "error");
-    return { ok: false, reason: "delivery_failed" };
+    const code = error51 instanceof McpToolCodedError || error51 instanceof MrrlinApiError ? error51.code : void 0;
+    const violations = error51 instanceof MrrlinApiError || error51 instanceof McpToolCodedError ? error51.violations : void 0;
+    return {
+      ok: false,
+      reason: "delivery_failed",
+      message: error51 instanceof Error ? error51.message : void 0,
+      code,
+      violations
+    };
   }
 }
 async function refuse(client, route, input) {
@@ -65111,7 +65270,7 @@ async function recordUse(client, route, input, outcome) {
     return null;
   }
 }
-async function callDestination(client, projectSlug, route, payload, mcpConfigPath) {
+async function callDestination(client, projectSlug, route, payload, mcpConfigPath, bareFetch) {
   const operation = isRecord6(payload) ? payload.operation : void 0;
   if (route.capability === "wiki") {
     if (operation !== "create" && operation !== "update") {
@@ -65127,6 +65286,12 @@ async function callDestination(client, projectSlug, route, payload, mcpConfigPat
     if (server === null) throw new NoGrantForServerError(`no local MCP config for server "${route.serverId}"`);
     return deliverToGit(server, route.toolName, payload);
   }
+  if (route.capability === "artifacts") {
+    if (operation !== "upload") {
+      throw new Error(`callDestination: payload.operation "${String(operation)}" is not valid for artifacts`);
+    }
+    return deliverToArtifacts(client, projectSlug, payload, bareFetch);
+  }
   throw new Error(`callDestination: no destination wired for capability "${route.capability}"`);
 }
 function isRecord6(value) {
@@ -67298,14 +67463,6 @@ var ARTIFACT_EXTENSION_TYPES = {
   ".webp": "image/webp",
   ".gif": "image/gif"
 };
-var McpToolCodedError = class extends Error {
-  code;
-  constructor(code, message) {
-    super(message);
-    this.name = "McpToolCodedError";
-    this.code = code;
-  }
-};
 function withAuth(options) {
   const baseFetch = options.fetch ?? globalThis.fetch;
   const authedFetch = async (input, init = {}) => {
@@ -67343,7 +67500,11 @@ function classifyClientError(fallbackCode, fallbackMessage, raw) {
     };
   }
   if (raw instanceof McpToolCodedError) {
-    return { code: raw.code, message: raw.message || fallbackMessage };
+    return {
+      code: raw.code,
+      message: raw.message || fallbackMessage,
+      ...raw.violations ? { violations: raw.violations } : {}
+    };
   }
   if (raw instanceof Error) {
     return { code: fallbackCode, message: raw.message || fallbackMessage };
@@ -67370,18 +67531,33 @@ function pingAsyncWorkerDispatch(projectSlug, jobId) {
   }).catch(() => {
   });
 }
-async function deliverBuiltIn(client, projectSlug, artifactKind, payload, mcpConfigPath) {
+async function deliverBuiltIn(client, projectSlug, artifactKind, payload, extra = {}) {
   const result = await deliverThroughCapability(client, {
     projectSlug,
     taskProjectSlug: projectSlug,
     artifactKind,
-    taskId: null,
-    runId: null,
+    taskId: extra.taskId ?? null,
+    runId: extra.runId ?? null,
     payload,
-    mcpConfigPath
+    mcpConfigPath: extra.mcpConfigPath,
+    bareFetch: extra.bareFetch
   });
   if (!result.ok) {
-    throw new McpToolCodedError(`CAPABILITY_${result.reason.toUpperCase()}`, `Delivery refused: ${result.reason}`);
+    throw new McpToolCodedError(
+      result.code ?? `CAPABILITY_${result.reason.toUpperCase()}`,
+      describeCapabilityRefusal({
+        reason: result.reason,
+        projectSlug,
+        artifactKind,
+        capability: resolveKindCapability(artifactKind),
+        detail: result.message
+      }),
+      // Consensus round 1 (chunk 4): a destination's own MrrlinApiError (e.g. artifact-file creation's
+      // 409) carries structured violations that classifyClientError already surfaces for every other
+      // tool -- deliverThroughCapability threads them onto DeliveryResult, converted here from the
+      // nullable client shape to McpToolCodedError's optional-array one.
+      result.violations ?? void 0
+    );
   }
   return result.result;
 }
@@ -67463,68 +67639,6 @@ async function getAgentProviderForPanel(client, opts = {}) {
 }
 function createMrrlinTools(options) {
   const client = createMrrlinClient(withAuth(options));
-  async function uploadArtifactBytes(c, args) {
-    const { bytes: bytes3, class: artifactClass, contentType, description, filename, projectSlug, runId, taskId } = args;
-    const created = await c.createArtifactFile(projectSlug, {
-      class: artifactClass,
-      contentType,
-      filename,
-      runId,
-      sizeBytes: bytes3.byteLength,
-      taskId
-    });
-    let stage = "upload";
-    try {
-      if (created.upload.kind === "presigned-post") {
-        const form = new FormData();
-        for (const [field, value] of Object.entries(created.upload.fields)) {
-          form.append(field, value);
-        }
-        form.append("file", new Blob([bytes3], { type: contentType }), filename);
-        const bareFetch = options.fetch ?? globalThis.fetch;
-        const uploadResponse = await bareFetch(created.upload.url, { body: form, method: "POST" });
-        if (!uploadResponse.ok) {
-          throw new Error(
-            `Presigned upload failed: ${uploadResponse.status} ${await uploadResponse.text()}`
-          );
-        }
-      } else {
-        await c.uploadArtifactFileContent(projectSlug, created.artifact.id, bytes3, contentType);
-      }
-      stage = "complete";
-      const completed = await c.completeArtifactFile(projectSlug, created.artifact.id);
-      if (completed.runId) {
-        stage = "append-run-artifact";
-        await c.appendExecutionArtifact(projectSlug, completed.runId, {
-          id: `EA-${completed.id}`,
-          kind: "file",
-          payload: {
-            artifactFileId: completed.id,
-            class: completed.class,
-            contentType: completed.contentType,
-            description: description ?? null,
-            filename: completed.filename,
-            sizeBytes: completed.sizeBytes,
-            stableUrl: created.stableUrl
-          }
-        });
-      }
-      const markdown = contentType.startsWith("image/") ? `![${completed.filename}](${created.stableUrl})` : `[${completed.filename}](${created.stableUrl})`;
-      return {
-        artifactFile: completed,
-        markdown,
-        stableUrl: created.stableUrl
-      };
-    } catch (error51) {
-      const original = error51 instanceof MrrlinApiError ? error51.code : error51 instanceof McpToolCodedError ? error51.code : "ARTIFACT_FILE_UPLOAD_FAILED";
-      const message = error51 instanceof Error ? error51.message : String(error51);
-      const note = stage === "append-run-artifact" ? "file uploaded and completed successfully; only the run-history append failed \u2014 do NOT re-upload, reference the stableUrl directly" : "a pending row may remain; it is reaped automatically after 1h";
-      throw new McpToolCodedError(
-        original,
-        `artifactFileId=${created.artifact.id} stableUrl=${created.stableUrl} (failed at ${stage}; ${note}): ${message}`
-      );
-    }
-  }
   return {
     [mcpToolNames.archivePlan]: makeTool(
       client,
@@ -67569,7 +67683,7 @@ function createMrrlinTools(options) {
         projectSlug,
         "code_change",
         { operation: "branch", ...input },
-        options.mcpConfigPath
+        { mcpConfigPath: options.mcpConfigPath }
       )
     ),
     [mcpToolNames.createGithubPullRequest]: makeTool(
@@ -67582,7 +67696,7 @@ function createMrrlinTools(options) {
         projectSlug,
         "code_change",
         { operation: "pull_request", ...input },
-        options.mcpConfigPath
+        { mcpConfigPath: options.mcpConfigPath }
       )
     ),
     [mcpToolNames.createPlan]: makeTool(
@@ -67659,7 +67773,7 @@ function createMrrlinTools(options) {
         projectSlug,
         "document",
         { operation: "create", page: input },
-        options.mcpConfigPath
+        { mcpConfigPath: options.mcpConfigPath }
       )
     ),
     [mcpToolNames.deleteTaskDependency]: makeTool(
@@ -67854,7 +67968,7 @@ function createMrrlinTools(options) {
         projectSlug,
         "document",
         { operation: "update", pageId, patch },
-        options.mcpConfigPath
+        { mcpConfigPath: options.mcpConfigPath }
       )
     ),
     [mcpToolNames.markSpecReady]: makeTool(
@@ -68152,16 +68266,13 @@ function createMrrlinTools(options) {
           );
         }
         const filename = import_node_path32.default.basename(filePath);
-        return uploadArtifactBytes(c, {
-          bytes: bytes3,
-          class: artifactClass,
-          contentType,
-          description,
-          filename,
+        return deliverBuiltIn(
+          c,
           projectSlug,
-          runId,
-          taskId
-        });
+          "file_set",
+          { operation: "upload", bytes: bytes3, class: artifactClass, contentType, description, filename, runId, taskId },
+          { mcpConfigPath: options.mcpConfigPath, bareFetch: options.fetch ?? globalThis.fetch, taskId, runId }
+        );
       }
     ),
     [mcpToolNames.deliverFile]: makeTool(
@@ -68197,16 +68308,13 @@ function createMrrlinTools(options) {
             "Artifact exceeds 5MB; split or summarize instead."
           );
         }
-        return uploadArtifactBytes(c, {
-          bytes: bytes3,
-          class: artifactClass,
-          contentType,
-          description,
-          filename,
+        return deliverBuiltIn(
+          c,
           projectSlug,
-          runId,
-          taskId
-        });
+          "file_set",
+          { operation: "upload", bytes: bytes3, class: artifactClass, contentType, description, filename, runId, taskId },
+          { mcpConfigPath: options.mcpConfigPath, bareFetch: options.fetch ?? globalThis.fetch, taskId, runId }
+        );
       }
     ),
     [mcpToolNames.listArtifactFiles]: makeTool(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrrlin-dev/mcp",
-  "version": "0.4.55",
+  "version": "0.4.59",
   "type": "module",
   "bin": {
     "mrrlin-mcp": "dist/bin.cjs"
@@ -24,8 +24,8 @@
     "@mrrlin/client": "0.0.0",
     "@mrrlin/agent-client": "0.0.0",
     "@mrrlin/director-e2e": "0.0.0",
-    "@mrrlin/tsconfig": "0.0.0",
     "@mrrlin/schemas": "0.0.0",
+    "@mrrlin/tsconfig": "0.0.0",
     "@mrrlin/wiki": "0.0.0"
   },
   "dependencies": {