fullcourtdefense-cli 1.1.13 → 1.1.14

package/dist/commands/mcpGateway.js

@@ -80,24 +80,27 @@ function normalizeAgentClient(value, fallback) {
         return value;
     return fallback;
 }
+/**
+ * Detect which agent client spawned this gateway process at runtime.
+ *
+ * Claude Code sets `CLAUDECODE=1` and `CLAUDE_CODE_SESSION_ID` in every stdio
+ * MCP subprocess it starts, so a gateway launched by Claude Code can self-label
+ * even when it was installed with no explicit `--agent-client`. Cursor and
+ * Claude Desktop don't expose a runtime marker, so they fall through to the
+ * install-time default baked into the MCP config.
+ */
+function detectRuntimeAgentClient() {
+    if (process.env.CLAUDECODE === '1' || process.env.CLAUDE_CODE_SESSION_ID)
+        return 'claude-code';
+    return undefined;
+}
+/** Claude Code passes the session id to spawned MCP servers for correlation. */
+function runtimeSessionId() {
+    return firstNonEmpty(process.env.CLAUDE_CODE_SESSION_ID, process.env.FCD_SESSION_ID);
+}
 function firstNonEmpty(...values) {
     return values.map(value => value?.trim()).find(Boolean);
 }
-function commandOutput(command, args) {
-    try {
-        const result = (0, child_process_1.spawnSync)(command, args, {
-            encoding: 'utf8',
-            shell: process.platform === 'win32',
-            stdio: ['ignore', 'pipe', 'ignore'],
-        });
-        if (result.status !== 0)
-            return undefined;
-        return result.stdout?.trim() || undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
 function safeIdentityPart(value) {
     return value
         .trim()
@@ -106,8 +109,18 @@ function safeIdentityPart(value) {
         .replace(/^-+|-+$/g, '')
         .toLowerCase() || 'local-user';
 }
+/**
+ * Resolve the developer identity for runtime attribution.
+ *
+ * Same behavior for Cursor, Claude Code, and Claude Desktop: prefer an explicit
+ * name (flag or env var IT can set per machine), otherwise fall back to
+ * `username@hostname` — exactly like the Cursor hook. We intentionally do NOT
+ * guess from git email / npm whoami: neither Cursor nor Claude exposes the
+ * account email, so the machine-scoped login is the one stable, predictable,
+ * collision-free identity.
+ */
 function detectedDeveloperName(args) {
-    return firstNonEmpty(args.developerName, process.env.FCD_DEVELOPER_NAME, process.env.FULLCOURTDEFENSE_DEVELOPER_NAME, process.env.AGENTGUARD_DEVELOPER_NAME, process.env.USER_EMAIL, commandOutput('git', ['config', '--get', 'user.email']), commandOutput('npm', ['whoami']), safeUserName()) || 'unknown';
+    return firstNonEmpty(args.developerName, process.env.FCD_DEVELOPER_NAME, process.env.FULLCOURTDEFENSE_DEVELOPER_NAME, process.env.AGENTGUARD_DEVELOPER_NAME, machineScopedUser()) || 'unknown';
 }
 function defaultAgentName(agentClient, developerName, defaults) {
     if (defaults.agentName)
@@ -120,7 +133,7 @@ function resolveGatewayConfig(args, config, defaults = {}) {
     const shieldId = args.shieldId || process.env.FCD_SHIELD_ID || process.env.FULLCOURTDEFENSE_SHIELD_ID || process.env.AGENTGUARD_SHIELD_ID || config.shieldId || home.shieldId;
     if (!shieldId)
         throw new Error('Missing Shield ID. Pass --shield-id or run fullcourtdefense configure.');
-    const agentClient = normalizeAgentClient(args.agentClient || process.env.FCD_AGENT_CLIENT, defaults.agentClient || 'cursor');
+    const agentClient = normalizeAgentClient(args.agentClient || process.env.FCD_AGENT_CLIENT || detectRuntimeAgentClient(), defaults.agentClient || 'cursor');
     const developerName = detectedDeveloperName(args);
     return {
         shieldId,
@@ -140,15 +153,17 @@ function resolveGatewayConfig(args, config, defaults = {}) {
     };
 }
 function machineMetadata(developerName, agentClient = 'cursor') {
+    const sessionId = runtimeSessionId();
     return {
-        developerName: developerName || safeUserName(),
+        developerName: developerName || machineScopedUser(),
         machineName: os.hostname(),
         os: `${os.platform()} ${os.release()}`,
         username: safeUserName(),
         ipAddress: firstPrivateIp(),
         cwd: process.cwd(),
-        workspacePath: process.env.WORKSPACE_PATH || process.cwd(),
+        workspacePath: process.env.WORKSPACE_PATH || process.env.CLAUDE_PROJECT_DIR || process.cwd(),
         agentClient,
+        ...(sessionId ? { sessionId } : {}),
         gateway: 'agentguard-mcp-gateway',
     };
 }
@@ -170,6 +185,25 @@ function safeUserName() {
         return 'unknown';
     }
 }
+/**
+ * Machine-scoped identity: `username@hostname` (e.g. `boazl@BOAZ-PC`).
+ *
+ * Bare OS usernames collide across machines (every laptop has an `admin` /
+ * `user`), which breaks per-person attribution and fails SOC 2 CC6.1
+ * non-repudiation. Pairing the login with the hostname makes the identity
+ * unique per device with zero config, and matches the Cursor hook's format.
+ * For verified corporate identity, set `FCD_DEVELOPER_NAME` (e.g. via MDM/IdP).
+ */
+function machineScopedUser() {
+    const user = safeUserName();
+    try {
+        const host = os.hostname();
+        return host ? `${user}@${host}` : user;
+    }
+    catch {
+        return user;
+    }
+}
 function summarizeToolArgs(args, developerName, agentClient = 'cursor') {
     const out = { ...machineMetadata(developerName, agentClient) };
     for (const [key, value] of Object.entries(args || {})) {

package/dist/index.js

@@ -11,7 +11,7 @@ const discover_1 = require("./commands/discover");
 const hook_1 = require("./commands/hook");
 const installCursorHook_1 = require("./commands/installCursorHook");
 const mcpGateway_1 = require("./commands/mcpGateway");
-const VERSION = '1.1.13';
+const VERSION = '1.1.14';
 function parseArgs(argv) {
     const flags = {};
     let command = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fullcourtdefense-cli",
-  "version": "1.1.13",
+  "version": "1.1.14",
   "description": "Full Court Defense CLI — security scanning for AI agents from your terminal",
   "main": "dist/index.js",
   "bin": {