@adhdev/daemon-core 0.9.82-rc.466 → 0.9.82-rc.468

package/dist/index.mjs

@@ -404,10 +404,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "e0f04b7d54855e0f0d5ed4200078d95596ab9f6f" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "e0f04b7d" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.466" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-07-05T08:18:54.364Z" : void 0);
+  const commit = readInjected(true ? "f05125bad26f9ee974d8bd31a8b9ab66bca9d4cd" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "f05125ba" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.468" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-07-05T10:08:41.050Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -6159,7 +6159,7 @@ var init_mesh_work_queue = __esm({
 });
 
 // src/mesh/mesh-runtime-store.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync6, renameSync as renameSync3, statSync as statSync5 } from "fs";
+import { existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync6, renameSync as renameSync3, statSync as statSync5, unlinkSync as unlinkSync2 } from "fs";
 import { dirname as dirname2, join as join9 } from "path";
 function loadDatabaseCtor() {
   if (DatabaseCtor) return DatabaseCtor;
@@ -6172,9 +6172,28 @@ function safeMeshId(meshId) {
 function legacyQueuePath(meshId) {
   return join9(getLedgerDir(), `${safeMeshId(meshId)}.queue.json`);
 }
+function cleanupStrayRootRuntimeDb(canonicalPath) {
+  try {
+    const strayPath = join9(getConfigDir(), "mesh-runtime.db");
+    if (strayPath === canonicalPath) return;
+    if (!existsSync8(strayPath)) return;
+    if (statSync5(strayPath).size !== 0) return;
+    unlinkSync2(strayPath);
+    if (!loggedStrayCleanup) {
+      loggedStrayCleanup = true;
+      LOG.info("MeshRuntimeStore", `Removed stray 0-byte root mesh-runtime.db at ${strayPath}`);
+    }
+  } catch (err) {
+    if (!loggedStrayCleanup) {
+      loggedStrayCleanup = true;
+      LOG.warn("MeshRuntimeStore", `Stray root mesh-runtime.db cleanup failed (ignored): ${err?.message || err}`);
+    }
+  }
+}
 function meshRuntimeStorePath() {
   const dir = getLedgerDir();
   const nextPath = join9(dir, "mesh-runtime.db");
+  cleanupStrayRootRuntimeDb(nextPath);
   if (existsSync8(nextPath)) return nextPath;
   const legacyPath = join9(dir, "beads.db");
   if (!existsSync8(legacyPath)) return nextPath;
@@ -6198,16 +6217,18 @@ function meshRuntimeStorePath() {
   }
   return nextPath;
 }
-var DatabaseCtor, loggedMigrationFailure, MeshRuntimeStore;
+var DatabaseCtor, loggedMigrationFailure, loggedStrayCleanup, MeshRuntimeStore;
 var init_mesh_runtime_store = __esm({
   "src/mesh/mesh-runtime-store.ts"() {
     "use strict";
     init_logger();
     init_load_better_sqlite3();
+    init_config();
     init_mesh_ledger();
     init_mesh_work_queue();
     init_dist();
     loggedMigrationFailure = false;
+    loggedStrayCleanup = false;
     MeshRuntimeStore = class _MeshRuntimeStore {
       static instance;
       db;
@@ -6550,6 +6571,7 @@ var init_mesh_runtime_store = __esm({
                     ON mesh_pending_events(mesh_id, event_id)
                     WHERE event_id IS NOT NULL
             `);
+          this.db.exec(`DROP TABLE IF EXISTS mesh_direct_delivered_events`);
         } catch (err) {
           if (!loggedMigrationFailure) {
             loggedMigrationFailure = true;
@@ -11510,7 +11532,7 @@ var init_mesh_events_utils = __esm({
 });
 
 // src/mesh/mesh-events-pending.ts
-import { appendFileSync as appendFileSync2, existsSync as existsSync15, readFileSync as readFileSync12, renameSync as renameSync4, statSync as statSync6, unlinkSync as unlinkSync2, writeFileSync as writeFileSync6 } from "fs";
+import { appendFileSync as appendFileSync2, existsSync as existsSync15, readFileSync as readFileSync12, renameSync as renameSync4, statSync as statSync6, unlinkSync as unlinkSync3, writeFileSync as writeFileSync6 } from "fs";
 import { join as join16 } from "path";
 import { randomUUID as randomUUID8 } from "crypto";
 function normalizeCoordinatorDaemonIds(coordinatorDaemonId) {
@@ -11986,13 +12008,13 @@ function atomicDrainFile(path45) {
   try {
     const content = readFileSync12(tmpPath, "utf-8");
     try {
-      unlinkSync2(tmpPath);
+      unlinkSync3(tmpPath);
     } catch {
     }
     return content;
   } catch {
     try {
-      unlinkSync2(tmpPath);
+      unlinkSync3(tmpPath);
     } catch {
     }
     return null;
@@ -12010,7 +12032,7 @@ function selectiveDrainFile(path45, predicate) {
     content = readFileSync12(tmpPath, "utf-8");
   } catch {
     try {
-      unlinkSync2(tmpPath);
+      unlinkSync3(tmpPath);
     } catch {
     }
     return [];
@@ -12035,7 +12057,7 @@ function selectiveDrainFile(path45, predicate) {
     if (keptLines.length > 0) {
       writeFileSync6(path45, keptLines.join("\n") + "\n", "utf-8");
     }
-    unlinkSync2(tmpPath);
+    unlinkSync3(tmpPath);
   } catch {
     try {
       if (existsSync15(tmpPath) && !existsSync15(path45)) renameSync4(tmpPath, path45);
@@ -12185,7 +12207,7 @@ function clearPendingMeshCoordinatorEvents(meshId, coordinatorDaemonId) {
   const paths = coordinatorDaemonId ? [getPendingEventsPath(meshId, coordinatorDaemonId), getPendingEventsPath(meshId)] : [getPendingEventsPath(meshId)];
   for (const path45 of paths) {
     if (existsSync15(path45)) try {
-      unlinkSync2(path45);
+      unlinkSync3(path45);
     } catch {
     }
   }
@@ -19309,11 +19331,13 @@ async function pullRemoteNodeQueues(components, mesh, localDaemonId, candidateDa
   if (!dispatchMeshCommand) return;
   const meshId = mesh.id;
   const pulls = candidateDaemonIds.length > 0 ? candidateDaemonIds.map((id) => ({ meshId, coordinatorDaemonId: id })) : [{ meshId }];
-  for (const node of mesh.nodes) {
+  await Promise.allSettled(mesh.nodes.map(async (node) => {
     const nodeDaemonId = readNonEmptyString2(node.daemonId);
-    if (!nodeDaemonId) continue;
-    if (daemonIdsEquivalent(nodeDaemonId, localDaemonId)) continue;
-    if (daemonIdListIncludes(candidateDaemonIds, nodeDaemonId)) continue;
+    if (!nodeDaemonId) return;
+    if (daemonIdsEquivalent(nodeDaemonId, localDaemonId)) return;
+    if (daemonIdListIncludes(candidateDaemonIds, nodeDaemonId)) return;
+    const peerSnapshot = components.getMeshPeerConnectionStatus?.(nodeDaemonId);
+    if (peerSnapshot && String(peerSnapshot.state) !== "connected") return;
     for (const pendingEventArgs of pulls) {
       let events;
       try {
@@ -19331,7 +19355,7 @@ async function pullRemoteNodeQueues(components, mesh, localDaemonId, candidateDa
         }
       }
     }
-  }
+  }));
 }
 function unwrapReadChatPayload(raw) {
   let cursor = raw;
@@ -19567,6 +19591,10 @@ async function collectLiveNodesWithSessions(components, mesh, selfIds, localDaem
   return Promise.all(mesh.nodes.map(async (node) => {
     const nodeDaemonId = readNonEmptyString2(node.daemonId);
     const isLocalNode = !nodeDaemonId || daemonIdListIncludes(selfIds, nodeDaemonId) || daemonIdsEquivalent(nodeDaemonId, localDaemonId);
+    if (!isLocalNode) {
+      const peerSnapshot = components.getMeshPeerConnectionStatus?.(nodeDaemonId);
+      if (peerSnapshot && String(peerSnapshot.state) !== "connected") return node;
+    }
     let statusResult;
     try {
       if (isLocalNode) {
@@ -42306,7 +42334,7 @@ async function waitForCliAdapterReady(adapter, options) {
   throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
 }
 
-// src/providers/cli-provider-instance.ts
+// src/providers/cli-provider-instance-types.ts
 var STATUS_HYDRATION_TAIL_LIMIT = 200;
 var COMPLETED_FINALIZATION_RETRY_MS = 1e3;
 var COMPLETED_FINALIZATION_MAX_WAIT_MS = 3e4;
@@ -42318,6 +42346,123 @@ var TERMINAL_MESH_EVENTS = /* @__PURE__ */ new Set([
   "agent:stopped",
   "agent:ready"
 ]);
+
+// src/providers/cli-provider-transcript-merge.ts
+init_contracts2();
+init_chat_message_normalization();
+function mergeConversationMessages(runtimeMessages, parsedMessages) {
+  if (runtimeMessages.length === 0) return normalizeChatMessages(parsedMessages);
+  const parsedEntries = parsedMessages.map((message, index) => ({
+    message,
+    index,
+    source: "parsed"
+  }));
+  const getRole = (message) => typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
+  const runtimeEntries = runtimeMessages.map((entry, index) => ({
+    message: entry.message,
+    index: parsedMessages.length + index,
+    source: "runtime",
+    runtimeKey: entry.key
+  })).filter((entry) => {
+    const meta = entry.message.meta && typeof entry.message.meta === "object" && !Array.isArray(entry.message.meta) ? entry.message.meta : {};
+    if (meta.runtimeInputAck !== true) return true;
+    const runtimeText = flattenContent(entry.message.content).replace(/\s+/g, " ").trim();
+    if (!runtimeText) return false;
+    return !parsedEntries.some((parsedEntry) => {
+      const parsedRole = getRole(parsedEntry.message);
+      if (parsedRole !== "user" && parsedRole !== "human") return false;
+      const parsedText = flattenContent(parsedEntry.message.content).replace(/\s+/g, " ").trim();
+      return parsedText === runtimeText;
+    });
+  });
+  const getTime = (message) => {
+    const value = typeof message.receivedAt === "number" ? message.receivedAt : typeof message.timestamp === "number" ? message.timestamp : 0;
+    return Number.isFinite(value) && value > 0 ? value : 0;
+  };
+  const isRuntimeOverlay = (entry) => {
+    if (entry.source !== "runtime") return false;
+    const key2 = typeof entry.runtimeKey === "string" ? entry.runtimeKey.trim().toLowerCase() : "";
+    if (key2.startsWith("auto_approval:")) return true;
+    return !isUserFacingChatMessage(entry.message);
+  };
+  const shouldKeepParsedBeforeUntimedRuntime = (message) => {
+    const role = getRole(message);
+    return role === "user" || role === "human";
+  };
+  const shouldKeepParsedAfterUntimedRuntime = (message) => {
+    const role = getRole(message);
+    if (role !== "assistant") return false;
+    const kind = resolveChatMessageKind(message);
+    return kind === "standard" || kind === "terminal";
+  };
+  return normalizeChatMessages([...parsedEntries, ...runtimeEntries].sort((a, b) => {
+    const aTime = getTime(a.message);
+    const bTime = getTime(b.message);
+    if (aTime && bTime && aTime !== bTime) return aTime - bTime;
+    if (a.source !== b.source && aTime !== bTime) {
+      const parsedEntry = a.source === "parsed" ? a : b.source === "parsed" ? b : null;
+      const runtimeEntry = a.source === "runtime" ? a : b.source === "runtime" ? b : null;
+      if (parsedEntry && runtimeEntry && isRuntimeOverlay(runtimeEntry) && getTime(parsedEntry.message) === 0 && getTime(runtimeEntry.message) > 0) {
+        if (shouldKeepParsedBeforeUntimedRuntime(parsedEntry.message)) {
+          return a.source === "parsed" ? -1 : 1;
+        }
+        if (shouldKeepParsedAfterUntimedRuntime(parsedEntry.message)) {
+          return a.source === "parsed" ? 1 : -1;
+        }
+      }
+    }
+    return a.index - b.index;
+  }).map((entry) => entry.message));
+}
+function buildExternalTranscriptProbe(messages, sourcePath, sourceMtimeMs) {
+  const visibleMessages = messages.filter((message) => isUserFacingChatMessage(message));
+  const lastVisible = visibleMessages[visibleMessages.length - 1];
+  const readAt = Date.now();
+  const mtimeMs = Number(sourceMtimeMs) || 0;
+  return {
+    readAt,
+    msgCount: messages.length,
+    lastRole: typeof lastVisible?.role === "string" ? lastVisible.role.trim().toLowerCase() : null,
+    lastKind: typeof lastVisible?.kind === "string" ? lastVisible.kind : null,
+    contentLen: lastVisible ? flattenContent(lastVisible.content).trim().length : 0,
+    sourcePath: typeof sourcePath === "string" && sourcePath ? sourcePath : null,
+    sourceMtimeMs: mtimeMs || null,
+    mtimeAgeMs: mtimeMs ? Math.max(0, readAt - mtimeMs) : null
+  };
+}
+
+// src/providers/cli-provider-effect-format.ts
+function getEffectDedupKey(effect) {
+  if (effect.id) return `provider_effect:${effect.id}`;
+  if (effect.type === "message") {
+    const content = typeof effect.message?.content === "string" ? effect.message.content : JSON.stringify(effect.message?.content || "");
+    return `provider_effect:message:${content}`;
+  }
+  if (effect.type === "notification") {
+    return `provider_effect:notification:${effect.notification?.title || ""}:${effect.notification?.body || ""}`;
+  }
+  return `provider_effect:toast:${effect.toast?.message || ""}`;
+}
+function formatApprovalRequestMessage(modalMessage, buttons) {
+  const lines = ["Approval requested"];
+  const cleanMessage = String(modalMessage || "").trim();
+  if (cleanMessage) lines.push(cleanMessage);
+  const labels = (buttons || []).map((button) => String(button || "").trim()).filter(Boolean);
+  if (labels.length > 0) {
+    lines.push(labels.map((label) => `[${label}]`).join(" "));
+  }
+  return lines.join("\n");
+}
+function formatMarkerTimestamp(timestamp) {
+  const date = new Date(timestamp);
+  const pad = (value) => String(value).padStart(2, "0");
+  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
+}
+
+// src/providers/cli-provider-instance.ts
+function approvalModalSignature(message, affirmativeAnchor) {
+  return [typeof message === "string" ? message.trim() : "", affirmativeAnchor].join("::");
+}
 var CliProviderInstance = class _CliProviderInstance {
   constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, options) {
     this.provider = provider;
@@ -42565,7 +42710,7 @@ var CliProviderInstance = class _CliProviderInstance {
       const resumedAt = Date.now();
       this.historyWriter.appendSystemMarker(
         this.type,
-        `Resumed saved session at ${this.formatMarkerTimestamp(resumedAt)}`,
+        `Resumed saved session at ${formatMarkerTimestamp(resumedAt)}`,
         {
           instanceId: this.instanceId,
           historySessionId: this.providerSessionId,
@@ -42677,7 +42822,7 @@ var CliProviderInstance = class _CliProviderInstance {
     if (historyMessageCount !== null) {
       parsedMessages = historyMessageCount > 0 ? parsedMessages.slice(-historyMessageCount) : [];
     }
-    const mergedMessages = this.mergeConversationMessages(parsedMessages);
+    const mergedMessages = mergeConversationMessages(this.runtimeMessages, parsedMessages);
     const canonicalBackedHistory = this.shouldHydrateExistingProviderHistory() ? this.syncCanonicalSavedHistoryIfNeeded() : false;
     const statusMessages = canonicalBackedHistory && this.lastPersistedHistoryMessages.length > 0 ? this.lastPersistedHistoryMessages.map((message) => ({
       role: message.role,
@@ -43142,22 +43287,6 @@ var CliProviderInstance = class _CliProviderInstance {
     }
     return true;
   }
-  buildExternalTranscriptProbe(messages, sourcePath, sourceMtimeMs) {
-    const visibleMessages = messages.filter((message) => isUserFacingChatMessage(message));
-    const lastVisible = visibleMessages[visibleMessages.length - 1];
-    const readAt = Date.now();
-    const mtimeMs = Number(sourceMtimeMs) || 0;
-    return {
-      readAt,
-      msgCount: messages.length,
-      lastRole: typeof lastVisible?.role === "string" ? lastVisible.role.trim().toLowerCase() : null,
-      lastKind: typeof lastVisible?.kind === "string" ? lastVisible.kind : null,
-      contentLen: lastVisible ? flattenContent(lastVisible.content).trim().length : 0,
-      sourcePath: typeof sourcePath === "string" && sourcePath ? sourcePath : null,
-      sourceMtimeMs: mtimeMs || null,
-      mtimeAgeMs: mtimeMs ? Math.max(0, readAt - mtimeMs) : null
-    };
-  }
   recordPendingTranscriptProbe(pending) {
     const probe = this.lastExternalCompletionProbe;
     if (!probe) return null;
@@ -43209,7 +43338,7 @@ var CliProviderInstance = class _CliProviderInstance {
       this.lastExternalCompletionProbe = null;
       return null;
     }
-    this.lastExternalCompletionProbe = this.buildExternalTranscriptProbe(
+    this.lastExternalCompletionProbe = buildExternalTranscriptProbe(
       restoredHistory.messages,
       restoredHistory.sourcePath,
       restoredHistory.sourceMtimeMs
@@ -43457,6 +43586,27 @@ var CliProviderInstance = class _CliProviderInstance {
   autoApproveContinuityWindowMs() {
     return this.autoApproveMaskSince > 0 && this.isMeshWorkerSession() ? _CliProviderInstance.AUTO_APPROVE_FLAP_CONTINUITY_MS : _CliProviderInstance.AUTO_APPROVE_GATE_HYSTERESIS_MS;
   }
+  /**
+   * The settle-gate identity signature for a raw activeModal, or null when the
+   * modal is NOT a concrete auto-approvable consent prompt (no captured buttons,
+   * a picker/confirm kind, or no reliable affirmative+decline anchor). Mirrors the
+   * gates the auto-approve fire path applies before computing modalSignature, so
+   * the mask-stall nudge can ask the SAME question the settle gate is tracking —
+   * "is THIS frame's modal the identity the settle clock is accruing against?" —
+   * without duplicating the button-pick logic. The signature is message +
+   * normalized affirmative label only (no volatile counters/button set), matching
+   * the fire path exactly (AUTOAPPROVE-SETTLE-FLAP).
+   */
+  approvableModalSignature(modal) {
+    const buttons = Array.isArray(modal?.buttons) ? modal.buttons.map((b) => String(b || "").trim()).filter(Boolean) : [];
+    if (!modal || buttons.length === 0) return null;
+    const modalKind = typeof modal?.kind === "string" ? modal.kind : "approval";
+    if (modalKind !== "approval") return null;
+    const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(buttons, this.provider);
+    const hasReliableConsentAnchor = hasNegativeApprovalOption(buttons) || hasReliableApprovalAffirmative(buttons);
+    if (buttonIndex < 0 || !hasReliableConsentAnchor) return null;
+    return approvalModalSignature(modal?.message, normalizeApprovalLabel(buttonLabel));
+  }
   // FALSE-IDLE (self-coordinator settle): an autonomously-progressing mesh session
   // is either a delegated worker (isMeshWorkerSession) OR the coordinator's OWN
   // claude-cli session (meshCoordinatorFor). Both run auto-approved tool turns whose
@@ -43760,10 +43910,7 @@ var CliProviderInstance = class _CliProviderInstance {
       return autoApproveActive;
     }
     const affirmativeAnchor = normalizeApprovalLabel(buttonLabel);
-    const modalSignature = [
-      typeof modal?.message === "string" ? modal.message.trim() : "",
-      affirmativeAnchor
-    ].join("::");
+    const modalSignature = approvalModalSignature(modal?.message, affirmativeAnchor);
     const approvalEntrySeq = typeof adapterStatus?.approvalEntrySeq === "number" ? adapterStatus.approvalEntrySeq : 0;
     const busySignature = `${approvalEntrySeq}::${modalSignature}`;
     if (this.autoApproveBusy && busySignature === this.lastAutoApprovalSignature) {
@@ -43996,7 +44143,7 @@ var CliProviderInstance = class _CliProviderInstance {
         if (approvalFingerprint !== this.lastApprovalEventFingerprint) {
           this.lastApprovalEventFingerprint = approvalFingerprint;
           this.appendRuntimeSystemMessage(
-            this.formatApprovalRequestMessage(modal?.message, modal?.buttons),
+            formatApprovalRequestMessage(modal?.message, modal?.buttons),
             `approval_request:${now}`,
             now
           );
@@ -44297,7 +44444,7 @@ var CliProviderInstance = class _CliProviderInstance {
       const effectWhen = effect.when || "immediate";
       if (effectWhen === "turn_completed" && options.phase !== "turn_completed") continue;
       if (effectWhen === "immediate" && options.phase === "turn_completed") continue;
-      const effectKey = this.getEffectDedupKey(effect);
+      const effectKey = getEffectDedupKey(effect);
       if (this.appliedEffectKeys.has(effectKey)) continue;
       this.appliedEffectKeys.add(effectKey);
       if (effect.persist !== false) {
@@ -44340,34 +44487,6 @@ var CliProviderInstance = class _CliProviderInstance {
       this.appliedEffectKeys = new Set(Array.from(this.appliedEffectKeys).slice(-100));
     }
   }
-  getEffectDedupKey(effect) {
-    if (effect.id) return `provider_effect:${effect.id}`;
-    if (effect.type === "message") {
-      const content = typeof effect.message?.content === "string" ? effect.message.content : JSON.stringify(effect.message?.content || "");
-      return `provider_effect:message:${content}`;
-    }
-    if (effect.type === "notification") {
-      return `provider_effect:notification:${effect.notification?.title || ""}:${effect.notification?.body || ""}`;
-    }
-    return `provider_effect:toast:${effect.toast?.message || ""}`;
-  }
-  getPersistedEffectContent(effect) {
-    if (effect.type === "message") {
-      return typeof effect.message?.content === "string" ? effect.message.content : JSON.stringify(effect.message?.content || "");
-    }
-    if (effect.type === "toast") {
-      return effect.toast?.message || null;
-    }
-    if (effect.type === "notification") {
-      if (typeof effect.notification?.bubbleContent === "string") return effect.notification.bubbleContent;
-      if (typeof effect.notification?.title === "string" && effect.notification.title.trim()) {
-        return `${effect.notification.title}
-${effect.notification.body || ""}`.trim();
-      }
-      return effect.notification?.body || null;
-    }
-    return null;
-  }
   // ─── Adapter access (backward compat) ──────────────────
   getAdapter() {
     return this.adapter;
@@ -44439,15 +44558,16 @@ ${effect.notification.body || ""}`.trim();
     if (!this.isMeshWorkerSession()) return;
     if (adapterStatus?.status !== "waiting_approval") return;
     if (!this.autoApproveMaskStalled(now)) return;
-    const modalButtons = Array.isArray(adapterStatus.activeModal?.buttons) ? adapterStatus.activeModal.buttons.map((b) => String(b || "").trim()).filter(Boolean) : [];
-    if (this.pendingAutoApprovalSince && modalButtons.length > 0) return;
+    const currentSignature = this.approvableModalSignature(adapterStatus.activeModal);
+    const settleProgressing = !!currentSignature && this.pendingAutoApprovalSince > 0 && currentSignature === this.pendingAutoApprovalSignature;
+    if (settleProgressing) return;
     if (this.stalledApprovalNudgeEpisode === this.autoApproveMaskSince) return;
     this.stalledApprovalNudgeEpisode = this.autoApproveMaskSince;
     const modal = adapterStatus.activeModal;
     const dirName = workingDirBasename(this.workingDir);
     const chatTitle = `${this.provider.name} \xB7 ${dirName}`;
     this.appendRuntimeSystemMessage(
-      this.formatApprovalRequestMessage(modal?.message, modal?.buttons),
+      formatApprovalRequestMessage(modal?.message, modal?.buttons),
       `approval_request:${now}`,
       now
     );
@@ -44477,11 +44597,6 @@ ${effect.notification.body || ""}`.trim();
       now
     );
   }
-  formatMarkerTimestamp(timestamp) {
-    const date = new Date(timestamp);
-    const pad = (value) => String(value).padStart(2, "0");
-    return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
-  }
   maybeAppendRuntimeRecoveryMessage(runtime) {
     if (!runtime?.restoredFromStorage || !runtime.runtimeId) return;
     const recoveryState = String(runtime.recoveryState || "").trim();
@@ -44542,81 +44657,7 @@ ${effect.notification.body || ""}`.trim();
     }
   }
   mergeRuntimeChatMessages(parsedMessages) {
-    return this.mergeConversationMessages(parsedMessages);
-  }
-  mergeConversationMessages(parsedMessages) {
-    if (this.runtimeMessages.length === 0) return normalizeChatMessages(parsedMessages);
-    const parsedEntries = parsedMessages.map((message, index) => ({
-      message,
-      index,
-      source: "parsed"
-    }));
-    const getRole = (message) => typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
-    const runtimeEntries = this.runtimeMessages.map((entry, index) => ({
-      message: entry.message,
-      index: parsedMessages.length + index,
-      source: "runtime",
-      runtimeKey: entry.key
-    })).filter((entry) => {
-      const meta = entry.message.meta && typeof entry.message.meta === "object" && !Array.isArray(entry.message.meta) ? entry.message.meta : {};
-      if (meta.runtimeInputAck !== true) return true;
-      const runtimeText = flattenContent(entry.message.content).replace(/\s+/g, " ").trim();
-      if (!runtimeText) return false;
-      return !parsedEntries.some((parsedEntry) => {
-        const parsedRole = getRole(parsedEntry.message);
-        if (parsedRole !== "user" && parsedRole !== "human") return false;
-        const parsedText = flattenContent(parsedEntry.message.content).replace(/\s+/g, " ").trim();
-        return parsedText === runtimeText;
-      });
-    });
-    const getTime = (message) => {
-      const value = typeof message.receivedAt === "number" ? message.receivedAt : typeof message.timestamp === "number" ? message.timestamp : 0;
-      return Number.isFinite(value) && value > 0 ? value : 0;
-    };
-    const isRuntimeOverlay = (entry) => {
-      if (entry.source !== "runtime") return false;
-      const key2 = typeof entry.runtimeKey === "string" ? entry.runtimeKey.trim().toLowerCase() : "";
-      if (key2.startsWith("auto_approval:")) return true;
-      return !isUserFacingChatMessage(entry.message);
-    };
-    const shouldKeepParsedBeforeUntimedRuntime = (message) => {
-      const role = getRole(message);
-      return role === "user" || role === "human";
-    };
-    const shouldKeepParsedAfterUntimedRuntime = (message) => {
-      const role = getRole(message);
-      if (role !== "assistant") return false;
-      const kind = resolveChatMessageKind(message);
-      return kind === "standard" || kind === "terminal";
-    };
-    return normalizeChatMessages([...parsedEntries, ...runtimeEntries].sort((a, b) => {
-      const aTime = getTime(a.message);
-      const bTime = getTime(b.message);
-      if (aTime && bTime && aTime !== bTime) return aTime - bTime;
-      if (a.source !== b.source && aTime !== bTime) {
-        const parsedEntry = a.source === "parsed" ? a : b.source === "parsed" ? b : null;
-        const runtimeEntry = a.source === "runtime" ? a : b.source === "runtime" ? b : null;
-        if (parsedEntry && runtimeEntry && isRuntimeOverlay(runtimeEntry) && getTime(parsedEntry.message) === 0 && getTime(runtimeEntry.message) > 0) {
-          if (shouldKeepParsedBeforeUntimedRuntime(parsedEntry.message)) {
-            return a.source === "parsed" ? -1 : 1;
-          }
-          if (shouldKeepParsedAfterUntimedRuntime(parsedEntry.message)) {
-            return a.source === "parsed" ? 1 : -1;
-          }
-        }
-      }
-      return a.index - b.index;
-    }).map((entry) => entry.message));
-  }
-  formatApprovalRequestMessage(modalMessage, buttons) {
-    const lines = ["Approval requested"];
-    const cleanMessage = String(modalMessage || "").trim();
-    if (cleanMessage) lines.push(cleanMessage);
-    const labels = (buttons || []).map((button) => String(button || "").trim()).filter(Boolean);
-    if (labels.length > 0) {
-      lines.push(labels.map((label) => `[${label}]`).join(" "));
-    }
-    return lines.join("\n");
+    return mergeConversationMessages(this.runtimeMessages, parsedMessages);
   }
   promoteProviderSessionId(sessionId, opts = {}) {
     const nextSessionId = String(sessionId || "").trim();