@executor-js/plugin-mcp 0.0.1 → 0.0.2

package/README.md

@@ -1,35 +1,41 @@
-# @executor/plugin-mcp
+# @executor-js/plugin-mcp
 
 Register [Model Context Protocol](https://modelcontextprotocol.io) servers as tool sources for an executor. Supports both stdio-launched servers and remote (HTTP) servers, with optional OAuth.
 
 ## Install
 
 ```sh
-bun add @executor/sdk @executor/plugin-mcp
+bun add @executor-js/sdk @executor-js/plugin-mcp
 # or
-npm install @executor/sdk @executor/plugin-mcp
+npm install @executor-js/sdk @executor-js/plugin-mcp
 ```
 
 ## Usage
 
 ```ts
-import { createExecutor } from "@executor/sdk";
-import { mcpPlugin } from "@executor/plugin-mcp";
+import { createExecutor } from "@executor-js/sdk";
+import { mcpPlugin } from "@executor-js/plugin-mcp";
 
 const executor = await createExecutor({
-  scope: { name: "my-app" },
-  plugins: [mcpPlugin()] as const,
+  onElicitation: "accept-all",
+  // Stdio sources spawn a local subprocess and inherit `process.env` —
+  // only enable for trusted single-user contexts.
+  plugins: [mcpPlugin({ dangerouslyAllowStdioMCP: true })] as const,
 });
 
+const scope = executor.scopes[0]!.id;
+
 // Remote MCP server
 await executor.mcp.addSource({
+  scope,
   transport: "remote",
   name: "Context7",
   endpoint: "https://mcp.context7.com/mcp",
 });
 
-// Stdio MCP server
+// Stdio MCP server (requires `dangerouslyAllowStdioMCP: true` above)
 await executor.mcp.addSource({
+  scope,
   transport: "stdio",
   name: "My Server",
   command: "npx",
@@ -39,19 +45,17 @@ await executor.mcp.addSource({
 // Every MCP tool is now part of the unified catalog
 const tools = await executor.tools.list();
 
-const result = await executor.tools.invoke(
-  "context7.searchLibraries",
-  { query: "effect-ts" },
-  { onElicitation: "accept-all" },
-);
+const result = await executor.tools.invoke("context7.searchLibraries", {
+  query: "effect-ts",
+});
 ```
 
 ## Using with Effect
 
-If you're building on `@executor/sdk` (the raw Effect entry), import this plugin from its `/core` subpath instead:
+If you're building on `@executor-js/sdk/core` (the raw Effect entry), import this plugin from its `/core` subpath instead — it returns the Effect-shaped plugin with `Effect.Effect<...>`-returning methods rather than promisified wrappers:
 
 ```ts
-import { mcpPlugin } from "@executor/plugin-mcp";
+import { mcpPlugin } from "@executor-js/plugin-mcp/core";
 ```
 
 ## Status

package/dist/api/group.d.ts

@@ -1,146 +1,115 @@
-import { HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from "@effect/platform";
+import { HttpApiEndpoint, HttpApiGroup } from "effect/unstable/httpapi";
 import { Schema } from "effect";
+import { InternalError } from "@executor-js/api";
+import { McpConnectionError, McpToolDiscoveryError } from "../sdk/errors";
 import { McpStoredSourceSchema } from "../sdk/stored-source";
-export { HttpApiSchema };
-declare const McpApiError_base: Schema.TaggedErrorClass<McpApiError, "McpApiError", {
-    readonly _tag: Schema.tag<"McpApiError">;
-} & {
-    message: typeof Schema.String;
-}>;
-export declare class McpApiError extends McpApiError_base {
-}
-declare const McpInternalError_base: Schema.TaggedErrorClass<McpInternalError, "McpInternalError", {
-    readonly _tag: Schema.tag<"McpInternalError">;
-} & {
-    message: typeof Schema.String;
-}>;
-export declare class McpInternalError extends McpInternalError_base {
-}
-declare const McpGroup_base: HttpApiGroup.HttpApiGroup<"mcp", HttpApiEndpoint.HttpApiEndpoint<"probeEndpoint", "POST", {
-    readonly scopeId: string & import("effect/Brand").Brand<"ScopeId">;
-}, never, {
-    readonly endpoint: string;
-}, never, {
-    readonly name: string;
-    readonly namespace: string;
-    readonly connected: boolean;
-    readonly requiresOAuth: boolean;
-    readonly toolCount: number | null;
-    readonly serverName: string | null;
-}, McpApiError | McpInternalError, never, never> | HttpApiEndpoint.HttpApiEndpoint<"addSource", "POST", {
-    readonly scopeId: string & import("effect/Brand").Brand<"ScopeId">;
-}, never, {
-    readonly name: string;
-    readonly endpoint: string;
-    readonly namespace?: string | undefined;
-    readonly transport: "remote";
-    readonly remoteTransport?: "streamable-http" | "sse" | "auto" | undefined;
-    readonly queryParams?: {
-        readonly [x: string]: string;
-    } | undefined;
-    readonly headers?: {
-        readonly [x: string]: string;
-    } | undefined;
-    readonly auth?: {
-        readonly kind: "none";
-    } | {
-        readonly secretId: string;
-        readonly kind: "header";
-        readonly headerName: string;
-        readonly prefix?: string | undefined;
-    } | {
-        readonly kind: "oauth2";
-        readonly scope: string | null;
-        readonly accessTokenSecretId: string;
-        readonly refreshTokenSecretId: string | null;
-        readonly tokenType?: string | undefined;
-        readonly expiresAt: number | null;
-    } | undefined;
-} | {
-    readonly name: string;
-    readonly namespace?: string | undefined;
-    readonly transport: "stdio";
-    readonly command: string;
-    readonly args?: readonly string[] | undefined;
-    readonly env?: {
-        readonly [x: string]: string;
-    } | undefined;
-    readonly cwd?: string | undefined;
-}, never, {
-    readonly namespace: string;
-    readonly toolCount: number;
-}, McpApiError | McpInternalError, never, never> | HttpApiEndpoint.HttpApiEndpoint<"removeSource", "POST", {
-    readonly scopeId: string & import("effect/Brand").Brand<"ScopeId">;
-}, never, {
-    readonly namespace: string;
-}, never, {
-    readonly removed: boolean;
-}, McpApiError | McpInternalError, never, never> | HttpApiEndpoint.HttpApiEndpoint<"refreshSource", "POST", {
-    readonly scopeId: string & import("effect/Brand").Brand<"ScopeId">;
-}, never, {
-    readonly namespace: string;
-}, never, {
-    readonly toolCount: number;
-}, McpApiError | McpInternalError, never, never> | HttpApiEndpoint.HttpApiEndpoint<"startOAuth", "POST", {
-    readonly scopeId: string & import("effect/Brand").Brand<"ScopeId">;
-}, never, {
-    readonly endpoint: string;
-    readonly queryParams?: {
-        readonly [x: string]: string;
-    } | null | undefined;
-    readonly redirectUrl: string;
-}, never, {
-    readonly sessionId: string;
-    readonly authorizationUrl: string;
-}, McpApiError | McpInternalError, never, never> | HttpApiEndpoint.HttpApiEndpoint<"completeOAuth", "POST", {
-    readonly scopeId: string & import("effect/Brand").Brand<"ScopeId">;
-}, never, {
-    readonly error?: string | undefined;
-    readonly code?: string | undefined;
-    readonly state: string;
-}, never, {
-    readonly scope: string | null;
-    readonly accessTokenSecretId: string;
-    readonly refreshTokenSecretId: string | null;
-    readonly tokenType: string;
-    readonly expiresAt: number | null;
-}, McpApiError | McpInternalError, never, never> | HttpApiEndpoint.HttpApiEndpoint<"oauthCallback", "GET", never, {
-    readonly error?: string | undefined;
-    readonly code?: string | undefined;
-    readonly state: string;
-    readonly error_description?: string | undefined;
-}, never, never, string, McpApiError | McpInternalError, never, never> | HttpApiEndpoint.HttpApiEndpoint<"getSource", "GET", {
-    readonly scopeId: string & import("effect/Brand").Brand<"ScopeId">;
-    readonly namespace: string;
-}, never, never, never, McpStoredSourceSchema | null, McpApiError | McpInternalError, never, never> | HttpApiEndpoint.HttpApiEndpoint<"updateSource", "PATCH", {
-    readonly scopeId: string & import("effect/Brand").Brand<"ScopeId">;
-    readonly namespace: string;
-}, never, {
-    readonly name?: string | undefined;
-    readonly endpoint?: string | undefined;
-    readonly queryParams?: {
-        readonly [x: string]: string;
-    } | undefined;
-    readonly headers?: {
-        readonly [x: string]: string;
-    } | undefined;
-    readonly auth?: {
-        readonly kind: "none";
-    } | {
-        readonly secretId: string;
-        readonly kind: "header";
-        readonly headerName: string;
-        readonly prefix?: string | undefined;
-    } | {
-        readonly kind: "oauth2";
-        readonly scope: string | null;
-        readonly accessTokenSecretId: string;
-        readonly refreshTokenSecretId: string | null;
-        readonly tokenType?: string | undefined;
-        readonly expiresAt: number | null;
-    } | undefined;
-}, never, {
-    readonly updated: boolean;
-}, McpApiError | McpInternalError, never, never>, never, never, false>;
-export declare class McpGroup extends McpGroup_base {
-}
+export declare const McpGroup: HttpApiGroup.HttpApiGroup<"mcp", HttpApiEndpoint.HttpApiEndpoint<"probeEndpoint", "POST", "/scopes/:scopeId/mcp/probe", HttpApiEndpoint.StringTree<Schema.Struct<{
+    scopeId: Schema.brand<Schema.String, "ScopeId">;
+}>>, HttpApiEndpoint.StringTree<never>, HttpApiEndpoint.Json<Schema.Struct<{
+    readonly endpoint: Schema.String;
+    readonly headers: Schema.optional<Schema.$Record<Schema.String, Schema.Union<readonly [Schema.String, Schema.Struct<{
+        readonly secretId: Schema.String;
+        readonly prefix: Schema.optional<Schema.String>;
+    }>]>>>;
+    readonly queryParams: Schema.optional<Schema.$Record<Schema.String, Schema.Union<readonly [Schema.String, Schema.Struct<{
+        readonly secretId: Schema.String;
+        readonly prefix: Schema.optional<Schema.String>;
+    }>]>>>;
+}>>, HttpApiEndpoint.StringTree<never>, HttpApiEndpoint.Json<Schema.Struct<{
+    readonly connected: Schema.Boolean;
+    readonly requiresOAuth: Schema.Boolean;
+    readonly name: Schema.String;
+    readonly namespace: Schema.String;
+    readonly toolCount: Schema.NullOr<Schema.Number>;
+    readonly serverName: Schema.NullOr<Schema.String>;
+}>>, HttpApiEndpoint.Json<typeof McpConnectionError | typeof McpToolDiscoveryError | typeof InternalError>, never, never> | HttpApiEndpoint.HttpApiEndpoint<"addSource", "POST", "/scopes/:scopeId/mcp/sources", HttpApiEndpoint.StringTree<Schema.Struct<{
+    scopeId: Schema.brand<Schema.String, "ScopeId">;
+}>>, HttpApiEndpoint.StringTree<never>, HttpApiEndpoint.Json<Schema.Union<readonly [Schema.Struct<{
+    readonly transport: Schema.Literal<"remote">;
+    readonly name: Schema.String;
+    readonly endpoint: Schema.String;
+    readonly remoteTransport: Schema.optional<Schema.Literals<readonly ["streamable-http", "sse", "auto"]>>;
+    readonly namespace: Schema.optional<Schema.String>;
+    readonly queryParams: Schema.optional<Schema.$Record<Schema.String, Schema.Union<readonly [Schema.String, Schema.Struct<{
+        readonly secretId: Schema.String;
+        readonly prefix: Schema.optional<Schema.String>;
+    }>]>>>;
+    readonly headers: Schema.optional<Schema.$Record<Schema.String, Schema.Union<readonly [Schema.String, Schema.Struct<{
+        readonly secretId: Schema.String;
+        readonly prefix: Schema.optional<Schema.String>;
+    }>]>>>;
+    readonly auth: Schema.optional<Schema.Union<readonly [Schema.Struct<{
+        readonly kind: Schema.Literal<"none">;
+    }>, Schema.Struct<{
+        readonly kind: Schema.Literal<"header">;
+        readonly headerName: Schema.String;
+        readonly secretId: Schema.String;
+        readonly prefix: Schema.optional<Schema.String>;
+    }>, Schema.Struct<{
+        readonly kind: Schema.Literal<"oauth2">;
+        /** Stable id of the SDK Connection minted by `completeOAuth`. The
+         *  backing access/refresh secrets live on the connection row; the
+         *  source only needs this pointer. */
+        readonly connectionId: Schema.String;
+        readonly clientIdSecretId: Schema.optional<Schema.String>;
+        readonly clientSecretSecretId: Schema.optional<Schema.NullOr<Schema.String>>;
+    }>]>>;
+}>, Schema.Struct<{
+    readonly transport: Schema.Literal<"stdio">;
+    readonly name: Schema.String;
+    readonly command: Schema.String;
+    readonly args: Schema.optional<Schema.$Array<Schema.String>>;
+    readonly env: Schema.optional<Schema.$Record<Schema.String, Schema.String>>;
+    readonly cwd: Schema.optional<Schema.String>;
+    readonly namespace: Schema.optional<Schema.String>;
+}>]>>, HttpApiEndpoint.StringTree<never>, HttpApiEndpoint.Json<Schema.Struct<{
+    readonly toolCount: Schema.Number;
+    readonly namespace: Schema.String;
+}>>, HttpApiEndpoint.Json<typeof McpConnectionError | typeof McpToolDiscoveryError | typeof InternalError>, never, never> | HttpApiEndpoint.HttpApiEndpoint<"removeSource", "POST", "/scopes/:scopeId/mcp/sources/remove", HttpApiEndpoint.StringTree<Schema.Struct<{
+    scopeId: Schema.brand<Schema.String, "ScopeId">;
+}>>, HttpApiEndpoint.StringTree<never>, HttpApiEndpoint.Json<Schema.Struct<{
+    readonly namespace: Schema.String;
+}>>, HttpApiEndpoint.StringTree<never>, HttpApiEndpoint.Json<Schema.Struct<{
+    readonly removed: Schema.Boolean;
+}>>, HttpApiEndpoint.Json<typeof McpConnectionError | typeof McpToolDiscoveryError | typeof InternalError>, never, never> | HttpApiEndpoint.HttpApiEndpoint<"refreshSource", "POST", "/scopes/:scopeId/mcp/sources/refresh", HttpApiEndpoint.StringTree<Schema.Struct<{
+    scopeId: Schema.brand<Schema.String, "ScopeId">;
+}>>, HttpApiEndpoint.StringTree<never>, HttpApiEndpoint.Json<Schema.Struct<{
+    readonly namespace: Schema.String;
+}>>, HttpApiEndpoint.StringTree<never>, HttpApiEndpoint.Json<Schema.Struct<{
+    readonly toolCount: Schema.Number;
+}>>, HttpApiEndpoint.Json<typeof McpConnectionError | typeof McpToolDiscoveryError | typeof InternalError>, never, never> | HttpApiEndpoint.HttpApiEndpoint<"getSource", "GET", "/scopes/:scopeId/mcp/sources/:namespace", HttpApiEndpoint.StringTree<Schema.Struct<{
+    scopeId: Schema.brand<Schema.String, "ScopeId">;
+    namespace: Schema.String;
+}>>, HttpApiEndpoint.StringTree<never>, HttpApiEndpoint.StringTree<never>, HttpApiEndpoint.StringTree<never>, HttpApiEndpoint.Json<Schema.NullOr<typeof McpStoredSourceSchema>>, HttpApiEndpoint.Json<typeof McpConnectionError | typeof McpToolDiscoveryError | typeof InternalError>, never, never> | HttpApiEndpoint.HttpApiEndpoint<"updateSource", "PATCH", "/scopes/:scopeId/mcp/sources/:namespace", HttpApiEndpoint.StringTree<Schema.Struct<{
+    scopeId: Schema.brand<Schema.String, "ScopeId">;
+    namespace: Schema.String;
+}>>, HttpApiEndpoint.StringTree<never>, HttpApiEndpoint.Json<Schema.Struct<{
+    readonly name: Schema.optional<Schema.String>;
+    readonly endpoint: Schema.optional<Schema.String>;
+    readonly headers: Schema.optional<Schema.$Record<Schema.String, Schema.Union<readonly [Schema.String, Schema.Struct<{
+        readonly secretId: Schema.String;
+        readonly prefix: Schema.optional<Schema.String>;
+    }>]>>>;
+    readonly queryParams: Schema.optional<Schema.$Record<Schema.String, Schema.Union<readonly [Schema.String, Schema.Struct<{
+        readonly secretId: Schema.String;
+        readonly prefix: Schema.optional<Schema.String>;
+    }>]>>>;
+    readonly auth: Schema.optional<Schema.Union<readonly [Schema.Struct<{
+        readonly kind: Schema.Literal<"none">;
+    }>, Schema.Struct<{
+        readonly kind: Schema.Literal<"header">;
+        readonly headerName: Schema.String;
+        readonly secretId: Schema.String;
+        readonly prefix: Schema.optional<Schema.String>;
+    }>, Schema.Struct<{
+        readonly kind: Schema.Literal<"oauth2">;
+        /** Stable id of the SDK Connection minted by `completeOAuth`. The
+         *  backing access/refresh secrets live on the connection row; the
+         *  source only needs this pointer. */
+        readonly connectionId: Schema.String;
+        readonly clientIdSecretId: Schema.optional<Schema.String>;
+        readonly clientSecretSecretId: Schema.optional<Schema.NullOr<Schema.String>>;
+    }>]>>;
+}>>, HttpApiEndpoint.StringTree<never>, HttpApiEndpoint.Json<Schema.Struct<{
+    readonly updated: Schema.Boolean;
+}>>, HttpApiEndpoint.Json<typeof McpConnectionError | typeof McpToolDiscoveryError | typeof InternalError>, never, never>, false>;

package/dist/api/handlers.d.ts

@@ -1,7 +1,7 @@
 import { Context } from "effect";
 import type { McpPluginExtension } from "../sdk/plugin";
-declare const McpExtensionService_base: Context.TagClass<McpExtensionService, "McpExtensionService", McpPluginExtension>;
+declare const McpExtensionService_base: Context.ServiceClass<McpExtensionService, "McpExtensionService", McpPluginExtension>;
 export declare class McpExtensionService extends McpExtensionService_base {
 }
-export declare const McpHandlers: import("effect/Layer").Layer<import("@effect/platform/HttpApiGroup").ApiGroup<"executor", "mcp">, never, McpExtensionService>;
+export declare const McpHandlers: import("effect/Layer").Layer<import("effect/unstable/httpapi/HttpApiGroup").ApiGroup<"executor", "mcp">, never, import("effect/unstable/http/HttpRouter").Request<"Requires", McpExtensionService>>;
 export {};