log-llm-config 1.3.21 → 1.3.22

package/dist/log_config_files/runtime/remediation_sync.js

@@ -476,25 +476,49 @@ function mergeSqliteOpIntoJson(currentJson, sqliteOp) {
         const parentParts = parts.slice(0, -1);
         let node = currentJson;
         for (const p of parentParts) {
-            if (node == null || typeof node !== 'object')
+            if (node == null || typeof node !== 'object' || Array.isArray(node))
                 return;
-            node = node[p];
+            const rec = node;
+            const child = rec[p];
+            if (child == null) {
+                rec[p] = {};
+                node = rec[p];
+            }
+            else if (typeof child === 'object' && !Array.isArray(child)) {
+                node = child;
+            }
+            else {
+                return;
+            }
         }
         if (node == null || typeof node !== 'object' || Array.isArray(node))
             return;
         const container = node;
-        const arr = container[arrayKey];
-        if (!Array.isArray(arr))
+        const existing = container[arrayKey];
+        let arr;
+        if (Array.isArray(existing)) {
+            arr = existing;
+        }
+        else if (existing == null) {
+            arr = [];
+            container[arrayKey] = arr;
+        }
+        else {
             return;
+        }
         const idx = arr.findIndex((item) => {
             if (item === null || typeof item !== 'object')
                 return false;
             const o = item;
             return Object.entries(where).every(([k, v]) => o[k] === v);
         });
-        if (idx < 0)
+        if (idx >= 0) {
+            Object.assign(arr[idx], sqliteOp.updates);
             return;
-        Object.assign(arr[idx], sqliteOp.updates);
+        }
+        const newItem = { ...where };
+        Object.assign(newItem, sqliteOp.updates);
+        arr.push(newItem);
         return;
     }
     mergeJsonAtSqlitePath(currentJson, sqliteOp.json_path, sqliteOp.updates);
@@ -750,10 +774,17 @@ function queueDeferredSqliteOpsMerged(configPath, sqliteOps, postApplyUpload) {
         const line = `sqlite_update: database not found at ${dbPath}`;
         hookRunLog(line);
         complianceRunnerDiag(line);
-        return false;
+        return {
+            ok: false,
+            reason: `state.vscdb not on disk at ${dbPath} (Cursor may not have created globalStorage yet — open Cursor once).`,
+        };
+    }
+    if (!assertSqlite3Available()) {
+        return {
+            ok: false,
+            reason: 'sqlite3 CLI not found in PATH (IDE hooks often inherit a minimal PATH; install Xcode CLT / sqlite3 or fix PATH).',
+        };
     }
-    if (!assertSqlite3Available())
-        return false;
     const resolvedOps = sqliteOps.map((op) => resolveCursorComposerSqliteOp(dbPath, op));
     const groups = new Map();
     for (const op of resolvedOps) {
@@ -771,7 +802,7 @@ function queueDeferredSqliteOpsMerged(configPath, sqliteOps, postApplyUpload) {
                 const line = `sqlite_update: rejected unsafe or empty target_key for deferred queue (refusing to write state.vscdb)`;
                 hookRunLog(line);
                 complianceRunnerDiag(`${line} target_key_preview=${first.target_key.slice(0, 80)}`);
-                return false;
+                return { ok: false, reason: 'unsafe or empty ItemTable target_key (see hook_log).' };
             }
             complianceRunnerDiag(`sqlite_update: deferred merge db=${dbPath} target_key=${first.target_key} operations=${ops.length}`);
             let currentJson = {};
@@ -786,7 +817,10 @@ function queueDeferredSqliteOpsMerged(configPath, sqliteOps, postApplyUpload) {
                 const line = `sqlite_update: error querying database: ${e instanceof Error ? e.message : String(e)}`;
                 hookRunLog(line);
                 complianceRunnerDiag(line);
-                return false;
+                return {
+                    ok: false,
+                    reason: `sqlite read/parse failed: ${e instanceof Error ? e.message : String(e)}`,
+                };
             }
             for (const op of ops) {
                 mergeSqliteOpIntoJson(currentJson, op);
@@ -797,7 +831,10 @@ function queueDeferredSqliteOpsMerged(configPath, sqliteOps, postApplyUpload) {
                 const line = `sqlite_update: deferred merge produced empty JSON — refusing to queue (would wipe ItemTable row)`;
                 hookRunLog(line);
                 complianceRunnerDiag(line);
-                return false;
+                return {
+                    ok: false,
+                    reason: 'merge produced empty JSON (no-op merge — often missing modes4/agent structure or outdated log-llm-config; publish latest package and retry).',
+                };
             }
             queueDeferredVscdbItem({
                 dbPath,
@@ -811,13 +848,16 @@ function queueDeferredSqliteOpsMerged(configPath, sqliteOps, postApplyUpload) {
             hookRunLog(okLine);
             complianceRunnerDiag(okLine);
         }
-        return true;
+        return { ok: true };
     }
     catch (err) {
         const line = `sqlite_update: unexpected error: ${err instanceof Error ? err.message : String(err)}`;
         hookRunLog(line);
         complianceRunnerDiag(line);
-        return false;
+        return {
+            ok: false,
+            reason: `unexpected: ${err instanceof Error ? err.message : String(err)}`,
+        };
     }
 }
 /**
@@ -932,11 +972,11 @@ export function enforceRemediation(instruction) {
                 const postApplyUpload = ft && inst.config_file_path.includes('#')
                     ? { file_path: inst.config_file_path, file_type: ft }
                     : undefined;
-                const ok = queueDeferredSqliteOpsMerged(inst.config_file_path, ops, postApplyUpload);
-                if (!ok) {
-                    return fail('deferred state.vscdb queue failed (database missing, sqlite3 unavailable, or read/merge error — see sqlite_update lines above in hook_log)', { config_file_path: inst.config_file_path });
+                const q = queueDeferredSqliteOpsMerged(inst.config_file_path, ops, postApplyUpload);
+                if (!q.ok) {
+                    return fail(`deferred state.vscdb queue failed — ${q.reason} (see sqlite_update lines in ~/opt-ai-sec/management/hook_log.txt)`, { config_file_path: inst.config_file_path });
                 }
-                return { ok, deferredSqlite: ok };
+                return { ok: true, deferredSqlite: true };
             }
             let allSuccess = true;
             for (const check of sqliteOps) {

package/package.json

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