@expandai/mcp-server 0.1.4 → 0.2.0

package/dist/main.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { ServerInfo, makeServerLayer } from './chunk-TUBB4OP4.js';
+import { ServerInfo, makeServerLayer } from './chunk-MEO7UHLG.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.4",
+  "version": "0.2.0",
   "description": "MCP server for expand.ai - Give AI agents access to the web",
   "type": "module",
   "publishConfig": {

package/src/Fetch.ts

@@ -1,59 +1,51 @@
 import { Tool } from '@effect/ai'
 import { Effect, Schema } from 'effect'
 import { ExpandClient } from './ExpandClient.js'
-import { PageMeta } from './Generated.js'
 
-export class SnippetsFormat extends Schema.Class<SnippetsFormat>('SnippetsFormat')({
+export class SearchParams extends Schema.Class<SearchParams>('SearchParams')({
 	query: Schema.String.annotations({
-		description: 'Query to find relevant content snippets from the page',
+		description: 'Query to find relevant content snippets',
 	}),
-	maxSnippets: Schema.optional(
-		Schema.Int.pipe(Schema.greaterThanOrEqualTo(1), Schema.lessThanOrEqualTo(50)),
-	).annotations({
-		description: 'Maximum number of snippets to return (1-50, default: 5)',
+	minScore: Schema.optionalWith(Schema.Number.pipe(Schema.greaterThanOrEqualTo(0), Schema.lessThanOrEqualTo(1)), {
+		default: () => 0.6,
+	}).annotations({
+		description: 'Minimum relevance score (0-1)',
+		default: 0.6,
 	}),
-	targetSnippetSize: Schema.optional(
-		Schema.Int.pipe(Schema.greaterThanOrEqualTo(100), Schema.lessThanOrEqualTo(2000)),
-	).annotations({
-		description: 'Target snippet size in characters (100-2000, default: 384)',
+	maxResults: Schema.optionalWith(Schema.Int.pipe(Schema.greaterThanOrEqualTo(1), Schema.lessThanOrEqualTo(50)), {
+		default: () => 5,
+	}).annotations({
+		description: 'Maximum snippets to return',
+		default: 5,
 	}),
 }) {}
 
-export const Format = Schema.Union(
-	Schema.Literal('markdown').annotations({
-		description: 'Return as cleaned markdown content',
-	}),
-	Schema.Literal('html').annotations({
-		description: 'Return as raw HTML content',
-	}),
-	Schema.Literal('summary').annotations({
-		description: 'Return AI-generated summary of the page content',
-	}),
-	SnippetsFormat,
-).annotations({
-	description: 'Output format for the fetched content',
-})
-
 export class FetchParams extends Schema.Class<FetchParams>('FetchParams')({
 	url: Schema.String.annotations({
 		description: 'The URL to fetch content from',
 	}),
-	format: Format,
-	includeMeta: Schema.Boolean.annotations({
-		description: 'Whether to include page meta tags in the response',
+	includeMeta: Schema.optionalWith(Schema.Boolean, { default: () => false }).annotations({
+		description: 'Include page meta tags (title, description, Open Graph)',
+		default: false,
+	}),
+	includeAppendix: Schema.optionalWith(Schema.Boolean, { default: () => false }).annotations({
+		description: 'Include extracted links and sidebar content',
+		default: false,
+	}),
+	includeJson: Schema.optionalWith(Schema.Boolean, { default: () => false }).annotations({
+		description: 'Include JSON extracted from network responses and DOM',
+		default: false,
+	}),
+	search: Schema.optional(SearchParams).annotations({
+		description: 'Semantic search. When provided, returns snippets instead of markdown.',
 	}),
-}) {}
-
-export class FetchResult extends Schema.Class<FetchResult>('FetchResult')({
-	content: Schema.String,
-	url: Schema.String,
-	meta: Schema.optional(PageMeta),
 }) {}
 
 export const FetchTool = Tool.make('fetch', {
-	description: 'Fetch and extract content from any URL.',
+	description: `Fetch and extract content from any URL.
+
+Returns markdown by default. When \`search\` is provided, returns semantically relevant snippets instead.`,
 	parameters: FetchParams.fields,
-	success: FetchResult,
 })
 	.annotate(Tool.Readonly, true)
 	.annotate(Tool.Destructive, false)
@@ -63,35 +55,38 @@ export class Fetch extends Effect.Service<Fetch>()('Fetch', {
 	scoped: Effect.gen(function* () {
 		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 fetch = Effect.fn('Fetch.fetch')(function* ({
+			url,
+			includeMeta,
+			includeAppendix,
+			includeJson,
+			search,
+		}: FetchParams) {
+			const hasSearch = search !== undefined
+			yield* Effect.logDebug(`Fetching: ${url}`).pipe(
+				Effect.annotateLogs({ hasSearch, includeMeta, includeAppendix, includeJson }),
+			)
 
 			const result = yield* client.fetch({
 				url,
 				select: {
-					markdown: format === 'markdown',
-					html: format === 'html',
-					summary: format === 'summary',
-					snippets: format instanceof SnippetsFormat ? { ...format } : undefined,
+					markdown: !hasSearch,
+					snippets: hasSearch
+						? {
+								query: search.query,
+								maxSnippets: search.maxResults,
+								minScore: search.minScore,
+							}
+						: undefined,
 					meta: includeMeta,
+					json: includeJson,
+					appendix: includeAppendix,
 				},
 			})
 
-			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.logDebug(`📤 Fetched successfully: ${result.data.response.url}`)
+			yield* Effect.logDebug(`Fetched successfully: ${result.data.response.url}`)
 
-			return new FetchResult({
-				content,
-				url: result.data.response.url,
-				meta: result.data.meta,
-			})
+			return result.data
 		}, Effect.orDie)
 
 		return { fetch } as const