ai-lens 0.5.0 → 0.6.2

package/.commithash

@@ -1 +1 @@
-968235e
+3e7557f

package/bin/ai-lens.js

@@ -13,10 +13,6 @@ switch (command) {
     await remove();
     break;
   }
-  case 'mcp': {
-    await import('../mcp-server/index.js');
-    break;
-  }
   case 'version':
   case '--version':
   case '-v': {
@@ -35,8 +31,12 @@ switch (command) {
     console.log('');
     console.log('Commands:');
     console.log('  init            Configure AI tool hooks for event capture');
+    console.log('    --server URL    Server URL (default: saved or http://localhost:3000)');
+    console.log('    --yes, -y       Non-interactive: accept all defaults, no prompts');
+    console.log('    --projects LIST Comma-separated project paths to track');
+    console.log('    --no-mcp        Skip MCP server registration');
+    console.log('    --mcp-scope S   MCP scope: user, local, or project (default: user)');
     console.log('  remove          Remove AI Lens hooks and client files');
-    console.log('  mcp             Start the MCP server (stdio transport)');
     console.log('  version         Show package version and commit hash');
     process.exit(command ? 1 : 0);
 }

package/cli/hooks.js

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, writeFileSync, copyFileSync, renameSync, mkdirSync, rmSync } from 'node:fs';
+import { existsSync, readFileSync, writeFileSync, copyFileSync, renameSync, mkdirSync, rmSync, unlinkSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { homedir } from 'node:os';
 import { fileURLToPath } from 'node:url';
@@ -150,6 +150,8 @@ export const TOOL_CONFIGS = [
     hookDefs: CLAUDE_CODE_HOOKS,
     topLevelFields: {},
     sharedConfig: true,
+    // Older init versions wrote hooks here — clean up on init/remove
+    legacyConfigPaths: [join(homedir(), '.claude', 'hooks.json')],
   },
   {
     name: 'Cursor',
@@ -350,6 +352,123 @@ export function writeHooksConfig(tool, config) {
 // Describe what will happen (for plan display)
 // ---------------------------------------------------------------------------
 
+/**
+ * Clean up AI Lens hooks from legacy config paths (e.g. ~/.claude/hooks.json).
+ * Returns array of { path, action } describing what was done.
+ */
+export function cleanupLegacyHooks(tool) {
+  const results = [];
+  if (!Array.isArray(tool.legacyConfigPaths)) return results;
+
+  for (const legacyPath of tool.legacyConfigPaths) {
+    if (legacyPath === tool.configPath) continue;
+    if (!existsSync(legacyPath)) continue;
+
+    let raw;
+    try {
+      raw = readFileSync(legacyPath, 'utf-8');
+    } catch {
+      continue;
+    }
+
+    let config;
+    try {
+      config = JSON.parse(raw);
+    } catch {
+      continue;
+    }
+
+    // Check if any AI Lens hooks exist in this file
+    const hooks = config.hooks;
+    if (!hooks || typeof hooks !== 'object') continue;
+
+    let hasAiLens = false;
+    for (const entries of Object.values(hooks)) {
+      if (Array.isArray(entries) && entries.some(e => isAiLensHook(e))) {
+        hasAiLens = true;
+        break;
+      }
+    }
+    if (!hasAiLens) continue;
+
+    // Strip AI Lens hooks
+    const stripped = buildStrippedConfig(tool, config);
+    if (stripped) {
+      writeFileSync(legacyPath, JSON.stringify(stripped, null, 2) + '\n');
+      results.push({ path: legacyPath, action: 'cleaned' });
+    } else {
+      unlinkSync(legacyPath);
+      results.push({ path: legacyPath, action: 'deleted' });
+    }
+  }
+
+  return results;
+}
+
+/**
+ * Delete .mcp.json in cwd if it was left with empty mcpServers by `claude mcp remove`.
+ */
+export function cleanupEmptyMcpJson() {
+  const mcpJsonPath = join(process.cwd(), '.mcp.json');
+  try {
+    const content = JSON.parse(readFileSync(mcpJsonPath, 'utf-8'));
+    if (content.mcpServers
+        && Object.keys(content.mcpServers).length === 0
+        && Object.keys(content).length === 1) {
+      unlinkSync(mcpJsonPath);
+    }
+  } catch {
+    // file doesn't exist or isn't valid JSON — nothing to clean
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Cursor MCP helpers (no CLI — direct JSON editing)
+// ---------------------------------------------------------------------------
+
+const CURSOR_MCP_GLOBAL = join(homedir(), '.cursor', 'mcp.json');
+
+function cursorMcpEntry(mcpUrl) {
+  return { url: mcpUrl };
+}
+
+function readJsonSafe(path) {
+  try {
+    return JSON.parse(readFileSync(path, 'utf-8'));
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Add or update ai-lens MCP server in Cursor's mcp.json.
+ */
+export function addCursorMcp(mcpUrl) {
+  const config = readJsonSafe(CURSOR_MCP_GLOBAL) || { mcpServers: {} };
+  if (!config.mcpServers) config.mcpServers = {};
+  config.mcpServers['ai-lens'] = cursorMcpEntry(mcpUrl);
+  mkdirSync(dirname(CURSOR_MCP_GLOBAL), { recursive: true });
+  writeFileSync(CURSOR_MCP_GLOBAL, JSON.stringify(config, null, 2) + '\n');
+}
+
+/**
+ * Remove ai-lens MCP server from Cursor's mcp.json.
+ * Also checks .cursor/mcp.json in cwd (project scope).
+ */
+export function removeCursorMcp() {
+  const paths = [CURSOR_MCP_GLOBAL, join(process.cwd(), '.cursor', 'mcp.json')];
+  for (const p of paths) {
+    const config = readJsonSafe(p);
+    if (!config?.mcpServers?.['ai-lens']) continue;
+    delete config.mcpServers['ai-lens'];
+    if (Object.keys(config.mcpServers).length === 0 && Object.keys(config).length === 1) {
+      unlinkSync(p);
+    } else {
+      writeFileSync(p, JSON.stringify(config, null, 2) + '\n');
+    }
+  }
+}
+
 export function describePlan(tool, analysis) {
   const hookNames = Object.keys(tool.hookDefs);
 

package/cli/init.js

@@ -13,6 +13,7 @@ import {
   CAPTURE_PATH, detectInstalledTools,
   analyzeToolHooks, buildMergedConfig, writeHooksConfig, describePlan,
   installClientFiles, readLensConfig, saveLensConfig, getVersionInfo,
+  cleanupLegacyHooks, cleanupEmptyMcpJson, addCursorMcp, removeCursorMcp,
 } from './hooks.js';
 
 function ask(question) {
@@ -152,14 +153,13 @@ async function deviceCodeAuth(serverUrl) {
     throw new Error('Auth0 device code flow not configured on server (missing AUTH0_CLI_CLIENT_ID)');
   }
 
-  const { domain, cliClientId, audience } = config;
+  const { domain, cliClientId } = config;
 
   // 2. Request device code
   const codeParams = {
     client_id: cliClientId,
     scope: 'openid profile email',
   };
-  if (audience) codeParams.audience = audience;
 
   const codeResp = await postForm(`https://${domain}/oauth/device/code`, codeParams);
   if (codeResp.status !== 200) {
@@ -226,7 +226,42 @@ async function deviceCodeAuth(serverUrl) {
   throw new Error('Device code expired. Please try again.');
 }
 
+// =============================================================================
+// CLI flags for non-interactive mode
+// =============================================================================
+
+function getInitArgs() {
+  const args = process.argv.slice(3); // skip "node", script, "init"
+  const flags = {};
+
+  for (let i = 0; i < args.length; i++) {
+    switch (args[i]) {
+      case '--server':
+        flags.server = args[++i];
+        break;
+      case '--projects':
+        flags.projects = args[++i];
+        break;
+      case '--yes':
+      case '-y':
+        flags.yes = true;
+        break;
+      case '--no-mcp':
+        flags.noMcp = true;
+        break;
+      case '--mcp-scope':
+        flags.mcpScope = args[++i];
+        break;
+    }
+  }
+
+  return flags;
+}
+
 export default async function init() {
+  const flags = getInitArgs();
+  const auto = flags.yes || false;
+
   const { version, commit } = getVersionInfo();
   initLogger(`v${version} (${commit})`);
 
@@ -257,19 +292,33 @@ export default async function init() {
 
   // Server URL
   const currentServer = currentConfig.serverUrl || 'http://localhost:3000';
-  const serverInput = await ask(
-    `Server URL (Enter = ${currentServer}): `,
-  );
-  const serverUrl = serverInput || currentServer;
+  let serverUrl;
+  if (flags.server) {
+    serverUrl = flags.server.replace(/\/+$/, '');
+  } else if (auto) {
+    serverUrl = currentServer;
+  } else {
+    const serverInput = await ask(
+      `Server URL (Enter = ${currentServer}): `,
+    );
+    serverUrl = (serverInput || currentServer).replace(/\/+$/, '');
+  }
   info(`  Server: ${serverUrl}`);
 
   // Project filter
   const currentProjects = currentConfig.projects || null;
-  const projectsDefault = currentProjects || 'all';
-  const projectsInput = await ask(
-    `Projects to track (comma-separated, ~ supported, Enter = ${projectsDefault}): `,
-  );
-  const projects = projectsInput || currentProjects;
+  let projects;
+  if (flags.projects) {
+    projects = flags.projects;
+  } else if (auto) {
+    projects = currentProjects;
+  } else {
+    const projectsDefault = currentProjects || 'all';
+    const projectsInput = await ask(
+      `Projects to track (comma-separated, ~ supported, Enter = ${projectsDefault}): `,
+    );
+    projects = projectsInput || currentProjects;
+  }
   if (projects) {
     info(`  Tracking: ${projects}`);
   } else {
@@ -292,8 +341,12 @@ export default async function init() {
       saveLensConfig(newConfig);
       success(`  Authenticated as ${result.name} (${result.email})`);
     } catch (err) {
-      error(`  Authentication failed: ${err.message}`);
-      return;
+      if (err.message.includes('not configured')) {
+        warn(`  Auth not configured on server — personal mode (events sent via git identity)`);
+      } else {
+        error(`  Authentication failed: ${err.message}`);
+        return;
+      }
     }
   } else {
     success('  Already authenticated (token present)');
@@ -329,6 +382,13 @@ export default async function init() {
   // Filter to tools that need changes
   const pending = analyses.filter(a => a.analysis.status !== 'current');
 
+  // Clean up legacy hook locations (always, even if current hooks are up-to-date)
+  for (const { tool } of analyses) {
+    for (const lr of cleanupLegacyHooks(tool)) {
+      success(`  ${tool.name}: ${lr.action} legacy hooks in ${lr.path}`);
+    }
+  }
+
   if (pending.length === 0) {
     success('Everything is up-to-date. Nothing to do.');
   } else {
@@ -343,10 +403,12 @@ export default async function init() {
     blank();
 
     // Confirm
-    const answer = await ask('Proceed? [Y/n] ');
-    if (answer && answer.toLowerCase() !== 'y') {
-      info('Aborted.');
-      return;
+    if (!auto) {
+      const answer = await ask('Proceed? [Y/n] ');
+      if (answer && answer.toLowerCase() !== 'y') {
+        info('Aborted.');
+        return;
+      }
     }
     blank();
 
@@ -391,35 +453,78 @@ export default async function init() {
     blank();
   }
 
-  // MCP setup (only if Claude Code is installed)
+  // MCP setup (HTTP transport — auth via OAuth in browser, no token needed)
+  const mcpUrl = `${serverUrl}/mcp`;
+  const setupMcp = !flags.noMcp;
+
+  // Claude Code MCP
   const claudeDir = join(homedir(), '.claude');
   const hasClaudeDir = existsSync(claudeDir);
   let hasClaudeCli = false;
-  try {
-    execSync('which claude', { stdio: 'ignore' });
-    hasClaudeCli = true;
-  } catch {}
+  try { execSync('which claude', { stdio: 'ignore' }); hasClaudeCli = true; } catch {}
 
   if (hasClaudeDir && hasClaudeCli) {
-    heading('MCP Server');
-    const mcpAnswer = await ask('Set up AI Lens MCP server in Claude Code? [Y/n] ');
-    if (!mcpAnswer || mcpAnswer.toLowerCase() === 'y') {
-      const mcpToken = newConfig.authToken;
-      if (!mcpToken) {
-        warn('  No auth token available — authenticate first.');
+    heading('MCP Server — Claude Code');
+    let doSetup;
+    if (auto) {
+      doSetup = setupMcp;
+    } else {
+      const mcpAnswer = await ask('Set up AI Lens MCP server in Claude Code? [Y/n] ');
+      doSetup = !mcpAnswer || mcpAnswer.toLowerCase() === 'y';
+    }
+
+    if (doSetup) {
+      let scope;
+      if (flags.mcpScope && ['local', 'project', 'user'].includes(flags.mcpScope)) {
+        scope = flags.mcpScope;
+      } else if (auto) {
+        scope = 'user';
       } else {
-        try {
-          execSync(
-            `claude mcp add ai-lens -e AI_LENS_SERVER_URL=${serverUrl} -e AI_LENS_AUTH_TOKEN=${mcpToken} -- npx -y ai-lens mcp`,
-            { stdio: 'inherit' },
-          );
-          success('  MCP server registered in Claude Code');
-        } catch (err) {
-          error(`  Failed to register MCP server: ${err.message}`);
-        }
+        const scopeInput = await ask('  Scope — user, local, or project? (Enter = user): ');
+        scope = ['local', 'project', 'user'].includes(scopeInput) ? scopeInput : 'user';
+      }
+      try {
+        // Remove old stdio-based MCP from all scopes, then add HTTP-based
+        try { execSync('claude mcp remove ai-lens -s local', { stdio: 'ignore' }); } catch {}
+        try { execSync('claude mcp remove ai-lens -s project', { stdio: 'ignore' }); } catch {}
+        try { execSync('claude mcp remove ai-lens -s user', { stdio: 'ignore' }); } catch {}
+        cleanupEmptyMcpJson();
+        execSync(
+          `claude mcp add --transport http ai-lens -s ${scope} ${mcpUrl}`,
+          { stdio: 'inherit' },
+        );
+        success(`  MCP server registered in Claude Code (${scope})`);
+      } catch (err) {
+        error(`  Failed to register MCP server: ${err.message}`);
+      }
+    } else {
+      info('  Skipped');
+    }
+    blank();
+  }
+
+  // Cursor MCP
+  const cursorDir = join(homedir(), '.cursor');
+  if (existsSync(cursorDir)) {
+    heading('MCP Server — Cursor');
+    let doSetup;
+    if (auto) {
+      doSetup = setupMcp;
+    } else {
+      const cursorMcpAnswer = await ask('Set up AI Lens MCP server in Cursor? [Y/n] ');
+      doSetup = !cursorMcpAnswer || cursorMcpAnswer.toLowerCase() === 'y';
+    }
+
+    if (doSetup) {
+      try {
+        removeCursorMcp();
+        addCursorMcp(mcpUrl);
+        success('  MCP server registered in Cursor (~/.cursor/mcp.json)');
+      } catch (err) {
+        error(`  Failed to register MCP server: ${err.message}`);
       }
     } else {
-      info('  Skipped MCP setup');
+      info('  Skipped');
     }
     blank();
   }

package/cli/remove.js

@@ -1,5 +1,8 @@
 import { createInterface } from 'node:readline';
-import { unlinkSync } from 'node:fs';
+import { unlinkSync, existsSync } from 'node:fs';
+import { execSync } from 'node:child_process';
+import { join } from 'node:path';
+import { homedir } from 'node:os';
 import {
   initLogger, info, success, warn, error,
   heading, detail, blank, getLogPath,
@@ -7,6 +10,7 @@ import {
 import {
   detectInstalledTools, analyzeToolHooks,
   buildStrippedConfig, writeHooksConfig, removeClientFiles, getVersionInfo,
+  cleanupLegacyHooks, cleanupEmptyMcpJson, removeCursorMcp,
 } from './hooks.js';
 
 function ask(question) {
@@ -88,6 +92,46 @@ export default async function remove() {
   }
   blank();
 
+  // Clean up legacy hook locations
+  for (const tool of tools) {
+    for (const lr of cleanupLegacyHooks(tool)) {
+      success(`  ${tool.name}: ${lr.action} legacy hooks in ${lr.path}`);
+    }
+  }
+  blank();
+
+  // Remove MCP servers
+  heading('Removing MCP servers...');
+
+  // Claude Code
+  const claudeDir = join(homedir(), '.claude');
+  let hasClaudeCli = false;
+  try { execSync('which claude', { stdio: 'ignore' }); hasClaudeCli = true; } catch {}
+
+  if (existsSync(claudeDir) && hasClaudeCli) {
+    try {
+      try { execSync('claude mcp remove ai-lens -s local', { stdio: 'ignore' }); } catch {}
+      try { execSync('claude mcp remove ai-lens -s project', { stdio: 'ignore' }); } catch {}
+      try { execSync('claude mcp remove ai-lens -s user', { stdio: 'ignore' }); } catch {}
+      cleanupEmptyMcpJson();
+      success('  Claude Code: MCP server removed');
+    } catch (err) {
+      error(`  Claude Code: failed — ${err.message}`);
+    }
+  }
+
+  // Cursor
+  const cursorDir = join(homedir(), '.cursor');
+  if (existsSync(cursorDir)) {
+    try {
+      removeCursorMcp();
+      success('  Cursor: MCP server removed');
+    } catch (err) {
+      error(`  Cursor: failed — ${err.message}`);
+    }
+  }
+  blank();
+
   // Remove client files
   heading('Removing client files...');
   try {

package/client/capture.js

@@ -16,8 +16,10 @@ import {
   ensureDataDir,
   QUEUE_PATH,
   SESSION_PATHS_PATH,
+  LAST_EVENTS_PATH,
   getServerUrl,
   getGitIdentity,
+  getGitMetadata,
   getMonitoredProjects,
 } from './config.js';
 // Soft import — redact.js may not exist on older client installs
@@ -124,6 +126,44 @@ function getCachedSessionPath(sessionId) {
   return paths[sessionId] || null;
 }
 
+// =============================================================================
+// Deduplication: drop consecutive identical event types per session
+// =============================================================================
+
+// Event types that should be deduplicated when repeated consecutively
+const DEDUP_TYPES = new Set(['Stop', 'SessionEnd']);
+
+function loadLastEvents() {
+  if (!existsSync(LAST_EVENTS_PATH)) return {};
+  try {
+    return JSON.parse(readFileSync(LAST_EVENTS_PATH, 'utf-8'));
+  } catch {
+    return {};
+  }
+}
+
+function saveLastEvents(cache) {
+  ensureDataDir();
+  const tmpPath = LAST_EVENTS_PATH + '.tmp.' + process.pid;
+  writeFileSync(tmpPath, JSON.stringify(cache));
+  renameSync(tmpPath, LAST_EVENTS_PATH);
+}
+
+/**
+ * Returns true if this event is a duplicate that should be dropped.
+ * Updates the cache with the current event type.
+ */
+export function isDuplicateEvent(sessionId, type) {
+  const cache = loadLastEvents();
+  const prev = cache[sessionId];
+  const dominated = DEDUP_TYPES.has(type) && prev === type;
+  if (prev !== type) {
+    cache[sessionId] = type;
+    saveLastEvents(cache);
+  }
+  return dominated;
+}
+
 // =============================================================================
 // Normalization: Claude Code
 // =============================================================================
@@ -458,6 +498,11 @@ async function main() {
     process.exit(0);
   }
 
+  // Deduplicate consecutive identical event types (e.g. repeated Stop from idle sessions)
+  if (isDuplicateEvent(unified.session_id, unified.type)) {
+    process.exit(0);
+  }
+
   // Filter by monitored projects (if configured)
   const monitored = getMonitoredProjects();
   if (monitored && !monitored.some(p => unified.project_path === p || unified.project_path?.startsWith(p + '/'))) {
@@ -473,6 +518,12 @@ async function main() {
   unified.developer_email = email;
   unified.developer_name = identity.name || event.user_name || email;
 
+  // Attach git metadata (remote, branch, commit)
+  const gitMeta = getGitMetadata(unified.project_path);
+  unified.git_remote = gitMeta.git_remote;
+  unified.git_branch = gitMeta.git_branch;
+  unified.git_commit = gitMeta.git_commit;
+
   // Append to queue
   appendToQueue(unified);
 

package/client/config.js

@@ -1,4 +1,4 @@
-import { mkdirSync, appendFileSync } from 'node:fs';
+import { mkdirSync, appendFileSync, readFileSync, writeFileSync, existsSync, renameSync } from 'node:fs';
 import { join } from 'node:path';
 import { homedir } from 'node:os';
 import { execSync } from 'node:child_process';
@@ -7,6 +7,8 @@ export const DATA_DIR = join(homedir(), '.ai-lens');
 export const QUEUE_PATH = join(DATA_DIR, 'queue.jsonl');
 export const SENDING_PATH = join(DATA_DIR, 'queue.sending.jsonl');
 export const SESSION_PATHS_PATH = join(DATA_DIR, 'session-paths.json');
+export const GIT_REMOTES_PATH = join(DATA_DIR, 'git-remotes.json');
+export const LAST_EVENTS_PATH = join(DATA_DIR, 'last-events.json');
 export const LOG_PATH = join(DATA_DIR, 'sender.log');
 
 export function log(fields) {
@@ -57,3 +59,56 @@ export function getGitIdentity() {
 
   return { email, name };
 }
+
+// =============================================================================
+// Git Metadata (remote, branch, commit per event)
+// =============================================================================
+
+function loadGitRemotes() {
+  if (!existsSync(GIT_REMOTES_PATH)) return {};
+  try {
+    return JSON.parse(readFileSync(GIT_REMOTES_PATH, 'utf-8'));
+  } catch {
+    return {};
+  }
+}
+
+function saveGitRemotes(remotes) {
+  ensureDataDir();
+  const tmpPath = GIT_REMOTES_PATH + '.tmp.' + process.pid;
+  writeFileSync(tmpPath, JSON.stringify(remotes));
+  renameSync(tmpPath, GIT_REMOTES_PATH);
+}
+
+function getCachedRemote(projectPath) {
+  const remotes = loadGitRemotes();
+  return remotes[projectPath]; // undefined = not cached, null = no remote
+}
+
+function cacheRemote(projectPath, remote) {
+  const remotes = loadGitRemotes();
+  if (remotes[projectPath] !== remote) {
+    remotes[projectPath] = remote;
+    saveGitRemotes(remotes);
+  }
+}
+
+export function getGitMetadata(projectPath) {
+  if (!projectPath) return { git_remote: null, git_branch: null, git_commit: null };
+  const opts = { encoding: 'utf-8', timeout: 3000, cwd: projectPath };
+
+  // git_remote: cached per project_path (stable, ~0ms after first call)
+  let git_remote = getCachedRemote(projectPath);
+  if (git_remote === undefined) {
+    try { git_remote = execSync('git remote get-url origin', opts).trim() || null; }
+    catch { git_remote = null; }
+    cacheRemote(projectPath, git_remote);
+  }
+
+  // git_branch + git_commit: every event (~5ms each)
+  let git_branch = null, git_commit = null;
+  try { git_branch = execSync('git rev-parse --abbrev-ref HEAD', opts).trim() || null; } catch {}
+  try { git_commit = execSync('git rev-parse --short HEAD', opts).trim() || null; } catch {}
+
+  return { git_remote, git_branch, git_commit };
+}

package/client/sender.js

@@ -24,6 +24,7 @@ import {
 } from './config.js';
 
 export const MAX_QUEUE_SIZE = 10_000;
+export const MAX_CHUNK_BYTES = 4 * 1024 * 1024; // 4 MB per POST (Express limit is 5 MB)
 
 /**
  * Parse queue file content into events array.
@@ -148,6 +149,39 @@ export function partialRollback(sendingPath, unsentEvents, totalCount, queuePath
   }
 }
 
+/**
+ * Split an array of events into chunks that fit within MAX_CHUNK_BYTES.
+ * Each chunk is JSON-serialized as an array; we ensure the serialized
+ * size stays under the limit.
+ */
+export function chunkEvents(events, maxBytes = MAX_CHUNK_BYTES) {
+  const chunks = [];
+  let chunk = [];
+  let chunkSize = 2; // opening '[' + closing ']'
+
+  for (const evt of events) {
+    const evtJson = JSON.stringify(evt);
+    const evtBytes = Buffer.byteLength(evtJson);
+    // comma separator between elements
+    const added = chunkSize === 2 ? evtBytes : evtBytes + 1;
+
+    if (chunkSize + added > maxBytes && chunk.length > 0) {
+      chunks.push(chunk);
+      chunk = [evt];
+      chunkSize = 2 + evtBytes;
+    } else {
+      chunk.push(evt);
+      chunkSize += added;
+    }
+  }
+
+  if (chunk.length > 0) {
+    chunks.push(chunk);
+  }
+
+  return chunks;
+}
+
 /**
  * POST events to server using Node.js stdlib.
  */
@@ -227,12 +261,17 @@ async function main() {
 
   try {
     for (const { identity, events: batch } of byDeveloper.values()) {
-      const result = await postEvents(serverUrl, batch, identity);
-      for (const evt of batch) {
-        if (evt.event_id) sentEventIds.add(evt.event_id);
+      const chunks = chunkEvents(batch);
+      let totalReceived = 0;
+      for (const chunk of chunks) {
+        const result = await postEvents(serverUrl, chunk, identity);
+        totalReceived += result.received;
+        for (const evt of chunk) {
+          if (evt.event_id) sentEventIds.add(evt.event_id);
+        }
       }
       const projects = [...new Set(batch.map(e => e.project_path).filter(Boolean))];
-      log({ msg: 'sent', events: result.received, developer: identity.email, projects, server: serverUrl });
+      log({ msg: 'sent', events: totalReceived, chunks: chunks.length, developer: identity.email, projects, server: serverUrl });
     }
     commitQueue(sendingPath);
   } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-lens",
-  "version": "0.5.0",
+  "version": "0.6.2",
   "type": "module",
   "description": "Centralized session analytics for AI coding tools",
   "bin": {
@@ -10,7 +10,6 @@
     "bin/",
     "cli/",
     "client/",
-    "mcp-server/",
     ".commithash",
     "README.md"
   ],
@@ -24,11 +23,8 @@
     "build:dashboard": "npm run --prefix dashboard build",
     "analyze": "node scripts/analyze-sessions.js"
   },
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.26.0",
-    "zod": "^3.24.0"
-  },
   "devDependencies": {
+    "express": "^4.22.1",
     "vitest": "^3.0.0"
   }
 }

package/mcp-server/index.js

@@ -1,186 +0,0 @@
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { z } from "zod";
-import { execSync } from "child_process";
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
-import { homedir } from "node:os";
-
-function loadLensConfig() {
-  try {
-    return JSON.parse(readFileSync(join(homedir(), ".ai-lens", "config.json"), "utf-8"));
-  } catch {
-    return {};
-  }
-}
-
-const lensConfig = loadLensConfig();
-const SERVER_URL = process.env.AI_LENS_SERVER_URL || lensConfig.serverUrl || "http://168.119.103.228:13300";
-const AUTH_TOKEN = process.env.AI_LENS_AUTH_TOKEN || lensConfig.authToken;
-
-async function apiCall(path) {
-  const headers = {};
-  if (AUTH_TOKEN) {
-    headers["X-Auth-Token"] = AUTH_TOKEN;
-  }
-  const res = await fetch(`${SERVER_URL}${path}`, { headers });
-  if (!res.ok) {
-    const text = await res.text().catch(() => "");
-    throw new Error(`API ${res.status}: ${text || res.statusText}`);
-  }
-  return res.json();
-}
-
-function textResult(data) {
-  return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
-}
-
-const server = new McpServer({ name: "ai-lens", version: "1.0.0" });
-
-// 1. who_am_i
-server.tool(
-  "who_am_i",
-  "Identify the current user by their git email. Returns your developer_id, name, and team(s). Call this first to get IDs needed for other tools like get_developer or get_team.",
-  {},
-  async () => {
-    let email;
-    try {
-      email = execSync("git config user.email", { encoding: "utf-8" }).trim();
-    } catch {
-      return textResult({ error: "Could not resolve git email. Make sure git is configured." });
-    }
-
-    const developers = await apiCall("/api/developers");
-    const me = developers.find(
-      (d) => d.email.toLowerCase() === email.toLowerCase()
-    );
-    if (!me) {
-      return textResult({ error: `No developer found for email: ${email}` });
-    }
-
-    const detail = await apiCall(`/api/dashboard/developers/${me.id}?days=7`);
-
-    return textResult({
-      developer_id: me.id,
-      name: me.name,
-      email: me.email,
-      teams: (detail.teams || []).map((t) => ({ id: t.id, name: t.name })),
-    });
-  }
-);
-
-// 2. get_overview
-server.tool(
-  "get_overview",
-  "Get organization-wide KPIs and trends: active developers, adoption rate, total AI hours, MCP server and skill distribution. Use `days` to control the time window (default: 7 days).",
-  { days: z.number().optional().describe("Time window in days (default: 7)") },
-  async ({ days }) => {
-    const data = await apiCall(`/api/dashboard/overview?days=${days ?? 7}`);
-    return textResult(data);
-  }
-);
-
-// 3. list_teams
-server.tool(
-  "list_teams",
-  "List all teams with aggregated stats: member counts, adoption rate, average sessions per developer, total AI hours. Use a team's `id` with get_team or get_team_analysis for details.",
-  { days: z.number().optional().describe("Time window in days (default: 7)") },
-  async ({ days }) => {
-    const data = await apiCall(`/api/dashboard/teams?days=${days ?? 7}`);
-    return textResult(data);
-  }
-);
-
-// 4. get_team
-server.tool(
-  "get_team",
-  "Get detailed team info: KPIs, member list with activity status (active/inactive/never_used), tasks with story points, activity trend, MCP and skill distribution. Use who_am_i to find your team_id first. Each member has `developer_id` you can pass to get_developer.",
-  {
-    team_id: z.string().describe("Team ID"),
-    days: z.number().optional().describe("Time window in days (default: 7)"),
-  },
-  async ({ team_id, days }) => {
-    const data = await apiCall(`/api/dashboard/teams/${team_id}?days=${days ?? 7}`);
-    return textResult(data);
-  }
-);
-
-// 5. get_team_analysis
-server.tool(
-  "get_team_analysis",
-  "Get AI-generated team analysis: summary, key achievements, recurring problems with time wasted and recommendations, unanswered questions patterns, MCP and bash error patterns, and CLAUDE.md suggestions. Each problem includes type, occurrences, affected developers, and actionable recommendation.",
-  {
-    team_id: z.string().describe("Team ID"),
-    days: z.number().optional().describe("Time window in days (default: 7)"),
-  },
-  async ({ team_id, days }) => {
-    const data = await apiCall(`/api/dashboard/teams/${team_id}/analysis?days=${days ?? 7}`);
-    return textResult(data);
-  }
-);
-
-// 6. get_developer
-server.tool(
-  "get_developer",
-  "Get developer profile: session count, AI hours, tasks with story points, MCP and skill usage, recent session chains, and comparison with team averages. Use who_am_i to find your developer_id. Each chain has a `chain_id` you can pass to get_chain for full event history.",
-  {
-    developer_id: z.string().describe("Developer ID (UUID)"),
-    days: z.number().optional().describe("Time window in days (default: 30)"),
-  },
-  async ({ developer_id, days }) => {
-    const data = await apiCall(`/api/dashboard/developers/${developer_id}?days=${days ?? 30}`);
-    return textResult(data);
-  }
-);
-
-// 7. get_mcp_distribution
-server.tool(
-  "get_mcp_distribution",
-  "Get MCP server usage distribution across the organization: which MCP servers are used, how often, by how many developers, in how many sessions.",
-  { days: z.number().optional().describe("Time window in days (default: 30)") },
-  async ({ days }) => {
-    const data = await apiCall(`/api/dashboard/mcp?days=${days ?? 30}`);
-    return textResult(data);
-  }
-);
-
-// 8. get_chain
-server.tool(
-  "get_chain",
-  "Get a session chain (one or more linked sessions) with event history, plan mode segments, and timing. Find chain_id from get_developer's recent_chains list. Events include tool uses, prompts, errors, and raw original payloads. Use `offset` and `limit` to paginate through events (default: first 50). Response includes `event_count` and `has_more` to help with pagination.",
-  {
-    chain_id: z.string().describe("Chain ID (UUID)"),
-    offset: z.number().optional().describe("Skip first N events (default: 0)"),
-    limit: z.number().optional().describe("Max events to return (default: 50)"),
-  },
-  async ({ chain_id, offset, limit }) => {
-    const data = await apiCall(`/api/dashboard/chains/${chain_id}`);
-    const off = offset ?? 0;
-    const lim = limit ?? 50;
-    const allEvents = data.events || [];
-    const page = allEvents.slice(off, off + lim);
-    return textResult({
-      ...data,
-      events: page,
-      event_count: allEvents.length,
-      events_returned: page.length,
-      offset: off,
-      has_more: off + lim < allEvents.length,
-    });
-  }
-);
-
-// 9. get_chain_analysis
-server.tool(
-  "get_chain_analysis",
-  "Get AI-generated analysis for a session chain: what tasks were worked on (with status, complexity, files modified), what went well, problems encountered (with time wasted and recommendations), unanswered questions, and tool errors. Use chain_id from get_developer's recent_chains.",
-  { chain_id: z.string().describe("Chain ID (UUID)") },
-  async ({ chain_id }) => {
-    const data = await apiCall(`/api/dashboard/chains/${chain_id}/analysis`);
-    return textResult(data);
-  }
-);
-
-const transport = new StdioServerTransport();
-await server.connect(transport);
-console.error("AI Lens MCP server running");