dsh-engram 0.8.7 → 0.9.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-engram",
   "description": "Minimalist long-term memory for DeepSeek Harness, distilling symbolic-index + pi-esr ideas: zero-LLM auto-capture, a symbolic [ENGRAM] index with progressive disclosure, and an ESR-lite evidence-closure protocol (esr_task / esr_node / esr_close / esr_link). Real agent-behaviour telemetry (usage rollup + /stats) and a deterministic offline recall benchmark (npm run eval). Hot path is model-free; storage on ctx.storageDomain; web memory viewer, observability panel and config card through DSH's native settings slots.",
-  "version": "0.8.7",
+  "version": "0.9.0",
   "packageManager": "pnpm@11.22.0",
   "license": "MIT",
   "repository": {

package/scripts/dsh-engram.mjs

@@ -118,39 +118,50 @@ async function discoverPresets(status, presetsDirFlag) {
     push(id, entry.path);
   }
 
-  // 2. Legacy roots.
-  for (const root of legacyPresetRoots()) {
+  // 2. An explicit --presets-dir wins over everything: the operator named it.
+  //    Without this, a stale legacy composed-preset root (this machine has an
+  //    older checkout beside the repo) claims the ids first, the declarative
+  //    patch files are deduped away by id, and `status` reports the legacy
+  //    layout while showing the declarative ones as "custom" (three CLI tests
+  //    caught exactly this on Linux).
+  const scanDeclarative = async (dir) => {
     let entries = [];
     try {
-      entries = await readdir(root, { withFileTypes: true });
+      entries = await readdir(dir, { withFileTypes: true });
     } catch {
-      continue;
+      return;
     }
     for (const entry of entries) {
-      if (!entry.isDirectory()) continue;
-      const file = await compositionIn(join(root, entry.name));
-      if (file === undefined) continue;
-      push(entry.name, file);
+      if (!entry.isFile() || !entry.name.endsWith(".patch.yml")) continue;
+      push(entry.name.slice(0, -".patch.yml".length), join(dir, entry.name));
     }
-  }
-
-  // 3. Declarative shipped presets.
+  };
+  //
+  // Resolved once, up front: an explicit --presets-dir or DSH_WEB_PRESETS_DIR is
+  // the operator naming a directory, and the dsh-anchored default is the layout
+  // this DSH ships. Either beats a stale legacy root that only happens to exist.
   const presetsDir = discoverPresetsDir({
     presetsDir: presetsDirFlag,
     anchors: [dshBinAnchor()].filter((anchor) => typeof anchor === "string"),
   });
-  if (presetsDir !== undefined) {
+  if (presetsDir !== undefined) await scanDeclarative(presetsDir);
+
+  // 3. Legacy roots.
+  for (const root of legacyPresetRoots()) {
     let entries = [];
     try {
-      entries = await readdir(presetsDir, { withFileTypes: true });
+      entries = await readdir(root, { withFileTypes: true });
     } catch {
-      entries = [];
+      continue;
     }
     for (const entry of entries) {
-      if (!entry.isFile() || !entry.name.endsWith(".patch.yml")) continue;
-      push(entry.name.slice(0, -".patch.yml".length), join(presetsDir, entry.name));
+      if (!entry.isDirectory()) continue;
+      const file = await compositionIn(join(root, entry.name));
+      if (file === undefined) continue;
+      push(entry.name, file);
     }
   }
+
   return presets;
 }
 
@@ -241,8 +252,9 @@ async function printStatus(presetsDirFlag) {
   // Printed from data, not from startup logs — a dormant leg must be visible
   // without the terminal that printed the warning.
   try {
-    const home = process.env.DSH_HOME ?? join(homedir(), ".dsh");
-    log(`  ${describePushLegs(readPushLegsHealth(home))}`);
+    // `readLedger` above already resolves the same way: `<dsh home>/engram`.
+    const engramDir = join(process.env.DSH_HOME ?? join(homedir(), ".dsh"), "engram");
+    log(`  ${describePushLegs(readPushLegsHealth(engramDir))}`);
     log("");
   } catch {}