@youdotcom-oss/mcp 3.2.3 → 3.3.0

package/bin/stdio.js

@@ -12889,29 +12889,12 @@ var getLogger = (sendNotification) => async (params) => {
   await sendNotification({ method: "notifications/message", params });
 };
 
-// src/contents/contents.schemas.ts
-var ContentsStructuredContentSchema = object({
-  count: number2().describe("URLs processed"),
-  formats: array(string2()).describe("Content formats requested"),
-  items: array(object({
-    url: string2().describe("URL"),
-    title: string2().optional().describe("Title"),
-    markdown: string2().optional().describe("Markdown content"),
-    html: string2().optional().describe("HTML content"),
-    metadata: object({
-      favicon_url: string2().describe("Favicon URL"),
-      site_name: string2().optional().nullable().describe("Site name")
-    }).optional().nullable().describe("Page metadata")
-  })).describe("Extracted items")
-});
-
 // src/contents/contents.utils.ts
 var formatContentsResponse = (response, formats) => {
   const textParts = [`Successfully extracted content from ${response.length} URL(s):
 `];
   textParts.push(`Formats: ${formats.join(", ")}
 `);
-  const items = [];
   for (const item of response) {
     textParts.push(`
 ## ${item.title || "Untitled"}`);
@@ -12957,28 +12940,14 @@ var formatContentsResponse = (response, formats) => {
     textParts.push(`
 ---
 `);
-    items.push({
-      url: item.url,
-      title: item.title ?? undefined,
-      markdown: item.markdown ?? undefined,
-      html: item.html ?? undefined,
-      metadata: item.metadata ?? undefined
-    });
   }
-  return {
-    content: [
-      {
-        type: "text",
-        text: textParts.join(`
+  return [
+    {
+      type: "text",
+      text: textParts.join(`
 `)
-      }
-    ],
-    structuredContent: {
-      count: response.length,
-      formats,
-      items
     }
-  };
+  ];
 };
 
 // src/contents/register-contents-tool.ts
@@ -12990,8 +12959,10 @@ var registerContentsTool = ({
   mcp.registerTool("you-contents", {
     title: "Extract Web Page Contents",
     description: "Extract page content in markdown or HTML",
-    inputSchema: ContentsQuerySchema.shape,
-    outputSchema: ContentsStructuredContentSchema.shape
+    inputSchema: ContentsQuerySchema,
+    outputSchema: object({
+      output: ContentsApiResponseSchema
+    })
   }, async (contentsQuery, { sendNotification }) => {
     const logger = getLogger(sendNotification);
     try {
@@ -13007,14 +12978,16 @@ var registerContentsTool = ({
         YDC_API_KEY,
         getUserAgent
       });
-      const { content, structuredContent } = formatContentsResponse(response, requestFormats);
+      const content = formatContentsResponse(response, requestFormats);
       await logger({
         level: "info",
         data: `Contents API call successful: extracted ${response.length} page(s)`
       });
       return {
         content,
-        structuredContent
+        structuredContent: {
+          output: response
+        }
       };
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : String(err);
@@ -20464,7 +20437,7 @@ var EMPTY_COMPLETION_RESULT = {
 // package.json
 var package_default = {
   name: "@youdotcom-oss/mcp",
-  version: "3.2.3",
+  version: "3.3.0",
   description: "You.com MCP server — web search, AI research, and content extraction via You.com APIs",
   license: "MIT",
   engines: {
@@ -20521,7 +20494,8 @@ var package_default = {
     zod: "^4.3.6"
   },
   devDependencies: {
-    "@modelcontextprotocol/inspector": "0.21.1"
+    "@modelcontextprotocol/inspector": "0.21.2",
+    "@types/bun": "latest"
   }
 };
 
@@ -20537,37 +20511,15 @@ var getMcpServer = () => new McpServer({
   instructions: `Use this server to search the web, get AI-powered answers with web context, and extract content from web pages using You.com. The you-contents tool extracts page content and returns it in markdown or HTML format. Use HTML format for layout preservation, interactive content, and visual fidelity; use markdown for text extraction and simpler consumption.`
 });
 
-// src/research/research.schemas.ts
-var ResearchStructuredContentSchema = object({
-  contentType: string2().describe("Format of the content field"),
-  sourceCount: number2().describe("Number of sources used"),
-  sources: array(object({
-    url: string2().describe("Source URL"),
-    title: string2().optional().describe("Source title"),
-    snippetCount: number2().describe("Number of excerpts from this source")
-  })).describe("Sources used in the research answer")
-});
-
 // src/research/research.utils.ts
 var formatResearchResults = (response) => {
   const text = formatResearchResponse(response);
-  return {
-    content: [
-      {
-        type: "text",
-        text
-      }
-    ],
-    structuredContent: {
-      contentType: response.output.content_type,
-      sourceCount: response.output.sources.length,
-      sources: response.output.sources.map((source) => ({
-        url: source.url,
-        title: source.title,
-        snippetCount: source.snippets?.length ?? 0
-      }))
+  return [
+    {
+      type: "text",
+      text
     }
-  };
+  ];
 };
 
 // src/research/register-research-tool.ts
@@ -20579,8 +20531,8 @@ var registerResearchTool = ({
   mcp.registerTool("you-research", {
     title: "Research",
     description: "Research a topic with comprehensive answers and cited sources. Configurable effort levels (lite, standard, deep, exhaustive).",
-    inputSchema: ResearchQuerySchema.shape,
-    outputSchema: ResearchStructuredContentSchema.shape
+    inputSchema: ResearchQuerySchema,
+    outputSchema: ResearchResponseSchema
   }, async (researchQuery, { sendNotification }) => {
     const logger = getLogger(sendNotification);
     try {
@@ -20594,8 +20546,8 @@ var registerResearchTool = ({
         level: "info",
         data: `Research for "${researchQuery.input.substring(0, 100)}" complete: ${sourceCount} source(s)`
       });
-      const { content, structuredContent } = formatResearchResults(response);
-      return { content, structuredContent };
+      const content = formatResearchResults(response);
+      return { content, structuredContent: response };
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : String(err);
       const reportLink = generateErrorReportLink({
@@ -20623,36 +20575,6 @@ Report this issue: ${reportLink}`
   });
 };
 
-// src/search/search.schemas.ts
-var SearchStructuredContentSchema = object({
-  resultCounts: object({
-    web: number2().describe("Web results"),
-    news: number2().describe("News results"),
-    total: number2().describe("Total results")
-  }),
-  results: object({
-    web: array(object({
-      url: string2().describe("URL"),
-      title: string2().describe("Title"),
-      page_age: string2().optional().describe("Publication timestamp"),
-      snippets: array(string2()).optional().describe("Content snippets"),
-      contents: object({
-        html: string2().optional().describe("Full HTML content"),
-        markdown: string2().optional().describe("Full Markdown content")
-      }).optional().describe("Livecrawled page content")
-    })).optional().describe("Web results"),
-    news: array(object({
-      url: string2().describe("URL"),
-      title: string2().describe("Title"),
-      page_age: string2().describe("Publication timestamp"),
-      contents: object({
-        html: string2().optional().describe("Full HTML content"),
-        markdown: string2().optional().describe("Full Markdown content")
-      }).optional().describe("Livecrawled page content")
-    })).optional().describe("News results")
-  }).optional().describe("Search results")
-});
-
 // src/shared/format-search-results-text.ts
 var formatCharCount = (count) => count.toLocaleString();
 var formatSearchResultsText = (results) => {
@@ -20713,53 +20635,14 @@ ${"=".repeat(50)}
 
 ${newsResults}`;
   }
-  const structuredResults = {};
-  if (response.results.web?.length) {
-    structuredResults.web = response.results.web.map((result) => {
-      const item = {
-        url: result.url,
-        title: result.title
-      };
-      if (result.page_age)
-        item.page_age = result.page_age;
-      if (result.snippets?.length)
-        item.snippets = result.snippets;
-      if (result.contents)
-        item.contents = result.contents ?? undefined;
-      return item;
-    });
-  }
-  if (response.results.news?.length) {
-    structuredResults.news = response.results.news.map((article) => {
-      const item = {
-        url: article.url,
-        title: article.title,
-        page_age: article.page_age
-      };
-      if (article.contents)
-        item.contents = article.contents ?? undefined;
-      return item;
-    });
-  }
-  return {
-    content: [
-      {
-        type: "text",
-        text: `Search Results for "${response.metadata.query}":
+  return [
+    {
+      type: "text",
+      text: `Search Results for "${response.metadata.query}":
 
 ${formattedResults}`
-      }
-    ],
-    structuredContent: {
-      resultCounts: {
-        web: response.results.web?.length || 0,
-        news: response.results.news?.length || 0,
-        total: (response.results.web?.length || 0) + (response.results.news?.length || 0)
-      },
-      results: Object.keys(structuredResults).length > 0 ? structuredResults : undefined
-    },
-    fullResponse: response
-  };
+    }
+  ];
 };
 
 // src/search/register-search-tool.ts
@@ -20771,8 +20654,8 @@ var registerSearchTool = ({
   mcp.registerTool("you-search", {
     title: "Web Search",
     description: "Web and news search via You.com. Supports domain filtering, language selection, livecrawl for full page content, and date freshness controls.",
-    inputSchema: SearchQuerySchema.shape,
-    outputSchema: SearchStructuredContentSchema.shape
+    inputSchema: SearchQuerySchema,
+    outputSchema: SearchResponseSchema
   }, async (searchQuery, { sendNotification }) => {
     const logger = getLogger(sendNotification);
     try {
@@ -20790,21 +20673,15 @@ var registerSearchTool = ({
         });
         return {
           content: [{ type: "text", text: "No results found." }],
-          structuredContent: {
-            resultCounts: {
-              web: 0,
-              news: 0,
-              total: 0
-            }
-          }
+          structuredContent: response
         };
       }
       await logger({
         level: "info",
         data: `Search successful for query: "${searchQuery.query}" - ${webCount} web results, ${newsCount} news results (${webCount + newsCount} total)`
       });
-      const { content, structuredContent } = formatSearchResults(response);
-      return { content, structuredContent };
+      const content = formatSearchResults(response);
+      return { content, structuredContent: response };
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : String(err);
       const reportLink = generateErrorReportLink({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@youdotcom-oss/mcp",
-  "version": "3.2.3",
+  "version": "3.3.0",
   "description": "You.com MCP server — web search, AI research, and content extraction via You.com APIs",
   "license": "MIT",
   "engines": {
@@ -57,6 +57,7 @@
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@modelcontextprotocol/inspector": "0.21.1"
+    "@modelcontextprotocol/inspector": "0.21.2",
+    "@types/bun": "latest"
   }
 }

package/server.json

@@ -3,7 +3,7 @@
   "name": "io.github.youdotcom-oss/mcp",
   "title": "You.com Web Access & AI",
   "description": "Web search, AI agent, and content extraction via You.com APIs",
-  "version": "3.0.0",
+  "version": "3.2.3",
   "remotes": [
     {
       "type": "streamable-http",
@@ -22,7 +22,7 @@
     {
       "registryType": "npm",
       "identifier": "@youdotcom-oss/mcp",
-      "version": "3.0.0",
+      "version": "3.2.3",
       "transport": {
         "type": "stdio"
       },

package/src/contents/contents.utils.ts

@@ -1,33 +1,23 @@
 import type { ContentsApiResponse } from '@youdotcom-oss/api'
-import type { ContentsStructuredContent } from './contents.schemas.ts'
 
 /**
  * Format contents API response for MCP output
- * Returns full content in both text and structured formats
  * @param response - Validated API response
  * @param formats - Formats used for extraction
- * @returns Formatted response with content and structuredContent
+ * @returns Text content blocks for the MCP response
  */
 export const formatContentsResponse = (
   response: ContentsApiResponse,
   formats: string[],
-): {
-  content: Array<{ type: 'text'; text: string }>
-  structuredContent: ContentsStructuredContent
-} => {
-  // Build text content with full extracted content
+): Array<{ type: 'text'; text: string }> => {
   const textParts: string[] = [`Successfully extracted content from ${response.length} URL(s):\n`]
   textParts.push(`Formats: ${formats.join(', ')}\n`)
 
-  const items: ContentsStructuredContent['items'] = []
-
   for (const item of response) {
-    // Add header for this item
     textParts.push(`\n## ${item.title || 'Untitled'}`)
     textParts.push(`URL: ${item.url}\n`)
     textParts.push('---\n')
 
-    // Add content based on requested formats
     if (formats.includes('markdown') && item.markdown) {
       textParts.push('\n### Markdown Content\n')
       textParts.push(item.markdown)
@@ -35,7 +25,7 @@ export const formatContentsResponse = (
     }
 
     if (formats.includes('html') && item.html) {
-      // Text output is a brief preview only — full HTML is in structuredContent.items[].html
+      // Text output is a brief preview only — full HTML is in structuredContent.output[].html
       textParts.push('\n### HTML Content\n')
       textParts.push(`Length: ${item.html.length} characters\n`)
       textParts.push(item.html.substring(0, 500))
@@ -58,28 +48,12 @@ export const formatContentsResponse = (
     }
 
     textParts.push('\n---\n')
-
-    // Add to structured content
-    items.push({
-      url: item.url,
-      title: item.title ?? undefined,
-      markdown: item.markdown ?? undefined,
-      html: item.html ?? undefined,
-      metadata: item.metadata ?? undefined,
-    })
   }
 
-  return {
-    content: [
-      {
-        type: 'text',
-        text: textParts.join('\n'),
-      },
-    ],
-    structuredContent: {
-      count: response.length,
-      formats,
-      items,
+  return [
+    {
+      type: 'text',
+      text: textParts.join('\n'),
     },
-  }
+  ]
 }

package/src/contents/register-contents-tool.ts

@@ -1,7 +1,12 @@
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
-import { ContentsQuerySchema, fetchContents, generateErrorReportLink } from '@youdotcom-oss/api'
+import {
+  ContentsApiResponseSchema,
+  ContentsQuerySchema,
+  fetchContents,
+  generateErrorReportLink,
+} from '@youdotcom-oss/api'
+import * as z from 'zod'
 import { getLogger } from '../shared/get-logger.ts'
-import { ContentsStructuredContentSchema } from './contents.schemas.ts'
 import { formatContentsResponse } from './contents.utils.ts'
 
 /**
@@ -17,43 +22,39 @@ export const registerContentsTool = ({
   YDC_API_KEY?: string
   getUserAgent: () => string
 }) => {
-  // Register the tool
   mcp.registerTool(
     'you-contents',
     {
       title: 'Extract Web Page Contents',
       description: 'Extract page content in markdown or HTML',
-      inputSchema: ContentsQuerySchema.shape,
-      outputSchema: ContentsStructuredContentSchema.shape,
+      inputSchema: ContentsQuerySchema,
+      outputSchema: z.object({
+        output: ContentsApiResponseSchema,
+      }),
     },
     async (contentsQuery, { sendNotification }) => {
       const logger = getLogger(sendNotification)
 
       try {
-        // Validate and parse input
         const { urls, formats, format, crawl_timeout } = contentsQuery
 
         // Handle backward compatibility: prefer formats array, fallback to format string, default to ['markdown']
         const requestFormats = formats || (format ? [format] : ['markdown'])
 
-        // Log the request
         const timeoutInfo = crawl_timeout ? ` with timeout: ${crawl_timeout}s` : ''
         await logger({
           level: 'info',
           data: `Contents API call initiated for ${urls.length} URL(s) with formats: ${requestFormats.join(', ')}${timeoutInfo}`,
         })
 
-        // Fetch contents from API
         const response = await fetchContents({
           contentsQuery,
           YDC_API_KEY,
           getUserAgent,
         })
 
-        // Format response with full content
-        const { content, structuredContent } = formatContentsResponse(response, requestFormats)
+        const content = formatContentsResponse(response, requestFormats)
 
-        // Log success
         await logger({
           level: 'info',
           data: `Contents API call successful: extracted ${response.length} page(s)`,
@@ -61,10 +62,11 @@ export const registerContentsTool = ({
 
         return {
           content,
-          structuredContent,
+          structuredContent: {
+            output: response,
+          },
         }
       } catch (err: unknown) {
-        // Handle and log errors
         const errorMessage = err instanceof Error ? err.message : String(err)
         const reportLink = generateErrorReportLink({
           errorMessage,

package/src/contents/tests/contents.utils.spec.ts

@@ -14,30 +14,16 @@ describe('formatContentsResponse', () => {
 
     const result = formatContentsResponse(mockResponse, ['markdown'])
 
-    expect(result).toHaveProperty('content')
-    expect(result).toHaveProperty('structuredContent')
-    expect(Array.isArray(result.content)).toBe(true)
-    expect(result.content[0]).toHaveProperty('type', 'text')
-    expect(result.content[0]).toHaveProperty('text')
+    expect(Array.isArray(result)).toBe(true)
+    expect(result[0]).toHaveProperty('type', 'text')
+    expect(result[0]).toHaveProperty('text')
 
-    const text = result.content[0]?.text
+    const text = result[0]?.text
     expect(text).toContain('Example Page')
     expect(text).toContain('https://example.com')
     expect(text).toContain('Formats: markdown')
     expect(text).toContain('# Hello')
     expect(text).toContain('This is a test page with some content.')
-
-    expect(result.structuredContent).toHaveProperty('count', 1)
-    expect(result.structuredContent).toHaveProperty('formats')
-    expect(result.structuredContent.formats).toEqual(['markdown'])
-    expect(result.structuredContent.items).toHaveLength(1)
-
-    const item = result.structuredContent.items[0]
-    expect(item).toBeDefined()
-
-    expect(item).toHaveProperty('url', 'https://example.com')
-    expect(item).toHaveProperty('title', 'Example Page')
-    expect(item).toHaveProperty('markdown', '# Hello\n\nThis is a test page with some content.')
   })
 
   test('formats multiple items correctly', () => {
@@ -56,10 +42,8 @@ describe('formatContentsResponse', () => {
 
     const result = formatContentsResponse(mockResponse, ['markdown'])
 
-    expect(result.structuredContent.count).toBe(2)
-    expect(result.structuredContent.items).toHaveLength(2)
-
-    const text = result.content[0]?.text
+    const text = result[0]?.text
+    expect(text).toContain('Successfully extracted content from 2 URL(s)')
     expect(text).toContain('Page 1')
     expect(text).toContain('Page 2')
     expect(text).toContain('https://example1.com')
@@ -77,8 +61,7 @@ describe('formatContentsResponse', () => {
 
     const result = formatContentsResponse(mockResponse, ['html'])
 
-    expect(result.structuredContent.formats).toEqual(['html'])
-    const text = result.content[0]?.text
+    const text = result[0]?.text
     expect(text).toContain('Formats: html')
     expect(text).toContain('<html>')
   })
@@ -95,13 +78,8 @@ describe('formatContentsResponse', () => {
 
     const result = formatContentsResponse(mockResponse, ['markdown'])
 
-    const text = result.content[0]?.text
-    // Full content should be included (not truncated)
+    const text = result[0]?.text
     expect(text).toContain(longContent)
-
-    // Structured content should have full markdown content
-    const item = result.structuredContent.items[0]
-    expect(item?.markdown).toBe(longContent)
   })
 
   test('handles empty content gracefully', () => {
@@ -115,9 +93,7 @@ describe('formatContentsResponse', () => {
 
     const result = formatContentsResponse(mockResponse, ['markdown'])
 
-    expect(result.structuredContent.items[0]?.markdown).toBe('')
-    const text = result.content[0]?.text
+    const text = result[0]?.text
     expect(text).toContain('Empty Page')
-    // Empty content should still be handled gracefully
   })
 })

package/src/main.ts

@@ -1,8 +1,5 @@
-export type { ContentsStructuredContent } from './contents/contents.schemas.ts'
 export { registerContentsTool } from './contents/register-contents-tool.ts'
 export { getMcpServer } from './get-mcp-server.ts'
 export { registerResearchTool } from './research/register-research-tool.ts'
-export type { ResearchStructuredContent } from './research/research.schemas.ts'
 export { registerSearchTool } from './search/register-search-tool.ts'
-export type { SearchStructuredContent } from './search/search.schemas.ts'
 export { useGetClientVersion } from './shared/use-client-version.ts'

package/src/research/register-research-tool.ts

@@ -1,7 +1,6 @@
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
-import { callResearch, generateErrorReportLink, ResearchQuerySchema } from '@youdotcom-oss/api'
+import { callResearch, generateErrorReportLink, ResearchQuerySchema, ResearchResponseSchema } from '@youdotcom-oss/api'
 import { getLogger } from '../shared/get-logger.ts'
-import { ResearchStructuredContentSchema } from './research.schemas.ts'
 import { formatResearchResults } from './research.utils.ts'
 
 export const registerResearchTool = ({
@@ -19,8 +18,8 @@ export const registerResearchTool = ({
       title: 'Research',
       description:
         'Research a topic with comprehensive answers and cited sources. Configurable effort levels (lite, standard, deep, exhaustive).',
-      inputSchema: ResearchQuerySchema.shape,
-      outputSchema: ResearchStructuredContentSchema.shape,
+      inputSchema: ResearchQuerySchema,
+      outputSchema: ResearchResponseSchema,
     },
     async (researchQuery, { sendNotification }) => {
       const logger = getLogger(sendNotification)
@@ -38,8 +37,8 @@ export const registerResearchTool = ({
           data: `Research for "${researchQuery.input.substring(0, 100)}" complete: ${sourceCount} source(s)`,
         })
 
-        const { content, structuredContent } = formatResearchResults(response)
-        return { content, structuredContent }
+        const content = formatResearchResults(response)
+        return { content, structuredContent: response }
       } catch (err: unknown) {
         const errorMessage = err instanceof Error ? err.message : String(err)
         const reportLink = generateErrorReportLink({

package/src/research/research.utils.ts

@@ -1,30 +1,12 @@
 import type { ResearchResponse } from '@youdotcom-oss/api'
 import { formatResearchResponse } from '@youdotcom-oss/api'
-import type { ResearchStructuredContent } from './research.schemas.ts'
 
-export const formatResearchResults = (
-  response: ResearchResponse,
-): {
-  content: Array<{ type: 'text'; text: string }>
-  structuredContent: ResearchStructuredContent
-} => {
+export const formatResearchResults = (response: ResearchResponse): Array<{ type: 'text'; text: string }> => {
   const text = formatResearchResponse(response)
-
-  return {
-    content: [
-      {
-        type: 'text',
-        text,
-      },
-    ],
-    structuredContent: {
-      contentType: response.output.content_type,
-      sourceCount: response.output.sources.length,
-      sources: response.output.sources.map((source) => ({
-        url: source.url,
-        title: source.title,
-        snippetCount: source.snippets?.length ?? 0,
-      })),
+  return [
+    {
+      type: 'text',
+      text,
     },
-  }
+  ]
 }

package/src/research/tests/research.utils.spec.ts

@@ -25,89 +25,14 @@ describe('formatResearchResults', () => {
 
     const result = formatResearchResults(mockResponse)
 
-    expect(result).toHaveProperty('content')
-    expect(result).toHaveProperty('structuredContent')
-    expect(Array.isArray(result.content)).toBe(true)
-    expect(result.content[0]).toHaveProperty('type', 'text')
-    expect(result.content[0]).toHaveProperty('text')
+    expect(Array.isArray(result)).toBe(true)
+    expect(result[0]).toHaveProperty('type', 'text')
+    expect(result[0]).toHaveProperty('text')
 
-    const text = result.content[0]?.text
+    const text = result[0]?.text
     expect(text).toContain('Research Answer')
     expect(text).toContain('Source One')
     expect(text).toContain('https://example.com/source1')
-
-    expect(result.structuredContent.contentType).toBe('text')
-    expect(result.structuredContent.sourceCount).toBe(2)
-    expect(result.structuredContent.sources).toHaveLength(2)
-    expect(result.structuredContent.sources[0]).toMatchObject({
-      url: 'https://example.com/source1',
-      title: 'Source One',
-      snippetCount: 2,
-    })
-    expect(result.structuredContent.sources[1]).toMatchObject({
-      url: 'https://example.com/source2',
-      title: 'Source Two',
-      snippetCount: 1,
-    })
-  })
-
-  test('handles source with undefined title', () => {
-    const mockResponse: ResearchResponse = {
-      output: {
-        content: 'Answer text',
-        content_type: 'text',
-        sources: [
-          {
-            url: 'https://example.com/no-title',
-            snippets: ['A snippet'],
-          },
-        ],
-      },
-    }
-
-    const result = formatResearchResults(mockResponse)
-
-    expect(result.structuredContent.sourceCount).toBe(1)
-    expect(result.structuredContent.sources[0]).toMatchObject({
-      url: 'https://example.com/no-title',
-      title: undefined,
-      snippetCount: 1,
-    })
-  })
-
-  test('handles source with empty snippets array', () => {
-    const mockResponse: ResearchResponse = {
-      output: {
-        content: 'Answer with no-snippet source',
-        content_type: 'text',
-        sources: [
-          {
-            url: 'https://example.com/empty-snippets',
-            title: 'Empty Snippets Source',
-            snippets: [],
-          },
-        ],
-      },
-    }
-
-    const result = formatResearchResults(mockResponse)
-
-    expect(result.structuredContent.sourceCount).toBe(1)
-    expect(result.structuredContent.sources[0]?.snippetCount).toBe(0)
-  })
-
-  test('handles source with undefined snippets', () => {
-    const mockResponse: ResearchResponse = {
-      output: {
-        content: 'Answer',
-        content_type: 'text',
-        sources: [{ url: 'https://example.com/no-snippets', title: 'No Snippets' }],
-      },
-    }
-
-    const result = formatResearchResults(mockResponse)
-
-    expect(result.structuredContent.sources[0]?.snippetCount).toBe(0)
   })
 
   test('handles response with zero sources', () => {
@@ -121,8 +46,6 @@ describe('formatResearchResults', () => {
 
     const result = formatResearchResults(mockResponse)
 
-    expect(result.structuredContent.sourceCount).toBe(0)
-    expect(result.structuredContent.sources).toHaveLength(0)
-    expect(result.content[0]?.text).toContain('An answer with no cited sources.')
+    expect(result[0]?.text).toContain('An answer with no cited sources.')
   })
 })

package/src/search/register-search-tool.ts

@@ -1,7 +1,11 @@
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
-import { fetchSearchResults, generateErrorReportLink, SearchQuerySchema } from '@youdotcom-oss/api'
+import {
+  fetchSearchResults,
+  generateErrorReportLink,
+  SearchQuerySchema,
+  SearchResponseSchema,
+} from '@youdotcom-oss/api'
 import { getLogger } from '../shared/get-logger.ts'
-import { SearchStructuredContentSchema } from './search.schemas.ts'
 import { formatSearchResults } from './search.utils.ts'
 
 export const registerSearchTool = ({
@@ -19,8 +23,8 @@ export const registerSearchTool = ({
       title: 'Web Search',
       description:
         'Web and news search via You.com. Supports domain filtering, language selection, livecrawl for full page content, and date freshness controls.',
-      inputSchema: SearchQuerySchema.shape,
-      outputSchema: SearchStructuredContentSchema.shape,
+      inputSchema: SearchQuerySchema,
+      outputSchema: SearchResponseSchema,
     },
     async (searchQuery, { sendNotification }) => {
       const logger = getLogger(sendNotification)
@@ -42,13 +46,7 @@ export const registerSearchTool = ({
 
           return {
             content: [{ type: 'text' as const, text: 'No results found.' }],
-            structuredContent: {
-              resultCounts: {
-                web: 0,
-                news: 0,
-                total: 0,
-              },
-            },
+            structuredContent: response,
           }
         }
 
@@ -57,8 +55,8 @@ export const registerSearchTool = ({
           data: `Search successful for query: "${searchQuery.query}" - ${webCount} web results, ${newsCount} news results (${webCount + newsCount} total)`,
         })
 
-        const { content, structuredContent } = formatSearchResults(response)
-        return { content, structuredContent }
+        const content = formatSearchResults(response)
+        return { content, structuredContent: response }
       } catch (err: unknown) {
         const errorMessage = err instanceof Error ? err.message : String(err)
         const reportLink = generateErrorReportLink({

package/src/search/search.utils.ts

@@ -4,13 +4,11 @@ import { formatSearchResultsText } from '../shared/format-search-results-text.ts
 export const formatSearchResults = (response: SearchResponse) => {
   let formattedResults = ''
 
-  // Format web results using shared utility
   if (response.results.web?.length) {
     const webResults = formatSearchResultsText(response.results.web)
     formattedResults += `WEB RESULTS:\n\n${webResults}`
   }
 
-  // Format news results using shared utility (consistent with web formatting)
   if (response.results.news?.length) {
     const newsResults = formatSearchResultsText(response.results.news)
 
@@ -20,64 +18,10 @@ export const formatSearchResults = (response: SearchResponse) => {
     formattedResults += `NEWS RESULTS:\n\n${newsResults}`
   }
 
-  // Extract fields for structuredContent
-  const structuredResults: {
-    web?: Array<{
-      url: string
-      title: string
-      page_age?: string
-      snippets?: string[]
-      contents?: { html?: string; markdown?: string }
-    }>
-    news?: Array<{ url: string; title: string; page_age: string; contents?: { html?: string; markdown?: string } }>
-  } = {}
-
-  if (response.results.web?.length) {
-    structuredResults.web = response.results.web.map((result) => {
-      const item: {
-        url: string
-        title: string
-        page_age?: string
-        snippets?: string[]
-        contents?: { html?: string; markdown?: string }
-      } = {
-        url: result.url,
-        title: result.title,
-      }
-      if (result.page_age) item.page_age = result.page_age
-      if (result.snippets?.length) item.snippets = result.snippets
-      if (result.contents) item.contents = result.contents ?? undefined
-      return item
-    })
-  }
-
-  if (response.results.news?.length) {
-    structuredResults.news = response.results.news.map((article) => {
-      const item: { url: string; title: string; page_age: string; contents?: { html?: string; markdown?: string } } = {
-        url: article.url,
-        title: article.title,
-        page_age: article.page_age,
-      }
-      if (article.contents) item.contents = article.contents ?? undefined
-      return item
-    })
-  }
-
-  return {
-    content: [
-      {
-        type: 'text' as const,
-        text: `Search Results for "${response.metadata.query}":\n\n${formattedResults}`,
-      },
-    ],
-    structuredContent: {
-      resultCounts: {
-        web: response.results.web?.length || 0,
-        news: response.results.news?.length || 0,
-        total: (response.results.web?.length || 0) + (response.results.news?.length || 0),
-      },
-      results: Object.keys(structuredResults).length > 0 ? structuredResults : undefined,
+  return [
+    {
+      type: 'text' as const,
+      text: `Search Results for "${response.metadata.query}":\n\n${formattedResults}`,
     },
-    fullResponse: response,
-  }
+  ]
 }

package/src/search/tests/register-search-tool.spec.ts

@@ -88,9 +88,7 @@ describe('registerSearchTool', () => {
     const toolResult = await result.client.callTool({ name: 'you-search', arguments: { query: 'nonexistent' } })
 
     expect(toolResult.content).toEqual([{ type: 'text', text: 'No results found.' }])
-    expect(toolResult.structuredContent).toEqual({
-      resultCounts: { web: 0, news: 0, total: 0 },
-    })
+    expect(toolResult.structuredContent).toEqual(emptyResponse)
   })
 
   test('returns formatted results for successful search', async () => {
@@ -104,9 +102,7 @@ describe('registerSearchTool', () => {
     expect(text).toContain('Example')
     expect(text).toContain('https://example.com')
 
-    const structured = toolResult.structuredContent as Record<string, unknown>
-    expect(structured).toHaveProperty('resultCounts')
-    expect((structured as { resultCounts: { total: number } }).resultCounts.total).toBe(1)
+    expect(toolResult.structuredContent).toEqual(oneResultResponse)
   })
 
   test('returns error when API call fails', async () => {

package/src/search/tests/search.utils.spec.ts

@@ -27,32 +27,13 @@ describe('formatSearchResults', () => {
 
     const result = formatSearchResults(mockResponse)
 
-    expect(result).toHaveProperty('content')
-    expect(result).toHaveProperty('structuredContent')
-    expect(result).toHaveProperty('fullResponse')
-    expect(Array.isArray(result.content)).toBe(true)
-    expect(result.content[0]).toHaveProperty('type', 'text')
-    expect(result.content[0]).toHaveProperty('text')
-    expect(result.content[0]?.text).toContain('WEB RESULTS:')
-    expect(result.content[0]?.text).toContain('Test Title')
-    // URL and page_age should be in text content
-    expect(result.content[0]?.text).toContain('URL: https://example.com')
-    expect(result.content[0]?.text).toContain('Published: 2023-01-01T00:00:00')
-    expect(result.structuredContent).toHaveProperty('resultCounts')
-    expect(result.structuredContent.resultCounts).toHaveProperty('web', 1)
-    expect(result.structuredContent.resultCounts).toHaveProperty('news', 0)
-    expect(result.structuredContent.resultCounts).toHaveProperty('total', 1)
-    // All fields should be in structuredContent.results
-    expect(result.structuredContent).toHaveProperty('results')
-    expect(result.structuredContent.results?.web).toBeDefined()
-    expect(result.structuredContent.results?.web?.length).toBe(1)
-    expect(result.structuredContent.results?.web?.[0]).toMatchObject({
-      url: 'https://example.com',
-      title: 'Test Title',
-      page_age: '2023-01-01T00:00:00',
-      snippets: ['snippet 1', 'snippet 2'],
-    })
-    expect(result.fullResponse).toBe(mockResponse)
+    expect(Array.isArray(result)).toBe(true)
+    expect(result[0]).toHaveProperty('type', 'text')
+    expect(result[0]).toHaveProperty('text')
+    expect(result[0]?.text).toContain('WEB RESULTS:')
+    expect(result[0]?.text).toContain('Test Title')
+    expect(result[0]?.text).toContain('URL: https://example.com')
+    expect(result[0]?.text).toContain('Published: 2023-01-01T00:00:00')
   })
 
   test('formats news results correctly', () => {
@@ -77,25 +58,11 @@ describe('formatSearchResults', () => {
 
     const result = formatSearchResults(mockResponse)
 
-    expect(result.content[0]?.text).toContain('NEWS RESULTS:')
-    expect(result.content[0]?.text).toContain('News Title')
-    expect(result.content[0]?.text).toContain('Published: 2023-01-01T00:00:00')
-    // URL and Description should be in text content (routed through formatSearchResultsText)
-    expect(result.content[0]?.text).toContain('URL: https://news.com/article')
-    expect(result.content[0]?.text).toContain('Description: News description')
-    expect(result.structuredContent).toHaveProperty('resultCounts')
-    expect(result.structuredContent.resultCounts).toHaveProperty('web', 0)
-    expect(result.structuredContent.resultCounts).toHaveProperty('news', 1)
-    expect(result.structuredContent.resultCounts).toHaveProperty('total', 1)
-    // All fields should be in structuredContent.results
-    expect(result.structuredContent).toHaveProperty('results')
-    expect(result.structuredContent.results?.news).toBeDefined()
-    expect(result.structuredContent.results?.news?.length).toBe(1)
-    expect(result.structuredContent.results?.news?.[0]).toMatchObject({
-      url: 'https://news.com/article',
-      title: 'News Title',
-      page_age: '2023-01-01T00:00:00',
-    })
+    expect(result[0]?.text).toContain('NEWS RESULTS:')
+    expect(result[0]?.text).toContain('News Title')
+    expect(result[0]?.text).toContain('Published: 2023-01-01T00:00:00')
+    expect(result[0]?.text).toContain('URL: https://news.com/article')
+    expect(result[0]?.text).toContain('Description: News description')
   })
 
   test('formats both web and news results', () => {
@@ -129,35 +96,14 @@ describe('formatSearchResults', () => {
 
     const result = formatSearchResults(mockResponse)
 
-    expect(result.content[0]?.text).toContain('WEB RESULTS:')
-    expect(result.content[0]?.text).toContain('NEWS RESULTS:')
-    expect(result.content[0]?.text).toContain(`=${'='.repeat(49)}`)
-    // URLs should be in text content
-    expect(result.content[0]?.text).toContain('URL: https://web.com')
-    expect(result.content[0]?.text).toContain('URL: https://news.com/article')
-    expect(result.structuredContent.resultCounts).toHaveProperty('web', 1)
-    expect(result.structuredContent.resultCounts).toHaveProperty('news', 1)
-    expect(result.structuredContent.resultCounts).toHaveProperty('total', 2)
-    // All fields should be in structuredContent.results
-    expect(result.structuredContent).toHaveProperty('results')
-    expect(result.structuredContent.results?.web).toBeDefined()
-    expect(result.structuredContent.results?.news).toBeDefined()
-    expect(result.structuredContent.results?.web?.length).toBe(1)
-    expect(result.structuredContent.results?.news?.length).toBe(1)
-    expect(result.structuredContent.results?.web?.[0]).toMatchObject({
-      url: 'https://web.com',
-      title: 'Web Title',
-      page_age: '2023-01-01T00:00:00',
-      snippets: ['web snippet'],
-    })
-    expect(result.structuredContent.results?.news?.[0]).toMatchObject({
-      url: 'https://news.com/article',
-      title: 'News Title',
-      page_age: '2023-01-01T00:00:00',
-    })
+    expect(result[0]?.text).toContain('WEB RESULTS:')
+    expect(result[0]?.text).toContain('NEWS RESULTS:')
+    expect(result[0]?.text).toContain(`=${'='.repeat(49)}`)
+    expect(result[0]?.text).toContain('URL: https://web.com')
+    expect(result[0]?.text).toContain('URL: https://news.com/article')
   })
 
-  test('includes contents in structuredContent and text indicator when livecrawl returns page content', () => {
+  test('includes page content indicator when livecrawl returns contents', () => {
     const mockResponse: SearchResponse = {
       results: {
         web: [
@@ -185,23 +131,12 @@ describe('formatSearchResults', () => {
 
     const result = formatSearchResults(mockResponse)
 
-    // Text content should include the contents indicator
-    expect(result.content[0]?.text).toContain('Page content available:')
-    expect(result.content[0]?.text).toContain('chars (markdown)')
-    expect(result.content[0]?.text).toContain('chars (html)')
-
-    // structuredContent should include contents
-    expect(result.structuredContent.results?.web?.[0]).toMatchObject({
-      url: 'https://example.com',
-      title: 'Livecrawl Title',
-      contents: {
-        markdown: 'Full page content in markdown format.',
-        html: '<p>Full page content in HTML format.</p>',
-      },
-    })
+    expect(result[0]?.text).toContain('Page content available:')
+    expect(result[0]?.text).toContain('chars (markdown)')
+    expect(result[0]?.text).toContain('chars (html)')
   })
 
-  test('omits contents when not present in response', () => {
+  test('omits content indicator when livecrawl contents absent', () => {
     const mockResponse: SearchResponse = {
       results: {
         web: [
@@ -223,11 +158,10 @@ describe('formatSearchResults', () => {
 
     const result = formatSearchResults(mockResponse)
 
-    expect(result.content[0]?.text).not.toContain('Page content available:')
-    expect(result.structuredContent.results?.web?.[0]?.contents).toBeUndefined()
+    expect(result[0]?.text).not.toContain('Page content available:')
   })
 
-  test('includes contents indicator for news results with livecrawl', () => {
+  test('includes content indicator for news results with livecrawl', () => {
     const mockResponse: SearchResponse = {
       results: {
         web: [],
@@ -252,40 +186,7 @@ describe('formatSearchResults', () => {
 
     const result = formatSearchResults(mockResponse)
 
-    // Text content should include the contents indicator for news too
-    expect(result.content[0]?.text).toContain('Page content available:')
-    expect(result.content[0]?.text).toContain('chars (markdown)')
-
-    // structuredContent should include contents for news
-    expect(result.structuredContent.results?.news?.[0]).toMatchObject({
-      url: 'https://news.com/article',
-      title: 'News with Content',
-      contents: { markdown: 'Full news article content in markdown.' },
-    })
-  })
-
-  test('includes snippets in structuredContent for web results', () => {
-    const mockResponse: SearchResponse = {
-      results: {
-        web: [
-          {
-            url: 'https://example.com',
-            title: 'With Snippets',
-            description: 'Has snippets',
-            snippets: ['first snippet', 'second snippet'],
-          },
-        ],
-        news: [],
-      },
-      metadata: {
-        search_uuid: 'test-uuid',
-        query: 'test',
-        latency: 0.1,
-      },
-    }
-
-    const result = formatSearchResults(mockResponse)
-
-    expect(result.structuredContent.results?.web?.[0]?.snippets).toEqual(['first snippet', 'second snippet'])
+    expect(result[0]?.text).toContain('Page content available:')
+    expect(result[0]?.text).toContain('chars (markdown)')
   })
 })

package/src/contents/contents.schemas.ts

@@ -1,30 +0,0 @@
-import * as z from 'zod'
-
-/**
- * Structured content schema for MCP response
- * Includes full content and metadata for each URL
- */
-export const ContentsStructuredContentSchema = z.object({
-  count: z.number().describe('URLs processed'),
-  formats: z.array(z.string()).describe('Content formats requested'),
-  items: z
-    .array(
-      z.object({
-        url: z.string().describe('URL'),
-        title: z.string().optional().describe('Title'),
-        markdown: z.string().optional().describe('Markdown content'),
-        html: z.string().optional().describe('HTML content'),
-        metadata: z
-          .object({
-            favicon_url: z.string().describe('Favicon URL'),
-            site_name: z.string().optional().nullable().describe('Site name'),
-          })
-          .optional()
-          .nullable()
-          .describe('Page metadata'),
-      }),
-    )
-    .describe('Extracted items'),
-})
-
-export type ContentsStructuredContent = z.infer<typeof ContentsStructuredContentSchema>

package/src/research/research.schemas.ts

@@ -1,19 +0,0 @@
-import * as z from 'zod'
-
-// Minimal schema for structuredContent (reduces payload duplication)
-// Full research content is in the text content field
-export const ResearchStructuredContentSchema = z.object({
-  contentType: z.string().describe('Format of the content field'),
-  sourceCount: z.number().describe('Number of sources used'),
-  sources: z
-    .array(
-      z.object({
-        url: z.string().describe('Source URL'),
-        title: z.string().optional().describe('Source title'),
-        snippetCount: z.number().describe('Number of excerpts from this source'),
-      }),
-    )
-    .describe('Sources used in the research answer'),
-})
-
-export type ResearchStructuredContent = z.infer<typeof ResearchStructuredContentSchema>

package/src/search/search.schemas.ts

@@ -1,53 +0,0 @@
-import * as z from 'zod'
-
-// Minimal schema for structuredContent (reduces payload duplication)
-// Excludes metadata (query, search_uuid, latency) as these are not actionable by LLM
-export const SearchStructuredContentSchema = z.object({
-  resultCounts: z.object({
-    web: z.number().describe('Web results'),
-    news: z.number().describe('News results'),
-    total: z.number().describe('Total results'),
-  }),
-  results: z
-    .object({
-      web: z
-        .array(
-          z.object({
-            url: z.string().describe('URL'),
-            title: z.string().describe('Title'),
-            page_age: z.string().optional().describe('Publication timestamp'),
-            snippets: z.array(z.string()).optional().describe('Content snippets'),
-            contents: z
-              .object({
-                html: z.string().optional().describe('Full HTML content'),
-                markdown: z.string().optional().describe('Full Markdown content'),
-              })
-              .optional()
-              .describe('Livecrawled page content'),
-          }),
-        )
-        .optional()
-        .describe('Web results'),
-      news: z
-        .array(
-          z.object({
-            url: z.string().describe('URL'),
-            title: z.string().describe('Title'),
-            page_age: z.string().describe('Publication timestamp'),
-            contents: z
-              .object({
-                html: z.string().optional().describe('Full HTML content'),
-                markdown: z.string().optional().describe('Full Markdown content'),
-              })
-              .optional()
-              .describe('Livecrawled page content'),
-          }),
-        )
-        .optional()
-        .describe('News results'),
-    })
-    .optional()
-    .describe('Search results'),
-})
-
-export type SearchStructuredContent = z.infer<typeof SearchStructuredContentSchema>