Merge origin/main into dynamic-mcp-tools

Merge commits:
- ff69f62: Fix search/list/read operations to use indexed commit ref (#13)
- ef6a46a: feat: add consistent User-Agent string (#14)

Resolved conflicts:
- src/clients/mcp-server.ts: Kept Discovery mode logic while integrating User-Agent changes
- src/clients/multi-index-runner.ts: Added clientUserAgent parameter and updateClientUserAgent method

Fixed type errors from main branch:
- Removed invalid clientUserAgent parameter from DirectContext.create/import calls
- Removed invalid clientUserAgent parameter from AugmentLanguageModel config

All tests pass and build succeeds.

Author: richhankins

package-lock.json

@@ -20,7 +20,7 @@
     "cli": "tsx src/bin/index.ts",
     "cli:index": "tsx src/bin/index.ts index",
     "cli:search": "tsx src/bin/index.ts search",
-    "test:integration": "tsx test/augment-provider.ts && tsx test/cli-agent.ts",
+    "test:integration": "tsx test/augment-provider.ts && tsx test/cli-agent.ts && tsx test/resolved-ref.ts",
     "format": "biome format --write .",
     "lint": "biome check .",
     "lint:fix": "biome check --write ."
@@ -68,7 +68,7 @@
     }
   },
   "dependencies": {
-    "@augmentcode/auggie-sdk": "^0.1.14",
+    "@augmentcode/auggie-sdk": "^0.1.15",
     "cheerio": "^1.1.2",
     "commander": "^12.0.0",
     "ignore": "^5.3.0",

package.json

@@ -7,6 +7,7 @@ import * as readline from "readline";
 import { CLIAgent, type Provider } from "../clients/cli-agent.js";
 import { MultiIndexRunner } from "../clients/multi-index-runner.js";
 import { CompositeStoreReader, parseIndexSpecs } from "../stores/index.js";
+import { buildClientUserAgent } from "../core/utils.js";
 
 const PROVIDER_DEFAULTS: Record<Provider, string> = {
   openai: "gpt-5-mini",
@@ -50,9 +51,13 @@ export const agentCommand = new Command("agent")
       const store = await CompositeStoreReader.fromSpecs(specs);
 
       // Create multi-index runner
+      // Build User-Agent for analytics tracking
+      const clientUserAgent = buildClientUserAgent("cli");
+      
       const runner = await MultiIndexRunner.create({
         store,
         searchOnly: options.searchOnly,
+        clientUserAgent,
       });
 
       console.log("\x1b[1;36mContext Connectors Minimal Agent\x1b[0m");
@@ -73,6 +78,7 @@ export const agentCommand = new Command("agent")
         model,
         maxSteps: options.maxSteps,
         verbose: options.verbose,
+        clientUserAgent,
       });
       await agent.initialize();
 

src/bin/cmd-agent.ts

@@ -7,6 +7,7 @@ import { Indexer } from "../core/indexer.js";
 import { Source } from "../sources/types.js";
 import { FilesystemStore } from "../stores/filesystem.js";
 import { getS3Config } from "../stores/s3-config.js";
+import { buildClientUserAgent } from "../core/utils.js";
 
 // Shared store options
 interface StoreOptions {
@@ -49,7 +50,9 @@ async function runIndex(
   sourceType: string
 ) {
   console.log(`Indexing ${sourceType} source...`);
-  const indexer = new Indexer();
+  const indexer = new Indexer({
+    clientUserAgent: buildClientUserAgent("cli"),
+  });
   const result = await indexer.index(source, store, indexKey);
 
   console.log(`\nIndexing complete!`);

src/bin/cmd-index.ts

@@ -9,6 +9,7 @@ import { getSourceIdentifier } from "../core/types.js";
 import { getS3Config } from "../stores/s3-config.js";
 import { parseIndexSpec } from "../stores/index-spec.js";
 import type { IndexStoreReader } from "../stores/types.js";
+import { buildClientUserAgent } from "../core/utils.js";
 
 export const searchCommand = new Command("search")
   .description("Search indexed content and answer questions (use --raw for raw results)")
@@ -83,6 +84,7 @@ export const searchCommand = new Command("search")
       const client = new SearchClient({
         store,
         indexName: indexKey,
+        clientUserAgent: buildClientUserAgent("cli"),
       });
 
       await client.initialize();

src/bin/cmd-search.ts

@@ -79,6 +79,12 @@ export interface CLIAgentSingleConfig {
   stream?: boolean;
   /** Custom system prompt. Uses a sensible default if not provided. */
   systemPrompt?: string;
+  /**
+   * Custom User-Agent string for analytics tracking.
+   * When provided, this is sent to the Augment API for usage analytics.
+   * Only used when provider is 'augment'.
+   */
+  clientUserAgent?: string;
 }
 
 /**
@@ -110,6 +116,12 @@ export interface CLIAgentMultiConfig {
   stream?: boolean;
   /** Custom system prompt. Uses a sensible default if not provided. */
   systemPrompt?: string;
+  /**
+   * Custom User-Agent string for analytics tracking.
+   * When provided, this is sent to the Augment API for usage analytics.
+   * Only used when provider is 'augment'.
+   */
+  clientUserAgent?: string;
 }
 
 /** Configuration for the CLI agent */
@@ -136,7 +148,8 @@ Be concise but thorough. Reference specific files and line numbers when helpful.
  */
 async function loadModel(
   provider: Provider,
-  modelName: string
+  modelName: string,
+  clientUserAgent?: string
 ): Promise<LanguageModel> {
   switch (provider) {
     case "openai": {
@@ -179,6 +192,7 @@ async function loadModel(
       return new AugmentLanguageModel(modelName, {
         apiKey: credentials.apiKey,
         apiUrl: credentials.apiUrl,
+        clientUserAgent,
       }) as unknown as LanguageModel;
     }
     default:
@@ -223,6 +237,7 @@ export class CLIAgent {
   private readonly verbose: boolean;
   private readonly stream: boolean;
   private readonly systemPrompt: string;
+  private readonly clientUserAgent?: string;
   private readonly tools: ToolSet;
   private messages: CoreMessage[] = [];
 
@@ -242,6 +257,7 @@ export class CLIAgent {
     this.verbose = config.verbose ?? false;
     this.stream = config.stream ?? true;
     this.systemPrompt = config.systemPrompt ?? DEFAULT_SYSTEM_PROMPT;
+    this.clientUserAgent = config.clientUserAgent;
     this.tools = this.runner ? this.createMultiIndexTools() : this.createSingleClientTools();
   }
 
@@ -393,7 +409,7 @@ export class CLIAgent {
    * @throws Error if the provider package is not installed
    */
   async initialize(): Promise<void> {
-    this.model = await loadModel(this.provider, this.modelName);
+    this.model = await loadModel(this.provider, this.modelName, this.clientUserAgent);
   }
 
   /**

src/clients/cli-agent.ts

@@ -40,14 +40,14 @@ import {
 import type { IndexStoreReader, IndexStore } from "../stores/types.js";
 import type { Source } from "../sources/types.js";
 import { MultiIndexRunner } from "./multi-index-runner.js";
+import { buildClientUserAgent, type MCPClientInfo } from "../core/utils.js";
 import {
   SEARCH_DESCRIPTION,
   LIST_FILES_DESCRIPTION,
   READ_FILE_DESCRIPTION,
   withListIndexesReference,
   withIndexList,
 } from "./tool-descriptions.js";
-
 /**
  * Configuration for the MCP server.
  */
@@ -81,7 +81,6 @@ export interface MCPServerConfig {
    */
   discovery?: boolean;
 }
-
 /**
  * Create an MCP server instance.
  *
@@ -105,14 +104,20 @@ export async function createMCPServer(
   config: MCPServerConfig
 ): Promise<Server> {
   // Create shared runner for multi-index operations
+  // Build User-Agent for analytics tracking
+  const clientUserAgent = buildClientUserAgent("mcp");
+  
   const runner = await MultiIndexRunner.create({
     store: config.store,
     indexNames: config.indexNames,
     searchOnly: config.searchOnly,
+    clientUserAgent,
   });
 
+  const { indexNames, indexes } = runner;
   const searchOnly = !runner.hasFileOperations();
-
+  // Format index list for tool descriptions
+  const indexListStr = runner.getIndexListString();
   // Create MCP server
   const server = new Server(
     {
@@ -125,7 +130,19 @@ export async function createMCPServer(
       },
     }
   );
-
+  // Use the SDK's oninitialized callback to capture MCP client info
+  // This preserves the SDK's protocol version negotiation
+  server.oninitialized = () => {
+    const clientInfo = server.getClientVersion();
+    if (clientInfo) {
+      const mcpClientInfo: MCPClientInfo = {
+        name: clientInfo.name,
+        version: clientInfo.version,
+      };
+      const updatedUserAgent = buildClientUserAgent("mcp", mcpClientInfo);
+      runner.updateClientUserAgent(updatedUserAgent);
+    }
+  };
   // Define tool type for type safety
   type Tool = {
     name: string;
@@ -152,12 +169,10 @@ export async function createMCPServer(
     readFileDescription = withListIndexesReference(READ_FILE_DESCRIPTION);
   } else {
     // Fixed mode: include enum with index list
-    const indexListStr = runner.getIndexListString();
     searchDescription = withIndexList(SEARCH_DESCRIPTION, indexListStr);
     listFilesDescription = withIndexList(LIST_FILES_DESCRIPTION, indexListStr);
     readFileDescription = withIndexList(READ_FILE_DESCRIPTION, indexListStr);
   }
-
   // List available tools
   server.setRequestHandler(ListToolsRequestSchema, async () => {
     const tools: Tool[] = [
@@ -194,7 +209,6 @@ export async function createMCPServer(
         },
       },
     ];
-
     // Only advertise file tools if not in search-only mode
     if (!searchOnly) {
       tools.push(
@@ -274,10 +288,8 @@ export async function createMCPServer(
         }
       );
     }
-
     return { tools };
   });
-
   // Handle tool calls
   server.setRequestHandler(CallToolRequestSchema, async (request) => {
     const { name, arguments: args } = request.params;
@@ -302,7 +314,6 @@ export async function createMCPServer(
     try {
       const indexName = args?.index_name as string;
       const client = await runner.getClient(indexName);
-
       switch (name) {
         case "search": {
           const result = await client.search(args?.query as string, {
@@ -314,7 +325,6 @@ export async function createMCPServer(
             ],
           };
         }
-
         case "list_files": {
           if (searchOnly) {
             return {
@@ -335,7 +345,6 @@ export async function createMCPServer(
             content: [{ type: "text", text }],
           };
         }
-
         case "read_file": {
           if (searchOnly) {
             return {
@@ -365,7 +374,6 @@ export async function createMCPServer(
             content: [{ type: "text", text: result.contents ?? "" }],
           };
         }
-
         default:
           return {
             content: [{ type: "text", text: `Unknown tool: ${name}` }],
@@ -379,10 +387,8 @@ export async function createMCPServer(
       };
     }
   });
-
   return server;
 }
-
 /**
  * Run an MCP server with stdio transport.
  *
@@ -413,4 +419,3 @@ export async function runMCPServer(config: MCPServerConfig): Promise<void> {
   const transport = new StdioServerTransport();
   await server.connect(transport);
 }
-