Move control tools under executor namespace (#756)

Author: RhysSullivan

README.md

@@ -48,7 +48,7 @@ Open `http://127.0.0.1:4788`, go to **Add Source**, paste a URL, and Executor wi
 ### Via the CLI
 
 ```bash
-executor call openapi addSource '{
+executor call executor openapi addSource '{
   "spec": "https://petstore3.swagger.io/api/v3/openapi.json",
   "namespace": "petstore",
   "baseUrl": "https://petstore3.swagger.io/api/v3"

apps/cloud/src/mcp-miniflare.e2e.node.test.ts

@@ -14,7 +14,7 @@
 //
 // Elicitation coverage uses the openapi plugin: a tiny Effect HttpApi
 // upstream is stood up in-process, its generated spec is handed to
-// `tools.openapi.addSource`, and the cloud engine invokes a POST operation.
+// `tools.executor.openapi.addSource`, and the cloud engine invokes a POST operation.
 // `requiresApproval: true` fires the executor's approval elicitation, which
 // round-trips back to the SDK Client's `ElicitRequestSchema` handler.
 // ---------------------------------------------------------------------------
@@ -455,7 +455,7 @@ layer(TestEnv, { timeout: 60_000 })("cloud MCP over real HTTP (miniflare)", (it)
             method: "POST",
             headers: {
               accept: "application/json, text/event-stream",
-              authorization: "Bearer bogus",
+              authorization: "Bearer bogus.bogus.bogus",
               "content-type": "application/json",
             },
             body: JSON.stringify({
@@ -794,7 +794,7 @@ layer(TestEnv, { timeout: 60_000 })("cloud MCP over real HTTP (miniflare)", (it)
         // `HttpApiGroup` name ("approve") becomes part of the sandbox path,
         // so the invocation reads `tools.approveapi.approve.approveThing`.
         const code = [
-          `await tools.openapi.addSource({ scope: ${JSON.stringify(orgId)}, spec: ${JSON.stringify(specJson)}, namespace: "approveapi" });`,
+          `await tools.executor.openapi.addSource({ scope: ${JSON.stringify(orgId)}, spec: ${JSON.stringify(specJson)}, namespace: "approveapi" });`,
           `return await tools.approveapi.approve.approveThing({});`,
         ].join("\n");
         const result = yield* Effect.promise(() =>

apps/cloud/src/mcp-session.e2e.node.test.ts

@@ -15,7 +15,7 @@
 // before prod does.
 
 import { describe, expect, it } from "@effect/vitest";
-import { Effect } from "effect";
+import { Effect, Schema } from "effect";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
 import { ElicitRequestSchema } from "@modelcontextprotocol/sdk/types.js";
@@ -44,11 +44,9 @@ import { DbService } from "./services/db";
 // eliciting test drive the real engine + sandbox rather than a stub engine.
 // ---------------------------------------------------------------------------
 
-const EMPTY_INPUT_SCHEMA = {
-  type: "object",
-  properties: {},
-  additionalProperties: false,
-} as const;
+const EMPTY_INPUT_SCHEMA = Schema.toStandardSchemaV1(
+  Schema.toStandardJSONSchemaV1(Schema.Struct({})),
+);
 
 const elicitingTestPlugin = definePlugin(() => ({
   id: "eliciting-test" as const,

apps/cloud/src/services/sources-api.node.test.ts

@@ -676,13 +676,13 @@ describe("sources api (HTTP)", () => {
   it.effect("sources.remove on a static source is rejected", () =>
     Effect.gen(function* () {
       // `canRemove: false` is reserved for static (plugin-declared)
-      // sources. The openapi plugin declares one with id "openapi"
-      // for its control tools.
+      // sources. Plugin-owned executor tools are mounted under the
+      // built-in executor source.
       const org = `org_${crypto.randomUUID()}`;
 
       const result = yield* asOrg(org, (client) =>
         client.sources
-          .remove({ params: { scopeId: ScopeId.make(org), sourceId: "openapi" } })
+          .remove({ params: { scopeId: ScopeId.make(org), sourceId: "executor" } })
           .pipe(Effect.result),
       );
       expect(Result.isFailure(result)).toBe(true);

apps/local/src/web/shell.tsx

@@ -298,7 +298,7 @@ function SourceList(props: { pathname: string; onNavigate?: () => void }) {
                     : "text-sidebar-foreground hover:bg-sidebar-active/60 hover:text-foreground",
                 ].join(" ")}
               >
-                <SourceFavicon url={s.url} />
+                <SourceFavicon sourceId={s.id} url={s.url} />
                 <span className="flex-1 truncate">{s.name}</span>
                 <span className="rounded bg-secondary/50 px-1 py-px text-xs font-medium text-muted-foreground">
                   {s.kind}

apps/local/vite.config.ts

@@ -1,4 +1,5 @@
 import { readFileSync } from "node:fs";
+import { resolve } from "node:path";
 import { Readable } from "node:stream";
 import { defineConfig, type Plugin } from "vite";
 import react from "@vitejs/plugin-react";
@@ -38,6 +39,11 @@ function executorApiPlugin(): Plugin {
   return {
     name: "executor-api",
     configureServer(server) {
+      server.watcher.on("change", (path) => {
+        if (path.includes("/src/server/") || path.endsWith("/executor.config.ts")) {
+          handlers = null;
+        }
+      });
       server.middlewares.use(async (req, res, next) => {
         const rawUrl = req.url ?? "/";
         const isApi = rawUrl.startsWith("/api/") || rawUrl === "/api";
@@ -121,6 +127,9 @@ export default defineConfig({
       usePolling: true,
       interval: 200,
     },
+    fs: {
+      allow: [resolve(import.meta.dirname, "../..")],
+    },
   },
   plugins: [
     tailwindcss(),

bun.lock

@@ -90,7 +90,7 @@ Pattern used in `mcp-miniflare.e2e.node.test.ts`:
 5. SDK Client advertises `capabilities: { elicitation: { form: {} } }` and
    registers `client.setRequestHandler(ElicitRequestSchema, ...)` that returns
    `{ action: "accept", content: {} }`.
-6. Call `execute` with code that (a) calls `tools.openapi.addSource({ spec,
+6. Call `execute` with code that (a) calls `tools.executor.openapi.addSource({ spec,
 namespace })`, (b) invokes the POST operation.
 
 **Tool id format inside the `execute` sandbox.**

notes/old/mcp-testing.md

@@ -1,15 +1,13 @@
 import { describe, expect, it } from "@effect/vitest";
-import { Effect } from "effect";
+import { Effect, Schema } from "effect";
 
 import { createExecutor, definePlugin, makeTestConfig } from "@executor-js/sdk";
 
 import { buildExecuteDescription } from "./description";
 
-const EmptyInputSchema = {
-  type: "object",
-  properties: {},
-  additionalProperties: false,
-} as const;
+const EmptyInputSchema = Schema.toStandardSchemaV1(
+  Schema.toStandardJSONSchemaV1(Schema.Struct({})),
+);
 
 // Two plugins registering static sources whose ids are distinct from their
 // pluginIds/names. If `buildExecuteDescription` ever renders the wrong field

packages/core/execution/src/description.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "@effect/vitest";
-import { Effect, Fiber } from "effect";
+import { Effect, Fiber, Schema } from "effect";
 
 import {
   ElicitationResponse,
@@ -14,30 +14,17 @@ import { describeTool, makeExecutorToolInvoker, searchTools } from "./tool-invok
 
 const codeExecutor = makeQuickJsExecutor();
 
-const RepoInputSchema = {
-  type: "object",
-  properties: {
-    owner: { type: "string" },
-    repo: { type: "string" },
-  },
-  required: ["owner", "repo"],
-  additionalProperties: false,
-} as const;
-
-const ContactInputSchema = {
-  type: "object",
-  properties: {
-    email: { type: "string" },
-  },
-  required: ["email"],
-  additionalProperties: false,
-} as const;
-
-const EmptyInputSchema = {
-  type: "object",
-  properties: {},
-  additionalProperties: false,
-} as const;
+const RepoInputSchema = Schema.toStandardSchemaV1(
+  Schema.toStandardJSONSchemaV1(Schema.Struct({ owner: Schema.String, repo: Schema.String })),
+);
+
+const ContactInputSchema = Schema.toStandardSchemaV1(
+  Schema.toStandardJSONSchemaV1(Schema.Struct({ email: Schema.String })),
+);
+
+const EmptyInputSchema = Schema.toStandardSchemaV1(
+  Schema.toStandardJSONSchemaV1(Schema.Struct({})),
+);
 
 const acceptAll = () => Effect.succeed(new ElicitationResponse({ action: "accept" }));