@krak-stack/registry 0.1.38 → 0.1.40

package/dist/lib/httpapi-cli.js

@@ -1,39 +1,44 @@
 // ../../src/lib/httpapi-cli.ts
-import {
-  Cause,
-  Console,
-  Context as Context3,
-  Effect as Effect3,
-  Exit,
-  FileSystem,
-  Layer as Layer3,
-  Option as Option2,
-  Path,
-  Schema as Schema3,
-  Stdio,
-  Stream,
-  Terminal
-} from "effect";
+import { Console, Effect as Effect2, Option as Option2, Schema as Schema2, Stream } from "effect";
 import { Argument, Command, Flag } from "effect/cli";
-import { ChildProcessSpawner } from "effect/process/ChildProcessSpawner";
 
-// ../../src/lib/httpapi-client.ts
-import { Context, Effect, Layer, Schema, SchemaTransformation } from "effect";
-import { HttpClient } from "effect/http";
+// ../../src/lib/httpapi-adapter.ts
 import {
-  HttpApi,
-  HttpApiClient as EffectHttpApiClient,
-  OpenApi
-} from "effect/http-api";
-var executeHttpApiOperation = Effect.fn("HttpApiClient.executeOperation")((options, client) => client.execute({
-  operation: options.operation,
-  input: {
-    body: options.input.body,
-    headers: options.input.headers ?? {},
-    params: options.input.params ?? {},
-    query: options.input.query ?? {}
-  }
-}));
+  Context,
+  Effect,
+  Layer,
+  Option,
+  Schema,
+  SchemaTransformation
+} from "effect";
+import { HttpClient } from "effect/http";
+import { HttpApi, HttpApiClient, OpenApi } from "effect/http-api";
+var HttpApiMethods = [
+  "get",
+  "post",
+  "put",
+  "patch",
+  "delete"
+];
+var HttpApiOperation = Schema.Struct({
+  operationId: Schema.optional(Schema.String),
+  summary: Schema.optional(Schema.String),
+  description: Schema.optional(Schema.String),
+  tags: Schema.optional(Schema.Array(Schema.String)),
+  parameters: Schema.optional(Schema.Array(Schema.Struct({
+    name: Schema.String,
+    in: Schema.Literals(["path", "query", "header", "cookie"]),
+    required: Schema.optional(Schema.Boolean),
+    description: Schema.optional(Schema.String),
+    schema: Schema.optional(Schema.Json)
+  }))),
+  requestBody: Schema.optional(Schema.Struct({
+    required: Schema.optional(Schema.Boolean),
+    content: Schema.optional(Schema.Record(Schema.String, Schema.Struct({
+      schema: Schema.optional(Schema.Json)
+    })))
+  }))
+}).annotate({ identifier: "HttpApiOperation" });
 var UndefinedFromNull = Schema.Null.pipe(Schema.decodeTo(Schema.Undefined, SchemaTransformation.transform({
   decode: () => {
     return;
@@ -55,238 +60,163 @@ var HttpApiOperationResult = Schema.Union([
   HttpApiOperationResultValue,
   Schema.Undefined
 ]).annotate({ identifier: "HttpApiOperationResult" });
-var encodeHttpApiOperationResult = Effect.fn("HttpApiClient.encodeOperationResult")((result) => Schema.encodeUnknownEffect(HttpApiOperationResult)(result).pipe(Effect.map((encoded) => encoded ?? null), Effect.mapError((cause) => new Error("HTTP API result is not serializable", { cause }))));
+var encodeHttpApiOperationResult = Effect.fn("HttpApiAdapter.encodeOperationResult")((result) => Schema.encodeUnknownEffect(HttpApiOperationResult)(result).pipe(Effect.map((encoded) => encoded ?? null), Effect.mapError((cause) => new Error("HTTP API result is not serializable", { cause }))));
+var encodeOperationResult = Effect.fn("HttpApiAdapter.encodeResult")((result, operation) => operation.successSchema ? Schema.encodeUnknownEffect(operation.successSchema)(result).pipe(Effect.flatMap(encodeHttpApiOperationResult), Effect.mapError((cause) => new Error("HTTP API result does not match its success schema", {
+  cause
+}))) : encodeHttpApiOperationResult(result));
 var reflectedSchema = (schema) => Schema.make(schema.ast);
-var operationResultSchemas = (api) => {
-  const schemas = new Map;
-  HttpApi.reflect(api, {
-    onGroup: () => {
-      return;
-    },
-    onEndpoint: ({ endpoint, group, successes }) => {
-      const operationId = Context.getOrElse(endpoint.annotations, OpenApi.Identifier, () => group.topLevel ? endpoint.identifier : `${group.identifier}.${endpoint.identifier}`);
-      const operationSchemas = Array.from(successes.values()).flat().map(reflectedSchema);
-      if (operationSchemas.length === 1 && operationSchemas[0]) {
-        schemas.set(operationId, operationSchemas[0]);
-      } else if (operationSchemas.length > 1) {
-        schemas.set(operationId, Schema.Union(operationSchemas));
+var sanitizeHttpName = (name) => name.replace(/[^a-zA-Z0-9_-]/g, "_").replace(/_+/g, "_").replace(/^_+|_+$/g, "");
+var httpApiToolName = (entry) => (entry.operation.operationId || `${entry.method}_${entry.path.replace(/^\/api\//, "").replace(/[/:{}]/g, "_")}`).replace(/[^a-zA-Z0-9_-]/g, "_").replace(/_+/g, "_").slice(0, 64);
+var makeCatalogue = (api, methods, include) => Effect.try({
+  try: () => {
+    if (!HttpApi.isHttpApi(api))
+      throw new Error("HttpApiAdapter requires a valid HttpApi");
+    const spec = OpenApi.fromApi(api);
+    const reflected = new Map;
+    HttpApi.reflect(api, {
+      onGroup: () => {
+        return;
+      },
+      onEndpoint: ({ endpoint, group, successes }) => {
+        const operationId = Context.getOrElse(endpoint.annotations, OpenApi.Identifier, () => group.topLevel ? endpoint.identifier : `${group.identifier}.${endpoint.identifier}`);
+        if (reflected.has(operationId))
+          throw new Error(`Duplicate HTTP API operation ID: ${operationId}`);
+        const fields = {};
+        if (endpoint.params)
+          fields.params = Schema.toType(reflectedSchema(endpoint.params));
+        if (endpoint.query)
+          fields.query = Schema.optionalKey(Schema.toType(reflectedSchema(endpoint.query)));
+        if (endpoint.headers)
+          fields.headers = Schema.optionalKey(Schema.toType(reflectedSchema(endpoint.headers)));
+        const payloads = Array.from(endpoint.payload.values()).flatMap(({ schemas }) => schemas.map(reflectedSchema));
+        if (payloads.length === 1 && payloads[0])
+          fields.body = payloads[0];
+        else if (payloads.length > 1)
+          fields.body = Schema.Union(payloads);
+        const input = Object.keys(fields).length === 0 ? Schema.Record(Schema.String, Schema.Never) : Schema.Struct(fields);
+        const inputSchema = Schema.make(Schema.toCodecJson(input).ast).annotate({
+          identifier: `${sanitizeHttpName(operationId)}ToolInput`
+        });
+        const successSchemas = Array.from(successes.values()).flat().map(reflectedSchema);
+        reflected.set(operationId, {
+          groupIdentifier: group.identifier,
+          endpointIdentifier: endpoint.identifier,
+          topLevel: group.topLevel,
+          inputSchema,
+          successSchema: successSchemas.length === 1 ? successSchemas[0] : successSchemas.length > 1 ? Schema.Union(successSchemas) : undefined
+        });
+      }
+    });
+    const names = new Set;
+    const operations = [];
+    for (const [path, pathItem] of Object.entries(spec.paths)) {
+      for (const method of methods) {
+        const decoded = Schema.decodeUnknownOption(HttpApiOperation)(pathItem[method]);
+        if (Option.isNone(decoded))
+          continue;
+        const entry = { method, path, operation: decoded.value };
+        if (include && !include(entry))
+          continue;
+        const metadata = entry.operation.operationId ? reflected.get(entry.operation.operationId) : undefined;
+        if (!metadata)
+          throw new Error(`Missing endpoint schema for ${entry.operation.operationId}`);
+        const name = httpApiToolName(entry);
+        if (!name || names.has(name))
+          throw new Error(`Duplicate or empty HTTP API tool name: ${name}`);
+        names.add(name);
+        const document = Schema.toJsonSchemaDocument(metadata.inputSchema.annotate({ identifier: undefined }));
+        operations.push({
+          ...entry,
+          ...metadata,
+          name,
+          inputJsonSchema: {
+            ...document.schema,
+            $defs: document.definitions
+          },
+          readOnly: method === "get",
+          destructive: method === "delete",
+          idempotent: method === "get" || method === "put" || method === "delete"
+        });
       }
     }
-  });
-  return schemas;
-};
-var makeHttpApiOperationResultEncoder = (api) => {
-  const schemas = operationResultSchemas(api);
-  return Effect.fn("HttpApiClient.encodeOperationResultWithSchema")((result, operation) => {
-    const operationId = operation.operation.operationId;
-    const schema = operationId ? schemas.get(operationId) : undefined;
-    if (!schema)
-      return encodeHttpApiOperationResult(result);
-    return Schema.encodeUnknownEffect(schema)(result).pipe(Effect.flatMap(encodeHttpApiOperationResult), Effect.mapError((cause) => new Error("HTTP API result does not match its success schema", {
-      cause
-    })));
-  });
-};
+    return { info: spec.info, operations };
+  },
+  catch: (cause) => new Error("Failed to build HTTP API adapter catalogue", { cause })
+});
 var GeneratedOperation = Schema.declare((value) => value instanceof Function).annotate({ identifier: "GeneratedOperation" });
 var GeneratedOperationEffect = Schema.declare((value) => Effect.isEffect(value)).annotate({ identifier: "GeneratedOperationEffect" });
-var makeGeneratedClient = (api, http, baseUrl) => EffectHttpApiClient.makeWith(api, {
-  baseUrl,
-  httpClient: http
-});
-var executeGeneratedOperation = Effect.fn("HttpApiClient.executeGeneratedOperation")(function* (client, { input, operation: entry }) {
-  const operationId = entry.operation.operationId;
-  if (!operationId) {
-    return yield* Effect.fail(new Error(`No generated API client operation for ${entry.method} ${entry.path}`));
-  }
-  const target = Object(client);
-  const groupName = Object.keys(target).filter((name) => operationId.startsWith(`${name}.`)).sort((a, b) => b.length - a.length)[0];
-  const group = groupName ? Object.entries(target).find(([name]) => name === groupName)?.[1] : target;
-  const endpointName = groupName ? operationId.slice(groupName.length + 1) : operationId;
-  const endpointCandidate = group instanceof Function ? undefined : Object.entries(Object(group)).find(([name]) => name === endpointName)?.[1];
-  const endpoint = Schema.decodeUnknownOption(GeneratedOperation)(endpointCandidate);
-  if (endpoint._tag === "None") {
-    return yield* Effect.fail(new Error(`No generated API client operation for ${operationId}`));
-  }
+var executeGeneratedOperation = Effect.fn("HttpApiAdapter.executeGeneratedOperation")(function* (client, { operation, input }) {
+  const group = operation.topLevel ? client : Object.entries(Object(client)).find(([name]) => name === operation.groupIdentifier)?.[1];
+  const candidate = Object.entries(Object(group)).find(([name]) => name === operation.endpointIdentifier)?.[1];
+  const endpoint = Schema.decodeUnknownOption(GeneratedOperation)(candidate);
+  if (Option.isNone(endpoint))
+    return yield* Effect.fail(new Error(`No generated API client operation for ${operation.operation.operationId}`));
   const result = Schema.decodeUnknownOption(GeneratedOperationEffect)(endpoint.value({
-    headers: input.headers,
-    params: input.params,
-    query: input.query,
+    headers: input.headers ?? {},
+    params: input.params ?? {},
+    query: input.query ?? {},
     payload: input.body
   }));
-  if (result._tag === "None") {
-    return yield* Effect.fail(new Error(`Generated API client operation ${operationId} is invalid`));
-  }
+  if (Option.isNone(result))
+    return yield* Effect.fail(new Error(`Generated API client operation ${operation.operation.operationId} is invalid`));
   return yield* result.value;
 });
 
-class ApiClient extends Context.Service()("ApiClient") {
-  static layer = (config) => Layer.effect(this, Effect.gen(function* () {
-    const http = yield* HttpClient.HttpClient;
-    const encodeResult = makeHttpApiOperationResultEncoder(config.api);
-    const client = yield* makeGeneratedClient(config.api, http, config.baseUrl);
-    return {
-      encodeResult: config.encodeResult ?? ((result, operation) => encodeResult(result, operation)),
-      execute: Effect.fn("ApiClient.execute")(function* (options) {
-        return yield* executeGeneratedOperation(client, options);
+class HttpApiAdapter extends Context.Service()("@krak-stack/registry/HttpApiAdapter") {
+  static make = Effect.fn("HttpApiAdapter.make")(function* (config) {
+    const catalogue = yield* makeCatalogue(config.api, config.methods ?? HttpApiMethods, config.include);
+    const httpClient = yield* HttpClient.HttpClient;
+    const client = yield* HttpApiClient.makeWith(config.api, {
+      baseUrl: config.baseUrl,
+      httpClient
+    });
+    return HttpApiAdapter.of({
+      ...catalogue,
+      encodeResult: config.encodeResult ?? encodeOperationResult,
+      execute: Effect.fn("HttpApiAdapter.execute")(function* (options) {
+        const operation = catalogue.operations.find((entry) => entry.method === options.operation.method && entry.path === options.operation.path && entry.operation.operationId === options.operation.operation.operationId);
+        if (!operation) {
+          return yield* Effect.fail(new Error("Operation is not in this HTTP API adapter catalogue"));
+        }
+        return yield* executeGeneratedOperation(client, {
+          operation,
+          input: options.input
+        });
       })
-    };
-  }));
-}
-
-// ../../src/lib/httpapi-helpers.tsx
-import { Context as Context2, Effect as Effect2, Layer as Layer2, Option, Schema as Schema2 } from "effect";
-import { HttpApi as HttpApi2, OpenApi as OpenApi2 } from "effect/http-api";
-var JsonObjectSchema = Schema2.Record(Schema2.String, Schema2.Json).annotate({
-  identifier: "HttpJsonObject",
-  title: "HTTP JSON object",
-  description: "A JSON object passed to an HTTP API operation.",
-  examples: [{ id: "example-id" }]
-});
-var JsonObjectFromString = Schema2.fromJsonString(JsonObjectSchema);
-var JsonValueFromString = Schema2.fromJsonString(Schema2.Json);
-var HttpApiMethods = [
-  "get",
-  "post",
-  "put",
-  "patch",
-  "delete"
-];
-var HttpApiOperationSchema = Schema2.declare((value) => Schema2.is(JsonObjectSchema)(value)).annotate({ identifier: "HttpApiOperation" });
-var decodeHttpApiOperation = Schema2.decodeUnknownOption(HttpApiOperationSchema);
-var toHttpError = (message, error) => new Error(message, { cause: error });
-var sanitizeHttpName = (name) => name.replace(/[^a-zA-Z0-9_-]/g, "_").replace(/_+/g, "_").replace(/^_+|_+$/g, "");
-var httpApiToolName = (method, path, operation) => {
-  const fallback = `${method}_${path.replace(/^\/api\//, "").replace(/[/:{}]/g, "_")}`;
-  return (operation.operationId || fallback).replace(/[^a-zA-Z0-9_-]/g, "_").replace(/_+/g, "_").slice(0, 64);
-};
-var httpApiOperations = ({
-  spec,
-  methods = HttpApiMethods
-}) => {
-  const operations = [];
-  for (const [path, pathItem] of Object.entries(spec.paths)) {
-    for (const method of methods) {
-      const operation = decodeHttpApiOperation(pathItem[method]);
-      if (Option.isSome(operation))
-        operations.push({ method, path, operation: operation.value });
-    }
-  }
-  return operations;
-};
-var reflectedSchema2 = (schema) => Schema2.make(schema.ast);
-var reflectedOperationInputSchemas = (api) => {
-  const schemas = new Map;
-  HttpApi2.reflect(api, {
-    onGroup: () => {
-      return;
-    },
-    onEndpoint: ({ endpoint, group }) => {
-      const operationId = Context2.getOrElse(endpoint.annotations, OpenApi2.Identifier, () => group.topLevel ? endpoint.identifier : `${group.identifier}.${endpoint.identifier}`);
-      const fields = {};
-      if (endpoint.params)
-        fields.params = Schema2.toType(reflectedSchema2(endpoint.params));
-      if (endpoint.query)
-        fields.query = Schema2.optionalKey(Schema2.toType(reflectedSchema2(endpoint.query)));
-      if (endpoint.headers)
-        fields.headers = Schema2.optionalKey(Schema2.toType(reflectedSchema2(endpoint.headers)));
-      const payloads = Array.from(endpoint.payload.values()).flatMap(({ schemas: schemas2 }) => schemas2.map(reflectedSchema2));
-      if (payloads.length === 1 && payloads[0])
-        fields.body = payloads[0];
-      else if (payloads.length > 1)
-        fields.body = Schema2.Union(payloads);
-      const input = Object.keys(fields).length === 0 ? Schema2.Record(Schema2.String, Schema2.Never) : Schema2.Struct(fields);
-      schemas.set(operationId, Schema2.make(Schema2.toCodecJson(input).ast).annotate({ identifier: `${sanitizeHttpName(operationId)}ToolInput` }));
-    }
+    });
   });
-  return schemas;
-};
-var parseJsonObject = Effect2.fn("Http.parseJsonObject")(function* (value, label) {
-  if (!value)
-    return {};
-  return yield* Schema2.decodeUnknownEffect(JsonObjectFromString)(value).pipe(Effect2.mapError(() => new Error(`${label} must be a JSON object`)));
-});
-var parseJsonValue = Effect2.fn("Http.parseJsonValue")(function* (value, label) {
-  if (!value)
-    return;
-  return yield* Schema2.decodeUnknownEffect(JsonValueFromString)(value).pipe(Effect2.mapError(() => new Error(`${label} must be valid JSON`)));
-});
-
-class HttpApiSpec extends Context2.Service()("HttpApiSpec", {
-  make: (config) => Effect2.try({
-    try: () => {
-      const api = config.api;
-      if (!HttpApi2.isHttpApi(api))
-        throw new Error("HttpApiSpec requires a valid HttpApi");
-      const spec = OpenApi2.fromApi(api);
-      const schemas = reflectedOperationInputSchemas(api);
-      const names = new Set;
-      const operations = httpApiOperations({
-        spec,
-        methods: config.methods
-      }).filter((entry) => config.include?.(entry) ?? true).map((entry) => {
-        const name = httpApiToolName(entry.method, entry.path, entry.operation);
-        if (!name || names.has(name))
-          throw new Error(`Duplicate or empty HTTP API tool name: ${name}`);
-        names.add(name);
-        const inputSchema = entry.operation.operationId ? schemas.get(entry.operation.operationId) : undefined;
-        if (!inputSchema)
-          throw new Error(`Missing endpoint schema for ${entry.operation.operationId}`);
-        const document = Schema2.toJsonSchemaDocument(inputSchema.annotate({ identifier: undefined }));
-        return {
-          ...entry,
-          name,
-          inputSchema,
-          inputJsonSchema: {
-            ...document.schema,
-            $defs: document.definitions
-          },
-          readOnly: entry.method === "get",
-          destructive: entry.method === "delete",
-          idempotent: entry.method === "get" || entry.method === "put" || entry.method === "delete"
-        };
-      });
-      return { info: spec.info, operations };
-    },
-    catch: (error) => toHttpError("Failed to build HTTP API spec", error)
-  })
-}) {
-  static layer = (config) => Layer2.effect(this, this.make(config));
+  static layer = (config) => Layer.effect(this, this.make(config));
 }
 
 // ../../src/lib/httpapi-cli.ts
-var CliJsonSchema = Schema3.Struct({
-  type: Schema3.optional(Schema3.Union([Schema3.String, Schema3.Array(Schema3.String)])),
-  description: Schema3.optional(Schema3.String),
-  enum: Schema3.optional(Schema3.Array(Schema3.Json)),
-  items: Schema3.optional(Schema3.Json),
-  properties: Schema3.optional(Schema3.Record(Schema3.String, Schema3.Json)),
-  required: Schema3.optional(Schema3.Array(Schema3.String)),
-  pattern: Schema3.optional(Schema3.String),
-  allOf: Schema3.optional(Schema3.Array(Schema3.Json)),
-  anyOf: Schema3.optional(Schema3.Array(Schema3.Json)),
-  $ref: Schema3.optional(Schema3.String),
-  $defs: Schema3.optional(Schema3.Record(Schema3.String, Schema3.Json))
+var CliJsonSchema = Schema2.Struct({
+  type: Schema2.optional(Schema2.Union([Schema2.String, Schema2.Array(Schema2.String)])),
+  description: Schema2.optional(Schema2.String),
+  enum: Schema2.optional(Schema2.Array(Schema2.Json)),
+  items: Schema2.optional(Schema2.Json),
+  properties: Schema2.optional(Schema2.Record(Schema2.String, Schema2.Json)),
+  required: Schema2.optional(Schema2.Array(Schema2.String)),
+  pattern: Schema2.optional(Schema2.String),
+  allOf: Schema2.optional(Schema2.Array(Schema2.Json)),
+  anyOf: Schema2.optional(Schema2.Array(Schema2.Json)),
+  $ref: Schema2.optional(Schema2.String),
+  $defs: Schema2.optional(Schema2.Record(Schema2.String, Schema2.Json))
 }).annotate({ identifier: "HttpApiCliJsonSchema" });
-var decodeCliJsonSchema = Schema3.decodeUnknownOption(CliJsonSchema);
-var JsonFromString = Schema3.fromJsonString(Schema3.Json);
-var CliParsedOption = Schema3.declare((value) => Option2.isOption(value) && Option2.match(value, {
+var decodeCliJsonSchema = Schema2.decodeUnknownOption(CliJsonSchema);
+var JsonFromString = Schema2.fromJsonString(Schema2.Json);
+var CliParsedOption = Schema2.declare((value) => Option2.isOption(value) && Option2.match(value, {
   onNone: () => true,
-  onSome: Schema3.is(Schema3.Json)
+  onSome: Schema2.is(Schema2.Json)
 })).annotate({ identifier: "HttpApiCliParsedOption" });
-var CliParsedConfig = Schema3.Record(Schema3.String, Schema3.Union([Schema3.Json, CliParsedOption])).annotate({ identifier: "HttpApiCliParsedConfig" });
-
-class HttpApiCli extends Context3.Service()("HttpApiCli", {
-  make: () => Effect3.gen(function* () {
-    const spec = yield* HttpApiSpec;
-    const command = yield* makeHttpApiCliCommand();
-    return {
-      command,
-      run: (args) => Command.runWith(command, { version: spec.info.version })(args)
-    };
-  })
-}) {
-  static layer = Layer3.effect(this, this.make());
-}
+var CliParsedConfig = Schema2.Record(Schema2.String, Schema2.Union([Schema2.Json, CliParsedOption])).annotate({ identifier: "HttpApiCliParsedConfig" });
+var makeHttpApiCli = Effect2.fn("HttpApiCli.make")(function* () {
+  const spec = yield* HttpApiAdapter;
+  const command = yield* makeHttpApiCliCommand();
+  return {
+    command,
+    run: (args) => Command.runWith(command, { version: spec.info.version })(args)
+  };
+});
 var toHttpApiCliName = (value) => value.replace(/([a-z0-9])([A-Z])/g, "$1-$2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1-$2").replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").toLowerCase();
 var fallbackName = (value, fallback) => toHttpApiCliName(value) || fallback;
 var operationIdParts = (operation) => operation.operationId?.split(".").filter(Boolean) ?? [];
@@ -343,8 +273,8 @@ var schemaType = (schema) => {
     return type;
   return schemaType(effectiveSchema(schema));
 };
-var schemaEnum = (schema) => Schema3.decodeUnknownOption(Schema3.Array(Schema3.String))(effectiveSchema(schema).enum).pipe(Option2.getOrElse(() => []));
-var jsonFlag = (name) => Flag.String(name).pipe(Flag.mapTryCatch((value) => Schema3.decodeUnknownSync(JsonFromString)(value), () => `--${name} must be valid JSON`));
+var schemaEnum = (schema) => Schema2.decodeUnknownOption(Schema2.Array(Schema2.String))(effectiveSchema(schema).enum).pipe(Option2.getOrElse(() => []));
+var jsonFlag = (name) => Flag.String(name).pipe(Flag.mapTryCatch((value) => Schema2.decodeUnknownSync(JsonFromString)(value), () => `--${name} must be valid JSON`));
 var primitiveFlag = (name, schema, required) => {
   const type = schemaType(schema);
   const choices = schemaEnum(schema);
@@ -452,16 +382,16 @@ var operationInputs = (operation) => {
     };
   });
 };
-var HttpApiCliResultStream = Schema3.declare((value) => Stream.isStream(value)).annotate({ identifier: "HttpApiCliResultStream" });
-var printHttpApiCliResult = Effect3.fn("HttpApiCli.printResult")(function* (response, operation, client) {
-  const stream = Schema3.decodeUnknownOption(HttpApiCliResultStream)(response);
+var HttpApiCliResultStream = Schema2.declare((value) => Stream.isStream(value)).annotate({ identifier: "HttpApiCliResultStream" });
+var printHttpApiCliResult = Effect2.fn("HttpApiCli.printResult")(function* (response, operation, client) {
+  const stream = Schema2.decodeUnknownOption(HttpApiCliResultStream)(response);
   if (stream._tag === "Some") {
     return yield* stream.value.pipe(Stream.mapEffect((event) => client.encodeResult(event, operation)), Stream.runForEach((event) => print(JSON.stringify(event))));
   }
   const encoded = yield* client.encodeResult(response, operation);
   return yield* print(JSON.stringify(encoded, null, 2) ?? "null");
 });
-var callOperation = Effect3.fn("HttpApiCli.callOperation")(function* (operation, inputs, callConfig, client) {
+var callOperation = Effect2.fn("HttpApiCli.callOperation")(function* (operation, inputs, callConfig, client) {
   const emptyValues = () => ({});
   const assembled = {
     body: emptyValues(),
@@ -469,28 +399,28 @@ var callOperation = Effect3.fn("HttpApiCli.callOperation")(function* (operation,
     params: emptyValues(),
     query: emptyValues()
   };
-  for (const input2 of inputs) {
-    const parsed = callConfig[input2.configKey];
+  for (const input of inputs) {
+    const parsed = callConfig[input.configKey];
     const value = Option2.isOption(parsed) ? Option2.getOrUndefined(parsed) : parsed;
     if (value !== undefined) {
-      assembled[input2.location][input2.name] = value;
+      assembled[input.location][input.name] = value;
     }
   }
-  const bodyInput = inputs.some((input2) => input2.location === "body" && input2.name === "body") ? assembled.body.body : Object.keys(assembled.body).length > 0 || cliJsonSchema(operation.inputJsonSchema).required?.includes("body") ? assembled.body : undefined;
+  const bodyInput = inputs.some((input) => input.location === "body" && input.name === "body") ? assembled.body.body : Object.keys(assembled.body).length > 0 || cliJsonSchema(operation.inputJsonSchema).required?.includes("body") ? assembled.body : undefined;
   const rawInput = {};
-  if (inputs.some((input2) => input2.location === "params")) {
+  if (inputs.some((input) => input.location === "params")) {
     rawInput.params = assembled.params;
   }
-  if (inputs.some((input2) => input2.location === "headers")) {
+  if (inputs.some((input) => input.location === "headers")) {
     rawInput.headers = assembled.headers;
   }
-  if (inputs.some((input2) => input2.location === "query")) {
+  if (inputs.some((input) => input.location === "query")) {
     rawInput.query = assembled.query;
   }
   if (bodyInput !== undefined)
     rawInput.body = bodyInput;
-  const input = yield* Schema3.decodeUnknownEffect(operation.inputSchema)(rawInput).pipe(Effect3.mapError((error) => new Error(`Invalid input for ${operation.groupName} ${operation.name}: ${error.message}`)));
-  const response = yield* executeHttpApiOperation({ operation, input }, client);
+  const input = yield* Schema2.decodeUnknownEffect(operation.inputSchema)(rawInput).pipe(Effect2.mapError((error) => new Error(`Invalid input for ${operation.groupName} ${operation.name}: ${error.message}`)));
+  const response = yield* client.execute({ operation, input });
   return yield* printHttpApiCliResult(response, operation, client);
 });
 var listCommand = (groups) => Command.make("list", {}, () => print([
@@ -499,75 +429,31 @@ var listCommand = (groups) => Command.make("list", {}, () => print([
 ].join(`
 `))).pipe(Command.withDescription("List command groups"));
 var groupListCommand = (group) => Command.make("list", {}, () => listOperations(group.operations)).pipe(Command.withDescription(`List ${group.title} operations`));
-var operationCommand = (operation, client) => Effect3.sync(() => {
+var operationCommand = (operation, client) => Effect2.sync(() => {
   const inputs = operationInputs(operation);
   const config = Object.fromEntries(inputs.map((input) => [input.configKey, input.param]));
-  return Command.make(operation.name, config, (callConfig) => Schema3.decodeUnknownEffect(CliParsedConfig)(callConfig).pipe(Effect3.flatMap((parsed) => callOperation(operation, inputs, parsed, client)))).pipe(Command.withDescription(operation.summary || `${operation.method.toUpperCase()} ${operation.path}`), Command.withExamples([
+  return Command.make(operation.name, config, (callConfig) => Schema2.decodeUnknownEffect(CliParsedConfig)(callConfig).pipe(Effect2.flatMap((parsed) => callOperation(operation, inputs, parsed, client)))).pipe(Command.withDescription(operation.summary || `${operation.method.toUpperCase()} ${operation.path}`), Command.withExamples([
     {
       command: `${operation.groupName} ${operation.name}`,
       description: `${operation.method.toUpperCase()} ${operation.path}`
     }
   ]));
 });
-var groupCommand = (group, client) => Effect3.all(group.operations.map((operation) => operationCommand(operation, client))).pipe(Effect3.map((operationCommands) => Command.make(group.name).pipe(Command.withDescription(group.title), Command.withSubcommands([
+var groupCommand = (group, client) => Effect2.all(group.operations.map((operation) => operationCommand(operation, client))).pipe(Effect2.map((operationCommands) => Command.make(group.name).pipe(Command.withDescription(group.title), Command.withSubcommands([
   groupListCommand(group),
   ...operationCommands
 ]))));
-var makeHttpApiCliCommand = Effect3.fn("HttpApiCli.makeCommand")(function* () {
-  const spec = yield* HttpApiSpec;
-  const client = yield* ApiClient;
+var makeHttpApiCliCommand = Effect2.fn("HttpApiCli.makeCommand")(function* () {
+  const spec = yield* HttpApiAdapter;
+  const client = spec;
   const name = fallbackName(spec.info.title, "api");
-  const groups = yield* Effect3.try({
+  const groups = yield* Effect2.try({
     try: () => httpApiCliOperationGroups(spec.operations.map(toCliOperation)),
     catch: (error) => error instanceof Error ? error : new Error(String(error))
   });
-  const groupCommands = yield* Effect3.all(groups.map((group) => groupCommand(group, client)));
+  const groupCommands = yield* Effect2.all(groups.map((group) => groupCommand(group, client)));
   return Command.make(name).pipe(Command.withDescription(spec.info.description ?? spec.info.title), Command.withSubcommands([listCommand(groups), ...groupCommands]));
 });
-var cliEnvironmentLayer = (args) => Layer3.mergeAll(FileSystem.layerNoop({}), Path.layer, Stdio.layerTest({ args: Effect3.succeed(Array.from(args)) }), Layer3.succeed(Terminal.Terminal, Terminal.make({
-  columns: Effect3.sync(() => process.stdout.columns ?? 80),
-  rows: Effect3.sync(() => process.stdout.rows ?? 24),
-  readInput: Effect3.die("Terminal input is not supported"),
-  readLine: Effect3.die("Terminal input is not supported"),
-  display: (text) => Effect3.sync(() => process.stdout.write(text))
-})), Layer3.succeed(ChildProcessSpawner, ChildProcessSpawner.of({
-  spawn: () => Effect3.die("Child processes are not supported"),
-  exitCode: () => Effect3.die("Child processes are not supported"),
-  streamString: () => Stream.die("Child processes are not supported"),
-  streamLines: () => Stream.die("Child processes are not supported"),
-  lines: () => Effect3.die("Child processes are not supported"),
-  string: () => Effect3.die("Child processes are not supported")
-})));
-var httpApiCliEnvironmentLayer = (args) => cliEnvironmentLayer(args);
-var httpApiCli = (args = process.argv.slice(2)) => Effect3.gen(function* () {
-  const cli = yield* HttpApiCli;
-  return yield* cli.run(args);
-});
-var formatHttpApiCliCause = (cause) => {
-  const errors = Cause.prettyErrors(cause);
-  if (errors.length === 0)
-    return Cause.pretty(cause);
-  return errors.map((error) => error.message ? `${error.name}: ${error.message}` : error.name).join(`
-`);
-};
-var runHttpApiCli = (layer, args = process.argv.slice(2)) => {
-  Effect3.runPromiseExit(httpApiCli(args).pipe(Effect3.provide(layer), Effect3.provide(httpApiCliEnvironmentLayer(args)))).then(Exit.match({
-    onSuccess: () => {
-      return;
-    },
-    onFailure: (cause) => {
-      console.error(formatHttpApiCliCause(cause));
-      process.exitCode = 1;
-    }
-  }));
-};
 export {
-  HttpApiCli,
-  formatHttpApiCliCause,
-  httpApiCli,
-  httpApiCliEnvironmentLayer,
-  makeHttpApiCliCommand,
-  printHttpApiCliResult,
-  runHttpApiCli,
-  toHttpApiCliName
+  makeHttpApiCli
 };

package/dist/lib/httpapi-toolkit.d.ts

@@ -1,31 +1,22 @@
-import { Effect, Layer, Schema } from "effect";
+import { Effect, Schema } from "effect";
 import type { Json } from "effect/Schema";
 import { Tool, Toolkit } from "effect/ai";
-import { ApiClient } from "./httpapi-client.js";
-import { HttpApiSpec, type HttpApiOperationEntry } from "./httpapi-helpers.js";
+import { HttpApiAdapter } from "./httpapi-adapter.js";
+import { type HttpApiOperationEntry } from "./httpapi-adapter.js";
 export type HttpApiToolkitConfig = {
     readonly toolMetaKey?: string;
     readonly needsApproval?: (operation: HttpApiOperationEntry) => boolean;
     readonly strict?: (operation: HttpApiOperationEntry) => boolean;
     readonly transformResult?: (operation: HttpApiOperationEntry, result: Json) => Json;
 };
-export declare const makeHttpApiToolkit: (config: HttpApiToolkitConfig) => Effect.Effect<{
+export declare const makeHttpApiToolkit: (config?: HttpApiToolkitConfig | undefined) => Effect.Effect<{
     toolkit: Toolkit.Toolkit<{
         readonly [x: string]: Tool.Tool<string, {
-            readonly parameters: Schema.Codec<Partial<import("./httpapi-helpers.js").HttpApiOperationInput>, Json, never, never>;
+            readonly parameters: Schema.Codec<Partial<import("./httpapi-adapter.js").HttpApiOperationInput>, Json, never, never>;
             readonly success: Schema.Codec<Json, Json, never, never>;
             readonly failure: Schema.String;
             readonly failureMode: "return";
         }, never>;
     }>;
-    handlers: Layer.Layer<Tool.Handler<string>, never, ApiClient>;
-}, never, HttpApiSpec>;
-export declare const HttpApiToolkit: (config: HttpApiToolkitConfig) => Effect.Effect<Toolkit.Toolkit<{
-    readonly [x: string]: Tool.Tool<string, {
-        readonly parameters: Schema.Codec<Partial<import("./httpapi-helpers.js").HttpApiOperationInput>, Json, never, never>;
-        readonly success: Schema.Codec<Json, Json, never, never>;
-        readonly failure: Schema.String;
-        readonly failureMode: "return";
-    }, never>;
-}>, never, HttpApiSpec>;
-export declare const HttpApiToolkitLayer: (config: HttpApiToolkitConfig) => Layer.Layer<Tool.Handler<string>, never, ApiClient | HttpApiSpec>;
+    handlers: import("effect/Layer").Layer<Tool.Handler<string>, never, HttpApiAdapter>;
+}, never, HttpApiAdapter>;