log-llm-config 1.3.30 → 1.3.34

package/dist/log_config_files/runtime/remediation_sync.js

@@ -365,7 +365,7 @@ function assertSafeSqliteIdentifiersForItemTable(table, keyColumn, valueColumn)
 const TRUSTED_CURSOR_SQLITE_DEFERRED_RESTART_COMMAND = 'REPO_ROOT=$(git rev-parse --show-toplevel 2>/dev/null || pwd) && export REPO_ROOT && ' +
     'CURSOR_PROJECT="${CURSOR_PROJECT_DIR:-$REPO_ROOT}" && export CURSOR_PROJECT && ' +
     'OPTIMUS_DEFERRED_LOG="${HOME}/opt-ai-sec/management/deferred_vscdb_restart.log" && mkdir -p "$(dirname "$OPTIMUS_DEFERRED_LOG")" && export OPTIMUS_DEFERRED_LOG && ' +
-    "nohup bash -c 'exec >>\"\$OPTIMUS_DEFERRED_LOG\" 2>&1; echo deferred_restart:begin ts=\$(date -u +%Y-%m-%dT%H:%M:%SZ) REPO_ROOT=\"\$REPO_ROOT\" CURSOR_PROJECT=\"\$CURSOR_PROJECT\"; sleep 2; if [ -f \"\$REPO_ROOT/npx_packages/log-llm-config/dist/apply_deferred_vscdb.js\" ]; then echo deferred_restart:apply_via_monorepo_node; node \"\$REPO_ROOT/npx_packages/log-llm-config/dist/apply_deferred_vscdb.js\"; APPLY_EC=\$?; else echo deferred_restart:apply_via_npx; cd \"\$REPO_ROOT\" && npx --yes log-llm-config@latest apply-deferred-vscdb; APPLY_EC=\$?; fi; echo deferred_restart:apply_exit=\$APPLY_EC; if [ \$APPLY_EC -ne 0 ]; then echo deferred_restart:APPLY_FAILED_see_messages_above; fi; echo deferred_restart:open_cursor; open -a Cursor \"\$CURSOR_PROJECT\"; echo deferred_restart:open_exit=\$?; echo deferred_restart:end ts=\$(date -u +%Y-%m-%dT%H:%M:%SZ)' >/dev/null 2>&1 & killall -9 Cursor";
+    "nohup bash -c 'exec >>\"\$OPTIMUS_DEFERRED_LOG\" 2>&1; echo deferred_restart:begin ts=\$(date -u +%Y-%m-%dT%H:%M:%SZ) REPO_ROOT=\"\$REPO_ROOT\" CURSOR_PROJECT=\"\$CURSOR_PROJECT\"; sleep 2; if [ -f \"\$REPO_ROOT/dev_npx_packages/log-llm-config/dist/apply_deferred_vscdb.js\" ]; then echo deferred_restart:apply_via_monorepo_node; node \"\$REPO_ROOT/dev_npx_packages/log-llm-config/dist/apply_deferred_vscdb.js\"; APPLY_EC=\$?; else echo deferred_restart:apply_via_npx; cd \"\$REPO_ROOT\" && npx --yes log-llm-config@latest apply-deferred-vscdb; APPLY_EC=\$?; fi; echo deferred_restart:apply_exit=\$APPLY_EC; if [ \$APPLY_EC -ne 0 ]; then echo deferred_restart:APPLY_FAILED_see_messages_above; fi; echo deferred_restart:open_cursor; open -a Cursor \"\$CURSOR_PROJECT\"; echo deferred_restart:open_exit=\$?; echo deferred_restart:end ts=\$(date -u +%Y-%m-%dT%H:%M:%SZ)' >/dev/null 2>&1 & killall -9 Cursor";
 const TRUSTED_CURSOR_JSON_SETTINGS_RESTART_COMMAND = 'CURSOR_PROJECT=$(git rev-parse --show-toplevel 2>/dev/null || pwd) && export CURSOR_PROJECT && nohup bash -c \'sleep 2 && open -a Cursor "$CURSOR_PROJECT"\' >/dev/null 2>&1 & killall -9 Cursor';
 const TRUSTED_CLAUDE_RESTART_COMMAND = "nohup bash -c 'sleep 2 && open -a Claude' >/dev/null 2>&1 & pkill -x 'Claude'";
 /**
@@ -809,7 +809,7 @@ export async function applyDeferredVscdbFromDisk() {
  */
 export function buildDeferredCursorRestartCommand() {
     // Prefer monorepo path when hooks run from optimus-secure-fdn; otherwise `npx --yes log-llm-config@latest apply-deferred-vscdb`
-    // (package bin) so published installs work without a local npx_packages copy.
+    // (package bin) so published installs work without a local dev_npx_packages copy.
     return TRUSTED_CURSOR_SQLITE_DEFERRED_RESTART_COMMAND;
 }
 function sqliteRowGroupKey(dbPath, op) {

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

@@ -0,0 +1,176 @@
+import { execFileSync } from 'node:child_process';
+import crypto from 'node:crypto';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { readCommandOutput, resolveHardwareUuid } from './hardware_uuid.js';
+const safeJsonParse = (raw) => {
+    try {
+        return JSON.parse(raw);
+    }
+    catch {
+        return null;
+    }
+};
+const readCursorCachedEmailFromVscdb = () => {
+    const dbPath = path.join(os.homedir(), 'Library/Application Support/Cursor/User/globalStorage/state.vscdb');
+    if (!fs.existsSync(dbPath))
+        return '';
+    try {
+        const out = execFileSync('sqlite3', [dbPath, "select value from ItemTable where key='cursorAuth/cachedEmail';"], { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+        return out;
+    }
+    catch {
+        return '';
+    }
+};
+/** 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',
+            stdio: ['ignore', 'pipe', 'ignore'],
+        }).trim();
+        if (!out)
+            return '';
+        const parsed = safeJsonParse(out);
+        if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+            const email = parsed.email;
+            return typeof email === 'string' ? email.trim() : '';
+        }
+    }
+    catch {
+        return '';
+    }
+    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() ||
+        process.env.LOGNAME?.trim() ||
+        '';
+    if (fromEnv)
+        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'));
+};
+const readUserProfileFromEnvOrFile = () => {
+    const inline = process.env.OPTIMUS_USER_PROFILE_JSON?.trim();
+    if (inline) {
+        const parsed = safeJsonParse(inline);
+        if (parsed && typeof parsed === 'object' && !Array.isArray(parsed))
+            return parsed;
+    }
+    const filePath = process.env.OPTIMUS_USER_PROFILE_FILE?.trim();
+    if (filePath && fs.existsSync(filePath)) {
+        const parsed = safeJsonParse(fs.readFileSync(filePath, { encoding: 'utf8' }));
+        if (parsed && typeof parsed === 'object' && !Array.isArray(parsed))
+            return parsed;
+    }
+    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: readMacAccountGeneratedUid() || crypto.randomUUID(),
+    machineuuid: resolveHardwareUuid(),
+    mac_username: readMacUsername(),
+    github_username: readGithubUsername(),
+    claude_email: readClaudeAuthEmail(),
+    cursor_email: readCursorCachedEmail(),
+});
+/** Best-effort local user profile object for startup metadata. */
+const resolveUserProfile = () => readUserProfileFromEnvOrFile() ?? buildDefaultUserProfile();
+export { resolveUserProfile };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "log-llm-config",
-  "version": "1.3.30",
+  "version": "1.3.34",
   "description": "CLI helpers for logging hardware UUIDs and posting startup payloads to Optimus Security.",
   "type": "module",
   "bin": {
@@ -33,12 +33,12 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/optimuslabs-io/optimus-secure-fdn.git",
-    "directory": "npx_packages/log-llm-config"
+    "directory": "dev_npx_packages/log-llm-config"
   },
   "bugs": {
     "url": "https://github.com/optimuslabs-io/optimus-secure-fdn/issues"
   },
-  "homepage": "https://github.com/optimuslabs-io/optimus-secure-fdn/tree/main/npx_packages/log-llm-config#readme",
+  "homepage": "https://github.com/optimuslabs-io/optimus-secure-fdn/tree/main/dev_npx_packages/log-llm-config#readme",
   "files": [
     "dist/**/*",
     "README.md"