@corva/ui 3.80.0-4 → 3.80.0-5

package/mcp-server/server.mjs

@@ -11,9 +11,10 @@ import { randomUUID } from 'crypto';
 import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
 import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
 import { readFile } from 'fs/promises';
-import { join as join$1, resolve, dirname } from 'path';
-import { readFileSync } from 'fs';
+import { join as join$1, dirname, resolve, sep } from 'path';
+import { realpathSync, existsSync, statSync, readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
+import { homedir } from 'os';
 import { z } from 'zod';
 
 const LOG_SYMBOLS = {
@@ -246,12 +247,23 @@ const validateDsn = dsn => {
   return url.href;
 };
 
-const MCP_SERVER_VERSION = '1.9.1';
+const MCP_SERVER_VERSION = '1.10.0';
 
-var version = "3.80.0-4";
+var version = "3.80.0-5";
 
 const CORVA_UI_VERSION = version;
 
+const getIdentityAttrs = identity => ({
+  ...(identity?.appKey ? {
+    'corva.app.key': identity.appKey
+  } : {}),
+  ...(identity?.packageName ? {
+    'corva.package.name': identity.packageName
+  } : {}),
+  ...(identity?.repoName ? {
+    'corva.repo.name': identity.repoName
+  } : {})
+});
 const createMetricsClient = meter => {
   const invocationCounter = meter.createCounter('mcp.server.tool.invocations', {
     description: 'Number of tool invocations'
@@ -344,24 +356,14 @@ const createMetricsClient = meter => {
       sessionCounter.add(1, {
         'mcp.client.name': clientName || UNKNOWN_CLIENT_ATTR,
         'mcp.client.version': clientVersion || UNKNOWN_CLIENT_ATTR,
-        ...(projectIdentity?.appKey ? {
-          'corva.app.key': projectIdentity.appKey
-        } : {}),
-        ...(projectIdentity?.packageName ? {
-          'corva.package.name': projectIdentity.packageName
-        } : {})
+        ...getIdentityAttrs(projectIdentity)
       });
     },
     recordSessionEnd: (durationMs, toolCount, clientName, clientVersion, projectIdentity) => {
       const attrs = {
         'mcp.client.name': clientName || UNKNOWN_CLIENT_ATTR,
         'mcp.client.version': clientVersion || UNKNOWN_CLIENT_ATTR,
-        ...(projectIdentity?.appKey ? {
-          'corva.app.key': projectIdentity.appKey
-        } : {}),
-        ...(projectIdentity?.packageName ? {
-          'corva.package.name': projectIdentity.packageName
-        } : {})
+        ...getIdentityAttrs(projectIdentity)
       };
       sessionDuration.record(durationMs, attrs);
       sessionToolCount.record(toolCount, attrs);
@@ -530,6 +532,9 @@ const recordInitSpan = (tracer, attrs) => {
     if (attrs.packageName) {
       span.setAttribute('corva.package.name', attrs.packageName);
     }
+    if (attrs.repoName) {
+      span.setAttribute('corva.repo.name', attrs.repoName);
+    }
   } finally {
     span.end();
   }
@@ -937,6 +942,131 @@ const extractContextFromMeta = meta => {
   return propagation.extract(context.active(), meta, metaGetter);
 };
 
+const URL_WITH_SCHEME = /^[a-z][a-z0-9+.-]*:\/\//i;
+// A drive letter and a colon is a local Windows path, as in git's `has_dos_drive_prefix`. Read as
+// scp-like, `C:\Users\alice\repo` would export the path with the username.
+const LOCAL_PREFIX = /^(?:file:|[a-z]:)/i;
+// Git's scp-like form, `[user@]host:path`, where the host may be a bracketed IPv6 address. A slash
+// before the first colon means a local path, so neither the user nor the host may contain one.
+const SCP_LIKE = /^(?:[^@/:]+@)?(?:\[[^\]/]*\]|[^:/[\]]+):(.+)$/;
+
+/**
+ * Returns the last path segment of a git remote URL without `.git`, or null for a local path
+ * (including a Windows drive path), a `file:` URL, a URL without a path and a URL it cannot parse.
+ * Only the repository name leaves the machine: never the host, owner, user or credentials.
+ */
+const getRepoNameFromUrl = url => {
+  if (LOCAL_PREFIX.test(url)) {
+    return null;
+  }
+  let path;
+  if (URL_WITH_SCHEME.test(url)) {
+    try {
+      path = new URL(url).pathname;
+    } catch {
+      return null;
+    }
+  } else {
+    // The query goes first: an `@` or `:` inside it must not be read as the user or the host.
+    path = SCP_LIKE.exec(url.split(/[?#]/)[0])?.[1];
+  }
+  const name = path?.split('/').filter(Boolean).pop()?.replace(/\.git$/, '');
+  return name || null;
+};
+
+const SECTION_HEADER = /^\[\s*([^\s\]"]+)(?:\s+"((?:[^"\\]|\\.)*)")?\s*\]/;
+const URL_ENTRY = /^url\s*=\s*(.*)$/i;
+
+// A `.git` in the home directory or above it belongs to a dotfiles or system repository, not to
+// the project. Real paths, so a symbolic link cannot walk past the stop.
+const findGitEntry = (startDir, homeDir) => {
+  const home = realpathSync(homeDir);
+  const isHomeOrAbove = dir => dir === home || home.startsWith(`${dir}${sep}`);
+  for (let dir = realpathSync(startDir); !isHomeOrAbove(dir) && dirname(dir) !== dir; dir = dirname(dir)) {
+    const entry = join$1(dir, '.git');
+    if (existsSync(entry)) {
+      return entry;
+    }
+  }
+  return null;
+};
+
+// A linked worktree or a submodule has a `.git` file that points to its git directory; a worktree's
+// git directory points on to the shared one through `commondir`, and that is where `origin` lives.
+const getConfigPath = gitEntry => {
+  if (statSync(gitEntry).isDirectory()) {
+    return join$1(gitEntry, 'config');
+  }
+  const gitDirPath = /^gitdir:\s*(.+)$/m.exec(readFileSync(gitEntry, 'utf-8'))?.[1].trim();
+  if (!gitDirPath) {
+    return null;
+  }
+  const gitDir = resolve(dirname(gitEntry), gitDirPath);
+  const commonDirFile = join$1(gitDir, 'commondir');
+  const commonDir = existsSync(commonDirFile) ? resolve(gitDir, readFileSync(commonDirFile, 'utf-8').trim()) : gitDir;
+  return join$1(commonDir, 'config');
+};
+
+// A git config value can mix quoted and unquoted parts, and an unquoted `#` or `;` starts a comment
+// anywhere in it. Reading only a leading quoted part, or only a comment after whitespace, would
+// return the owner or a commented-out URL.
+const parseValue = raw => {
+  let value = '';
+  let quoted = false;
+  for (let i = 0; i < raw.length; i += 1) {
+    const char = raw[i];
+    if (char === '\\') {
+      value += raw[i + 1] ?? '';
+      i += 1;
+    } else if (char === '"') {
+      quoted = !quoted;
+    } else if (!quoted && (char === '#' || char === ';')) {
+      break;
+    } else {
+      value += char;
+    }
+  }
+  return value.trim();
+};
+
+// `include`/`includeIf` are not followed: they can point anywhere on the machine. The first `url`
+// wins because that is the one `git fetch` uses.
+const readOriginUrl = configPath => {
+  let inOrigin = false;
+  for (const rawLine of readFileSync(configPath, 'utf-8').split(/\r?\n/)) {
+    let line = rawLine.trim();
+    const section = SECTION_HEADER.exec(line);
+
+    // Git also accepts an entry on the header line: `[remote "origin"] url = ...`.
+    if (section) {
+      inOrigin = section[1].toLowerCase() === 'remote' && section[2] === 'origin';
+      line = line.slice(section[0].length).trim();
+    }
+    const value = inOrigin ? URL_ENTRY.exec(line)?.[1] : undefined;
+    if (value !== undefined) {
+      return parseValue(value);
+    }
+  }
+  return null;
+};
+
+/**
+ * Returns the repository name of the `origin` remote of the nearest git repository above
+ * `startDir`, or null. Reads the git files directly instead of spawning `git`, which may be missing
+ * and would cost a process on every session start. Never throws.
+ */
+const resolveRepoName = (startDir, homeDir) => {
+  try {
+    // `homedir()` throws when HOME is unset and the user has no passwd entry, as in some containers.
+    const gitEntry = findGitEntry(startDir, homeDir ?? homedir());
+    const configPath = gitEntry && getConfigPath(gitEntry);
+    const url = configPath && readOriginUrl(configPath);
+    return url ? getRepoNameFromUrl(url) : null;
+  } catch {
+    return null;
+  }
+};
+
 const readJsonField = (filePath, ...keys) => {
   try {
     let value = JSON.parse(readFileSync(filePath, 'utf-8'));
@@ -974,12 +1104,16 @@ const getProjectIdentityAttrs = identity => {
   if (identity?.packageName) {
     attrs['corva.package.name'] = identity.packageName;
   }
+  if (identity?.repoName) {
+    attrs['corva.repo.name'] = identity.repoName;
+  }
   return attrs;
 };
 const resolveProjectIdentity = async (server, logger) => {
   const empty = {
     appKey: null,
-    packageName: null
+    packageName: null,
+    repoName: null
   };
   try {
     const capabilities = server.getClientCapabilities();
@@ -995,15 +1129,20 @@ const resolveProjectIdentity = async (server, logger) => {
     const rootPath = fileURLToPath(roots[0].uri);
     const appKey = findUpJsonField(rootPath, 'manifest.json', 'application', 'key');
     const packageName = findUpJsonField(rootPath, 'package.json', 'name');
+    const repoName = resolveRepoName(rootPath);
     if (appKey) {
       logger.info(`Consuming app: ${appKey}`);
     }
     if (packageName) {
       logger.info(`Consuming package: ${packageName}`);
     }
+    if (repoName) {
+      logger.info(`Consuming repository: ${repoName}`);
+    }
     return {
       appKey,
-      packageName
+      packageName,
+      repoName
     };
   } catch {
     return empty;
@@ -1077,7 +1216,8 @@ const recordSessionStart = async ({
     protocolVersion: MCP_PROTOCOL_VERSION,
     networkTransport: MCP_NETWORK_TRANSPORT,
     appKey: projectIdentity?.appKey ?? undefined,
-    packageName: projectIdentity?.packageName ?? undefined
+    packageName: projectIdentity?.packageName ?? undefined,
+    repoName: projectIdentity?.repoName ?? undefined
   });
 };
 
@@ -22670,7 +22810,7 @@ const diagnosticsToolName = 'get_diagnostics';
 const diagnosticsToolTitle = 'Get Server Diagnostics';
 const diagnosticsToolDescription = `Get MCP server health metrics.
 Returns server version, uptime, memory usage, request statistics, telemetry status,
-whether feedback can reach the maintainers, project identity (app key and package name), and the prompts this server registers.`;
+whether feedback can reach the maintainers, project identity (app key, package name and repository name), and the prompts this server registers.`;
 const diagnosticsToolSchema = {};
 const formatUptime = ms => {
   const seconds = Math.floor(ms / 1000);
@@ -22738,6 +22878,7 @@ const handleGetDiagnostics = (stats, telemetry, identity, registeredPromptNames)
   text += h2('Project Identity');
   text += `${bold('App key')}: ${identity?.appKey ?? 'N/A'}\n`;
   text += `${bold('Package name')}: ${identity?.packageName ?? 'N/A'}\n`;
+  text += `${bold('Repository')}: ${identity?.repoName ?? 'N/A'}\n`;
   if (registeredPromptNames?.length) {
     text += `\n${h2('Registered Prompts')}`;
     text += `${list(registeredPromptNames.map(name => `\`${name}\``))}\n\n`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corva/ui",
-  "version": "3.80.0-4",
+  "version": "3.80.0-5",
   "license": "UNLICENSED",
   "description": "Shared components/utils for Corva ui projects",
   "repository": {