log-llm-config-staging 1.3.96 → 1.3.97

package/dist/log_config_files/collection/config_collector.js

@@ -7,6 +7,7 @@ import { enrichRawFromRecipe } from './enrichment_helpers.js';
 import { collectDirectoryEntries, collectDirectoryMetadata } from './directory_collector.js';
 import { collectVscdbEntries } from '../readers/vscdb_config_builder.js';
 import { pushDerivedFilesFromRecipe } from './openclaw_helpers.js';
+import { collapseMetadataByFileType } from './metadata_merge.js';
 function buildCollectionContext(patterns, projectRoot, home, homeRecurseSkipDirs = [], absolutePathPrefixes = [], mcpToolGlobSpec = null, clientPathConstants = null, pathResolutionSpecs = null) {
     const seenPaths = new Set();
     const targets = [];
@@ -148,7 +149,7 @@ function collectConfigFilesFromPatterns(patterns, projectRoot, onProgress, optio
                 pushDerivedFilesFromRecipe(entry.raw_content, configFiles, recipe);
         }
     }
-    return configFiles;
+    return collapseMetadataByFileType(configFiles);
 }
 // ─── Re-exports (barrel for public API) ──────────────────────────────────────
 export { collectConfigFilesFromPatterns };

package/dist/log_config_files/collection/directory_collector.js

@@ -57,6 +57,8 @@ function matchesDirGlob(name, glob) {
     // **/*.jsonl → match any extension suffix after **/
     if (glob.startsWith('**/')) {
         const suffix = glob.slice(3);
+        if (suffix === '*' || suffix === '**')
+            return true;
         if (suffix.startsWith('*.'))
             return name.endsWith(suffix.slice(1));
         return name === suffix;

package/dist/log_config_files/collection/metadata_merge.js

@@ -0,0 +1,43 @@
+/** When several install/log paths exist for one agent, keep a single metadata row (newest mtime). */
+const METADATA_COLLAPSE_BY_FILE_TYPE = new Set(['opencode_presence', 'opencode_log']);
+function metadataLastModifiedMs(entry) {
+    const raw = entry.raw_content;
+    if (!raw || typeof raw !== 'object')
+        return 0;
+    const lm = raw.last_modified;
+    if (typeof lm !== 'string')
+        return 0;
+    const ms = Date.parse(lm);
+    return Number.isFinite(ms) ? ms : 0;
+}
+/**
+ * Collapse multiple metadata uploads of the same file_type to one row: highest last_modified wins.
+ */
+function collapseMetadataByFileType(files) {
+    const passthrough = [];
+    const groups = new Map();
+    for (const f of files) {
+        if (f.collect_style === 'metadata' && METADATA_COLLAPSE_BY_FILE_TYPE.has(f.file_type)) {
+            const list = groups.get(f.file_type) ?? [];
+            list.push(f);
+            groups.set(f.file_type, list);
+        }
+        else {
+            passthrough.push(f);
+        }
+    }
+    const merged = [...passthrough];
+    for (const [, list] of groups) {
+        if (list.length === 0)
+            continue;
+        let best = list[0];
+        for (let i = 1; i < list.length; i++) {
+            if (metadataLastModifiedMs(list[i]) > metadataLastModifiedMs(best)) {
+                best = list[i];
+            }
+        }
+        merged.push(best);
+    }
+    return merged;
+}
+export { collapseMetadataByFileType, METADATA_COLLAPSE_BY_FILE_TYPE };

package/dist/log_config_files/runtime/compliance_check.js

@@ -41,6 +41,8 @@ export function normalizeAgentToken(raw) {
         return 'cursor';
     if (s === 'copilot')
         return 'copilot';
+    if (s === 'opencode')
+        return 'opencode';
     return '';
 }
 function currentAgentFromEnv() {
@@ -48,12 +50,14 @@ function currentAgentFromEnv() {
     const override = normalizeAgentToken(process.env.OPTIMUS_AGENT);
     if (override)
         return override;
-    // Backwards-compatible: hook wrappers set OPTIMUS_HOOK_TYPE to cursor|claude|copilot.
+    // Backwards-compatible: hook wrappers set OPTIMUS_HOOK_TYPE to cursor|claude|copilot|opencode.
     const hookType = normalizeAgentToken(process.env.OPTIMUS_HOOK_TYPE);
     if (hookType === 'cursor')
         return 'cursor';
     if (hookType === 'copilot')
         return 'copilot';
+    if (hookType === 'opencode')
+        return 'opencode';
     return 'claude';
 }
 function targetsCurrentAgent(entry, agent) {

package/dist/log_config_files/runtime/hook_type_for_request.js

@@ -0,0 +1,28 @@
+function normalizeToken(raw) {
+    if (!raw?.trim())
+        return '';
+    const s = raw.trim().toLowerCase().replace(/-/g, '_');
+    if (s === 'claude_desktop')
+        return 'claude';
+    if (s === 'github_copilot')
+        return 'copilot';
+    if (s === 'cursor' || s === 'claude' || s === 'copilot' || s === 'opencode')
+        return s;
+    // Legacy hooks set OPTIMUS_AGENT=Cursor (display casing)
+    if (raw.trim() === 'Cursor')
+        return 'cursor';
+    return s;
+}
+/** Resolve hook_request.hook_type from hook wrapper env (OPTIMUS_HOOK_TYPE, then OPTIMUS_AGENT). */
+export function resolveHookTypeFromEnv(env = process.env) {
+    const fromHook = normalizeToken(env.OPTIMUS_HOOK_TYPE);
+    const fromAgent = normalizeToken(env.OPTIMUS_AGENT);
+    const token = fromHook || fromAgent || 'claude';
+    if (token === 'cursor')
+        return 'cursor';
+    if (token === 'copilot')
+        return 'copilot';
+    if (token === 'opencode')
+        return 'opencode';
+    return 'claude';
+}

package/dist/log_config_files/runtime/main_runner.js

@@ -7,6 +7,7 @@ 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 { resolveHookTypeFromEnv } from './hook_type_for_request.js';
 import { resolveHardwareUuid } from './hardware_uuid.js';
 import { ensureAuthentication } from '../auth/auth_flow.js';
 import { readJSONFile, readMarkdownFile } from '../readers/file_readers.js';
@@ -128,8 +129,7 @@ async function addSensitivePathsAudit(endpointBase, configFiles) {
     }
 }
 async function sendAllConfigFiles(configFiles, worktreeReport, hardwareUuid, authKey) {
-    const hookTypeRaw = (process.env.OPTIMUS_HOOK_TYPE || 'claude').toLowerCase();
-    const hookType = hookTypeRaw === 'cursor' ? 'cursor' : hookTypeRaw === 'copilot' ? 'copilot' : 'claude';
+    const hookType = resolveHookTypeFromEnv();
     const manifest = configFiles.map((c) => canonicalCursorUserStateVscdbPath(c.file_path));
     const workspaceRepo = ensureWorkspaceRepoEnv(manifest);
     const hookRequestId = await sendHookRequestCreate(hardwareUuid, authKey, hookType, workspaceRepo);

package/dist/log_config_files/runtime/trusted_restarts.js

@@ -34,6 +34,8 @@ function currentAgentFromEnv() {
         return 'cursor';
     if (override === 'copilot')
         return 'copilot';
+    if (override === 'opencode')
+        return 'opencode';
     if (override === 'claude' || override === 'claude_desktop')
         return 'claude';
     const hookType = normalizeAgentToken(process.env.OPTIMUS_HOOK_TYPE);
@@ -41,6 +43,8 @@ function currentAgentFromEnv() {
         return 'cursor';
     if (hookType === 'copilot')
         return 'copilot';
+    if (hookType === 'opencode')
+        return 'opencode';
     return 'claude';
 }
 /** Spawn each trusted command detached (same pattern as former compliance_prompt_gate fireRestartCommands). */

package/package.json

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