@expandai/mcp-server 0.1.1 → 0.1.4

package/dist/main.cjs

@@ -39,7 +39,7 @@ var S__namespace = /*#__PURE__*/_interopNamespace(S);
 
 // package.json
 var package_default = {
-  version: "0.1.1"};
+  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,11 +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;
+          })
         )
       )
     });
@@ -765,6 +778,8 @@ var Fetch = class extends effect.Effect.Service()("Fetch", {
   scoped: effect.Effect.gen(function* () {
     const client = yield* ExpandClient;
     const fetch = effect.Effect.fn("Fetch.fetch")(function* ({ url, format, includeMeta }) {
+      const formatLabel = format instanceof SnippetsFormat ? "snippets" : format;
+      yield* effect.Effect.logDebug(`Fetching: ${url}`).pipe(effect.Effect.annotateLogs({ format: formatLabel, includeMeta }));
       const result = yield* client.fetch({
         url,
         select: {
@@ -776,6 +791,7 @@ var Fetch = class extends effect.Effect.Service()("Fetch", {
         }
       });
       const content = result.data.markdown ?? result.data.html ?? result.data.summary ?? result.data.snippets?.map((snippet) => `${snippet.text} (Score: ${snippet.score})`).join("\n") ?? "";
+      yield* effect.Effect.logDebug(`\u{1F4E4} Fetched successfully: ${result.data.response.url}`);
       return new FetchResult2({
         content,
         url: result.data.response.url,
@@ -787,28 +803,67 @@ var Fetch = class extends effect.Effect.Service()("Fetch", {
 }) {
 };
 
-// src/tools/index.ts
+// src/Toolkit.ts
 var toolkit = ai.Toolkit.make(FetchTool);
 var ToolkitLayer = toolkit.toLayer(
   effect.Effect.gen(function* () {
+    yield* effect.Effect.logInfo("Registering tools: fetch");
     const fetchService = yield* Fetch;
     return toolkit.of({
       fetch: fetchService.fetch
     });
   })
 ).pipe(effect.Layer.provide(Fetch.Default), effect.Layer.provide(ExpandClient.Default), effect.Layer.provide(platformNode.NodeHttpClient.layerUndici));
-var ExpandTools = ai.McpServer.toolkit(toolkit).pipe(effect.Layer.provide(ToolkitLayer));
+var ExpandToolKit = ai.McpServer.toolkit(toolkit).pipe(effect.Layer.provide(ToolkitLayer));
+
+// src/Server.ts
+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
-var enableDocs = effect.Config.withDefault(effect.Config.boolean("EXPAND_ENABLE_DOCS"), () => false);
+var enableDocs = effect.Config.withDefault(effect.Config.boolean("EXPAND_ENABLE_DOCS"), false);
+var logLevelConfig = effect.Config.withDefault(
+  effect.Config.literal("debug", "info", "warning", "error", "none")("LOG_LEVEL"),
+  "info"
+);
+var logLevelMap = {
+  debug: effect.LogLevel.Debug,
+  info: effect.LogLevel.Info,
+  warning: effect.LogLevel.Warning,
+  error: effect.LogLevel.Error,
+  none: effect.LogLevel.None
+};
+var startupBanner = `
+\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557
+\u2551                                                   \u2551
+\u2551   \u{1F310}  expand.ai MCP Server                        \u2551
+\u2551                                                   \u2551
+\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D`;
 var program = effect.Effect.gen(function* () {
   const docsEnabled = yield* enableDocs;
-  const layers = docsEnabled ? effect.Layer.mergeAll(ExpandTools, ExpandDocs) : ExpandTools;
-  yield* ai.McpServer.layerStdio({
-    name: "expandai-mcp-server",
-    version: package_default.version,
+  const logLevel = yield* logLevelConfig;
+  yield* effect.Effect.logInfo(startupBanner);
+  yield* effect.Effect.logInfo(`Starting v${ServerInfo.version}`);
+  yield* effect.Effect.logInfo(`Documentation resources: ${docsEnabled ? "enabled" : "disabled"}`);
+  const McpLayer = ai.McpServer.layerStdio({
+    ...ServerInfo,
     stdin: platformNode.NodeStream.stdin,
     stdout: platformNode.NodeSink.stdout
-  }).pipe(effect.Layer.provide(layers), effect.Layer.provide(effect.Logger.minimumLogLevel(effect.LogLevel.None)), effect.Layer.launch);
+  }).pipe(effect.Layer.provide(makeServerLayer({ includeDocs: docsEnabled })));
+  const LifecycleLayer = effect.Layer.scopedDiscard(
+    effect.Effect.acquireRelease(
+      effect.Effect.logInfo("Server ready and listening on stdio"),
+      () => effect.Effect.logInfo("Server shutting down gracefully...")
+    )
+  );
+  yield* effect.Layer.merge(McpLayer, LifecycleLayer).pipe(
+    effect.Layer.provide(effect.Logger.minimumLogLevel(logLevelMap[logLevel])),
+    effect.Layer.launch
+  );
 });
 program.pipe(platformNode.NodeRuntime.runMain);

package/dist/main.d.cts

@@ -0,0 +1 @@
+#!/usr/bin/env node

package/dist/main.d.ts

@@ -0,0 +1 @@
+#!/usr/bin/env node

package/dist/main.js

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+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';
+
+var enableDocs = Config.withDefault(Config.boolean("EXPAND_ENABLE_DOCS"), false);
+var logLevelConfig = Config.withDefault(
+  Config.literal("debug", "info", "warning", "error", "none")("LOG_LEVEL"),
+  "info"
+);
+var logLevelMap = {
+  debug: LogLevel.Debug,
+  info: LogLevel.Info,
+  warning: LogLevel.Warning,
+  error: LogLevel.Error,
+  none: LogLevel.None
+};
+var startupBanner = `
+\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557
+\u2551                                                   \u2551
+\u2551   \u{1F310}  expand.ai MCP Server                        \u2551
+\u2551                                                   \u2551
+\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D`;
+var program = Effect.gen(function* () {
+  const docsEnabled = yield* enableDocs;
+  const logLevel = yield* logLevelConfig;
+  yield* Effect.logInfo(startupBanner);
+  yield* Effect.logInfo(`Starting v${ServerInfo.version}`);
+  yield* Effect.logInfo(`Documentation resources: ${docsEnabled ? "enabled" : "disabled"}`);
+  const McpLayer = McpServer.layerStdio({
+    ...ServerInfo,
+    stdin: NodeStream.stdin,
+    stdout: NodeSink.stdout
+  }).pipe(Layer.provide(makeServerLayer({ includeDocs: docsEnabled })));
+  const LifecycleLayer = Layer.scopedDiscard(
+    Effect.acquireRelease(
+      Effect.logInfo("Server ready and listening on stdio"),
+      () => Effect.logInfo("Server shutting down gracefully...")
+    )
+  );
+  yield* Layer.merge(McpLayer, LifecycleLayer).pipe(
+    Layer.provide(Logger.minimumLogLevel(logLevelMap[logLevel])),
+    Layer.launch
+  );
+});
+program.pipe(NodeRuntime.runMain);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expandai/mcp-server",
-  "version": "0.1.1",
+  "version": "0.1.4",
   "description": "MCP server for expand.ai - Give AI agents access to the web",
   "type": "module",
   "publishConfig": {
@@ -9,6 +9,14 @@
   "bin": {
     "expandai-mcp-server": "./dist/main.cjs"
   },
+  "exports": {
+    ".": "./dist/main.cjs",
+    "./Server": {
+      "types": "./dist/Server.d.ts",
+      "import": "./dist/Server.js",
+      "require": "./dist/Server.cjs"
+    }
+  },
   "files": [
     "dist",
     "src",
@@ -17,10 +25,13 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/expandai/expandai-mcp-server.git"
+    "url": "git+https://github.com/expandai/expandai-mcp-server.git"
+  },
+  "bugs": {
+    "url": "https://github.com/expandai/expandai-mcp-server/issues"
   },
   "homepage": "https://expand.ai",
-  "author": "expand.ai",
+  "author": "expand.ai <support@expand.ai>",
   "license": "Apache-2.0",
   "keywords": [
     "mcp",

package/src/ExpandClient.ts

@@ -1,9 +1,10 @@
 import { HttpClient, HttpClientRequest } from '@effect/platform'
-import { Config, Effect, Redacted } from 'effect'
-import * as GeneratedClient from './generated/ExpandClient.js'
+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,13 +13,27 @@ 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}`)
 
 		return GeneratedClient.make(httpClient, {
 			transformClient: (client) =>
 				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/{tools/Fetch.ts → Fetch.ts}

@@ -1,7 +1,7 @@
 import { Tool } from '@effect/ai'
 import { Effect, Schema } from 'effect'
-import { ExpandClient } from '../ExpandClient.js'
-import { PageMeta } from '../generated/ExpandClient.js'
+import { ExpandClient } from './ExpandClient.js'
+import { PageMeta } from './Generated.js'
 
 export class SnippetsFormat extends Schema.Class<SnippetsFormat>('SnippetsFormat')({
 	query: Schema.String.annotations({
@@ -64,6 +64,9 @@ export class Fetch extends Effect.Service<Fetch>()('Fetch', {
 		const client = yield* ExpandClient
 
 		const fetch = Effect.fn('Fetch.fetch')(function* ({ url, format, includeMeta }: FetchParams) {
+			const formatLabel = format instanceof SnippetsFormat ? 'snippets' : format
+			yield* Effect.logDebug(`Fetching: ${url}`).pipe(Effect.annotateLogs({ format: formatLabel, includeMeta }))
+
 			const result = yield* client.fetch({
 				url,
 				select: {
@@ -82,6 +85,8 @@ export class Fetch extends Effect.Service<Fetch>()('Fetch', {
 				result.data.snippets?.map((snippet) => `${snippet.text} (Score: ${snippet.score})`).join('\n') ??
 				''
 
+			yield* Effect.logDebug(`📤 Fetched successfully: ${result.data.response.url}`)
+
 			return new FetchResult({
 				content,
 				url: result.data.response.url,

package/src/Server.ts

@@ -0,0 +1,17 @@
+import { Context, Layer } from 'effect'
+import packageJson from '../package.json' with { type: 'json' }
+import { ExpandDocs } from './ExpandDocs.js'
+import { ExpandToolKit } from './Toolkit.js'
+
+export const ServerInfo = {
+	name: 'expandai-mcp-server',
+	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

package/src/Toolkit.ts

@@ -0,0 +1,23 @@
+import { McpServer, Toolkit } from '@effect/ai'
+import { NodeHttpClient } from '@effect/platform-node'
+import { Effect, Layer } from 'effect'
+import { ExpandClient } from './ExpandClient.js'
+import { Fetch, FetchTool } from './Fetch.js'
+
+const toolkit = Toolkit.make(FetchTool)
+
+const ToolkitLayer = toolkit
+	.toLayer(
+		Effect.gen(function* () {
+			yield* Effect.logInfo('Registering tools: fetch')
+
+			const fetchService = yield* Fetch
+
+			return toolkit.of({
+				fetch: fetchService.fetch,
+			})
+		}),
+	)
+	.pipe(Layer.provide(Fetch.Default), Layer.provide(ExpandClient.Default), Layer.provide(NodeHttpClient.layerUndici))
+
+export const ExpandToolKit = McpServer.toolkit(toolkit).pipe(Layer.provide(ToolkitLayer))

package/src/main.ts

@@ -2,23 +2,54 @@
 import { McpServer } from '@effect/ai'
 import { NodeRuntime, NodeSink, NodeStream } from '@effect/platform-node'
 import { Config, Effect, Layer, Logger, LogLevel } from 'effect'
-import packageJson from '../package.json' with { type: 'json' }
-import { ExpandDocs } from './resources/ExpandDocs.js'
-import { ExpandTools } from './tools/index.js'
+import { makeServerLayer, ServerInfo } from './Server.js'
 
-const enableDocs = Config.withDefault(Config.boolean('EXPAND_ENABLE_DOCS'), () => false)
+const enableDocs = Config.withDefault(Config.boolean('EXPAND_ENABLE_DOCS'), false)
+
+const logLevelConfig = Config.withDefault(
+	Config.literal('debug', 'info', 'warning', 'error', 'none')('LOG_LEVEL'),
+	'info',
+)
+
+const logLevelMap = {
+	debug: LogLevel.Debug,
+	info: LogLevel.Info,
+	warning: LogLevel.Warning,
+	error: LogLevel.Error,
+	none: LogLevel.None,
+} as const
+
+const startupBanner = `
+╔═══════════════════════════════════════════════════╗
+║                                                   ║
+║   🌐  expand.ai MCP Server                        ║
+║                                                   ║
+╚═══════════════════════════════════════════════════╝`
 
 const program = Effect.gen(function* () {
 	const docsEnabled = yield* enableDocs
+	const logLevel = yield* logLevelConfig
 
-	const layers = docsEnabled ? Layer.mergeAll(ExpandTools, ExpandDocs) : ExpandTools
+	yield* Effect.logInfo(startupBanner)
+	yield* Effect.logInfo(`Starting v${ServerInfo.version}`)
+	yield* Effect.logInfo(`Documentation resources: ${docsEnabled ? 'enabled' : 'disabled'}`)
 
-	yield* McpServer.layerStdio({
-		name: 'expandai-mcp-server',
-		version: packageJson.version,
+	const McpLayer = McpServer.layerStdio({
+		...ServerInfo,
 		stdin: NodeStream.stdin,
 		stdout: NodeSink.stdout,
-	}).pipe(Layer.provide(layers), Layer.provide(Logger.minimumLogLevel(LogLevel.None)), Layer.launch)
+	}).pipe(Layer.provide(makeServerLayer({ includeDocs: docsEnabled })))
+
+	const LifecycleLayer = Layer.scopedDiscard(
+		Effect.acquireRelease(Effect.logInfo('Server ready and listening on stdio'), () =>
+			Effect.logInfo('Server shutting down gracefully...'),
+		),
+	)
+
+	yield* Layer.merge(McpLayer, LifecycleLayer).pipe(
+		Layer.provide(Logger.minimumLogLevel(logLevelMap[logLevel])),
+		Layer.launch,
+	)
 })
 
 program.pipe(NodeRuntime.runMain)

package/src/tools/index.ts

@@ -1,33 +0,0 @@
-import { McpServer, Toolkit } from '@effect/ai'
-import { NodeHttpClient } from '@effect/platform-node'
-import { Effect, Layer } from 'effect'
-import { ExpandClient } from '../ExpandClient.js'
-import { Fetch, FetchTool } from './Fetch.js'
-
-// =============================================================================
-// Toolkit (add more tools here)
-// =============================================================================
-
-const toolkit = Toolkit.make(FetchTool)
-
-// =============================================================================
-// Toolkit Layer
-// =============================================================================
-
-const ToolkitLayer = toolkit
-	.toLayer(
-		Effect.gen(function* () {
-			const fetchService = yield* Fetch
-
-			return toolkit.of({
-				fetch: fetchService.fetch,
-			})
-		}),
-	)
-	.pipe(Layer.provide(Fetch.Default), Layer.provide(ExpandClient.Default), Layer.provide(NodeHttpClient.layerUndici))
-
-// =============================================================================
-// Export
-// =============================================================================
-
-export const ExpandTools = McpServer.toolkit(toolkit).pipe(Layer.provide(ToolkitLayer))