Update executor version to 1.1.6, enhance tests, and add new source templates

- Bump version in package.json - Add tests for completed MCP return values in server.test.ts - Introduce new source templates for Neon MCP and Neon API in source-templates.ts - Refactor OpenAPI response handling in openapi-tools.ts and related tests - Improve result preview formatting in executor-mcp

Rhys Sullivan committed 8 months ago

Commit 9f5d7cf1 parent cc270618 files · +179 −125Browse files

Showing the changes to packages/codemode-openapi/src (2 of 8 files). Show all

Unified · Split

2 files

packages/codemode-openapi/src/openapi-tools.test.ts +56 −37
packages/codemode-openapi/src/openapi-tools.ts +31 −64

packages/codemode-openapi/src/openapi-tools.test.ts+56−37

       );
       expect(result).toEqual({
-        ok: true,
+        full_name: "octocat/hello-world",
-        status: 200,
+        include: null,
-        headers: expect.any(Object),
-        body: {
-          full_name: "octocat/hello-world",
-          include: null,
-        },
       });
       expect(server.requests).toHaveLength(1);
       expect(server.requests[0]?.path).toBe("/repos/octocat/hello-world");
       );
       expect(getResult).toEqual({
-        ok: true,
+        full_name: "octocat/hello-world",
-        status: 200,
+        include: "all",
-        headers: expect.any(Object),
-        body: {
-          full_name: "octocat/hello-world",
-          include: "all",
-        },
       });
       const postResult = yield* Effect.promise(() =>
       );
       expect(postResult).toEqual({
-        ok: true,
+        created: true,
-        status: 201,
+        owner: "octocat",
-        headers: expect.any(Object),
+        repo: "hello-world",
-        body: {
+        body: { title: "Bug report" },
-          created: true,
-          owner: "octocat",
-          repo: "hello-world",
-          body: { title: "Bug report" },
-        },
       });
       const missingBody = yield* Effect.either(
     }),
   );
+  it.effect("throws on non-2xx OpenAPI responses", () =>
+    Effect.gen(function* () {
+      const manifest = yield* extractOpenApiManifest("generated", generatedOpenApiSpec);
+      const httpClientLayer = Layer.succeed(
+        HttpClient.HttpClient,
+        HttpClient.make((request) =>
+          Effect.sync(() =>
+            HttpClientResponse.fromWeb(
+              request,
+              new Response(
+                JSON.stringify({ error: "missing" }),
+                {
+                  status: 404,
+                  headers: {
+                    "content-type": "application/json",
+                  },
+                },
+              ),
+            ),
+          ),
+        ),
+      );
+      const tools = createOpenApiToolsFromManifest({
+        manifest,
+        baseUrl: "https://example.com",
+        namespace: "source.generated",
+        httpClientLayer,
+      });
+      const getRepo = resolveToolExecutor(tools, "source.generated.repos.getRepo");
+      const failure = yield* Effect.either(
+        Effect.tryPromise({
+          try: () => getRepo({ owner: "octocat", repo: "hello-world" }),
+          catch: (error: unknown) =>
+            error instanceof Error ? error : new Error(String(error)),
+        }),
+      );
+      assertTrue(failure._tag === "Left");
+      if (failure._tag === "Left" && failure.left instanceof Error) {
+        assertInclude(failure.left.message, "HTTP 404");
+      }
+    }),
+  );
   it.effect("preserves base-path URLs when invoking tools", () =>
     Effect.gen(function* () {
       const manifest = yield* extractOpenApiManifest("generated", generatedOpenApiSpec);
       );
       expect(result).toEqual({
-        ok: true,
+        full_name: "octocat/hello-world",
-        status: 200,
+        include: null,
-        headers: expect.any(Object),
-        body: {
-          full_name: "octocat/hello-world",
-          include: null,
-        },
       });
       expect(capturedUrl).toBe("https://example.com/api/v3/repos/octocat/hello-world");
       );
       expect(result).toEqual({
-        ok: true,
+        full_name: "octocat/hello-world",
-        status: 200,
+        include: null,
-        headers: expect.any(Object),
-        body: {
-          full_name: "octocat/hello-world",
-          include: null,
-        },
       });
       expect(server.requests).toHaveLength(1);
       expect(server.requests[0]?.path).toBe("/repos/octocat/hello-world");

packages/codemode-openapi/src/openapi-tools.ts+31−64

@@ -40,44 +40,6 @@ export class OpenApiToolInvocationError extends Data.TaggedError( · 39 unmodified lines
40	details: string \| null;	40	details: string \| null;
41	}> {}	41	}> {}
42		42
43	const BLOCKED_RESPONSE_HEADER_NAMES = new Set([
44	"authorization",
45	"authentication-info",
46	"cookie",
47	"proxy-authenticate",
48	"proxy-authorization",
49	"set-cookie",
50	"set-cookie2",
51	"www-authenticate",
52	"x-api-key",
53	"x-auth-token",
54	"x-csrf-token",
55	]);
56
57	const NOISY_RESPONSE_HEADER_NAMES = new Set([
58	"alt-svc",
59	"cf-ray",
60	"server",
61	"traceparent",
62	"tracestate",
63	"via",
64	"x-cache",
65	"x-cache-hits",
66	"x-powered-by",
67	"x-request-id",
68	"x-runtime",
69	"x-served-by",
70	"x-trace-id",
71	]);
72
73	const NOISY_RESPONSE_HEADER_PREFIXES = [
74	"cf-",
75	"trace-",
76	"x-amz-cf-",
77	"x-b3-",
78	"x-cloud-trace-",
79	];
80
81	const isRecord = (value: unknown): value is Record<string, unknown> =>	43	const isRecord = (value: unknown): value is Record<string, unknown> =>
82	typeof value === "object" && value !== null && !Array.isArray(value);	44	typeof value === "object" && value !== null && !Array.isArray(value);
83		45
@@ -244,27 +206,7 @@ const normalizeHttpUrl = (value: string): string => { · 160 unmodified lines
244	}	206	}
245	};	207	};
246		208
247	const shouldDropResponseHeader = (headerName: string): boolean =>
248	BLOCKED_RESPONSE_HEADER_NAMES.has(headerName)
249	\|\| NOISY_RESPONSE_HEADER_NAMES.has(headerName)
250	\|\| NOISY_RESPONSE_HEADER_PREFIXES.some((prefix) => headerName.startsWith(prefix));
251
252	const sanitizeResponseHeaders = (
253	headers: Readonly<Record<string, string>>,
254	): Record<string, string> => {
255	const sanitized: Record<string, string> = {};
256
257	for (const [rawName, rawValue] of Object.entries(headers)) {
258	const name = rawName.trim().toLowerCase();
259	if (name.length === 0 \|\| shouldDropResponseHeader(name)) {
260	continue;
261	}
262		209
263	sanitized[name] = rawValue.length > 4000 ? `${rawValue.slice(0, 4000)}...` : rawValue;
264	}
265
266	return sanitized;
267	};
268		210
269	const decodeHttpClientResponseBody = (	211	const decodeHttpClientResponseBody = (
270	response: Awaited<ReturnType<HttpClient.HttpClient["execute"]>> extends Effect.Effect<	212	response: Awaited<ReturnType<HttpClient.HttpClient["execute"]>> extends Effect.Effect<
@@ -292,6 +234,28 @@ const decodeHttpClientResponseBody = ( · 21 unmodified lines
292	);	234	);
293	};	235	};
294		236
		237	const summarizeHttpResponseBody = (body: unknown): string \| null => {
		238	if (body === null \|\| body === undefined) {
		239	return null;
		240	}
		241
		242	if (typeof body === "string") {
		243	const trimmed = body.trim();
		244	if (trimmed.length === 0) {
		245	return null;
		246	}
		247
		248	return trimmed.length > 500 ? `${trimmed.slice(0, 500)}...` : trimmed;
		249	}
		250
		251	try {
		252	const serialized = JSON.stringify(body);
		253	return serialized.length > 500 ? `${serialized.slice(0, 500)}...` : serialized;
		254	} catch {
		255	return String(body);
		256	}
		257	};
		258
295	const inputSchemaFromTypingJson = (inputSchemaJson: string \| undefined) => {	259	const inputSchemaFromTypingJson = (inputSchemaJson: string \| undefined) => {
296	if (!inputSchemaJson) {	260	if (!inputSchemaJson) {
297	return unknownInputSchema;	261	return unknownInputSchema;
@@ -491,12 +455,15 @@ export const createOpenApiToolsFromManifest = ( · 193 unmodified lines
491	);	455	);
492	const body = yield* decodeHttpClientResponseBody(response);	456	const body = yield* decodeHttpClientResponseBody(response);
493		457
494	return {	458	if (response.status < 200 \|\| response.status >= 300) {
495	ok: response.status >= 200 && response.status < 300,	459	throw new OpenApiToolInvocationError({
496	status: response.status,	460	operation: "http_response",
497	headers: sanitizeResponseHeaders(response.headers),	461	message: `OpenAPI request failed with HTTP ${response.status}`,
498	body,	462	details: summarizeHttpResponseBody(body),
499	};	463	});
		464	}
		465
		466	return body;
500	}).pipe(	467	}).pipe(
501	Effect.provide(httpClientLayer),	468	Effect.provide(httpClientLayer),
502	),	469	),

Update executor version to 1.1.6, enhance tests, and add new source templates

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code