@adhdev/daemon-standalone 1.0.18-rc.7 → 1.0.18-rc.9

package/dist/index.js

@@ -30265,10 +30265,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "068ae7b54eceb85bb9843d2c7654c3d4687fce75" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "068ae7b5" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "1.0.18-rc.7" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-07-22T02:35:12.533Z" : void 0);
+      const commit = readInjected(true ? "3a1a0d16c0dd7ce3df15591fbe30b7e8638ab876" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "3a1a0d16" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "1.0.18-rc.9" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-07-22T05:27:46.385Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -39779,40 +39779,113 @@ Default branch: \`${mesh.defaultBranch}\`` : ""}`);
       if (!category) return true;
       return !(category in OPERATING_NOTE_CATEGORY_TTL_DAYS);
     }
-    function selectOperatingNotesForPrompt(notes, now, cap = OPERATING_NOTES_PROMPT_CAP) {
+    function deriveSubjectKey(note) {
+      const explicit = typeof note.subjectKey === "string" ? note.subjectKey.trim().toLowerCase() : "";
+      if (explicit) return explicit;
+      const text = typeof note.text === "string" ? note.text.trimStart() : "";
+      const m = /^\[([^\]]{1,80})\]/.exec(text);
+      const tag = m ? m[1].trim().toLowerCase() : "";
+      return tag || void 0;
+    }
+    function foldSameClassNotes(ranked) {
+      const out = [];
+      const survivorByKey = /* @__PURE__ */ new Map();
+      for (const note of ranked) {
+        const subject = deriveSubjectKey(note);
+        const foldable = !note.pinned && !!note.category && !!subject;
+        if (foldable) {
+          const key2 = `${note.category}\0${subject}`;
+          const existing = survivorByKey.get(key2);
+          if (existing !== void 0) {
+            const survivor = out[existing];
+            survivor.subsumedCount += 1;
+            if (typeof note.noteId === "string" && note.noteId) survivor.subsumedIds.push(note.noteId);
+            continue;
+          }
+          survivorByKey.set(key2, out.length);
+        }
+        out.push({ note, subsumedIds: [], subsumedCount: 0 });
+      }
+      return out;
+    }
+    function renderedNoteBytes(folded) {
+      return byteLength2(renderOperatingNoteLine(folded));
+    }
+    function selectOperatingNotesForPrompt(notes, now, cap = OPERATING_NOTES_PROMPT_CAP, byteBudget = OPERATING_NOTE_INJECTION_BYTE_BUDGET) {
       const valid = Array.isArray(notes) ? notes.filter((n) => n && typeof n.text === "string" && n.text.trim()) : [];
-      const kept = valid.map((note, index) => ({ note, index })).filter(({ note }) => note.pinned || !isNoteExpired(note, now));
+      let kept = valid.map((note, index) => ({ note, index })).filter(({ note }) => note.pinned || !isNoteExpired(note, now));
+      const supersededAtIndex = /* @__PURE__ */ new Map();
+      for (const { note, index } of kept) {
+        const target = typeof note.supersedes === "string" ? note.supersedes.trim().toLowerCase() : "";
+        if (!target) continue;
+        const prev = supersededAtIndex.get(target);
+        if (prev === void 0 || index > prev) supersededAtIndex.set(target, index);
+      }
+      if (supersededAtIndex.size > 0) {
+        kept = kept.filter(({ note, index }) => {
+          if (note.pinned) return true;
+          const byId = typeof note.noteId === "string" ? note.noteId.trim().toLowerCase() : "";
+          const bySubject = deriveSubjectKey(note);
+          const supIdx = Math.max(
+            byId ? supersededAtIndex.get(byId) ?? -1 : -1,
+            bySubject ? supersededAtIndex.get(bySubject) ?? -1 : -1
+          );
+          return !(supIdx > index);
+        });
+      }
       const rank = (n) => n.pinned ? 0 : isDurableCategory(n.category) ? 1 : 2;
       kept.sort((a, b) => {
         const r = rank(a.note) - rank(b.note);
         if (r !== 0) return r;
         return b.index - a.index;
       });
-      const omittedCount = Math.max(0, kept.length - cap);
-      const shown = (omittedCount > 0 ? kept.slice(0, cap) : kept).map((k) => k.note);
+      const folded = foldSameClassNotes(kept.map((k) => k.note));
+      const shown = [];
+      let usedBytes = 0;
+      let usedCount = 0;
+      for (const entry of folded) {
+        if (entry.note.pinned) {
+          shown.push(entry);
+          usedBytes += renderedNoteBytes(entry);
+          usedCount += 1;
+          continue;
+        }
+        if (usedCount >= cap) break;
+        const bytes = renderedNoteBytes(entry);
+        if (usedCount > 0 && usedBytes + bytes > byteBudget) break;
+        shown.push(entry);
+        usedBytes += bytes;
+        usedCount += 1;
+      }
+      const omittedCount = Math.max(0, folded.length - shown.length);
       return { shown, omittedCount };
     }
-    function buildOperatingNotesSection(notes, now = Date.now()) {
-      const hasAny = Array.isArray(notes) ? notes.some((n) => n && typeof n.text === "string" && n.text.trim()) : false;
-      if (!hasAny) return "";
+    function renderOperatingNoteLine(folded) {
+      const n = folded.note;
       const categoryLabel = {
         provider_quirk: "provider quirk",
         pattern_to_avoid: "pattern to avoid",
         recovery_lesson: "recovery lesson"
       };
+      const pin = n.pinned ? "\u{1F4CC} " : "";
+      const cat = n.category && categoryLabel[n.category] ? `[${categoryLabel[n.category]}] ` : "";
+      const fold = folded.subsumedCount > 0 ? ` _(+${folded.subsumedCount} earlier same-subject note${folded.subsumedCount === 1 ? "" : "s"} folded${folded.subsumedIds.length ? `: ${folded.subsumedIds.join(", ")}` : ""})_` : "";
+      return `- ${pin}${cat}${truncateNote(n.text.trim())}${fold}`;
+    }
+    function buildOperatingNotesSection(notes, now = Date.now()) {
+      const hasAny = Array.isArray(notes) ? notes.some((n) => n && typeof n.text === "string" && n.text.trim()) : false;
+      if (!hasAny) return "";
       const { shown, omittedCount } = selectOperatingNotesForPrompt(notes ?? [], now);
       if (shown.length === 0) return "";
       const lines = ["## Operating Notes", ""];
       lines.push("Lessons earlier coordinators on this mesh recorded via `mesh_record_note`. Treat them as accumulated operating knowledge \u2014 apply them. When you learn a durable lesson (a provider quirk, a pattern to avoid, a recovery lesson), record it with `mesh_record_note` so future coordinators inherit it.");
       lines.push("");
-      for (const n of shown) {
-        const pin = n.pinned ? "\u{1F4CC} " : "";
-        const cat = n.category && categoryLabel[n.category] ? `[${categoryLabel[n.category]}] ` : "";
-        lines.push(`- ${pin}${cat}${truncateNote(n.text.trim())}`);
+      for (const entry of shown) {
+        lines.push(renderOperatingNoteLine(entry));
       }
       if (omittedCount > 0) {
         lines.push("");
-        lines.push(`_${omittedCount} lower-priority note${omittedCount === 1 ? "" : "s"} omitted (kept in ledger; expired-and-unpinned notes are also hidden from this list but retained for audit; prune with \`mesh_forget_note\`)._`);
+        lines.push(`_${omittedCount} lower-priority note${omittedCount === 1 ? "" : "s"} omitted to fit the injection cap/byte-budget (kept in ledger; expired, superseded, and same-subject-folded notes are also hidden from this list but retained for audit; prune with \`mesh_forget_note\`)._`);
       }
       return lines.join("\n");
     }
@@ -39942,6 +40015,7 @@ When you compose the task message you dispatch to a node, include these requirem
     var PROMPT_SOFT_CAP_BYTES;
     var OPERATING_NOTES_PROMPT_CAP;
     var OPERATING_NOTE_MAX_CHARS;
+    var OPERATING_NOTE_INJECTION_BYTE_BUDGET;
     var TOOLS_SECTION;
     var TOOL_EXPOSURE_PREFLIGHT_SECTION;
     var WORKFLOW_SECTION;
@@ -39960,6 +40034,7 @@ When you compose the task message you dispatch to a node, include these requirem
         PROMPT_SOFT_CAP_BYTES = 60 * 1024;
         OPERATING_NOTES_PROMPT_CAP = 20;
         OPERATING_NOTE_MAX_CHARS = 300;
+        OPERATING_NOTE_INJECTION_BYTE_BUDGET = 6 * 1024;
         TOOLS_SECTION = `## Available Tools
 
 | Tool | Purpose |
@@ -41751,9 +41826,13 @@ ${rendered}`, "utf-8");
         ...typeof value.createdAt === "string" ? { createdAt: value.createdAt } : {},
         ...typeof value.sourceCoordinator === "string" ? { sourceCoordinator: value.sourceCoordinator } : {},
         // Operating-notes lifecycle: a repo-declared note may pin itself or set an
-        // explicit expiry, same as a runtime-recorded one.
+        // explicit expiry, same as a runtime-recorded one. Phase 2 (b)/(c): it may
+        // also declare supersedes/subjectKey to retire an earlier note or group
+        // same-subject notes for folding.
         ...value.pinned === true ? { pinned: true } : {},
-        ...typeof value.expiresAt === "string" ? { expiresAt: value.expiresAt } : {}
+        ...typeof value.expiresAt === "string" ? { expiresAt: value.expiresAt } : {},
+        ...typeof value.supersedes === "string" ? { supersedes: value.supersedes } : {},
+        ...typeof value.subjectKey === "string" ? { subjectKey: value.subjectKey } : {}
       };
     }
     function normalizeRepoMeshDeclarativeConfig(parsed) {
@@ -46516,6 +46595,33 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
       }
       return isWithinCloneBootstrapGrace(targetNodeId);
     }
+    function resolveDeadTargetVerdict(components, meshId, mesh, task) {
+      const NOT_DEAD = { dead: false, nodeDead: false, reason: "" };
+      const targetSessionId = readNonEmptyString(task.targetSessionId);
+      const targetNodeId = readNonEmptyString(task.targetNodeId);
+      if (!targetSessionId && !targetNodeId) return NOT_DEAD;
+      const lastUpdateMs = Date.parse(task.updatedAt || task.createdAt || "");
+      if (Number.isFinite(lastUpdateMs) && Date.now() - lastUpdateMs < DEAD_TARGET_GRACE_MS) return NOT_DEAD;
+      const nodes = Array.isArray(mesh?.nodes) ? mesh.nodes : [];
+      if (targetNodeId) {
+        const nodePresent = nodes.some((n) => meshNodeIdMatches(n, targetNodeId));
+        if (!nodePresent) {
+          if (isTargetNodeTransientlyUnresolved(mesh, task)) return NOT_DEAD;
+          return { dead: true, nodeDead: true, reason: "dead_target_node_absent" };
+        }
+      }
+      if (targetSessionId) {
+        const node = targetNodeId ? nodes.find((n) => meshNodeIdMatches(n, targetNodeId)) : void 0;
+        const nodeIsLocal = node ? isLocalAutoLaunchNode(node) : true;
+        if (nodeIsLocal) {
+          const verdict = resolveSessionBusyVerdict(components, targetSessionId);
+          if (verdict === "UNKNOWN") {
+            return { dead: true, nodeDead: false, reason: "dead_target_session_absent" };
+          }
+        }
+      }
+      return NOT_DEAD;
+    }
     function retractActionableSkipIfPreviouslyNotified(meshId, taskId) {
       const dedupKey = `${meshId}:${taskId}`;
       if (!lastActionableSkipNotified.delete(dedupKey)) return;
@@ -47033,6 +47139,21 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
           continue;
         }
         if (task.targetSessionId) {
+          const deadTarget = resolveDeadTargetVerdict(components, meshId, mesh, task);
+          if (deadTarget.dead) {
+            const requeued = requeueTask(meshId, task.id, {
+              reason: deadTarget.reason,
+              clearTargetSession: true,
+              // Keep the node pin if only the SESSION died on a still-live node; clear it
+              // when the NODE itself is absent (nothing to pin to).
+              clearTargetNode: deadTarget.nodeDead
+            });
+            if (requeued) {
+              LOG2.warn("MeshQueue", `DEAD-TARGET-SELFHEAL: task ${task.id} (mesh ${meshId}) was pinned to a dead target (${deadTarget.reason}); requeued${deadTarget.nodeDead ? " and unpinned node" : ""} (requeueCount=${requeued.requeueCount ?? "?"}, status=${requeued.status}).`);
+            }
+            markAutoLaunch(meshId, task.id, { status: "skipped", reason: "target_session_dead_requeued" });
+            continue;
+          }
           markAutoLaunch(meshId, task.id, { status: "skipped", reason: "target_session_constraint" });
           continue;
         }
@@ -47628,6 +47749,7 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
     var ACTIONABLE_SKIP_REASON_PREFIXES;
     var TRANSIENT_TARGET_NODE_BOOTSTRAP_PENDING_REASON;
     var lastActionableSkipNotified;
+    var DEAD_TARGET_GRACE_MS;
     var init_mesh_queue_assignment = __esm2({
       "src/mesh/mesh-queue-assignment.ts"() {
         "use strict";
@@ -47689,6 +47811,7 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
         ];
         TRANSIENT_TARGET_NODE_BOOTSTRAP_PENDING_REASON = "target_node_bootstrap_pending";
         lastActionableSkipNotified = /* @__PURE__ */ new Map();
+        DEAD_TARGET_GRACE_MS = 6e4;
       }
     });
     function readSettings(state) {
@@ -73169,6 +73292,40 @@ ${formatManifestValidationIssues2(validation.issues)}`,
     var POINTER_NAME = ".adhdev-current";
     var STABLE_FILES = [POINTER_NAME, "adhdev.cmd", "adhdev.ps1", "adhdev"];
     var DEFAULT_HEALTH_PORT = 19222;
+    function fetchLocalJson(port, pathname) {
+      return new Promise((resolve27) => {
+        const req = http2.get(`http://127.0.0.1:${port}${pathname}`, { timeout: 1500 }, (res) => {
+          let body = "";
+          res.setEncoding("utf8");
+          res.on("data", (chunk) => {
+            body += chunk;
+          });
+          res.on("end", () => resolve27({ ok: res.statusCode === 200, body }));
+        });
+        req.on("timeout", () => req.destroy());
+        req.on("error", () => resolve27({ ok: false, body: "" }));
+      });
+    }
+    async function fetchLocalHealth(port) {
+      const { ok, body } = await fetchLocalJson(port, "/health");
+      if (!ok) return { ok: false };
+      try {
+        const pid = Number(JSON.parse(body)?.pid);
+        return { ok: true, pid: Number.isFinite(pid) ? pid : void 0 };
+      } catch {
+        return { ok: false };
+      }
+    }
+    async function fetchLocalStatusVersion(port) {
+      const { ok, body } = await fetchLocalJson(port, "/api/v1/status");
+      if (!ok) return void 0;
+      try {
+        const version2 = JSON.parse(body)?.status?.version;
+        return typeof version2 === "string" ? version2 : void 0;
+      } catch {
+        return void 0;
+      }
+    }
     var ADHDEV_OWNED_MARKERS = [
       "session-host-daemon",
       "node_modules/adhdev",
@@ -73446,6 +73603,8 @@ exec "${portableNode}" "${cliEntry}" "$@"
       }
     }
     function createDefaultWindowsAtomicHooks(options) {
+      const healthPort = options.healthPort ?? DEFAULT_HEALTH_PORT;
+      const healthTimeoutMs = options.healthTimeoutMs ?? 3e4;
       return {
         install: (stagedPrefix, portableNode) => {
           const env2 = {
@@ -73456,7 +73615,7 @@ exec "${portableNode}" "${cliEntry}" "$@"
           };
           const pathKey = Object.keys(env2).find((key2) => key2.toLowerCase() === "path") || "Path";
           env2[pathKey] = `${path20.dirname(portableNode)};${env2[pathKey] || ""}`;
-          (0, import_child_process6.execFileSync)(portableNode, [
+          const installOutput = String((0, import_child_process6.execFileSync)(portableNode, [
             options.npmCliPath,
             "install",
             "-g",
@@ -73471,7 +73630,8 @@ exec "${portableNode}" "${cliEntry}" "$@"
             maxBuffer: 20 * 1024 * 1024,
             windowsHide: true,
             env: env2
-          });
+          }));
+          if (installOutput.trim()) options.log(installOutput.trim());
         },
         restart: (portableNode, stagedCliEntry) => {
           const restartArgv = options.restartArgv.map((arg, index) => index === 0 ? stagedCliEntry : arg);
@@ -73498,28 +73658,12 @@ exec "${portableNode}" "${cliEntry}" "$@"
           child.unref();
         },
         waitForHealth: async (pid, targetVersion) => {
-          const deadline = Date.now() + 3e4;
+          const deadline = Date.now() + healthTimeoutMs;
           while (Date.now() < deadline) {
-            const result = await new Promise((resolve27) => {
-              const req = http2.get(`http://127.0.0.1:${DEFAULT_HEALTH_PORT}/health`, { timeout: 1500 }, (res) => {
-                let body = "";
-                res.setEncoding("utf8");
-                res.on("data", (chunk) => {
-                  body += chunk;
-                });
-                res.on("end", () => {
-                  let responsePid;
-                  try {
-                    responsePid = Number(JSON.parse(body)?.pid);
-                  } catch {
-                  }
-                  resolve27({ ok: res.statusCode === 200, pid: responsePid, body });
-                });
-              });
-              req.on("timeout", () => req.destroy());
-              req.on("error", () => resolve27({ ok: false }));
-            });
-            if (result.ok && result.pid === pid && result.body?.includes(targetVersion)) return true;
+            const liveness = await fetchLocalHealth(healthPort);
+            const alive = liveness.ok && liveness.pid === pid;
+            const version2 = alive ? await fetchLocalStatusVersion(healthPort) : void 0;
+            if (alive && version2 === targetVersion) return true;
             await new Promise((resolve27) => setTimeout(resolve27, 500));
           }
           return false;
@@ -73946,22 +74090,31 @@ ${body}
             `Cannot upgrade: owned processes still running under current prefix: ${preStop.survivors.map((s2) => s2.pid).join(", ")}`
           );
         }
-        await performWindowsAtomicUpgrade({
-          layout: windowsInstallerLayout,
-          packageName: payload.packageName,
-          targetVersion: payload.targetVersion,
-          portableNode,
-          excludePids: upgradePids,
-          hooks: createDefaultWindowsAtomicHooks({
+        try {
+          await performWindowsAtomicUpgrade({
+            layout: windowsInstallerLayout,
             packageName: payload.packageName,
             targetVersion: payload.targetVersion,
-            npmCliPath,
-            restartArgv,
-            cwd: payload.cwd || process.cwd(),
-            env: Object.fromEntries(Object.entries(process.env).filter(([key2]) => key2 !== UPGRADE_HELPER_ENV)),
-            log: appendUpgradeLog
-          })
-        });
+            portableNode,
+            excludePids: upgradePids,
+            hooks: createDefaultWindowsAtomicHooks({
+              packageName: payload.packageName,
+              targetVersion: payload.targetVersion,
+              npmCliPath,
+              restartArgv,
+              cwd: payload.cwd || process.cwd(),
+              env: Object.fromEntries(Object.entries(process.env).filter(([key2]) => key2 !== UPGRADE_HELPER_ENV)),
+              log: appendUpgradeLog
+            })
+          });
+        } catch (error48) {
+          emitUpgradeFailureNotice([
+            `adhdev ${payload.packageName}@${payload.targetVersion} upgrade failed and was rolled back: ${error48?.message || String(error48)}`,
+            `Previous version preserved (active prefix: ${windowsInstallerLayout.activePrefix}).`,
+            "See daemon-upgrade.log for the full install/health trace. The next daemon start will retry."
+          ]);
+          throw error48;
+        }
         try {
           fs15.unlinkSync(getUpgradeFailureNoticePath());
         } catch {
@@ -78806,6 +78959,16 @@ ${body}
       generatingDebounceTimer = null;
       generatingDebouncePending = null;
       lastApprovalEventFingerprint = "";
+      // INTERACTIVE-PROMPT-PUSH: edge-trigger key for the AskUserQuestion / waiting_choice
+      // notification. An AskUserQuestion prompt is surfaced only as a display-only
+      // `waiting_choice` overlay in getState(); the raw adapter status stays idle/generating,
+      // so detectStatusTransition()'s status-keyed arms never fire and no push-worthy
+      // agent:* event is emitted — the owner misses the "ACTION REQUIRED" prompt when the
+      // app is backgrounded. We emit one agent:waiting_approval on ENTRY into the prompt
+      // state (reusing the existing server push path, no cloud change) and dedupe on this
+      // key so repeated status ticks with the same prompt do not re-fire. '' means no
+      // prompt is currently active (cleared when the prompt is answered/gone).
+      lastInteractivePromptEventKey = "";
       autoApproveBusy = false;
       autoApproveBusyTimer = null;
       lastAutoApprovalSignature = "";
@@ -81176,6 +81339,25 @@ ${buttons.join("\n")}`;
           }
           this.lastStatus = newStatus;
         }
+        const interactivePrompt = adapterStatus.activeInteractivePrompt ?? null;
+        if (interactivePrompt && newStatus !== "waiting_approval") {
+          const firstQuestion = interactivePrompt.questions?.[0];
+          const promptKey = `${interactivePrompt.promptId}::${firstQuestion?.question ?? ""}`;
+          if (promptKey !== this.lastInteractivePromptEventKey) {
+            this.lastInteractivePromptEventKey = promptKey;
+            const modalMessage = firstQuestion ? firstQuestion.header ? `${firstQuestion.header}: ${firstQuestion.question}` : firstQuestion.question : void 0;
+            const modalButtons = firstQuestion?.options?.map((option) => option.label);
+            this.pushEvent({
+              event: "agent:waiting_approval",
+              chatTitle,
+              timestamp: now,
+              modalMessage,
+              modalButtons
+            });
+          }
+        } else if (!interactivePrompt && this.lastInteractivePromptEventKey) {
+          this.lastInteractivePromptEventKey = "";
+        }
         const firstTurnStartedAt = typeof this.adapter?.currentTurnStartedAt === "number" ? this.adapter.currentTurnStartedAt : 0;
         const collapsedAt = this.startupGraceCollapseAt;
         const turnStartedWithinCollapseWindow = collapsedAt !== null && firstTurnStartedAt > 0 && firstTurnStartedAt >= collapsedAt && firstTurnStartedAt - collapsedAt < STARTUP_GRACE_IDLE_COLLAPSE_WINDOW_MS;
@@ -90604,7 +90786,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
           const buildOperatingNotesBestEffort = async (id) => {
             try {
               const { readOperatingNotes: readOperatingNotes2 } = await Promise.resolve().then(() => (init_mesh_ledger(), mesh_ledger_exports));
-              const noteEntries = readOperatingNotes2(id, { tail: 20 });
+              const noteEntries = readOperatingNotes2(id, { tail: 100 });
               const notes = noteEntries.map((e) => {
                 const p = e.payload || {};
                 const text = typeof p.text === "string" ? p.text.trim() : "";
@@ -90619,7 +90801,13 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
                   // injection-side selection can honor them. Legacy notes lack
                   // these → pinned defaults false, expiry governed by category TTL.
                   pinned: p.pinned === true,
-                  ...typeof p.expiresAt === "string" ? { expiresAt: p.expiresAt } : {}
+                  ...typeof p.expiresAt === "string" ? { expiresAt: p.expiresAt } : {},
+                  // Phase 2 (b)/(c): thread the ledger id + supersedes/subjectKey
+                  // so version-supersede targeting and same-class folding work.
+                  // Legacy notes lack them → no supersede, fold by leading [tag].
+                  noteId: e.id,
+                  ...typeof p.supersedes === "string" ? { supersedes: p.supersedes } : {},
+                  ...typeof p.subjectKey === "string" ? { subjectKey: p.subjectKey } : {}
                 };
               }).filter((n) => n !== null);
               return notes.length ? notes : void 0;