Update executor version to 1.1.3 and improve test descriptions

- Bump version in package.json - Refactor test descriptions for clarity in server.test.ts - Adjust endpoint handling in add-source.tsx to use template.endpoint directly3

Rhys Sullivan committed 8 months ago

Commit a676a1a1 parent aa596e23 files · +20 −21Browse files

Unified · Split

3 files

apps/executor/package.json +1 −1
apps/executor/src/server/server.test.ts +17 −19
apps/web/src/views/add-source.tsx +2 −1

apps/executor/package.json+1−1

@@ -1,6 +1,6 @@
1	{	1	{
2	"name": "executor",	2	"name": "executor",
3	"version": "1.1.1",	3	"version": "1.1.3",
4	"description": "Local AI executor with a CLI, local API server, and web UI.",	4	"description": "Local AI executor with a CLI, local API server, and web UI.",
5	"keywords": [	5	"keywords": [
6	"executor",	6	"executor",

apps/executor/src/server/server.test.ts+17−19

   OpenApi,
 } from "@effect/platform";
 import { describe, expect, it } from "@effect/vitest";
-import { assertInstanceOf, assertTrue } from "@effect/vitest/utils";
+import { assertTrue } from "@effect/vitest/utils";
 import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
 import { startMcpElicitationDemoServer } from "@executor-v3/mcp-elicitation-demo";
 import { makeToolInvokerFromTools, toTool } from "@executor-v3/codemode-core";
 import {
-  ControlPlaneStorageError,
   createControlPlaneClient,
   type ControlPlaneClient,
   type ResolveExecutionEnvironment,
     15_000,
   );
-  it.scoped("updates an existing demo MCP source instead of creating a duplicate", () =>
+  it.scoped("does not create a duplicate when the demo MCP source already exists", () =>
     Effect.gen(function* () {
       const demoServer = yield* Effect.acquireRelease(
         Effect.promise(() => startMcpElicitationDemoServer()),
         payload: {
           name: "Demo",
           kind: "mcp",
-          endpoint: "http://127.0.0.1:58005/mcp",
+          endpoint: demoServer.endpoint,
           status: "connected",
           enabled: true,
           namespace: "demo",
         namespace: "demo",
       });
-      expect(seeded.action).toBe("updated");
+      expect(seeded.action).toBe("noop");
       expect(seeded.sourceId).toBe(existing.id);
       const sources = yield* client.sources.list({
       expect(sources).toHaveLength(1);
       expect(sources[0]?.endpoint).toBe(demoServer.endpoint);
     }),
+  15_000,
   );
   it.scoped("loads OpenAPI sources from control-plane state and calls them", () =>
     }),
   );
-  it.scoped("returns a typed storage error when a configured MCP endpoint is invalid", () =>
+  it.scoped("marks execution failed when a configured MCP endpoint is invalid", () =>
     Effect.gen(function* () {
       const server = yield* createLocalExecutorServer({
         port: 0,
         }],
       });
-      const failure = yield* client.executions
+      const execution = yield* client.executions.create({
-        .create({
+        path: {
-          path: {
+          workspaceId: installation.workspaceId,
-            workspaceId: installation.workspaceId,
+        },
-          },
+        payload: {
-          payload: {
+          code: 'return await tools.demo.gated_echo({ value: "broken" });',
-            code: 'return await tools.demo.gated_echo({ value: "broken" });',
+        },
-          },
+      });
-        })
-        .pipe(Effect.flip);
-      assertInstanceOf(failure, ControlPlaneStorageError);
+      expect(execution.execution.status).toBe("failed");
-      expect(failure.operation).toBe("executions.create.environment");
+      expect(execution.pendingInteraction).toBeNull();
-      expect(failure.message).toContain("Failed creating MCP connector");
+      expect(execution.execution.errorText).toContain("Invalid URL");
     }),
   );
 });

apps/web/src/views/add-source.tsx+2−1

   const applyTemplate = async (template: SourceTemplate) => {
     const discoveryUrl = "specUrl" in template ? template.specUrl : template.endpoint;
-    setUrl(discoveryUrl);
+    setUrl(template.endpoint);
     setStatusBanner(null);
     setPhase("discovering");
       // Prefer the template's own values over whatever discover returned
       form.name = template.name;
       form.endpoint = template.endpoint;
+      form.namespace = namespaceFromUrl(template.endpoint);
       if ("specUrl" in template) {
         form.specUrl = template.specUrl;
       }