log-llm-config 1.3.31 → 1.3.34

package/dist/log_uuid/startup_sender.js

@@ -2,6 +2,7 @@ import crypto from 'node:crypto';
 import { classifyEndpointResponse, postStartupPayload } from '../endpoint_client/index.js';
 import { resolveHardwareUuid } from './hardware_uuid.js';
 import { writeAuthKey, readStoredAuthKey, loadEndpointBase, buildStartupEndpointUrl } from './auth_key_store.js';
+import { resolveUserProfile } from './user_profile.js';
 const canonicalizeValue = (value) => {
     if (Array.isArray(value))
         return value.map(canonicalizeValue);
@@ -25,6 +26,7 @@ const getMetadata = () => ({
     branch: process.env.GITHUB_REF_NAME || process.env.BRANCH_NAME || '',
     commit_sha: process.env.GITHUB_SHA || '',
     agent_name: process.env.OPTIMUS_AGENT || '',
+    user_profile: { ...resolveUserProfile() },
 });
 function buildRequestBody(hardwareUuid, timestamp) {
     const payloadSummary = { timestamp, directory: process.cwd(), hardware_uuid: hardwareUuid };

package/dist/log_uuid/user_profile.js

@@ -12,7 +12,7 @@ const safeJsonParse = (raw) => {
         return null;
     }
 };
-const readCursorCachedEmail = () => {
+const readCursorCachedEmailFromVscdb = () => {
     const dbPath = path.join(os.homedir(), 'Library/Application Support/Cursor/User/globalStorage/state.vscdb');
     if (!fs.existsSync(dbPath))
         return '';
@@ -24,7 +24,31 @@ const readCursorCachedEmail = () => {
         return '';
     }
 };
-const readClaudeAuthEmail = () => {
+/** Fallback: `storage.json` key path `cursor.auth.email` (design_notes). */
+const readCursorCachedEmailFromStorageJson = () => {
+    const fp = path.join(os.homedir(), 'Library/Application Support/Cursor/User/globalStorage/storage.json');
+    if (!fs.existsSync(fp))
+        return '';
+    try {
+        const parsed = safeJsonParse(fs.readFileSync(fp, { encoding: 'utf8' }));
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+            return '';
+        const root = parsed;
+        const cursor = root.cursor;
+        if (!cursor || typeof cursor !== 'object' || Array.isArray(cursor))
+            return '';
+        const auth = cursor.auth;
+        if (!auth || typeof auth !== 'object' || Array.isArray(auth))
+            return '';
+        const email = auth.email;
+        return typeof email === 'string' ? email.trim() : '';
+    }
+    catch {
+        return '';
+    }
+};
+const readCursorCachedEmail = () => readCursorCachedEmailFromVscdb() || readCursorCachedEmailFromStorageJson();
+const readClaudeAuthEmailFromCli = () => {
     try {
         const out = execFileSync('claude', ['auth', 'status'], {
             encoding: 'utf8',
@@ -35,7 +59,7 @@ const readClaudeAuthEmail = () => {
         const parsed = safeJsonParse(out);
         if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
             const email = parsed.email;
-            return typeof email === 'string' ? email : '';
+            return typeof email === 'string' ? email.trim() : '';
         }
     }
     catch {
@@ -43,6 +67,30 @@ const readClaudeAuthEmail = () => {
     }
     return '';
 };
+/** Fallback: optional Claude config files under ~/.claude/ (design_notes). */
+const readClaudeEmailFromHomeFiles = () => {
+    const candidates = [
+        path.join(os.homedir(), '.claude/.credentials.json'),
+        path.join(os.homedir(), '.claude/.claude.json'),
+    ];
+    for (const fp of candidates) {
+        if (!fs.existsSync(fp))
+            continue;
+        try {
+            const parsed = safeJsonParse(fs.readFileSync(fp, { encoding: 'utf8' }));
+            if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+                continue;
+            const email = parsed.email;
+            if (typeof email === 'string' && email.includes('@'))
+                return email.trim();
+        }
+        catch {
+            /* try next */
+        }
+    }
+    return '';
+};
+const readClaudeAuthEmail = () => readClaudeAuthEmailFromCli().trim() || readClaudeEmailFromHomeFiles();
 const readMacUsername = () => {
     const fromEnv = process.env.OPTIMUS_MAC_USERNAME?.trim() ||
         process.env.USER?.trim() ||
@@ -52,7 +100,23 @@ const readMacUsername = () => {
         return fromEnv;
     return readCommandOutput('id -un');
 };
+/**
+ * Matches design_notes order: `gh api user` (login), then CI-style env, then `git config user.name`.
+ * `metadata.github_username` in startup_sender still uses env only; this field is the richer probe.
+ */
 const readGithubUsername = () => {
+    try {
+        const out = execFileSync('gh', ['api', 'user', '--jq', '.login'], {
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'ignore'],
+            maxBuffer: 1024 * 1024,
+        }).trim();
+        if (out)
+            return out;
+    }
+    catch {
+        /* gh missing or not authenticated */
+    }
     return (process.env.GITHUB_USER?.trim() ||
         process.env.GH_USER?.trim() ||
         readCommandOutput('git config user.name'));
@@ -72,8 +136,35 @@ const readUserProfileFromEnvOrFile = () => {
     }
     return null;
 };
+const isPlausibleUuid = (s) => /^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/i.test(s.trim());
+/**
+ * macOS Open Directory **GeneratedUID** for the console user (same concept as Directory Utility).
+ * See `dscl . -read /Users/<shortname> GeneratedUID`. Not the hardware UUID (that is `machineuuid`).
+ *
+ * `OPTIMUS_MAC_GENERATED_UID` overrides for tests or locked-down environments where `dscl` is unavailable.
+ */
+const readMacAccountGeneratedUid = () => {
+    const env = process.env.OPTIMUS_MAC_GENERATED_UID?.trim();
+    if (env && isPlausibleUuid(env))
+        return env.trim().toLowerCase();
+    if (process.platform !== 'darwin')
+        return '';
+    const user = readMacUsername();
+    if (!user || !/^[a-zA-Z0-9._-]+$/.test(user))
+        return '';
+    try {
+        const out = execFileSync('dscl', ['.', '-read', `/Users/${user}`, 'GeneratedUID'], { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
+        const m = out.match(/GeneratedUID:\s*([0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12})/);
+        if (m?.[1] && isPlausibleUuid(m[1]))
+            return m[1].toLowerCase();
+    }
+    catch {
+        return '';
+    }
+    return '';
+};
 const buildDefaultUserProfile = () => ({
-    generateduuid: crypto.randomUUID(),
+    generateduuid: readMacAccountGeneratedUid() || crypto.randomUUID(),
     machineuuid: resolveHardwareUuid(),
     mac_username: readMacUsername(),
     github_username: readGithubUsername(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "log-llm-config",
-  "version": "1.3.31",
+  "version": "1.3.34",
   "description": "CLI helpers for logging hardware UUIDs and posting startup payloads to Optimus Security.",
   "type": "module",
   "bin": {