@executor-js/plugin-mcp 1.5.15 → 1.5.16

package/dist/{AddMcpSource-URN7Y5IO.js → AddMcpSource-H67EJXJ7.js}

@@ -6,8 +6,8 @@ import {
   mcpAuthMethodInputFromEditorValue,
   mcpWireAuthInput,
   probeMcpEndpoint
-} from "./chunk-SJ4LKQVQ.js";
-import "./chunk-3H5Y7JCQ.js";
+} from "./chunk-AMC5G2HJ.js";
+import "./chunk-4V3H3DDH.js";
 
 // src/react/AddMcpSource.tsx
 import { useReducer, useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -592,4 +592,4 @@ function AddMcpSource(props) {
 export {
   AddMcpSource as default
 };
-//# sourceMappingURL=AddMcpSource-URN7Y5IO.js.map
+//# sourceMappingURL=AddMcpSource-H67EJXJ7.js.map

package/dist/{EditMcpSource-3S6FUVCR.js → EditMcpSource-AS3ZTP6W.js}

@@ -4,8 +4,8 @@ import {
   mcpAuthMethodInputFromEditorValue,
   mcpServerAtom,
   mcpWireAuthInput
-} from "./chunk-SJ4LKQVQ.js";
-import "./chunk-3H5Y7JCQ.js";
+} from "./chunk-AMC5G2HJ.js";
+import "./chunk-4V3H3DDH.js";
 
 // src/react/EditMcpSource.tsx
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -156,4 +156,4 @@ function EditMcpSource({ sourceId, onPendingChange }) {
 export {
   EditMcpSource as default
 };
-//# sourceMappingURL=EditMcpSource-3S6FUVCR.js.map
+//# sourceMappingURL=EditMcpSource-AS3ZTP6W.js.map

package/dist/{McpAccountsPanel-273WNH3T.js → McpAccountsPanel-4F5WE7FH.js}

@@ -4,8 +4,8 @@ import {
   mcpAuthMethodInputsFromPlacements,
   mcpServerAtom,
   mcpWireAuthInput
-} from "./chunk-SJ4LKQVQ.js";
-import "./chunk-3H5Y7JCQ.js";
+} from "./chunk-AMC5G2HJ.js";
+import "./chunk-4V3H3DDH.js";
 
 // src/react/McpAccountsPanel.tsx
 import { useCallback, useMemo } from "react";
@@ -80,4 +80,4 @@ function McpAccountsPanel(props) {
 export {
   McpAccountsPanel as default
 };
-//# sourceMappingURL=McpAccountsPanel-273WNH3T.js.map
+//# sourceMappingURL=McpAccountsPanel-4F5WE7FH.js.map

package/dist/api/index.d.ts

@@ -16,8 +16,8 @@ export declare const mcpHttpPlugin: import("@executor-js/sdk/core").ConfiguredPl
     } | {
         connected: false;
         requiresAuthentication: true;
-        requiresOAuth: true;
-        supportsDynamicRegistration: boolean;
+        requiresOAuth: false;
+        supportsDynamicRegistration: false;
         name: string;
         slug: string;
         toolCount: null;
@@ -26,8 +26,8 @@ export declare const mcpHttpPlugin: import("@executor-js/sdk/core").ConfiguredPl
     } | {
         connected: false;
         requiresAuthentication: true;
-        requiresOAuth: false;
-        supportsDynamicRegistration: false;
+        requiresOAuth: true;
+        supportsDynamicRegistration: boolean;
         name: string;
         slug: string;
         toolCount: null;

package/dist/{chunk-3AGPV4QE.js → chunk-2CAKFQPL.js}

@@ -6,6 +6,7 @@ import {
   McpAuthShorthand,
   McpConnectionError,
   McpInvocationError,
+  McpOAuthReauthorizationRequired,
   McpRemoteTransport,
   McpToolAnnotations,
   McpToolDiscoveryError,
@@ -13,7 +14,7 @@ import {
   mcpAuthMethodFromShorthand,
   normalizeMcpAuthMethods,
   parseMcpIntegrationConfig
-} from "./chunk-3H5Y7JCQ.js";
+} from "./chunk-4V3H3DDH.js";
 
 // src/sdk/manifest.ts
 import { Option, Schema } from "effect";
@@ -93,7 +94,7 @@ var deriveMcpNamespace = (input) => {
 };
 
 // src/sdk/plugin.ts
-import { Effect as Effect5, Match, Option as Option4, Result, Schema as Schema4 } from "effect";
+import { Effect as Effect5, Option as Option4, Result, Schema as Schema4 } from "effect";
 import { CallToolResultSchema } from "@modelcontextprotocol/sdk/types.js";
 import * as z from "zod/v4";
 import {
@@ -119,7 +120,7 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { CfWorkerJsonSchemaValidator } from "@modelcontextprotocol/sdk/validation/cfworker";
-import { Effect } from "effect";
+import { Effect, Predicate } from "effect";
 var buildEndpointUrl = (endpoint, queryParams) => {
   const url = new URL(endpoint);
   for (const [key, value] of Object.entries(queryParams)) {
@@ -138,15 +139,18 @@ var connectionFromClient = (client) => ({
   client,
   close: () => client.close()
 });
+var connectionFailure = (transport, message, cause) => {
+  if (Predicate.isTagged(cause, "McpOAuthReauthorizationRequired")) {
+    return new McpOAuthReauthorizationRequired({ message: "MCP OAuth re-authorization required" });
+  }
+  return new McpConnectionError({ transport, message });
+};
 var connectClient = (input) => Effect.gen(function* () {
   const client = createClient();
   const transportInstance = input.createTransport();
   yield* Effect.tryPromise({
     try: () => client.connect(transportInstance),
-    catch: () => new McpConnectionError({
-      transport: input.transport,
-      message: `Failed connecting via ${input.transport}`
-    })
+    catch: (cause) => connectionFailure(input.transport, `Failed connecting via ${input.transport}`, cause)
   }).pipe(
     Effect.withSpan("plugin.mcp.connection.handshake", {
       attributes: { "plugin.mcp.transport": input.transport }
@@ -204,7 +208,11 @@ var createMcpConnector = (input) => {
   });
   if (remoteTransport === "streamable-http") return connectStreamableHttp;
   if (remoteTransport === "sse") return connectSse;
-  return connectStreamableHttp.pipe(Effect.catch(() => connectSse));
+  return connectStreamableHttp.pipe(
+    Effect.catch(
+      (error) => Predicate.isTagged(error, "McpOAuthReauthorizationRequired") ? Effect.fail(error) : connectSse
+    )
+  );
 };
 
 // src/sdk/discover.ts
@@ -250,7 +258,8 @@ var closeConnection = (connection) => Effect2.ignore(
 );
 
 // src/sdk/invoke.ts
-import { Cause, Effect as Effect3, Exit, Option as Option2, Predicate, Schema as Schema2 } from "effect";
+import { Cause, Effect as Effect3, Exit, Option as Option2, Predicate as Predicate2, Schema as Schema2 } from "effect";
+import { StreamableHTTPError } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { ElicitRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 import {
   ElicitationId,
@@ -260,6 +269,22 @@ import {
 var ArgsRecord = Schema2.Record(Schema2.String, Schema2.Unknown);
 var decodeArgsRecord = Schema2.decodeUnknownOption(ArgsRecord);
 var argsRecord = (value) => Option2.getOrElse(decodeArgsRecord(value), () => ({}));
+var SsePostErrorCause = Schema2.Struct({ message: Schema2.String });
+var decodeSsePostErrorCause = Schema2.decodeUnknownOption(SsePostErrorCause);
+var statusFromSsePostError = (cause) => Option2.match(decodeSsePostErrorCause(cause), {
+  onNone: () => void 0,
+  onSome: ({ message }) => {
+    const match = /^Error POSTing to endpoint \(HTTP ([1-5][0-9]{2})\):/.exec(message);
+    if (!match) return void 0;
+    return Number(match[1]);
+  }
+});
+var statusFromStreamableHttpError = (cause) => {
+  if (!(cause instanceof StreamableHTTPError)) return void 0;
+  const code = cause.code;
+  return code !== void 0 && code >= 100 && code <= 599 ? code : void 0;
+};
+var httpStatusFromCause = (cause) => statusFromStreamableHttpError(cause) ?? statusFromSsePostError(cause);
 var McpElicitParams = Schema2.Union([
   Schema2.Struct({
     mode: Schema2.Literal("url"),
@@ -298,8 +323,8 @@ var installElicitationHandler = (client, elicit) => {
     const failure = exit.cause.reasons.find(Cause.isFailReason);
     if (failure) {
       const err = failure.error;
-      if (Predicate.isTagged(err, "ElicitationDeclinedError")) {
-        const action = Predicate.hasProperty(err, "action") && err.action === "cancel" ? "cancel" : "decline";
+      if (Predicate2.isTagged(err, "ElicitationDeclinedError")) {
+        const action = Predicate2.hasProperty(err, "action") && err.action === "cancel" ? "cancel" : "decline";
         return { action };
       }
     }
@@ -310,10 +335,19 @@ var useConnection = (connection, toolName, args, elicit) => Effect3.gen(function
   installElicitationHandler(connection.client, elicit);
   return yield* Effect3.tryPromise({
     try: () => connection.client.callTool({ name: toolName, arguments: args }),
-    catch: () => new McpInvocationError({
-      toolName,
-      message: `MCP tool call failed for ${toolName}`
-    })
+    catch: (cause) => {
+      if (Predicate2.isTagged(cause, "McpOAuthReauthorizationRequired")) {
+        return new McpOAuthReauthorizationRequired({
+          message: "MCP OAuth re-authorization required"
+        });
+      }
+      const status = httpStatusFromCause(cause);
+      return new McpInvocationError({
+        toolName,
+        message: `MCP tool call failed for ${toolName}`,
+        ...status === void 0 ? {} : { status }
+      });
+    }
   }).pipe(
     Effect3.withSpan("plugin.mcp.client.call_tool", {
       attributes: { "mcp.tool.name": toolName }
@@ -673,6 +707,20 @@ var mcpToolFailure = (code, message, details) => ToolResult.fail({
   message,
   ...details === void 0 ? {} : { details }
 });
+var mcpInvocationAuthFailure = (input) => authToolFailure({
+  code: "connection_rejected",
+  message: input.status === 403 ? `MCP server rejected connection "${input.connection}" with HTTP 403. The credential may lack access or required scope; re-authenticate or update the connection before retrying this tool.` : `MCP server rejected connection "${input.connection}" with HTTP 401. Re-authenticate or update the connection before retrying this tool.`,
+  source: { id: input.integration },
+  credential: { kind: "upstream", label: input.connection },
+  status: input.status,
+  upstream: { status: input.status }
+});
+var mcpInvocationOAuthReauthFailure = (input) => authToolFailure({
+  code: "oauth_reauth_required",
+  message: `OAuth connection "${input.connection}" requires reauthorization before retrying this MCP tool.`,
+  source: { id: input.integration },
+  credential: { kind: "oauth", label: input.connection }
+});
 var slugFrom = (slug) => IntegrationSlug.make(slug);
 var normalizeSlug = (input) => input.slug ?? deriveMcpNamespace({
   name: input.name,
@@ -750,22 +798,7 @@ var urlMatchesToken = (url, token) => {
   const re = new RegExp(`(?:^|[^a-z0-9])${token}(?:$|[^a-z0-9])`, "i");
   return re.test(url.hostname) || re.test(url.pathname);
 };
-var userFacingProbeMessage = (shape) => {
-  if (shape.kind === "unreachable") {
-    return "Couldn't reach this URL. Check the address, your network, and that the server is running.";
-  }
-  return Match.value(shape.category).pipe(
-    Match.when(
-      "auth-required",
-      () => "This server requires authentication. Add credentials (Authorization header, query parameter, or API key) below and retry."
-    ),
-    Match.when(
-      "wrong-shape",
-      () => "This URL doesn't appear to host an MCP server. Double-check the address, including the path."
-    ),
-    Match.exhaustive
-  );
-};
+var userFacingProbeMessage = (shape) => shape.kind === "unreachable" ? "Couldn't reach this URL. Check the address, your network, and that the server is running." : "This URL doesn't appear to host an MCP server. Double-check the address, including the path.";
 var makeOAuthProvider = (accessToken) => ({
   get redirectUrl() {
     return "http://localhost/oauth/callback";
@@ -784,7 +817,9 @@ var makeOAuthProvider = (accessToken) => ({
   tokens: () => ({ access_token: accessToken, token_type: "Bearer" }),
   saveTokens: () => void 0,
   redirectToAuthorization: async () => {
-    throw new Error("MCP OAuth re-authorization required");
+    throw new McpOAuthReauthorizationRequired({
+      message: "MCP OAuth re-authorization required"
+    });
   },
   saveCodeVerifier: () => void 0,
   codeVerifier: () => {
@@ -932,12 +967,31 @@ var mcpPlugin = definePlugin((options) => {
           headers: probeHeaders,
           queryParams: probeQueryParams
         });
-        if (shape.kind !== "mcp") {
+        if (shape.kind === "unreachable") {
           return yield* new McpConnectionError({
             transport: "remote",
             message: userFacingProbeMessage(shape)
           });
         }
+        if (shape.kind === "not-mcp") {
+          if (shape.category === "wrong-shape") {
+            return yield* new McpConnectionError({
+              transport: "remote",
+              message: userFacingProbeMessage(shape)
+            });
+          }
+          return {
+            connected: false,
+            requiresAuthentication: true,
+            requiresOAuth: false,
+            supportsDynamicRegistration: false,
+            name,
+            slug,
+            toolCount: null,
+            serverName: null,
+            instructions: null
+          };
+        }
         const probeResult = yield* ctx.oauth.probe({ url: trimmed }).pipe(
           Effect5.map((oauth) => ({ ok: true, oauth })),
           Effect5.catch(() => Effect5.succeed({ ok: false, oauth: null })),
@@ -1198,16 +1252,36 @@ var mcpPlugin = definePlugin((options) => {
       return ToolResult.ok(raw);
     }).pipe(
       Effect5.catchTag(
-        "McpConnectionError",
-        ({ message }) => Effect5.succeed(
+        "McpOAuthReauthorizationRequired",
+        () => Effect5.succeed(
+          mcpInvocationOAuthReauthFailure({
+            integration: String(credential.integration),
+            connection: String(credential.connection)
+          })
+        )
+      ),
+      Effect5.catchTag("McpConnectionError", (error) => {
+        return Effect5.succeed(
           authToolFailure({
             code: "connection_rejected",
-            message,
+            message: error.message,
             source: { id: String(credential.integration) },
             credential: { kind: "upstream", label: String(credential.connection) }
           })
-        )
-      ),
+        );
+      }),
+      Effect5.catchTag("McpInvocationError", (error) => {
+        if (error.status === 401 || error.status === 403) {
+          return Effect5.succeed(
+            mcpInvocationAuthFailure({
+              status: error.status,
+              integration: String(credential.integration),
+              connection: String(credential.connection)
+            })
+          );
+        }
+        return Effect5.fail(error);
+      }),
       Effect5.withSpan("mcp.plugin.invoke_tool", {
         attributes: {
           "mcp.tool.name": String(toolRow.name),
@@ -1365,4 +1439,4 @@ export {
   userFacingProbeMessage,
   mcpPlugin
 };
-//# sourceMappingURL=chunk-3AGPV4QE.js.map
+//# sourceMappingURL=chunk-2CAKFQPL.js.map