refactor(mcp): update formatters to return structured {content, tokens}

- Remove token footer from content string (moved to metadata)
- Return tokens as separate field in FormattedResult
- Update formatter tests for new structure

Part of #51

Author: prosdev

packages/mcp-server/src/formatters/__tests__/formatters.test.ts

@@ -69,9 +69,9 @@ describe('Formatters', () => {
       expect(result.content).toContain('1. [89%]');
       expect(result.content).toContain('2. [84%]');
       expect(result.content).toContain('3. [72%]');
-      expect(result.tokenEstimate).toBeGreaterThan(0);
-      // Should include token footer
-      expect(result.content).toMatch(/🪙 ~\d+ tokens$/);
+      expect(result.tokens).toBeGreaterThan(0);
+      // Token footer moved to metadata, no longer in content
+      expect(result.content).not.toContain('🪙');
     });
 
     it('should respect maxResults option', () => {
@@ -143,8 +143,9 @@ describe('Formatters', () => {
       // Should have double newlines between results
       expect(result.content).toContain('\n\n');
 
-      // Should include token footer
-      expect(result.content).toMatch(/🪙 ~\d+ tokens$/);
+      // Token footer moved to metadata, no longer in content
+      expect(result.content).not.toContain('🪙');
+      expect(result.tokens).toBeGreaterThan(0);
     });
 
     it('should include signatures by default', () => {
@@ -209,7 +210,7 @@ describe('Formatters', () => {
       const verboseResult = verboseFormatter.formatResults(mockResults);
 
       // Verbose should be significantly larger
-      expect(verboseResult.tokenEstimate).toBeGreaterThan(compactResult.tokenEstimate * 2);
+      expect(verboseResult.tokens).toBeGreaterThan(compactResult.tokens * 2);
     });
 
     it('token estimates should scale with result count', () => {
@@ -218,37 +219,35 @@ describe('Formatters', () => {
       const oneResult = formatter.formatResults([mockResults[0]]);
       const threeResults = formatter.formatResults(mockResults);
 
-      expect(threeResults.tokenEstimate).toBeGreaterThan(oneResult.tokenEstimate * 2);
+      expect(threeResults.tokens).toBeGreaterThan(oneResult.tokens * 2);
     });
   });
 
-  describe('Token Footer', () => {
-    it('compact formatter should include coin emoji footer', () => {
+  describe('Structured Metadata', () => {
+    it('compact formatter should return tokens in result object', () => {
       const formatter = new CompactFormatter();
       const result = formatter.formatResults(mockResults);
 
-      expect(result.content).toContain('🪙');
-      expect(result.content).toMatch(/~\d+ tokens$/);
+      // Token info is now in the result object, not the content
+      expect(result.tokens).toBeGreaterThan(0);
+      expect(result.content).not.toContain('🪙');
     });
 
-    it('verbose formatter should include coin emoji footer', () => {
+    it('verbose formatter should return tokens in result object', () => {
       const formatter = new VerboseFormatter();
       const result = formatter.formatResults(mockResults);
 
-      expect(result.content).toContain('🪙');
-      expect(result.content).toMatch(/~\d+ tokens$/);
+      // Token info is now in the result object, not the content
+      expect(result.tokens).toBeGreaterThan(0);
+      expect(result.content).not.toContain('🪙');
     });
 
-    it('token footer should match tokenEstimate property', () => {
+    it('tokens property should be a positive number', () => {
       const formatter = new CompactFormatter();
       const result = formatter.formatResults(mockResults);
 
-      // Extract token count from footer
-      const footerMatch = result.content.match(/🪙 ~(\d+) tokens$/);
-      expect(footerMatch).toBeTruthy();
-
-      const footerTokens = Number.parseInt(footerMatch?.[1] ?? '0', 10);
-      expect(footerTokens).toBe(result.tokenEstimate);
+      expect(typeof result.tokens).toBe('number');
+      expect(result.tokens).toBeGreaterThan(0);
     });
   });
 });

packages/mcp-server/src/formatters/compact-formatter.ts

@@ -59,7 +59,7 @@ export class CompactFormatter implements ResultFormatter {
       const content = 'No results found';
       return {
         content,
-        tokenEstimate: estimateTokensForText(content),
+        tokens: estimateTokensForText(content),
       };
     }
 
@@ -71,16 +71,13 @@ export class CompactFormatter implements ResultFormatter {
       return `${index + 1}. ${this.formatResult(result)}`;
     });
 
-    // Calculate total tokens
-    const contentLines = formatted.join('\n');
-    const tokenEstimate = estimateTokensForText(contentLines);
-
-    // Add token footer
-    const content = `${contentLines}\n\n🪙 ~${tokenEstimate} tokens`;
+    // Calculate total tokens (content only, no footer)
+    const content = formatted.join('\n');
+    const tokens = estimateTokensForText(content);
 
     return {
       content,
-      tokenEstimate,
+      tokens,
     };
   }
 

packages/mcp-server/src/formatters/verbose-formatter.ts

@@ -89,7 +89,7 @@ export class VerboseFormatter implements ResultFormatter {
       const content = 'No results found';
       return {
         content,
-        tokenEstimate: estimateTokensForText(content),
+        tokens: estimateTokensForText(content),
       };
     }
 
@@ -101,16 +101,13 @@ export class VerboseFormatter implements ResultFormatter {
       return `${index + 1}. ${this.formatResult(result)}`;
     });
 
-    // Calculate total tokens
-    const contentLines = formatted.join('\n\n'); // Double newline for separation
-    const tokenEstimate = estimateTokensForText(contentLines);
-
-    // Add token footer
-    const content = `${contentLines}\n\n🪙 ~${tokenEstimate} tokens`;
+    // Calculate total tokens (content only, no footer)
+    const content = formatted.join('\n\n'); // Double newline for separation
+    const tokens = estimateTokensForText(content);
 
     return {
       content,
-      tokenEstimate,
+      tokens,
     };
   }