refactor: Simplify User-Agent format to product-based

Use augment.ctxc.{product}/{version} format:
- augment.ctxc.cli/{version} for all CLI commands (search, agent, index)
- augment.ctxc.mcp/{version} for MCP server
- augment.ctxc.sdk/{version} for SDK/programmatic usage

MCP with client info: augment.ctxc.mcp/{version}/{clientName}/{clientVersion}

Author: richhankins

src/bin/cmd-agent.ts

@@ -52,7 +52,7 @@ export const agentCommand = new Command("agent")
 
       // Create multi-index runner
       // Build User-Agent for analytics tracking
-      const clientUserAgent = buildClientUserAgent("cli-agent");
+      const clientUserAgent = buildClientUserAgent("cli");
 
       const runner = await MultiIndexRunner.create({
         store,

src/bin/cmd-index.ts

@@ -51,7 +51,7 @@ async function runIndex(
 ) {
   console.log(`Indexing ${sourceType} source...`);
   const indexer = new Indexer({
-    clientUserAgent: buildClientUserAgent("cli-index"),
+    clientUserAgent: buildClientUserAgent("cli"),
   });
   const result = await indexer.index(source, store, indexKey);
 

src/bin/cmd-search.ts

@@ -84,7 +84,7 @@ export const searchCommand = new Command("search")
       const client = new SearchClient({
         store,
         indexName: indexKey,
-        clientUserAgent: buildClientUserAgent("cli-search"),
+        clientUserAgent: buildClientUserAgent("cli"),
       });
 
       await client.initialize();

src/core/index.ts

@@ -21,7 +21,7 @@ export {
 } from "./file-filter.js";
 
 export { sanitizeKey, isoTimestamp, buildClientUserAgent } from "./utils.js";
-export type { ClientInterface, MCPClientInfo } from "./utils.js";
+export type { ClientProduct, MCPClientInfo } from "./utils.js";
 
 export { Indexer } from "./indexer.js";
 export type { IndexerConfig } from "./indexer.js";

src/core/utils.test.ts

@@ -1,30 +1,91 @@
-import { describe, expect, it } from "vitest";
-import { buildClientUserAgent } from "./utils.js";
+import { describe, it, expect } from "vitest";
+import { sanitizeKey, normalizePath, buildClientUserAgent } from "./utils.js";
+
+describe("sanitizeKey", () => {
+  it("replaces unsafe characters with underscores", () => {
+    expect(sanitizeKey("foo/bar/baz")).toBe("foo_bar_baz");
+    expect(sanitizeKey("foo:bar")).toBe("foo_bar");
+    expect(sanitizeKey("foo@bar.com")).toBe("foo_bar_com");
+  });
+
+  it("collapses multiple underscores", () => {
+    expect(sanitizeKey("foo//bar")).toBe("foo_bar");
+    expect(sanitizeKey("foo___bar")).toBe("foo_bar");
+  });
+
+  it("strips leading and trailing underscores", () => {
+    expect(sanitizeKey("_foo_")).toBe("foo");
+    expect(sanitizeKey("__foo__")).toBe("foo");
+  });
+
+  it("preserves safe characters", () => {
+    expect(sanitizeKey("foo-bar_baz123")).toBe("foo-bar_baz123");
+  });
+});
+
+describe("normalizePath", () => {
+  it("removes leading ./", () => {
+    expect(normalizePath("./src")).toBe("src");
+    expect(normalizePath("./foo/bar")).toBe("foo/bar");
+  });
+
+  it("removes leading slashes", () => {
+    expect(normalizePath("/src")).toBe("src");
+    expect(normalizePath("//src")).toBe("src");
+  });
+
+  it("removes trailing slashes", () => {
+    expect(normalizePath("src/")).toBe("src");
+    expect(normalizePath("src//")).toBe("src");
+  });
+
+  it("collapses multiple slashes", () => {
+    expect(normalizePath("src//lib")).toBe("src/lib");
+    expect(normalizePath("a///b//c")).toBe("a/b/c");
+  });
+
+  it("returns empty string for root representations", () => {
+    expect(normalizePath("./")).toBe("");
+    expect(normalizePath("/")).toBe("");
+    expect(normalizePath("")).toBe("");
+  });
+});
 
 describe("buildClientUserAgent", () => {
-  it("should build User-Agent for CLI search", () => {
-    const ua = buildClientUserAgent("cli-search");
-    expect(ua).toMatch(/^augment.ctxc\/[0-9]+\.[0-9]+\.[0-9]+\/cli-search$/);
+  it("builds CLI user agent", () => {
+    const ua = buildClientUserAgent("cli");
+    expect(ua).toMatch(/^augment\.ctxc\.cli\/\d+\.\d+\.\d+/);
+  });
+
+  it("builds SDK user agent", () => {
+    const ua = buildClientUserAgent("sdk");
+    expect(ua).toMatch(/^augment\.ctxc\.sdk\/\d+\.\d+\.\d+/);
   });
 
-  it("should build User-Agent for MCP without client info", () => {
+  it("builds MCP user agent without client info", () => {
     const ua = buildClientUserAgent("mcp");
-    expect(ua).toMatch(/^augment.ctxc\/[0-9]+\.[0-9]+\.[0-9]+\/mcp$/);
+    expect(ua).toMatch(/^augment\.ctxc\.mcp\/\d+\.\d+\.\d+$/);
   });
 
-  it("should build User-Agent for MCP with client info", () => {
+  it("builds MCP user agent with client info", () => {
     const ua = buildClientUserAgent("mcp", { name: "claude-desktop", version: "1.0.0" });
-    expect(ua).toMatch(/^augment.ctxc\/[0-9]+\.[0-9]+\.[0-9]+\/mcp\/claude-desktop\/1\.0\.0$/);
+    expect(ua).toMatch(/^augment\.ctxc\.mcp\/\d+\.\d+\.\d+\/claude-desktop\/1\.0\.0$/);
   });
 
-  it("should build User-Agent for MCP with client name only", () => {
+  it("builds MCP user agent with client name only", () => {
     const ua = buildClientUserAgent("mcp", { name: "cursor" });
-    expect(ua).toMatch(/^augment.ctxc\/[0-9]+\.[0-9]+\.[0-9]+\/mcp\/cursor$/);
+    expect(ua).toMatch(/^augment\.ctxc\.mcp\/\d+\.\d+\.\d+\/cursor$/);
+  });
+
+  it("sanitizes MCP client info - spaces replaced with dashes", () => {
+    const ua = buildClientUserAgent("mcp", { name: "My App", version: "1.2.3" });
+    // Space replaced with -
+    expect(ua).toMatch(/\/My-App\/1\.2\.3$/);
   });
 
-  it("should sanitize MCP client info", () => {
-    const ua = buildClientUserAgent("mcp", { name: "My App 2.0", version: "1.2.3-beta" });
-    // Spaces and other chars should be replaced with -
-    expect(ua).toMatch(/^augment.ctxc\/[0-9]+\.[0-9]+\.[0-9]+\/mcp\/My-App-2\.0\/1\.2\.3-be$/);
+  it("truncates long version strings", () => {
+    const ua = buildClientUserAgent("mcp", { name: "app", version: "1.2.3-beta.1" });
+    // Version truncated to 8 chars: "1.2.3-be"
+    expect(ua).toMatch(/\/app\/1\.2\.3-be$/);
   });
 });

src/core/utils.ts

@@ -52,18 +52,15 @@ export function normalizePath(path: string): string {
 // ============================================================================
 
 /**
- * Supported client interface types for User-Agent tracking.
+ * Client product types for User-Agent tracking.
  * 
- * Format matches auggie CLI: augment.ctxc/{version}/{interface}
+ * Format: augment.ctxc.{product}/{version}
+ * 
+ * - cli: CLI commands (ctxc search, ctxc agent, ctxc index)
+ * - mcp: MCP server mode (ctxc mcp)
+ * - sdk: SDK/programmatic usage
  */
-export type ClientInterface =
-  | 'cli-search'      // ctxc search command
-  | 'sdk-search'      // SearchClient programmatic use
-  | 'cli-index'       // ctxc index command
-  | 'sdk-index'       // Indexer programmatic use
-  | 'mcp'             // ctxc mcp command (MCP server mode)
-  | 'cli-agent'       // ctxc agent command
-  | 'sdk-agent-provider'; // Vercel AI SDK interface
+export type ClientProduct = 'cli' | 'mcp' | 'sdk';
 
 /**
  * MCP client information from the initialize request.
@@ -90,44 +87,50 @@ function getVersion(): string {
 
 /**
  * Sanitize a string for use in User-Agent per RFC 9110.
- * Only allows: a-z A-Z 0-9 ! # $ % & ' * + . ^ _ ` | ~ -
+ * Only allows: a-z A-Z 0-9 \! # $ % & ' * + . ^ _ ` | ~ -
  */
 function sanitizeUserAgentToken(s: string, maxLen: number): string {
-  return s.replace(/[^a-zA-Z0-9!#$%&'*+.^_`|~-]/g, "-").slice(0, maxLen);
+  return s.replace(/[^a-zA-Z0-9\!#$%&'*+.^_`|~-]/g, "-").slice(0, maxLen);
 }
 
 /**
  * Build a User-Agent string for analytics tracking.
  * 
- * Format matches auggie CLI style: augment.ctxc/{version}/{interface}
- * With MCP client: augment.ctxc/{version}/mcp/{clientName}
+ * Simplified format:
+ * - CLI:  augment.ctxc.cli/{version}
+ * - MCP:  augment.ctxc.mcp/{version}
+ * - SDK:  augment.ctxc.sdk/{version}
+ * 
+ * With MCP client info:
+ * - augment.ctxc.mcp/{version}/{clientName}/{clientVersion}
  * 
- * @param clientInterface - The interface being used
- * @param mcpClientInfo - Optional MCP client info for mcp interface
+ * @param product - The product being used (cli, mcp, sdk)
+ * @param mcpClientInfo - Optional MCP client info
  * @returns User-Agent string for the request
  * 
  * @example
- * buildClientUserAgent('cli-search')
- * // => 'augment.ctxc/0.1.3/cli-search'
+ * buildClientUserAgent('cli')
+ * // => 'augment.ctxc.cli/0.1.3'
  * 
  * buildClientUserAgent('mcp', { name: 'claude-desktop', version: '1.0.0' })
- * // => 'augment.ctxc/0.1.3/mcp/claude-desktop/1.0.0'
+ * // => 'augment.ctxc.mcp/0.1.3/claude-desktop/1.0.0'
  */
 export function buildClientUserAgent(
-  clientInterface: ClientInterface,
+  product: ClientProduct,
   mcpClientInfo?: MCPClientInfo
 ): string {
   const version = getVersion();
+  const base = `augment.ctxc.${product}/${version}`;
 
-  if (clientInterface === 'mcp' && mcpClientInfo) {
+  if (product === 'mcp' && mcpClientInfo) {
     // Sanitize MCP client info per RFC 9110 (same as auggie CLI)
     const name = sanitizeUserAgentToken(mcpClientInfo.name, 32);
     const clientVersion = mcpClientInfo.version 
       ? sanitizeUserAgentToken(mcpClientInfo.version, 8)
       : undefined;
-    const clientName = clientVersion ? `${name}/${clientVersion}` : name;
-    return `augment.ctxc/${version}/mcp/${clientName}`;
+    const clientSuffix = clientVersion ? `${name}/${clientVersion}` : name;
+    return `${base}/${clientSuffix}`;
   }
 
-  return `augment.ctxc/${version}/${clientInterface}`;
+  return base;
 }