@wrongstack/core 0.148.0 → 0.155.0

package/dist/storage/index.js

@@ -1315,7 +1315,7 @@ var FileMemoryBackend = class {
     const line = `
 - [${entry.ts}] ${id}${meta} ${entry.text.replace(/\n/g, " ")}
 `;
-    const next = existing.trim() ? existing.replace(/\n+$/, "") + line : `# WrongStack Memory
+    const next = existing.trim() ? existing.replace(/\n+$/, "") + line : `# Agent Memory
 ${line}`;
     await atomicWrite(file, next);
   }
@@ -2173,6 +2173,67 @@ function deepFreeze(obj) {
   }
   return Object.freeze(obj);
 }
+
+// src/utils/deep-merge.ts
+var FORBIDDEN_PROTO_KEYS = /* @__PURE__ */ new Set([
+  "__proto__",
+  "constructor",
+  "prototype",
+  "__defineGetter__",
+  "__defineSetter__",
+  "__lookupGetter__",
+  "__lookupSetter__"
+]);
+function isPrimitiveArray(a) {
+  return a.every((v) => v === null || typeof v !== "object" && typeof v !== "function");
+}
+function deepMerge(base, patch, options = {}) {
+  const {
+    conflictResolution = "prefer-patch",
+    arrayMode = "replace",
+    protectProto = true,
+    onNonPrimitiveArrayReplace
+  } = options;
+  if (typeof base !== "object" || base === null) {
+    return conflictResolution === "prefer-patch" ? patch : base;
+  }
+  if (typeof patch !== "object" || patch === null) {
+    return conflictResolution === "prefer-patch" ? patch : base;
+  }
+  if (Array.isArray(base) && Array.isArray(patch)) {
+    if (arrayMode === "concat-primitives" && isPrimitiveArray(base) && isPrimitiveArray(patch)) {
+      return [.../* @__PURE__ */ new Set([...base, ...patch])];
+    }
+    return conflictResolution === "prefer-patch" ? patch : base;
+  }
+  if (Array.isArray(base) || Array.isArray(patch)) {
+    return conflictResolution === "prefer-patch" ? patch : base;
+  }
+  const baseObj = base;
+  const patchObj = patch;
+  const out = { ...baseObj };
+  for (const [k, v] of Object.entries(patchObj)) {
+    if (protectProto && FORBIDDEN_PROTO_KEYS.has(k)) continue;
+    const existing = out[k];
+    if (v !== null && typeof v === "object" && !Array.isArray(v) && existing !== null && typeof existing === "object" && !Array.isArray(existing)) {
+      out[k] = deepMerge(existing, v, options);
+    } else if (Array.isArray(v) && Array.isArray(existing)) {
+      if (onNonPrimitiveArrayReplace && !isPrimitiveArray(v)) {
+        onNonPrimitiveArrayReplace(k, existing.length, v.length);
+      }
+      out[k] = deepMerge(existing, v, options);
+    } else if (v !== void 0) {
+      if (onNonPrimitiveArrayReplace && Array.isArray(v) && !isPrimitiveArray(v)) {
+        const existingLen = Array.isArray(existing) ? existing.length : 0;
+        onNonPrimitiveArrayReplace(k, existingLen, v.length);
+      }
+      out[k] = v;
+    }
+  }
+  return out;
+}
+
+// src/security/secret-vault.ts
 function decryptConfigSecrets(cfg, vault, opts) {
   const warn = ((msg) => console.warn(msg));
   return walk(cfg, vault, (v, key) => {
@@ -2387,43 +2448,16 @@ var defaultIndexing = {
   watchExternal: true,
   debounceMs: 400
 };
-function isPrimitiveArray(a) {
-  return a.every((v) => v === null || typeof v !== "object");
-}
-var FORBIDDEN_PROTO_KEYS = /* @__PURE__ */ new Set([
-  "__proto__",
-  "constructor",
-  "prototype",
-  "__defineGetter__",
-  "__defineSetter__",
-  "__lookupGetter__",
-  "__lookupSetter__"
-]);
-function deepMerge(base, patch) {
-  if (typeof base !== "object" || base === null) return patch ?? base;
-  if (typeof patch !== "object" || patch === null) return base;
-  const out = { ...base };
-  for (const [k, v] of Object.entries(patch)) {
-    if (FORBIDDEN_PROTO_KEYS.has(k)) continue;
-    const existing = out[k];
-    if (Array.isArray(v)) {
-      if (Array.isArray(existing) && isPrimitiveArray(v) && isPrimitiveArray(existing)) {
-        out[k] = [.../* @__PURE__ */ new Set([...existing, ...v])];
-      } else {
-        out[k] = v;
-        if (envBoolOptional(process.env.WRONGSTACK_DEBUG_CONFIG)) {
-          console.warn(
-            `[config] Non-primitive array for "${k}" replaced (global + local config merge). Global entries: ${existing?.length ?? 0}, local entries: ${v.length}.`
-          );
-        }
-      }
-    } else if (typeof v === "object" && v !== null && typeof existing === "object" && existing !== null) {
-      out[k] = deepMerge(existing, v);
-    } else if (v !== void 0) {
-      out[k] = v;
-    }
+function deepMerge2(base, patch) {
+  const opts = { arrayMode: "concat-primitives" };
+  if (envBoolOptional(process.env.WRONGSTACK_DEBUG_CONFIG)) {
+    opts.onNonPrimitiveArrayReplace = (key, existingLen, patchLen) => {
+      console.warn(
+        `[config] Non-primitive array for "${key}" replaced (global + local config merge). Global entries: ${existingLen}, local entries: ${patchLen}.`
+      );
+    };
   }
-  return out;
+  return deepMerge(base, patch, opts);
 }
 var DefaultConfigLoader = class {
   paths;
@@ -2443,9 +2477,9 @@ var DefaultConfigLoader = class {
       this.readJson(this.paths.projectLocalConfig),
       this.readJson(this.paths.inProjectConfig)
     ]);
-    cfg = deepMerge(cfg, global);
-    cfg = deepMerge(cfg, local);
-    cfg = deepMerge(cfg, inProject);
+    cfg = deepMerge2(cfg, global);
+    cfg = deepMerge2(cfg, local);
+    cfg = deepMerge2(cfg, inProject);
     for (const [key, fn] of Object.entries(ENV_MAP)) {
       const v = process.env[key];
       if (v) fn(cfg, v);
@@ -2459,14 +2493,14 @@ var DefaultConfigLoader = class {
       try {
         const patch = await src.read();
         if (patch && Object.keys(patch).length > 0) {
-          cfg = deepMerge(cfg, patch);
+          cfg = deepMerge2(cfg, patch);
         }
       } catch (err) {
         console.warn(`Config source "${src.name}" failed`, err);
       }
     }
     if (opts.cliFlags) {
-      cfg = deepMerge(cfg, opts.cliFlags);
+      cfg = deepMerge2(cfg, opts.cliFlags);
     }
     if (this.vault) {
       cfg = decryptConfigSecrets(cfg, this.vault);