@expandai/mcp-server 0.1.3 → 0.1.4

package/dist/Server.cjs

@@ -40,7 +40,7 @@ var S__namespace = /*#__PURE__*/_interopNamespace(S);
 
 // package.json
 var package_default = {
-  version: "0.1.3"};
+  version: "0.1.4"};
 var ExpandDocs = ai.McpServer.resource({
   uri: "expand://about",
   name: "About expand.ai",
@@ -691,7 +691,7 @@ var ClientError = (tag, cause, response) => new ClientErrorImpl({
 
 // src/ExpandClient.ts
 var ExpandConfig = effect.Config.all({
-  apiKey: effect.Config.redacted("EXPAND_API_KEY"),
+  apiKey: effect.Config.option(effect.Config.redacted("EXPAND_API_KEY")),
   baseUrl: effect.Config.withDefault(effect.Config.string("EXPAND_BASE_URL"), "https://api.expand.ai")
 });
 var ExpandClient = class extends effect.Effect.Service()("ExpandClient", {
@@ -699,12 +699,24 @@ var ExpandClient = class extends effect.Effect.Service()("ExpandClient", {
   scoped: effect.Effect.gen(function* () {
     const config = yield* ExpandConfig;
     const httpClient = yield* platform.HttpClient.HttpClient;
+    const requestHeaders = yield* effect.Effect.serviceOption(CurrentRequestHeaders);
     yield* effect.Effect.logInfo(`ExpandClient connected to ${config.baseUrl}`);
     return make(httpClient, {
       transformClient: (client) => effect.Effect.succeed(
         client.pipe(
           platform.HttpClient.mapRequest(platform.HttpClientRequest.prependUrl(config.baseUrl)),
-          platform.HttpClient.mapRequest(platform.HttpClientRequest.setHeader("x-expand-api-key", effect.Redacted.value(config.apiKey)))
+          platform.HttpClient.mapRequest((req) => {
+            if (effect.Option.isSome(requestHeaders)) {
+              const auth = requestHeaders.value["authorization"];
+              if (auth) {
+                return platform.HttpClientRequest.setHeader("authorization", auth)(req);
+              }
+            }
+            if (effect.Option.isSome(config.apiKey)) {
+              return platform.HttpClientRequest.setHeader("x-expand-api-key", effect.Redacted.value(config.apiKey.value))(req);
+            }
+            return req;
+          })
         )
       )
     });
@@ -810,7 +822,10 @@ var ServerInfo = {
   name: "expandai-mcp-server",
   version: package_default.version
 };
+var CurrentRequestHeaders = class extends effect.Context.Tag("CurrentRequestHeaders")() {
+};
 var makeServerLayer = (options = {}) => options.includeDocs ? effect.Layer.mergeAll(ExpandToolKit, ExpandDocs) : ExpandToolKit;
 
+exports.CurrentRequestHeaders = CurrentRequestHeaders;
 exports.ServerInfo = ServerInfo;
 exports.makeServerLayer = makeServerLayer;

package/dist/Server.d.cts

@@ -1,12 +1,15 @@
 import * as effect_ConfigError from 'effect/ConfigError';
-import { Layer } from 'effect';
+import { Context, Layer } from 'effect';
 
 declare const ServerInfo: {
     readonly name: "expandai-mcp-server";
     readonly version: string;
 };
+declare const CurrentRequestHeaders_base: Context.TagClass<CurrentRequestHeaders, "CurrentRequestHeaders", Record<string, string>>;
+declare class CurrentRequestHeaders extends CurrentRequestHeaders_base {
+}
 declare const makeServerLayer: (options?: {
     readonly includeDocs?: boolean;
 }) => Layer.Layer<never, effect_ConfigError.ConfigError, never>;
 
-export { ServerInfo, makeServerLayer };
+export { CurrentRequestHeaders, ServerInfo, makeServerLayer };

package/dist/Server.d.ts

@@ -1,12 +1,15 @@
 import * as effect_ConfigError from 'effect/ConfigError';
-import { Layer } from 'effect';
+import { Context, Layer } from 'effect';
 
 declare const ServerInfo: {
     readonly name: "expandai-mcp-server";
     readonly version: string;
 };
+declare const CurrentRequestHeaders_base: Context.TagClass<CurrentRequestHeaders, "CurrentRequestHeaders", Record<string, string>>;
+declare class CurrentRequestHeaders extends CurrentRequestHeaders_base {
+}
 declare const makeServerLayer: (options?: {
     readonly includeDocs?: boolean;
 }) => Layer.Layer<never, effect_ConfigError.ConfigError, never>;
 
-export { ServerInfo, makeServerLayer };
+export { CurrentRequestHeaders, ServerInfo, makeServerLayer };

package/dist/Server.js

@@ -1 +1 @@
-export { ServerInfo, makeServerLayer } from './chunk-7ECG3QBA.js';
+export { CurrentRequestHeaders, ServerInfo, makeServerLayer } from './chunk-TUBB4OP4.js';

package/dist/{chunk-7ECG3QBA.js → chunk-TUBB4OP4.js}

@@ -1,4 +1,4 @@
-import { Effect, Config, Schema, Layer, Redacted } from 'effect';
+import { Effect, Config, Schema, Layer, Context, Option, Redacted } from 'effect';
 import { McpServer, Tool, Toolkit } from '@effect/ai';
 import { NodeHttpClient } from '@effect/platform-node';
 import { HttpClient, HttpClientRequest as HttpClientRequest$1 } from '@effect/platform';
@@ -13,7 +13,7 @@ import * as S from 'effect/Schema';
 
 // package.json
 var package_default = {
-  version: "0.1.3"};
+  version: "0.1.4"};
 var ExpandDocs = McpServer.resource({
   uri: "expand://about",
   name: "About expand.ai",
@@ -664,7 +664,7 @@ var ClientError = (tag, cause, response) => new ClientErrorImpl({
 
 // src/ExpandClient.ts
 var ExpandConfig = Config.all({
-  apiKey: Config.redacted("EXPAND_API_KEY"),
+  apiKey: Config.option(Config.redacted("EXPAND_API_KEY")),
   baseUrl: Config.withDefault(Config.string("EXPAND_BASE_URL"), "https://api.expand.ai")
 });
 var ExpandClient = class extends Effect.Service()("ExpandClient", {
@@ -672,12 +672,24 @@ var ExpandClient = class extends Effect.Service()("ExpandClient", {
   scoped: Effect.gen(function* () {
     const config = yield* ExpandConfig;
     const httpClient = yield* HttpClient.HttpClient;
+    const requestHeaders = yield* Effect.serviceOption(CurrentRequestHeaders);
     yield* Effect.logInfo(`ExpandClient connected to ${config.baseUrl}`);
     return make(httpClient, {
       transformClient: (client) => Effect.succeed(
         client.pipe(
           HttpClient.mapRequest(HttpClientRequest$1.prependUrl(config.baseUrl)),
-          HttpClient.mapRequest(HttpClientRequest$1.setHeader("x-expand-api-key", Redacted.value(config.apiKey)))
+          HttpClient.mapRequest((req) => {
+            if (Option.isSome(requestHeaders)) {
+              const auth = requestHeaders.value["authorization"];
+              if (auth) {
+                return HttpClientRequest$1.setHeader("authorization", auth)(req);
+              }
+            }
+            if (Option.isSome(config.apiKey)) {
+              return HttpClientRequest$1.setHeader("x-expand-api-key", Redacted.value(config.apiKey.value))(req);
+            }
+            return req;
+          })
         )
       )
     });
@@ -783,6 +795,8 @@ var ServerInfo = {
   name: "expandai-mcp-server",
   version: package_default.version
 };
+var CurrentRequestHeaders = class extends Context.Tag("CurrentRequestHeaders")() {
+};
 var makeServerLayer = (options = {}) => options.includeDocs ? Layer.mergeAll(ExpandToolKit, ExpandDocs) : ExpandToolKit;
 
-export { ServerInfo, makeServerLayer };
+export { CurrentRequestHeaders, ServerInfo, makeServerLayer };

package/dist/main.cjs

@@ -39,7 +39,7 @@ var S__namespace = /*#__PURE__*/_interopNamespace(S);
 
 // package.json
 var package_default = {
-  version: "0.1.3"};
+  version: "0.1.4"};
 var ExpandDocs = ai.McpServer.resource({
   uri: "expand://about",
   name: "About expand.ai",
@@ -690,7 +690,7 @@ var ClientError = (tag, cause, response) => new ClientErrorImpl({
 
 // src/ExpandClient.ts
 var ExpandConfig = effect.Config.all({
-  apiKey: effect.Config.redacted("EXPAND_API_KEY"),
+  apiKey: effect.Config.option(effect.Config.redacted("EXPAND_API_KEY")),
   baseUrl: effect.Config.withDefault(effect.Config.string("EXPAND_BASE_URL"), "https://api.expand.ai")
 });
 var ExpandClient = class extends effect.Effect.Service()("ExpandClient", {
@@ -698,12 +698,24 @@ var ExpandClient = class extends effect.Effect.Service()("ExpandClient", {
   scoped: effect.Effect.gen(function* () {
     const config = yield* ExpandConfig;
     const httpClient = yield* platform.HttpClient.HttpClient;
+    const requestHeaders = yield* effect.Effect.serviceOption(CurrentRequestHeaders);
     yield* effect.Effect.logInfo(`ExpandClient connected to ${config.baseUrl}`);
     return make(httpClient, {
       transformClient: (client) => effect.Effect.succeed(
         client.pipe(
           platform.HttpClient.mapRequest(platform.HttpClientRequest.prependUrl(config.baseUrl)),
-          platform.HttpClient.mapRequest(platform.HttpClientRequest.setHeader("x-expand-api-key", effect.Redacted.value(config.apiKey)))
+          platform.HttpClient.mapRequest((req) => {
+            if (effect.Option.isSome(requestHeaders)) {
+              const auth = requestHeaders.value["authorization"];
+              if (auth) {
+                return platform.HttpClientRequest.setHeader("authorization", auth)(req);
+              }
+            }
+            if (effect.Option.isSome(config.apiKey)) {
+              return platform.HttpClientRequest.setHeader("x-expand-api-key", effect.Redacted.value(config.apiKey.value))(req);
+            }
+            return req;
+          })
         )
       )
     });
@@ -809,6 +821,8 @@ var ServerInfo = {
   name: "expandai-mcp-server",
   version: package_default.version
 };
+var CurrentRequestHeaders = class extends effect.Context.Tag("CurrentRequestHeaders")() {
+};
 var makeServerLayer = (options = {}) => options.includeDocs ? effect.Layer.mergeAll(ExpandToolKit, ExpandDocs) : ExpandToolKit;
 
 // src/main.ts

package/dist/main.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { ServerInfo, makeServerLayer } from './chunk-7ECG3QBA.js';
+import { ServerInfo, makeServerLayer } from './chunk-TUBB4OP4.js';
 import { McpServer } from '@effect/ai';
 import { NodeSink, NodeStream, NodeRuntime } from '@effect/platform-node';
 import { Config, Effect, Layer, Logger, LogLevel } from 'effect';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expandai/mcp-server",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "MCP server for expand.ai - Give AI agents access to the web",
   "type": "module",
   "publishConfig": {

package/src/ExpandClient.ts

@@ -1,9 +1,10 @@
 import { HttpClient, HttpClientRequest } from '@effect/platform'
-import { Config, Effect, Redacted } from 'effect'
+import { Config, Effect, Option, Redacted } from 'effect'
 import * as GeneratedClient from './Generated.js'
+import { CurrentRequestHeaders } from './Server.js'
 
 export const ExpandConfig = Config.all({
-	apiKey: Config.redacted('EXPAND_API_KEY'),
+	apiKey: Config.option(Config.redacted('EXPAND_API_KEY')),
 	baseUrl: Config.withDefault(Config.string('EXPAND_BASE_URL'), 'https://api.expand.ai'),
 })
 
@@ -12,6 +13,7 @@ export class ExpandClient extends Effect.Service<ExpandClient>()('ExpandClient',
 	scoped: Effect.gen(function* () {
 		const config = yield* ExpandConfig
 		const httpClient = yield* HttpClient.HttpClient
+		const requestHeaders = yield* Effect.serviceOption(CurrentRequestHeaders)
 
 		yield* Effect.logInfo(`ExpandClient connected to ${config.baseUrl}`)
 
@@ -20,7 +22,18 @@ export class ExpandClient extends Effect.Service<ExpandClient>()('ExpandClient',
 				Effect.succeed(
 					client.pipe(
 						HttpClient.mapRequest(HttpClientRequest.prependUrl(config.baseUrl)),
-						HttpClient.mapRequest(HttpClientRequest.setHeader('x-expand-api-key', Redacted.value(config.apiKey))),
+						HttpClient.mapRequest((req) => {
+							if (Option.isSome(requestHeaders)) {
+								const auth = requestHeaders.value['authorization']
+								if (auth) {
+									return HttpClientRequest.setHeader('authorization', auth)(req)
+								}
+							}
+							if (Option.isSome(config.apiKey)) {
+								return HttpClientRequest.setHeader('x-expand-api-key', Redacted.value(config.apiKey.value))(req)
+							}
+							return req
+						}),
 					),
 				),
 		})

package/src/Server.ts

@@ -1,4 +1,4 @@
-import { Layer } from 'effect'
+import { Context, Layer } from 'effect'
 import packageJson from '../package.json' with { type: 'json' }
 import { ExpandDocs } from './ExpandDocs.js'
 import { ExpandToolKit } from './Toolkit.js'
@@ -8,5 +8,10 @@ export const ServerInfo = {
 	version: packageJson.version,
 } as const
 
+export class CurrentRequestHeaders extends Context.Tag('CurrentRequestHeaders')<
+	CurrentRequestHeaders,
+	Record<string, string>
+>() {}
+
 export const makeServerLayer = (options: { readonly includeDocs?: boolean } = {}) =>
 	options.includeDocs ? Layer.mergeAll(ExpandToolKit, ExpandDocs) : ExpandToolKit