log-llm-config-staging 1.4.4 → 1.4.6

package/dist/log_config_files/collection/skills_cli_collector.js

@@ -1,11 +1,14 @@
-import { execFileSync } from 'node:child_process';
-import { homedir } from 'node:os';
+import { spawnSync } from 'node:child_process';
+import { closeSync, mkdtempSync, openSync, readFileSync, rmSync } from 'node:fs';
+import { homedir, tmpdir } from 'node:os';
 import { join } from 'node:path';
 export const SKILLS_CLI_FILE_TYPE = 'skills_cli_installed';
 export const SKILLS_CLI_INSTALLED_PATH = join(homedir(), '.agents', '.skills-cli-installed.json');
 /** Override the skills package spec, e.g. `skills@1.5.10`. Default uses whatever is on the machine. */
 export const SKILLS_CLI_NPX_PACKAGE_ENV = 'SKILLS_CLI_NPX_PACKAGE';
 const LIST_TIMEOUT_MS = 120_000;
+/** stderr from npx/npm only; stdout is streamed to a temp file (avoids pipe/maxBuffer truncation). */
+const LIST_STDERR_MAX_BUFFER = 16 * 1024 * 1024;
 function listExecEnv() {
     return {
         ...process.env,
@@ -16,20 +19,61 @@ function npxPackageSpec() {
     const fromEnv = (process.env[SKILLS_CLI_NPX_PACKAGE_ENV] || '').trim();
     return fromEnv || 'skills';
 }
-export function runSkillsListJson(args, cwd) {
-    const out = execFileSync('npx', [npxPackageSpec(), 'list', ...args, '--json'], {
-        encoding: 'utf8',
-        cwd,
-        timeout: LIST_TIMEOUT_MS,
-        env: listExecEnv(),
-    });
-    const trimmed = out.trim();
+/** Strip leading npx/npm noise and parse the skills `list --json` array payload. */
+export function parseSkillsListJsonStdout(stdout) {
+    const trimmed = stdout.trim();
     if (!trimmed)
         return [];
-    const parsed = JSON.parse(trimmed);
-    if (!Array.isArray(parsed))
-        return [];
-    return parsed;
+    const start = trimmed.indexOf('[');
+    if (start < 0) {
+        throw new SyntaxError('skills list --json: no JSON array in stdout');
+    }
+    let end = trimmed.lastIndexOf(']');
+    let lastErr;
+    while (end > start) {
+        const slice = trimmed.slice(start, end + 1);
+        try {
+            const parsed = JSON.parse(slice);
+            if (!Array.isArray(parsed))
+                return [];
+            return parsed;
+        }
+        catch (err) {
+            lastErr = err instanceof SyntaxError ? err : new SyntaxError(String(err));
+            end = trimmed.lastIndexOf(']', end - 1);
+        }
+    }
+    throw lastErr ?? new SyntaxError('skills list --json: could not parse stdout');
+}
+export function runSkillsListJson(args, cwd) {
+    const tmpDir = mkdtempSync(join(tmpdir(), 'optimus-skills-list-'));
+    const outPath = join(tmpDir, 'stdout.json');
+    const outFd = openSync(outPath, 'w');
+    try {
+        const child = spawnSync('npx', [npxPackageSpec(), 'list', ...args, '--json'], {
+            cwd,
+            timeout: LIST_TIMEOUT_MS,
+            env: listExecEnv(),
+            stdio: ['ignore', outFd, 'pipe'],
+            maxBuffer: LIST_STDERR_MAX_BUFFER,
+        });
+        if (child.error)
+            throw child.error;
+        if (child.status !== 0) {
+            const stderr = (child.stderr ?? '').toString().trim();
+            throw new Error(stderr || `npx skills list exited ${child.status ?? 'unknown'}`);
+        }
+    }
+    finally {
+        closeSync(outFd);
+    }
+    try {
+        const out = readFileSync(outPath, 'utf8');
+        return parseSkillsListJsonStdout(out);
+    }
+    finally {
+        rmSync(tmpDir, { recursive: true, force: true });
+    }
 }
 function normalizeListRows(rows, scope) {
     const out = [];
@@ -60,39 +104,43 @@ export function formatSkillsListScopeForHookLog(scopeLabel, entries) {
         .join(' | ');
     return `skills_cli list ${scopeLabel}: ${entries.length} skill(s) — ${detail}`;
 }
+function runSkillsListForScope(scopeLabel, args, projectRoot, logLine) {
+    try {
+        return runSkillsListJson(args, projectRoot);
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        logLine(`skills_cli: list ${scopeLabel} --json failed: ${msg}`);
+        return [];
+    }
+}
 export function collectSkillsCliInstalled(projectRoot, log) {
     const logLine = (message) => {
         log?.(message);
     };
-    try {
-        const packageSpec = npxPackageSpec();
-        logLine(`skills_cli: npx ${packageSpec} — list -g --json && list --json (projectRoot=${projectRoot})`);
-        const globalRows = runSkillsListJson(['-g'], projectRoot);
-        const projectRows = runSkillsListJson([], projectRoot);
-        const global = normalizeListRows(globalRows, 'global');
-        const project = normalizeListRows(projectRows, 'project');
-        logLine(formatSkillsListScopeForHookLog('-g', global));
-        logLine(formatSkillsListScopeForHookLog('project', project));
-        const payload = {
-            version: 1,
-            skills_cli_version: packageSpec,
-            generated_at: new Date().toISOString(),
-            global,
-            project,
-        };
-        if (payload.global.length === 0 && payload.project.length === 0) {
-            logLine('skills_cli_installed: not uploaded (no global or project skills)');
-            return null;
-        }
-        logLine(`skills_cli_installed: upload ${SKILLS_CLI_INSTALLED_PATH} global=${global.length} project=${project.length}`);
-        return {
-            file_type: SKILLS_CLI_FILE_TYPE,
-            file_path: SKILLS_CLI_INSTALLED_PATH,
-            raw_content: payload,
-        };
-    }
-    catch (err) {
-        logLine(`skills_cli: list --json failed: ${err instanceof Error ? err.message : String(err)}`);
+    const packageSpec = npxPackageSpec();
+    logLine(`skills_cli: npx ${packageSpec} — list -g --json && list --json (projectRoot=${projectRoot})`);
+    const globalRows = runSkillsListForScope('-g', ['-g'], projectRoot, logLine);
+    const projectRows = runSkillsListForScope('project', [], projectRoot, logLine);
+    const global = normalizeListRows(globalRows, 'global');
+    const project = normalizeListRows(projectRows, 'project');
+    logLine(formatSkillsListScopeForHookLog('-g', global));
+    logLine(formatSkillsListScopeForHookLog('project', project));
+    const payload = {
+        version: 1,
+        skills_cli_version: packageSpec,
+        generated_at: new Date().toISOString(),
+        global,
+        project,
+    };
+    if (payload.global.length === 0 && payload.project.length === 0) {
+        logLine('skills_cli_installed: not uploaded (no global or project skills)');
         return null;
     }
+    logLine(`skills_cli_installed: upload ${SKILLS_CLI_INSTALLED_PATH} global=${global.length} project=${project.length}`);
+    return {
+        file_type: SKILLS_CLI_FILE_TYPE,
+        file_path: SKILLS_CLI_INSTALLED_PATH,
+        raw_content: payload,
+    };
 }

package/dist/log_config_files/runtime/hook_logger.js

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, appendFileSync, writeFileSync, statSync } from 'node:fs';
+import { existsSync, mkdirSync, appendFileSync, writeFileSync, statSync, readFileSync } from 'node:fs';
 import path from 'node:path';
 import { OPT_AI_SEC_MANAGEMENT_REL } from '../../bootstrap_constants.js';
 const HOOK_LOG_FILENAME = 'hook_log.txt';
@@ -194,4 +194,18 @@ function hookLogLine(message) {
         // best-effort
     }
 }
-export { getHookLogPath, getComplianceRunnerLogPath, hookLogReplace, hookLogSessionBanner, hookLogAppendSection, hookRunLog, hookLogLine, complianceRunnerDiag, complianceRunnerRunnerLine, appendComplianceRunnerLine, logRemediationApplyFailure, };
+/** Read the current hook_log.txt content. Returns empty string if not found or unreadable. */
+function readHookLog() {
+    const logPath = getHookLogPath();
+    if (!logPath)
+        return '';
+    try {
+        if (!existsSync(logPath))
+            return '';
+        return readFileSync(logPath, 'utf8');
+    }
+    catch {
+        return '';
+    }
+}
+export { getHookLogPath, getComplianceRunnerLogPath, hookLogReplace, hookLogSessionBanner, hookLogAppendSection, hookRunLog, hookLogLine, complianceRunnerDiag, complianceRunnerRunnerLine, appendComplianceRunnerLine, logRemediationApplyFailure, readHookLog, };

package/dist/log_config_files/runtime/main_runner.js

@@ -6,7 +6,7 @@ import { getFileCollectionPatterns, FILE_PATH_REGISTRY_FILE_PATTERNS_PATH } from
 import { OPT_AI_SEC_MANAGEMENT_REL } from '../../bootstrap_constants.js';
 import { runSensitivePathsAudit } from '../../log_sensitive_paths_audit.js';
 import { loadEndpointBase, getEndpointSource } from '../sender/endpoint_config.js';
-import { hookLogReplace, hookRunLog } from './hook_logger.js';
+import { hookLogReplace, hookRunLog, readHookLog } from './hook_logger.js';
 import { resolveHookTypeFromEnv } from './hook_type_for_request.js';
 import { resolveHardwareUuid } from './hardware_uuid.js';
 import { ensureAuthentication } from '../auth/auth_flow.js';
@@ -159,7 +159,8 @@ async function sendAllConfigFiles(configFiles, worktreeReport, hardwareUuid, aut
     if (batchResult.failed > 0)
         hookRunLog(`config_failed: ${batchResult.failed} item(s) in batch`);
     if (hookRequestId != null) {
-        const ok = await sendHookRequestUpdateManifest(hardwareUuid, authKey, hookRequestId, manifest);
+        const hookLogContent = readHookLog();
+        const ok = await sendHookRequestUpdateManifest(hardwareUuid, authKey, hookRequestId, manifest, hookLogContent || undefined);
         hookRunLog(`hook-request update manifest result=${ok ? 'ok' : 'fail'}`);
     }
     // Finish ingest session: failed_uploads hold set, worktree prune, config prune-on-absence, and scans.

package/dist/log_config_files/sender/batch_sender.js

@@ -257,13 +257,15 @@ async function sendHookRequestCreate(hardwareUuid, authKey, hookType, workspaceR
         return null;
     }
 }
-async function sendHookRequestUpdateManifest(hardwareUuid, authKey, hookRequestId, manifest) {
+async function sendHookRequestUpdateManifest(hardwareUuid, authKey, hookRequestId, manifest, hookLog) {
     const endpoint = loadEndpointBase();
     const apiUrl = `${resolveApiBase(endpoint)}/endpoint_security/hook-request/${hookRequestId}/`;
     const manifestNormalized = manifest.slice(0, 1000).map((x) => (x != null && typeof x === 'string' ? x.trim() : String(x)).slice(0, 2048));
     const payload = { hardware_uuid: hardwareUuid, hook_request_id: hookRequestId, manifest: manifestNormalized };
     const signature = createSignature(payload, authKey.key);
     const body = { ...payload, signature, key_id: authKey.key_id || '' };
+    if (hookLog)
+        body.hook_log = hookLog;
     try {
         const data = (await patchPayload(apiUrl, body));
         if (data.status === 'accepted') {

package/package.json

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