nexrall-code 0.5.93 → 0.5.94

package/dist/index.js

@@ -11149,19 +11149,19 @@ var require_memory = __commonJS({
       };
     }();
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.AGENT_MEMORY_MAX_BYTES = exports2.AGENT_MEMORY_INJECT_MAX = exports2.MEMORY_HARD_CAP_BYTES = exports2.MEMORY_COMPACT_TRIGGER_BYTES = exports2.MEMORY_MAX_BYTES = exports2.MEMORY_ENTRY_MAX_CHARS = void 0;
+    exports2.AGENT_MEMORY_MAX_BYTES = exports2.AGENT_MEMORY_INJECT_MAX = exports2.MEMORY_ARCHIVE_MAX_BYTES = exports2.MEMORY_HARD_CAP_BYTES = exports2.MEMORY_COMPACT_TRIGGER_BYTES = exports2.MEMORY_MAX_BYTES = exports2.MEMORY_ENTRY_MAX_CHARS = void 0;
     exports2.memoryFilePath = memoryFilePath;
     exports2.writeMemory = writeMemory;
     exports2.readMemory = readMemory2;
     exports2.readAllMemory = readAllMemory2;
     exports2.clearMemory = clearMemory2;
     exports2.memoryStats = memoryStats2;
+    exports2.compactMemoryIfNeeded = compactMemoryIfNeeded2;
     exports2.isSafeAgentName = isSafeAgentName;
     exports2.agentMemoryPath = agentMemoryPath;
     exports2.readAgentMemory = readAgentMemory;
     exports2.writeAgentMemory = writeAgentMemory;
     exports2.agentMemoryPreamble = agentMemoryPreamble;
-    exports2.compactMemoryIfNeeded = compactMemoryIfNeeded2;
     var fs9 = __importStar(__require("fs"));
     var os6 = __importStar(__require("os"));
     var path7 = __importStar(__require("path"));
@@ -11178,7 +11178,10 @@ var require_memory = __commonJS({
     exports2.MEMORY_MAX_BYTES = 12e3;
     exports2.MEMORY_COMPACT_TRIGGER_BYTES = 16e3;
     exports2.MEMORY_HARD_CAP_BYTES = 4 * exports2.MEMORY_COMPACT_TRIGGER_BYTES;
+    exports2.MEMORY_ARCHIVE_MAX_BYTES = Math.floor(exports2.MEMORY_MAX_BYTES / 2);
     var FINGERPRINT_LEN = 60;
+    var SOURCE_TAG_MAX_CHARS = 60;
+    var SUPERSEDED_HEADER = "## Superseded";
     var _locks = /* @__PURE__ */ new Map();
     async function withLock(key, fn) {
       const prev = _locks.get(key) ?? Promise.resolve();
@@ -11207,49 +11210,107 @@ var require_memory = __commonJS({
       fs9.mkdirSync(path7.dirname(file), { recursive: true });
       fs9.writeFileSync(file, content, "utf-8");
     }
-    function evictOldest(content, maxBytes) {
-      if (Buffer.byteLength(content, "utf-8") <= maxBytes)
-        return content;
-      const lines = content.split("\n").filter((l2) => l2.trim().length > 0);
-      while (lines.length > 1 && Buffer.byteLength(lines.join("\n"), "utf-8") > maxBytes)
-        lines.shift();
-      return "\n" + lines.join("\n");
+    function parseSections(content) {
+      const lines = content.split("\n");
+      const headerIdx = lines.findIndex((l2) => l2.trim() === SUPERSEDED_HEADER);
+      if (headerIdx === -1) {
+        return { active: lines.filter((l2) => l2.trim().length > 0), archived: [] };
+      }
+      return {
+        active: lines.slice(0, headerIdx).filter((l2) => l2.trim().length > 0),
+        archived: lines.slice(headerIdx + 1).filter((l2) => l2.trim().length > 0)
+      };
+    }
+    function serializeSections(active, archived) {
+      let out = "\n" + active.join("\n");
+      if (archived.length > 0)
+        out += `
+
+${SUPERSEDED_HEADER}
+` + archived.join("\n");
+      return out;
     }
-    async function writeMemory(content, scope, workDir) {
+    function evictToFit(active, archived, maxBytes) {
+      const a = [...active];
+      const arch = [...archived];
+      let content = serializeSections(a, arch);
+      while (Buffer.byteLength(content, "utf-8") > maxBytes && (arch.length > 0 || a.length > 1)) {
+        if (arch.length > 0)
+          arch.shift();
+        else
+          a.shift();
+        content = serializeSections(a, arch);
+      }
+      return content;
+    }
+    function sanitizeSourceTag(source2) {
+      if (!source2)
+        return "";
+      return source2.trim().replace(/[[\]\n\r]/g, "").slice(0, SOURCE_TAG_MAX_CHARS);
+    }
+    async function writeMemory(content, scope, workDir, opts = {}) {
       let trimmed = content.trim();
       if (!trimmed)
         return { ok: false, already: false, scope, file: "" };
-      if (trimmed.length > exports2.MEMORY_ENTRY_MAX_CHARS)
-        trimmed = trimmed.slice(0, exports2.MEMORY_ENTRY_MAX_CHARS - 1).trimEnd() + "\u2026";
+      const sourceTag = sanitizeSourceTag(opts.source);
+      const prefix = sourceTag ? `[src: ${sourceTag}] ` : "";
+      const budget = exports2.MEMORY_ENTRY_MAX_CHARS - prefix.length;
+      if (budget <= 0) {
+        if (trimmed.length > exports2.MEMORY_ENTRY_MAX_CHARS)
+          trimmed = trimmed.slice(0, exports2.MEMORY_ENTRY_MAX_CHARS - 1).trimEnd() + "\u2026";
+      } else if (trimmed.length > budget) {
+        trimmed = trimmed.slice(0, budget - 1).trimEnd() + "\u2026";
+      }
+      const body = prefix && budget > 0 ? prefix + trimmed : trimmed;
       const file = memoryFilePath(scope, workDir);
       return withLock(file, async () => {
         const existing = readMemoryFile(file);
-        const fingerprint = trimmed.toLowerCase().slice(0, FINGERPRINT_LEN);
-        if (existing.toLowerCase().includes(fingerprint)) {
-          return { ok: true, already: true, scope, file };
-        }
+        let { active, archived } = parseSections(existing);
         const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-        let next = existing + `
-- [${today}] ${trimmed}`;
+        let superseded = false;
+        if (opts.supersedes && opts.supersedes.trim()) {
+          const supFingerprint = opts.supersedes.trim().toLowerCase().slice(0, FINGERPRINT_LEN);
+          const stillActive = [];
+          for (const line of active) {
+            if (!superseded && line.toLowerCase().includes(supFingerprint)) {
+              archived = [...archived, `${line} \u2014 superseded ${today}`];
+              superseded = true;
+            } else {
+              stillActive.push(line);
+            }
+          }
+          active = stillActive;
+        }
+        const fingerprint = body.toLowerCase().slice(0, FINGERPRINT_LEN);
+        if (active.some((l2) => l2.toLowerCase().includes(fingerprint))) {
+          if (superseded)
+            writeMemoryFile(file, serializeSections(active, archived));
+          return { ok: true, already: true, scope, file, superseded };
+        }
+        active = [...active, `- [${today}] ${body}`];
+        let next = serializeSections(active, archived);
         if (Buffer.byteLength(next, "utf-8") > exports2.MEMORY_HARD_CAP_BYTES) {
-          next = evictOldest(next, exports2.MEMORY_MAX_BYTES);
+          next = evictToFit(active, archived, exports2.MEMORY_MAX_BYTES);
         }
         writeMemoryFile(file, next);
-        return { ok: true, already: false, scope, file };
+        return { ok: true, already: false, scope, file, superseded };
       });
     }
-    function readMemory2(scope, workDir) {
+    function readMemory2(scope, workDir, opts = {}) {
       const file = memoryFilePath(scope, workDir);
-      return readMemoryFile(file).trim();
+      const { active, archived } = parseSections(readMemoryFile(file));
+      if (!opts.includeArchived)
+        return active.length ? serializeSections(active, []).trim() : "";
+      return serializeSections(active, archived).trim();
     }
-    function readAllMemory2(workDir) {
+    function readAllMemory2(workDir, opts = {}) {
       const parts = [];
-      const globalMem = readMemory2("global");
+      const globalMem = readMemory2("global", void 0, opts);
       if (globalMem)
         parts.push(`[Global memories \u2014 apply to every project]
 ${globalMem}`);
       if (workDir) {
-        const projMem = readMemory2("project", workDir);
+        const projMem = readMemory2("project", workDir, opts);
         if (projMem)
           parts.push(`[Project memories \u2014 ${path7.basename(path7.resolve(workDir))}]
 ${projMem}`);
@@ -11266,8 +11327,52 @@ ${projMem}`);
     function memoryStats2(scope, workDir) {
       const file = memoryFilePath(scope, workDir);
       const content = readMemoryFile(file);
-      const entries = content.split("\n").filter((l2) => /^-\s\[\d{4}-\d{2}-\d{2}\]/.test(l2)).length;
-      return { file, bytes: Buffer.byteLength(content, "utf-8"), entries };
+      const { active, archived } = parseSections(content);
+      return {
+        file,
+        bytes: Buffer.byteLength(content, "utf-8"),
+        entries: active.filter((l2) => /^-\s\[\d{4}-\d{2}-\d{2}\]/.test(l2)).length,
+        archived: archived.filter((l2) => /^-\s\[\d{4}-\d{2}-\d{2}\]/.test(l2)).length
+      };
+    }
+    async function compactMemoryIfNeeded2(scope, workDir, summarize) {
+      const file = memoryFilePath(scope, workDir);
+      return withLock(file, async () => {
+        const content = readMemoryFile(file);
+        if (Buffer.byteLength(content, "utf-8") <= exports2.MEMORY_COMPACT_TRIGGER_BYTES)
+          return false;
+        let { active, archived } = parseSections(content);
+        let changed = false;
+        if (Buffer.byteLength(archived.join("\n"), "utf-8") > exports2.MEMORY_ARCHIVE_MAX_BYTES) {
+          while (archived.length > 1 && Buffer.byteLength(archived.join("\n"), "utf-8") > exports2.MEMORY_ARCHIVE_MAX_BYTES) {
+            archived = archived.slice(1);
+          }
+          changed = true;
+        }
+        if (Buffer.byteLength(serializeSections(active, archived), "utf-8") > exports2.MEMORY_COMPACT_TRIGGER_BYTES && active.length >= 8) {
+          const cut = Math.floor(active.length / 2);
+          const older = active.slice(0, cut);
+          const recent = active.slice(cut);
+          const prompt2 = `Consolidate these persistent-memory bullet entries into a shorter set of bullets, merging duplicates/near-duplicates that describe the same fact in different words. Do NOT invent a resolution for facts that seem to conflict \u2014 contradictions are handled structurally elsewhere; if two entries genuinely disagree, keep both rather than guessing which is current. Keep each resulting bullet under ${exports2.MEMORY_ENTRY_MAX_CHARS} characters, one fact per line, prefixed "- [YYYY-MM-DD] " using the LATEST date among the entries it draws from, and preserve any leading "[src: ...]" provenance tag verbatim when present. Output ONLY the bullet lines, nothing else.
+
+${older.join("\n")}`;
+          try {
+            const summarized = (await summarize(prompt2)).trim();
+            if (summarized) {
+              active = [...summarized.split("\n").filter((l2) => l2.trim().length > 0), ...recent];
+              changed = true;
+            }
+          } catch {
+          }
+        }
+        if (!changed)
+          return false;
+        let next = serializeSections(active, archived);
+        if (Buffer.byteLength(next, "utf-8") > exports2.MEMORY_MAX_BYTES)
+          next = evictToFit(active, archived, exports2.MEMORY_MAX_BYTES);
+        writeMemoryFile(file, next);
+        return true;
+      });
     }
     exports2.AGENT_MEMORY_INJECT_MAX = 8e3;
     exports2.AGENT_MEMORY_MAX_BYTES = 24e3;
@@ -11318,7 +11423,10 @@ ${projMem}`);
         let next = existing + `
 - [${today}] ${trimmed}`;
         if (Buffer.byteLength(next, "utf-8") > exports2.AGENT_MEMORY_MAX_BYTES) {
-          next = evictOldest(next, exports2.AGENT_MEMORY_MAX_BYTES);
+          const lines = next.split("\n").filter((l2) => l2.trim().length > 0);
+          while (lines.length > 1 && Buffer.byteLength(lines.join("\n"), "utf-8") > exports2.AGENT_MEMORY_MAX_BYTES)
+            lines.shift();
+          next = "\n" + lines.join("\n");
         }
         writeMemoryFile(file, next);
         return { ok: true, already: false, file };
@@ -11334,34 +11442,6 @@ These are notes YOU saved on previous runs. Treat them as your accumulated exper
 
 ${kept}`;
     }
-    async function compactMemoryIfNeeded2(scope, workDir, summarize) {
-      const file = memoryFilePath(scope, workDir);
-      return withLock(file, async () => {
-        const content = readMemoryFile(file);
-        if (Buffer.byteLength(content, "utf-8") <= exports2.MEMORY_COMPACT_TRIGGER_BYTES)
-          return false;
-        const lines = content.split("\n").filter((l2) => l2.trim().length > 0);
-        if (lines.length < 8)
-          return false;
-        const cut = Math.floor(lines.length / 2);
-        const older = lines.slice(0, cut);
-        const recent = lines.slice(cut);
-        const prompt2 = `Consolidate these persistent-memory bullet entries into a shorter set of bullets, merging duplicates/near-duplicates and dropping anything clearly stale or superseded by a later entry. Keep each resulting bullet under ${exports2.MEMORY_ENTRY_MAX_CHARS} characters, one fact per line, prefixed "- [YYYY-MM-DD] " using the LATEST date among the entries it draws from. Output ONLY the bullet lines, nothing else.
-
-${older.join("\n")}`;
-        let summarized;
-        try {
-          summarized = (await summarize(prompt2)).trim();
-        } catch {
-          return false;
-        }
-        if (!summarized)
-          return false;
-        const next = summarized + "\n" + recent.join("\n");
-        writeMemoryFile(file, Buffer.byteLength(next, "utf-8") > exports2.MEMORY_MAX_BYTES ? evictOldest(next, exports2.MEMORY_MAX_BYTES) : next);
-        return true;
-      });
-    }
   }
 });
 
@@ -101327,18 +101407,24 @@ ${lines.join("\n")}` };
       if (!content)
         return { error: "content is required" };
       const scope = memoryScopeOf(input);
-      const r2 = await (0, memory_1.writeMemory)(content, scope, workDir);
+      const supersedes = typeof input.supersedes === "string" ? input.supersedes.trim() : void 0;
+      const source2 = typeof input.source === "string" ? input.source.trim() : void 0;
+      const r2 = await (0, memory_1.writeMemory)(content, scope, workDir, { supersedes, source: source2 });
       if (!r2.ok)
         return { error: "failed to save memory" };
-      return { output: r2.already ? `Memory already recorded (skipped duplicate): ${content}` : `Memory saved (${scope}): ${content}` };
+      if (r2.already)
+        return { output: `Memory already recorded (skipped duplicate): ${content}` };
+      const supersedeNote = r2.superseded ? " (older fact moved to Superseded)" : "";
+      return { output: `Memory saved (${scope}): ${content}${supersedeNote}` };
     }
     async function memoryRead(input, workDir) {
       try {
+        const includeArchived = input?.include_archived === true;
         if (input && (input.scope === "project" || input.scope === "global")) {
-          const mem2 = (0, memory_1.readMemory)(input.scope, workDir);
+          const mem2 = (0, memory_1.readMemory)(input.scope, workDir, { includeArchived });
           return { output: mem2 || "No memories saved yet." };
         }
-        const mem = (0, memory_1.readAllMemory)(workDir);
+        const mem = (0, memory_1.readAllMemory)(workDir, { includeArchived });
         return { output: mem || "No memories saved yet." };
       } catch (err) {
         return { error: err.message };
@@ -153271,7 +153357,7 @@ function printHelp() {
     ["/rewind [id]", "List file checkpoints, or roll back to one"],
     ["/compact", "Summarize conversation to save tokens"],
     ["/init", "Generate nexrall.md for this project"],
-    ["/memory [global] [clear]", "View persistent memory (project or global); /memory clear to wipe"],
+    ["/memory [global] [archived] [clear]", "View persistent memory (project or global); archived also shows superseded facts; clear wipes it"],
     ["/help", "Show this help"],
     ["/model [name]", "Switch model (e.g. claude-opus-5, gpt-5.4)"],
     ["/mode [ask|edit|plan|auto]", "Set agent mode"],
@@ -153818,6 +153904,7 @@ ${dirList}`;
           const memArgs = arg.toLowerCase().split(/\s+/).filter(Boolean);
           const wantsGlobalOnly = memArgs.includes("global");
           const wantsClear = memArgs.includes("clear");
+          const wantsArchived = memArgs.includes("archived");
           const memScope = wantsGlobalOnly ? "global" : "project";
           if (wantsClear) {
             const label = memScope === "global" ? "GLOBAL" : "this PROJECT's";
@@ -153835,20 +153922,23 @@ ${dirList}`;
           console.log();
           if (wantsGlobalOnly) {
             const stats = (0, import_code_core3.memoryStats)("global");
-            const content = (0, import_code_core3.readMemory)("global");
-            console.log(source_default.bold("  Global memory ") + source_default.dim(`(${stats.entries} entries, ${(stats.bytes / 1024).toFixed(1)}KB) \u2014 ${stats.file}`));
+            const content = (0, import_code_core3.readMemory)("global", void 0, { includeArchived: wantsArchived });
+            const archivedNote = stats.archived > 0 ? `, ${stats.archived} archived` : "";
+            console.log(source_default.bold("  Global memory ") + source_default.dim(`(${stats.entries} entries${archivedNote}, ${(stats.bytes / 1024).toFixed(1)}KB) \u2014 ${stats.file}`));
             console.log();
             console.log(content || source_default.dim("  No global memories saved yet."));
           } else {
             const projStats = (0, import_code_core3.memoryStats)("project", workDir);
             const globalStats = (0, import_code_core3.memoryStats)("global");
-            console.log(source_default.bold("  Memory") + source_default.dim(`  \u2014 project: ${projStats.entries} entries (${(projStats.bytes / 1024).toFixed(1)}KB)  \xB7  global: ${globalStats.entries} entries (${(globalStats.bytes / 1024).toFixed(1)}KB)`));
+            const projArchived = projStats.archived > 0 ? `+${projStats.archived} archived ` : "";
+            const globalArchived = globalStats.archived > 0 ? `+${globalStats.archived} archived ` : "";
+            console.log(source_default.bold("  Memory") + source_default.dim(`  \u2014 project: ${projStats.entries} ${projArchived}entries (${(projStats.bytes / 1024).toFixed(1)}KB)  \xB7  global: ${globalStats.entries} ${globalArchived}entries (${(globalStats.bytes / 1024).toFixed(1)}KB)`));
             console.log();
-            const merged = (0, import_code_core3.readAllMemory)(workDir);
+            const merged = (0, import_code_core3.readAllMemory)(workDir, { includeArchived: wantsArchived });
             console.log(merged || source_default.dim("  No memories saved yet."));
           }
           console.log();
-          console.log(source_default.dim("  Tip: /memory global  \xB7  /memory clear  \xB7  /memory global clear"));
+          console.log(source_default.dim("  Tip: /memory global  \xB7  /memory archived  \xB7  /memory clear  \xB7  /memory global clear"));
           rl.prompt();
           return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexrall-code",
-  "version": "0.5.93",
+  "version": "0.5.94",
   "description": "Nexrall Code — AI coding assistant for your terminal (headless agent for scripts, CI and automation)",
   "keywords": [
     "ai",
@@ -41,7 +41,7 @@
     "release": "node build.js && node scripts/upload-release.cjs"
   },
   "dependencies": {
-    "@nexrall/code-core": "^1.4.46",
+    "@nexrall/code-core": "^1.4.47",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "diff": "^5.2.0",