refactor(mcp): migrate ExploreAdapter and RefsAdapter to SearchService

Migrate two more MCP adapters to use the service layer with dependency
injection for better testability and consistency.

Adapters Refactored:
- ExploreAdapter: Now uses SearchService for search() and findSimilar()
- RefsAdapter: Now uses SearchService for all call graph queries

Changes:
- ExploreAdapterConfig: searchService replaces repositoryIndexer
- RefsAdapterConfig: searchService replaces repositoryIndexer
- Updated adapter instantiation in MCP server and CLI
- Updated test mocks from mockIndexer to mockSearchService
- Fixed similar code tests to use findSimilar() method
- Removed unused imports (chalk, formatBytes, loadConfig) in CLI

Benefits:
- Consistent service layer usage across adapters
- Better testability with dependency injection
- Easier to mock for unit tests
- Reduced coupling to implementation details

Adapters by Refactoring Status:
✅ Service Layer (5/9):
  - SearchAdapter → SearchService
  - StatusAdapter → StatsService, GitHubService
  - GitHubAdapter → GitHubService
  - ExploreAdapter → SearchService
  - RefsAdapter → SearchService

⏭️ Thin Wrappers (4/9 - no refactor needed):
  - MapAdapter: Utility wrapper around generateCodebaseMap
  - HistoryAdapter: Uses GitIndexer (would need GitHistoryService)
  - PlanAdapter: Utility wrapper around assembleContext
  - HealthAdapter: Different interface than HealthService

The remaining 4 adapters are already well-designed as thin wrappers
around core utilities. Further refactoring would add complexity without
providing testability or maintainability benefits.

Tests: All 1918 tests passing
Lint: No warnings or errors

Author: prosdev

packages/cli/src/commands/clean.ts

@@ -5,11 +5,10 @@ import {
   getStorageFilePaths,
   getStoragePath,
 } from '@lytics/dev-agent-core';
-import chalk from 'chalk';
 import { Command } from 'commander';
 import ora from 'ora';
 import { loadConfig } from '../utils/config.js';
-import { formatBytes, getDirectorySize } from '../utils/file.js';
+import { getDirectorySize } from '../utils/file.js';
 import { logger } from '../utils/logger.js';
 import { output, printCleanSuccess, printCleanSummary } from '../utils/output.js';
 

packages/cli/src/commands/compact.ts

@@ -5,12 +5,11 @@ import {
   getStoragePath,
   RepositoryIndexer,
 } from '@lytics/dev-agent-core';
-import chalk from 'chalk';
 import { Command } from 'commander';
 import ora from 'ora';
 import { loadConfig } from '../utils/config.js';
 import { logger } from '../utils/logger.js';
-import { output, printCompactResults } from '../utils/output.js';
+import { printCompactResults } from '../utils/output.js';
 
 export const compactCommand = new Command('compact')
   .description('🗜️  Optimize and compact the vector store')

packages/cli/src/commands/git.ts

@@ -14,7 +14,6 @@ import { createLogger } from '@lytics/kero';
 import chalk from 'chalk';
 import { Command } from 'commander';
 import ora from 'ora';
-import { loadConfig } from '../utils/config.js';
 import { keroLogger, logger } from '../utils/logger.js';
 import { output, printGitStats } from '../utils/output.js';
 

packages/cli/src/commands/mcp.ts

@@ -149,7 +149,7 @@ Available Tools (9):
 
           const exploreAdapter = new ExploreAdapter({
             repositoryPath,
-            repositoryIndexer: indexer,
+            searchService,
             defaultLimit: 10,
             defaultThreshold: 0.7,
             defaultFormat: 'compact',
@@ -169,7 +169,7 @@ Available Tools (9):
           });
 
           const refsAdapter = new RefsAdapter({
-            repositoryIndexer: indexer,
+            searchService,
             defaultLimit: 20,
           });
 

packages/mcp-server/bin/dev-agent-mcp.ts

@@ -185,7 +185,7 @@ async function main() {
 
     const exploreAdapter = new ExploreAdapter({
       repositoryPath,
-      repositoryIndexer: indexer,
+      searchService,
       defaultLimit: 10,
       defaultThreshold: 0.7,
       defaultFormat: 'compact',
@@ -205,7 +205,7 @@ async function main() {
     });
 
     const refsAdapter = new RefsAdapter({
-      repositoryIndexer: indexer,
+      searchService,
       defaultLimit: 20,
     });
 

packages/mcp-server/src/adapters/__tests__/explore-adapter.test.ts

@@ -2,26 +2,27 @@
  * ExploreAdapter Unit Tests
  */
 
-import type { RepositoryIndexer, SearchResult } from '@lytics/dev-agent-core';
+import type { SearchResult, SearchService } from '@lytics/dev-agent-core';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { ExploreAdapter } from '../built-in/explore-adapter';
 import type { ToolExecutionContext } from '../types';
 
 describe('ExploreAdapter', () => {
   let adapter: ExploreAdapter;
-  let mockIndexer: RepositoryIndexer;
+  let mockSearchService: SearchService;
   let mockContext: ToolExecutionContext;
 
   beforeEach(() => {
-    // Mock RepositoryIndexer
-    mockIndexer = {
+    // Mock SearchService
+    mockSearchService = {
       search: vi.fn(),
-    } as unknown as RepositoryIndexer;
+      findSimilar: vi.fn(),
+    } as unknown as SearchService;
 
     // Create adapter
     adapter = new ExploreAdapter({
       repositoryPath: '/test/repo',
-      repositoryIndexer: mockIndexer,
+      searchService: mockSearchService,
       defaultLimit: 10,
       defaultThreshold: 0.7,
       defaultFormat: 'compact',
@@ -151,7 +152,7 @@ describe('ExploreAdapter', () => {
         },
       ];
 
-      vi.mocked(mockIndexer.search).mockResolvedValue(mockResults);
+      vi.mocked(mockSearchService.search).mockResolvedValue(mockResults);
 
       const result = await adapter.execute(
         {
@@ -183,7 +184,7 @@ describe('ExploreAdapter', () => {
         },
       ];
 
-      vi.mocked(mockIndexer.search).mockResolvedValue(mockResults);
+      vi.mocked(mockSearchService.search).mockResolvedValue(mockResults);
 
       const result = await adapter.execute(
         {
@@ -221,7 +222,7 @@ describe('ExploreAdapter', () => {
         },
       ];
 
-      vi.mocked(mockIndexer.search).mockResolvedValue(mockResults);
+      vi.mocked(mockSearchService.search).mockResolvedValue(mockResults);
 
       const result = await adapter.execute(
         {
@@ -238,7 +239,7 @@ describe('ExploreAdapter', () => {
     });
 
     it('should handle no results found', async () => {
-      vi.mocked(mockIndexer.search).mockResolvedValue([]);
+      vi.mocked(mockSearchService.search).mockResolvedValue([]);
 
       const result = await adapter.execute(
         {
@@ -276,7 +277,7 @@ describe('ExploreAdapter', () => {
         },
       ];
 
-      vi.mocked(mockIndexer.search).mockResolvedValue(mockResults);
+      vi.mocked(mockSearchService.findSimilar).mockResolvedValue(mockResults);
 
       const result = await adapter.execute(
         {
@@ -296,7 +297,7 @@ describe('ExploreAdapter', () => {
     });
 
     it('should handle no similar files', async () => {
-      vi.mocked(mockIndexer.search).mockResolvedValue([
+      vi.mocked(mockSearchService.findSimilar).mockResolvedValue([
         {
           id: '1',
           score: 1.0,
@@ -344,7 +345,7 @@ describe('ExploreAdapter', () => {
         },
       ];
 
-      vi.mocked(mockIndexer.search).mockResolvedValue(mockResults);
+      vi.mocked(mockSearchService.search).mockResolvedValue(mockResults);
 
       const result = await adapter.execute(
         {
@@ -360,7 +361,7 @@ describe('ExploreAdapter', () => {
     });
 
     it('should handle no relationships found', async () => {
-      vi.mocked(mockIndexer.search).mockResolvedValue([]);
+      vi.mocked(mockSearchService.search).mockResolvedValue([]);
 
       const result = await adapter.execute(
         {
@@ -377,7 +378,7 @@ describe('ExploreAdapter', () => {
 
   describe('Error Handling', () => {
     it('should handle file not found errors', async () => {
-      vi.mocked(mockIndexer.search).mockRejectedValue(new Error('File not found'));
+      vi.mocked(mockSearchService.findSimilar).mockRejectedValue(new Error('File not found'));
 
       const result = await adapter.execute(
         {
@@ -392,7 +393,7 @@ describe('ExploreAdapter', () => {
     });
 
     it('should handle index not ready errors', async () => {
-      vi.mocked(mockIndexer.search).mockRejectedValue(new Error('Index not indexed'));
+      vi.mocked(mockSearchService.search).mockRejectedValue(new Error('Index not indexed'));
 
       const result = await adapter.execute(
         {
@@ -407,7 +408,7 @@ describe('ExploreAdapter', () => {
     });
 
     it('should handle generic errors', async () => {
-      vi.mocked(mockIndexer.search).mockRejectedValue(new Error('Unknown error'));
+      vi.mocked(mockSearchService.search).mockRejectedValue(new Error('Unknown error'));
 
       const result = await adapter.execute(
         {

packages/mcp-server/src/adapters/__tests__/refs-adapter.test.ts

@@ -2,14 +2,14 @@
  * Tests for RefsAdapter
  */
 
-import type { RepositoryIndexer, SearchResult } from '@lytics/dev-agent-core';
+import type { SearchResult, SearchService } from '@lytics/dev-agent-core';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { ConsoleLogger } from '../../utils/logger';
 import { RefsAdapter } from '../built-in/refs-adapter';
 import type { AdapterContext, ToolExecutionContext } from '../types';
 
 describe('RefsAdapter', () => {
-  let mockIndexer: RepositoryIndexer;
+  let mockSearchService: SearchService;
   let adapter: RefsAdapter;
   let context: AdapterContext;
   let execContext: ToolExecutionContext;
@@ -69,14 +69,14 @@ describe('RefsAdapter', () => {
   ];
 
   beforeEach(async () => {
-    // Create mock indexer
-    mockIndexer = {
+    // Create mock search service
+    mockSearchService = {
       search: vi.fn().mockResolvedValue(mockSearchResults),
-    } as unknown as RepositoryIndexer;
+    } as unknown as SearchService;
 
     // Create adapter
     adapter = new RefsAdapter({
-      repositoryIndexer: mockIndexer,
+      searchService: mockSearchService,
       defaultLimit: 20,
     });
 
@@ -269,7 +269,7 @@ describe('RefsAdapter', () => {
   describe('Not Found', () => {
     it('should return error when function not found', async () => {
       // Mock empty results
-      (mockIndexer.search as ReturnType<typeof vi.fn>).mockResolvedValueOnce([]);
+      (mockSearchService.search as ReturnType<typeof vi.fn>).mockResolvedValueOnce([]);
 
       const result = await adapter.execute({ name: 'nonExistentFunction' }, execContext);
 

packages/mcp-server/src/adapters/built-in/explore-adapter.ts

@@ -6,7 +6,7 @@
  * falls back to direct indexer calls otherwise.
  */
 
-import type { RepositoryIndexer } from '@lytics/dev-agent-core';
+import type { SearchService } from '@lytics/dev-agent-core';
 import type {
   ExplorationResult,
   PatternResult,
@@ -20,7 +20,7 @@ import { validateArgs } from '../validation.js';
 
 export interface ExploreAdapterConfig {
   repositoryPath: string;
-  repositoryIndexer: RepositoryIndexer;
+  searchService: SearchService;
   defaultLimit?: number;
   defaultThreshold?: number;
   defaultFormat?: 'compact' | 'verbose';
@@ -43,15 +43,15 @@ export class ExploreAdapter extends ToolAdapter {
   };
 
   private repositoryPath: string;
-  private repositoryIndexer: RepositoryIndexer;
+  private searchService: SearchService;
   private defaultLimit: number;
   private defaultThreshold: number;
   private defaultFormat: 'compact' | 'verbose';
 
   constructor(config: ExploreAdapterConfig) {
     super();
     this.repositoryPath = config.repositoryPath;
-    this.repositoryIndexer = config.repositoryIndexer;
+    this.searchService = config.searchService;
     this.defaultLimit = config.defaultLimit ?? 10;
     this.defaultThreshold = config.defaultThreshold ?? 0.7;
     this.defaultFormat = config.defaultFormat ?? 'compact';
@@ -411,7 +411,7 @@ export class ExploreAdapter extends ToolAdapter {
     fileTypes: string[] | undefined,
     format: string
   ): Promise<string> {
-    const results = await this.repositoryIndexer.search(query, {
+    const results = await this.searchService.search(query, {
       limit,
       scoreThreshold: threshold,
     });
@@ -444,9 +444,9 @@ export class ExploreAdapter extends ToolAdapter {
     threshold: number,
     format: string
   ): Promise<string> {
-    const results = await this.repositoryIndexer.search(`file:${filePath}`, {
+    const results = await this.searchService.findSimilar(filePath, {
       limit: limit + 1,
-      scoreThreshold: threshold,
+      threshold,
     });
 
     // Exclude the reference file itself
@@ -469,7 +469,7 @@ export class ExploreAdapter extends ToolAdapter {
   private async findRelationships(filePath: string, format: string): Promise<string> {
     // Search for references to this file
     const fileName = filePath.split('/').pop() || filePath;
-    const results = await this.repositoryIndexer.search(`import ${fileName}`, {
+    const results = await this.searchService.search(`import ${fileName}`, {
       limit: 20,
       scoreThreshold: 0.6,
     });

packages/mcp-server/src/adapters/built-in/refs-adapter.ts

@@ -3,7 +3,7 @@
  * Provides call graph queries via the dev_refs tool
  */
 
-import type { CalleeInfo, RepositoryIndexer, SearchResult } from '@lytics/dev-agent-core';
+import type { CalleeInfo, SearchResult, SearchService } from '@lytics/dev-agent-core';
 import { estimateTokensForText, startTimer } from '../../formatters/utils';
 import { RefsArgsSchema, type RefsOutput, RefsOutputSchema } from '../../schemas/index.js';
 import { ToolAdapter } from '../tool-adapter';
@@ -20,9 +20,9 @@ export type RefDirection = 'callees' | 'callers' | 'both';
  */
 export interface RefsAdapterConfig {
   /**
-   * Repository indexer instance
+   * Search service instance
    */
-  repositoryIndexer: RepositoryIndexer;
+  searchService: SearchService;
 
   /**
    * Default result limit
@@ -53,14 +53,16 @@ export class RefsAdapter extends ToolAdapter {
     author: 'Dev-Agent Team',
   };
 
-  private indexer: RepositoryIndexer;
-  private config: Required<RefsAdapterConfig>;
+  private searchService: SearchService;
+  private config: Required<Omit<RefsAdapterConfig, 'searchService'>> & {
+    searchService: SearchService;
+  };
 
   constructor(config: RefsAdapterConfig) {
     super();
-    this.indexer = config.repositoryIndexer;
+    this.searchService = config.searchService;
     this.config = {
-      repositoryIndexer: config.repositoryIndexer,
+      searchService: config.searchService,
       defaultLimit: config.defaultLimit ?? 20,
     };
   }
@@ -156,7 +158,7 @@ export class RefsAdapter extends ToolAdapter {
       context.logger.debug('Executing refs query', { name, direction, limit });
 
       // First, find the target component
-      const searchResults = await this.indexer.search(name, { limit: 10 });
+      const searchResults = await this.searchService.search(name, { limit: 10 });
       const target = this.findBestMatch(searchResults, name);
 
       if (!target) {
@@ -288,7 +290,7 @@ export class RefsAdapter extends ToolAdapter {
 
     // Search for components that might call this target
     // We search broadly and then filter by callees
-    const candidates = await this.indexer.search(targetName, { limit: 100 });
+    const candidates = await this.searchService.search(targetName, { limit: 100 });
 
     const callers: RefResult[] = [];