adhdev 0.8.70 → 0.8.73

package/dist/index.js

@@ -633,6 +633,31 @@ var init_saved_sessions = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/providers/provider-session-id.ts
+function normalizeProviderSessionId(providerType, providerSessionId) {
+  const normalizedProviderType = typeof providerType === "string" ? providerType.trim() : "";
+  const normalizedId = typeof providerSessionId === "string" ? providerSessionId.trim() : "";
+  if (!normalizedId) return "";
+  const lowered = normalizedId.toLowerCase();
+  if (lowered === "undefined" || lowered === "null") return "";
+  if (normalizedProviderType === "hermes-cli" && !HERMES_SESSION_ID_RE.test(normalizedId)) {
+    return "";
+  }
+  return normalizedId;
+}
+function isLegacyVolatileSessionReadKey(key) {
+  const normalizedKey = typeof key === "string" ? key.trim() : "";
+  if (!normalizedKey) return false;
+  return normalizedKey.startsWith("provider:codex:vscode-webview://");
+}
+var HERMES_SESSION_ID_RE;
+var init_provider_session_id = __esm({
+  "../../oss/packages/daemon-core/src/providers/provider-session-id.ts"() {
+    "use strict";
+    HERMES_SESSION_ID_RE = /^\d{8}_\d{6}_[a-z0-9]+$/i;
+  }
+});
+
 // ../../oss/packages/daemon-core/src/config/state-store.ts
 function isPlainObject2(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
@@ -642,15 +667,31 @@ function getStatePath() {
 }
 function normalizeState(raw) {
   const parsed = isPlainObject2(raw) ? raw : {};
+  const recentActivity = (Array.isArray(parsed.recentActivity) ? parsed.recentActivity : []).filter((entry) => {
+    if (!isPlainObject2(entry)) return false;
+    const normalizedId = normalizeProviderSessionId(
+      typeof entry.providerType === "string" ? entry.providerType : "",
+      typeof entry.providerSessionId === "string" ? entry.providerSessionId : ""
+    );
+    if (typeof entry.providerSessionId === "string" && !normalizedId) return false;
+    return true;
+  });
+  const savedProviderSessions = (Array.isArray(parsed.savedProviderSessions) ? parsed.savedProviderSessions : []).filter((entry) => {
+    if (!isPlainObject2(entry)) return false;
+    return !!normalizeProviderSessionId(
+      typeof entry.providerType === "string" ? entry.providerType : "",
+      typeof entry.providerSessionId === "string" ? entry.providerSessionId : ""
+    );
+  });
   const sessionReads = Object.fromEntries(
-    Object.entries(isPlainObject2(parsed.sessionReads) ? parsed.sessionReads : {}).filter(([, value]) => typeof value === "number" && Number.isFinite(value))
+    Object.entries(isPlainObject2(parsed.sessionReads) ? parsed.sessionReads : {}).filter(([key, value]) => !isLegacyVolatileSessionReadKey(key) && typeof value === "number" && Number.isFinite(value))
   );
   const sessionReadMarkers = Object.fromEntries(
-    Object.entries(isPlainObject2(parsed.sessionReadMarkers) ? parsed.sessionReadMarkers : {}).filter(([, value]) => typeof value === "string")
+    Object.entries(isPlainObject2(parsed.sessionReadMarkers) ? parsed.sessionReadMarkers : {}).filter(([key, value]) => !isLegacyVolatileSessionReadKey(key) && typeof value === "string")
   );
   return {
-    recentActivity: Array.isArray(parsed.recentActivity) ? parsed.recentActivity : [],
-    savedProviderSessions: Array.isArray(parsed.savedProviderSessions) ? parsed.savedProviderSessions : [],
+    recentActivity,
+    savedProviderSessions,
     sessionReads,
     sessionReadMarkers
   };
@@ -682,6 +723,7 @@ var init_state_store = __esm({
     import_fs2 = require("fs");
     import_path2 = require("path");
     init_config();
+    init_provider_session_id();
     DEFAULT_STATE = {
       recentActivity: [],
       savedProviderSessions: [],
@@ -5862,6 +5904,37 @@ var init_reconcile = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/commands/provider-script-resolver.ts
+function resolveLegacyProviderScript(fn, scriptName, params) {
+  if (typeof fn !== "function") return null;
+  if (params && typeof params === "object" && !Array.isArray(params) && Object.keys(params).length > 0) {
+    const firstVal = Object.values(params)[0];
+    if (scriptName === "sendMessage" && typeof firstVal === "string") {
+      const legacyScript = fn(firstVal);
+      if (legacyScript) return legacyScript;
+    }
+    const script = fn(params);
+    const likelyLegacyObjectLeak = typeof script === "string" && script.includes("[object Object]") && typeof firstVal === "string";
+    if (!likelyLegacyObjectLeak && script) return script;
+    if (firstVal !== void 0) {
+      const legacyScript = fn(firstVal);
+      if (legacyScript) return legacyScript;
+    }
+    if (script) return script;
+    return null;
+  }
+  if (params !== void 0) {
+    const script = fn(params);
+    if (script) return script;
+  }
+  return fn() || null;
+}
+var init_provider_script_resolver = __esm({
+  "../../oss/packages/daemon-core/src/commands/provider-script-resolver.ts"() {
+    "use strict";
+  }
+});
+
 // ../../oss/packages/daemon-core/src/providers/provider-input-support.ts
 function getProviderLabel(provider) {
   return provider?.name || provider?.type || "This provider";
@@ -6062,7 +6135,7 @@ var init_debug_trace = __esm({
   }
 });
 
-// ../../oss/packages/daemon-core/src/commands/chat-commands.ts
+// ../../oss/packages/daemon-core/src/chat/chat-signatures.ts
 function hashSignatureParts(parts) {
   let hash2 = 2166136261;
   for (const part of parts) {
@@ -6076,6 +6149,60 @@ function hashSignatureParts(parts) {
   }
   return hash2.toString(16).padStart(8, "0");
 }
+function stringifySignatureContent(content) {
+  try {
+    return JSON.stringify(content ?? "");
+  } catch {
+    return String(content ?? "");
+  }
+}
+function stringifySignatureMessages(messages) {
+  try {
+    return JSON.stringify(messages);
+  } catch {
+    return String(messages.length);
+  }
+}
+function buildChatMessageSignature(message) {
+  if (!message) return "";
+  return hashSignatureParts([
+    String(message.id || ""),
+    String(message.index ?? ""),
+    String(message.role || ""),
+    String(message.receivedAt ?? message.timestamp ?? ""),
+    stringifySignatureContent(message.content)
+  ]);
+}
+function buildChatTailDeliverySignature(payload) {
+  return hashSignatureParts([
+    payload.sessionId,
+    payload.historySessionId || "",
+    payload.status,
+    payload.title || "",
+    payload.syncMode,
+    String(payload.replaceFrom),
+    String(payload.totalMessages),
+    payload.lastMessageSignature,
+    payload.activeModal ? `${payload.activeModal.message}|${payload.activeModal.buttons.join("")}` : "",
+    stringifySignatureMessages(payload.messages)
+  ]);
+}
+function buildSessionModalDeliverySignature(payload) {
+  return hashSignatureParts([
+    payload.sessionId,
+    payload.status,
+    payload.title || "",
+    payload.modalMessage || "",
+    Array.isArray(payload.modalButtons) ? payload.modalButtons.join("") : ""
+  ]);
+}
+var init_chat_signatures = __esm({
+  "../../oss/packages/daemon-core/src/chat/chat-signatures.ts"() {
+    "use strict";
+  }
+});
+
+// ../../oss/packages/daemon-core/src/commands/chat-commands.ts
 function getCurrentProviderType(h, fallback2 = "") {
   return h.currentSession?.providerType || h.currentProviderType || fallback2;
 }
@@ -6172,20 +6299,7 @@ function parseMaybeJson(value) {
   }
 }
 function getChatMessageSignature(message) {
-  if (!message) return "";
-  let content = "";
-  try {
-    content = JSON.stringify(message.content ?? "");
-  } catch {
-    content = String(message.content ?? "");
-  }
-  return hashSignatureParts([
-    String(message.id || ""),
-    String(message.index ?? ""),
-    String(message.role || ""),
-    String(message.receivedAt ?? message.timestamp ?? ""),
-    content
-  ]);
+  return buildChatMessageSignature(message);
 }
 function normalizeReadChatCursor(args) {
   const knownMessageCount = Math.max(0, Number(args?.knownMessageCount || 0));
@@ -7208,6 +7322,7 @@ var init_chat_commands = __esm({
     init_chat_history();
     init_logger();
     init_debug_trace();
+    init_chat_signatures();
     init_chat_message_normalization();
     RECENT_SEND_WINDOW_MS = 1200;
     recentSendByTarget = /* @__PURE__ */ new Map();
@@ -8214,6 +8329,7 @@ var init_handler = __esm({
     init_chat_history();
     init_reconcile();
     init_logger();
+    init_provider_script_resolver();
     init_chat_commands();
     init_cdp_commands();
     init_stream_commands();
@@ -8289,27 +8405,7 @@ var init_handler = __esm({
         if (provider?.scripts) {
           const fn = provider.scripts[scriptName];
           if (typeof fn === "function") {
-            const callScript = fn;
-            if (params && Object.keys(params).length > 0) {
-              const firstVal = Object.values(params)[0];
-              if (scriptName === "sendMessage" && typeof firstVal === "string") {
-                const legacyScript = callScript(firstVal);
-                if (legacyScript) return legacyScript;
-              }
-              const script = callScript(params);
-              if (script) {
-                const likelyLegacyObjectLeak = typeof script === "string" && script.includes("[object Object]") && typeof firstVal === "string";
-                if (!likelyLegacyObjectLeak) return script;
-              }
-              if (firstVal !== void 0) {
-                const legacyScript = callScript(firstVal);
-                if (legacyScript) return legacyScript;
-              }
-              if (script) return script;
-            } else {
-              const script = callScript();
-              if (script) return script;
-            }
+            return resolveLegacyProviderScript(fn, scriptName, params);
           }
         }
         return null;
@@ -12054,6 +12150,7 @@ var init_cli_provider_instance = __esm({
     init_approval_utils();
     init_cli_script_results();
     init_provider_patch_state();
+    init_provider_session_id();
     init_chat_message_normalization();
     CachedDatabaseSync = null;
     CliProviderInstance = class {
@@ -12216,7 +12313,10 @@ var init_cli_provider_instance = __esm({
         const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
         const autoApproveActive = adapterStatus.status === "waiting_approval" && this.shouldAutoApprove();
         const visibleStatus = autoApproveActive ? "generating" : adapterStatus.status;
-        const parsedProviderSessionId = typeof parsedStatus?.providerSessionId === "string" ? parsedStatus.providerSessionId.trim() : "";
+        const parsedProviderSessionId = normalizeProviderSessionId(
+          this.type,
+          typeof parsedStatus?.providerSessionId === "string" ? parsedStatus.providerSessionId : ""
+        );
         if (parsedProviderSessionId) {
           this.promoteProviderSessionId(parsedProviderSessionId);
         }
@@ -12480,7 +12580,10 @@ var init_cli_provider_instance = __esm({
       }
       applyProviderResponse(data, options) {
         if (!data || typeof data !== "object") return;
-        const patchedProviderSessionId = typeof data.providerSessionId === "string" ? data.providerSessionId.trim() : "";
+        const patchedProviderSessionId = normalizeProviderSessionId(
+          this.type,
+          typeof data.providerSessionId === "string" ? data.providerSessionId : ""
+        );
         if (patchedProviderSessionId) {
           this.promoteProviderSessionId(patchedProviderSessionId);
         }
@@ -36224,6 +36327,147 @@ var init_ipc_protocol = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/src/chat/subscription-updates.ts
+function normalizeSyncMode(syncMode) {
+  return syncMode === "append" || syncMode === "replace_tail" || syncMode === "noop" || syncMode === "full" ? syncMode : "full";
+}
+function normalizeModalButtons(value) {
+  return Array.isArray(value) ? value.filter((button) => typeof button === "string") : [];
+}
+function normalizeModalMessage(value) {
+  return typeof value === "string" ? value : void 0;
+}
+function normalizeChatTailActiveModal(activeModal) {
+  if (!activeModal || typeof activeModal !== "object") return null;
+  const message = normalizeModalMessage(activeModal.message);
+  if (!message) return null;
+  const rawButtons = activeModal.buttons;
+  if (!Array.isArray(rawButtons)) return null;
+  return {
+    message,
+    buttons: normalizeModalButtons(rawButtons)
+  };
+}
+function normalizeSessionModalFields(activeModal) {
+  if (!activeModal || typeof activeModal !== "object") {
+    return { modalButtons: [] };
+  }
+  return {
+    modalMessage: normalizeModalMessage(activeModal.message),
+    modalButtons: normalizeModalButtons(activeModal.buttons)
+  };
+}
+function buildNextChatCursor(cursor, result) {
+  return {
+    knownMessageCount: Math.max(0, Number(result.totalMessages || cursor.knownMessageCount)),
+    lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : cursor.lastMessageSignature,
+    tailLimit: cursor.tailLimit
+  };
+}
+function prepareSessionChatTailUpdate(input) {
+  const result = input.result;
+  if (!result?.success || result.syncMode === "noop") {
+    return {
+      cursor: result?.success ? buildNextChatCursor(input.cursor, result) : input.cursor,
+      seq: input.seq,
+      lastDeliveredSignature: input.lastDeliveredSignature,
+      update: null
+    };
+  }
+  const syncMode = normalizeSyncMode(result.syncMode);
+  const cursor = {
+    knownMessageCount: Math.max(0, Number(result.totalMessages || 0)),
+    lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : "",
+    tailLimit: input.cursor.tailLimit
+  };
+  const title = typeof result.title === "string" ? result.title : void 0;
+  const activeModal = normalizeChatTailActiveModal(result.activeModal);
+  const status = typeof result.status === "string" ? result.status : "idle";
+  const deliverySignature = buildChatTailDeliverySignature({
+    sessionId: input.sessionId,
+    ...input.historySessionId ? { historySessionId: input.historySessionId } : {},
+    messages: Array.isArray(result.messages) ? result.messages : [],
+    status,
+    ...title ? { title } : {},
+    ...activeModal ? { activeModal } : {},
+    syncMode,
+    replaceFrom: Number(result.replaceFrom || 0),
+    totalMessages: Number(result.totalMessages || 0),
+    lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : ""
+  });
+  const seq = input.seq + 1;
+  if (deliverySignature === input.lastDeliveredSignature) {
+    return {
+      cursor,
+      seq,
+      lastDeliveredSignature: input.lastDeliveredSignature,
+      update: null
+    };
+  }
+  return {
+    cursor,
+    seq,
+    lastDeliveredSignature: deliverySignature,
+    update: {
+      topic: "session.chat_tail",
+      key: input.key,
+      sessionId: input.sessionId,
+      ...input.historySessionId ? { historySessionId: input.historySessionId } : {},
+      ...input.interactionId ? { interactionId: input.interactionId } : {},
+      seq,
+      timestamp: input.timestamp,
+      messages: Array.isArray(result.messages) ? result.messages : [],
+      status,
+      ...title ? { title } : {},
+      ...activeModal ? { activeModal } : {},
+      syncMode,
+      replaceFrom: Number(result.replaceFrom || 0),
+      totalMessages: Number(result.totalMessages || 0),
+      lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : ""
+    }
+  };
+}
+function prepareSessionModalUpdate(input) {
+  const { modalMessage, modalButtons } = normalizeSessionModalFields(input.activeModal);
+  const deliverySignature = buildSessionModalDeliverySignature({
+    sessionId: input.sessionId,
+    status: input.status,
+    ...input.title ? { title: input.title } : {},
+    ...modalMessage ? { modalMessage } : {},
+    ...modalButtons.length > 0 ? { modalButtons } : {}
+  });
+  if (deliverySignature === input.lastDeliveredSignature) {
+    return {
+      seq: input.seq,
+      lastDeliveredSignature: input.lastDeliveredSignature,
+      update: null
+    };
+  }
+  const seq = input.seq + 1;
+  return {
+    seq,
+    lastDeliveredSignature: deliverySignature,
+    update: {
+      topic: "session.modal",
+      key: input.key,
+      sessionId: input.sessionId,
+      status: input.status,
+      ...input.title ? { title: input.title } : {},
+      ...modalMessage ? { modalMessage } : {},
+      ...modalButtons.length > 0 ? { modalButtons } : {},
+      ...input.interactionId ? { interactionId: input.interactionId } : {},
+      seq,
+      timestamp: input.timestamp
+    }
+  };
+}
+var init_subscription_updates = __esm({
+  "../../oss/packages/daemon-core/src/chat/subscription-updates.ts"() {
+    "use strict";
+    init_chat_signatures();
+  }
+});
+
 // ../../oss/packages/daemon-core/src/agent-stream/provider-adapter.ts
 var ProviderStreamAdapter;
 var init_provider_adapter = __esm({
@@ -41243,6 +41487,7 @@ var init_dev_server = __esm({
     init_logger();
     init_builders();
     init_dev_cdp_handlers();
+    init_provider_script_resolver();
     init_dev_cli_debug();
     init_dev_auto_implement();
     DEV_SERVER_PORT = 19280;
@@ -41506,7 +41751,8 @@ var init_dev_server = __esm({
       }
       async handleRunScript(type, req, res, parsedBody) {
         const body = parsedBody || await this.readBody(req);
-        const { script: scriptName, params, ideType: scriptIdeType } = body;
+        const { script: scriptName, params, args, ideType: scriptIdeType } = body;
+        const rawParams = args !== void 0 ? args : params;
         const provider = this.providerLoader.resolve(type);
         if (!provider) {
           this.json(res, 404, { error: `Provider '${type}' not found` });
@@ -41523,13 +41769,7 @@ var init_dev_server = __esm({
           return;
         }
         try {
-          let scriptCode = null;
-          if (["sendMessage", "webviewSendMessage", "switchSession", "webviewSwitchSession", "setMode", "webviewSetMode", "setModel", "webviewSetModel"].includes(scriptName)) {
-            const firstVal = params && typeof params === "object" && Object.keys(params).length > 0 ? Object.values(params)[0] : params;
-            scriptCode = firstVal !== void 0 ? fn(firstVal) : fn();
-          } else {
-            scriptCode = params !== void 0 ? fn(params) : fn();
-          }
+          const scriptCode = resolveLegacyProviderScript(fn, scriptName, rawParams);
           if (!scriptCode) {
             this.json(res, 500, { error: "Script function returned null" });
             return;
@@ -41546,6 +41786,17 @@ var init_dev_server = __esm({
                 break;
               }
             }
+            if (!sessionId) {
+              try {
+                const discovered = await cdp.discoverAgentWebviews();
+                const target = discovered.find((entry) => entry.agentType === type);
+                if (target) {
+                  sessionId = await cdp.attachToAgent(target);
+                }
+              } catch (error48) {
+                this.log(`Extension attach fallback failed for ${type}: ${error48?.message || String(error48)}`);
+              }
+            }
             if (sessionId) {
               raw = await cdp.evaluateInSessionFrame(sessionId, scriptCode);
             } else if (cdp.evaluateInWebviewFrame) {
@@ -43116,10 +43367,19 @@ var init_session_host_transport = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/session-host/app-name.ts
+function validateStandaloneSessionHostAppName(explicit) {
+  if (explicit !== DEFAULT_SESSION_HOST_APP_NAME) return;
+  throw new Error(
+    `Standalone session-host namespace '${DEFAULT_SESSION_HOST_APP_NAME}' is reserved for the global daemon. Use '${DEFAULT_STANDALONE_SESSION_HOST_APP_NAME}' or another non-default namespace.`
+  );
+}
 function resolveSessionHostAppName(options = {}) {
   const env3 = options.env || process.env;
   const explicit = typeof env3.ADHDEV_SESSION_HOST_NAME === "string" ? env3.ADHDEV_SESSION_HOST_NAME.trim() : "";
-  if (explicit) return explicit;
+  if (explicit) {
+    if (options.standalone) validateStandaloneSessionHostAppName(explicit);
+    return explicit;
+  }
   return options.standalone ? DEFAULT_STANDALONE_SESSION_HOST_APP_NAME : DEFAULT_SESSION_HOST_APP_NAME;
 }
 var DEFAULT_SESSION_HOST_APP_NAME, DEFAULT_STANDALONE_SESSION_HOST_APP_NAME;
@@ -43746,9 +44006,12 @@ __export(src_exports, {
   appendRecentActivity: () => appendRecentActivity,
   buildAssistantChatMessage: () => buildAssistantChatMessage,
   buildChatMessage: () => buildChatMessage,
+  buildChatMessageSignature: () => buildChatMessageSignature,
+  buildChatTailDeliverySignature: () => buildChatTailDeliverySignature,
   buildMachineInfo: () => buildMachineInfo,
   buildRuntimeSystemChatMessage: () => buildRuntimeSystemChatMessage,
   buildSessionEntries: () => buildSessionEntries,
+  buildSessionModalDeliverySignature: () => buildSessionModalDeliverySignature,
   buildStatusSnapshot: () => buildStatusSnapshot,
   buildSystemChatMessage: () => buildSystemChatMessage,
   buildTerminalChatMessage: () => buildTerminalChatMessage,
@@ -43784,6 +44047,7 @@ __export(src_exports, {
   getSessionHostSurfaceKind: () => getSessionHostSurfaceKind,
   getWorkspaceState: () => getWorkspaceState,
   hasCdpManager: () => hasCdpManager,
+  hashSignatureParts: () => hashSignatureParts,
   initDaemonComponents: () => initDaemonComponents,
   installExtensions: () => installExtensions,
   installGlobalInterceptor: () => installGlobalInterceptor,
@@ -43809,12 +44073,16 @@ __export(src_exports, {
   normalizeChatMessage: () => normalizeChatMessage,
   normalizeChatMessageKind: () => normalizeChatMessageKind,
   normalizeChatMessages: () => normalizeChatMessages,
+  normalizeChatTailActiveModal: () => normalizeChatTailActiveModal,
   normalizeInputEnvelope: () => normalizeInputEnvelope,
   normalizeManagedStatus: () => normalizeManagedStatus,
   normalizeMessageParts: () => normalizeMessageParts,
+  normalizeSessionModalFields: () => normalizeSessionModalFields,
   parseProviderSourceConfigUpdate: () => parseProviderSourceConfigUpdate,
   partitionSessionHostDiagnosticsSessions: () => partitionSessionHostDiagnosticsSessions,
   partitionSessionHostRecords: () => partitionSessionHostRecords,
+  prepareSessionChatTailUpdate: () => prepareSessionChatTailUpdate,
+  prepareSessionModalUpdate: () => prepareSessionModalUpdate,
   probeCdpPort: () => probeCdpPort,
   readChatHistory: () => readChatHistory,
   recordDebugTrace: () => recordDebugTrace,
@@ -43870,6 +44138,8 @@ var init_src = __esm({
     init_launch();
     init_ipc_protocol();
     init_chat_history();
+    init_chat_signatures();
+    init_subscription_updates();
     init_agent_stream();
     init_agent_stream();
     init_forward();
@@ -53041,48 +53311,6 @@ __export(adhdev_daemon_exports, {
   isDaemonRunning: () => isDaemonRunning,
   stopDaemon: () => stopDaemon
 });
-function hashSignatureParts2(parts) {
-  let hash2 = 2166136261;
-  for (const part of parts) {
-    const text = String(part || "");
-    for (let i = 0; i < text.length; i += 1) {
-      hash2 ^= text.charCodeAt(i);
-      hash2 = Math.imul(hash2, 16777619) >>> 0;
-    }
-    hash2 ^= 255;
-    hash2 = Math.imul(hash2, 16777619) >>> 0;
-  }
-  return hash2.toString(16).padStart(8, "0");
-}
-function buildChatTailDeliverySignature(payload) {
-  let messages = "";
-  try {
-    messages = JSON.stringify(payload.messages);
-  } catch {
-    messages = String(payload.messages.length);
-  }
-  return hashSignatureParts2([
-    payload.sessionId,
-    payload.historySessionId || "",
-    payload.status,
-    payload.title || "",
-    payload.syncMode,
-    String(payload.replaceFrom),
-    String(payload.totalMessages),
-    payload.lastMessageSignature,
-    payload.activeModal ? `${payload.activeModal.message}|${payload.activeModal.buttons.join("")}` : "",
-    messages
-  ]);
-}
-function buildSessionModalDeliverySignature(payload) {
-  return hashSignatureParts2([
-    payload.sessionId,
-    payload.status,
-    payload.title || "",
-    payload.modalMessage || "",
-    Array.isArray(payload.modalButtons) ? payload.modalButtons.join("") : ""
-  ]);
-}
 function resolveDaemonPort(ref = {}) {
   return Number.isFinite(ref.port) && Number(ref.port) > 0 ? Number(ref.port) : DEFAULT_DAEMON_PORT;
 }
@@ -53215,7 +53443,7 @@ var init_adhdev_daemon = __esm({
     init_source2();
     init_version();
     init_src();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.70" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.73" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -53356,44 +53584,24 @@ var init_adhdev_daemon = __esm({
           lastMessageSignature: subscription.cursor.lastMessageSignature,
           ...subscription.cursor.tailLimit > 0 ? { tailLimit: subscription.cursor.tailLimit } : {}
         }, "p2p");
-        if (!result?.success || result.syncMode === "noop") {
-          if (result?.success) {
-            subscription.cursor = {
-              knownMessageCount: Math.max(0, Number(result.totalMessages || subscription.cursor.knownMessageCount)),
-              lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : subscription.cursor.lastMessageSignature,
-              tailLimit: subscription.cursor.tailLimit
-            };
-          }
-          return null;
-        }
-        subscription.seq += 1;
-        const syncMode = result.syncMode === "append" || result.syncMode === "replace_tail" || result.syncMode === "noop" || result.syncMode === "full" ? result.syncMode : "full";
-        subscription.cursor = {
-          knownMessageCount: Math.max(0, Number(result.totalMessages || 0)),
-          lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : "",
-          tailLimit: subscription.cursor.tailLimit
-        };
-        const activeModal = result.activeModal && typeof result.activeModal === "object" && typeof result.activeModal.message === "string" && Array.isArray(result.activeModal.buttons) ? {
-          message: result.activeModal.message,
-          buttons: result.activeModal.buttons.filter((button) => typeof button === "string")
-        } : null;
-        const deliverySignature = buildChatTailDeliverySignature({
+        const interactionId = this.getSessionInteractionId(subscription.params.targetSessionId);
+        const prepared = prepareSessionChatTailUpdate({
+          key: subscription.key,
           sessionId: subscription.params.targetSessionId,
           ...subscription.params.historySessionId ? { historySessionId: subscription.params.historySessionId } : {},
-          messages: Array.isArray(result.messages) ? result.messages : [],
-          status: typeof result.status === "string" ? result.status : "idle",
-          ...typeof result.title === "string" ? { title: result.title } : {},
-          ...activeModal ? { activeModal } : {},
-          syncMode,
-          replaceFrom: Number(result.replaceFrom || 0),
-          totalMessages: Number(result.totalMessages || 0),
-          lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : ""
+          seq: subscription.seq,
+          timestamp: Date.now(),
+          ...interactionId ? { interactionId } : {},
+          cursor: subscription.cursor,
+          lastDeliveredSignature: subscription.lastDeliveredSignature,
+          result
         });
-        if (deliverySignature === subscription.lastDeliveredSignature) {
+        subscription.cursor = prepared.cursor;
+        subscription.seq = prepared.seq;
+        subscription.lastDeliveredSignature = prepared.lastDeliveredSignature;
+        if (!prepared.update) {
           return null;
         }
-        subscription.lastDeliveredSignature = deliverySignature;
-        const interactionId = this.getSessionInteractionId(subscription.params.targetSessionId);
         recordDebugTrace({
           interactionId,
           category: "topic",
@@ -53401,30 +53609,14 @@ var init_adhdev_daemon = __esm({
           level: "info",
           sessionId: subscription.params.targetSessionId,
           payload: {
-            syncMode,
-            totalMessages: Number(result.totalMessages || 0),
-            replaceFrom: Number(result.replaceFrom || 0),
-            hasModal: !!activeModal,
-            hasTitle: typeof result.title === "string"
+            syncMode: prepared.update.syncMode,
+            totalMessages: prepared.update.totalMessages,
+            replaceFrom: prepared.update.replaceFrom,
+            hasModal: !!prepared.update.activeModal,
+            hasTitle: typeof prepared.update.title === "string"
           }
         });
-        return {
-          topic: "session.chat_tail",
-          key: subscription.key,
-          sessionId: subscription.params.targetSessionId,
-          ...subscription.params.historySessionId ? { historySessionId: subscription.params.historySessionId } : {},
-          ...interactionId ? { interactionId } : {},
-          seq: subscription.seq,
-          timestamp: Date.now(),
-          messages: Array.isArray(result.messages) ? result.messages : [],
-          status: typeof result.status === "string" ? result.status : "idle",
-          ...typeof result.title === "string" ? { title: result.title } : {},
-          ...activeModal ? { activeModal } : {},
-          syncMode,
-          replaceFrom: Number(result.replaceFrom || 0),
-          totalMessages: Number(result.totalMessages || 0),
-          lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : ""
-        };
+        return prepared.update;
       }
       buildLiveStatusSnapshot() {
         return buildStatusSnapshot({
@@ -53540,24 +53732,26 @@ var init_adhdev_daemon = __esm({
         if (!state) return null;
         const now = Date.now();
         const activeModal = state.activeChat?.activeModal;
-        const modalButtons = Array.isArray(activeModal?.buttons) ? activeModal.buttons.filter((button) => typeof button === "string") : [];
         const status = String(state.activeChat?.status || state.status || "idle");
         const title = typeof state.activeChat?.title === "string" ? state.activeChat.title : void 0;
-        const modalMessage = typeof activeModal?.message === "string" ? activeModal.message : void 0;
-        const deliverySignature = buildSessionModalDeliverySignature({
+        const interactionId = this.getSessionInteractionId(subscription.params.targetSessionId);
+        const prepared = prepareSessionModalUpdate({
+          key: subscription.key,
           sessionId: subscription.params.targetSessionId,
           status,
-          ...title ? { title } : {},
-          ...modalMessage ? { modalMessage } : {},
-          ...modalButtons.length > 0 ? { modalButtons } : {}
+          title,
+          activeModal,
+          seq: subscription.seq,
+          timestamp: now,
+          ...interactionId ? { interactionId } : {},
+          lastDeliveredSignature: subscription.lastDeliveredSignature
         });
-        if (deliverySignature === subscription.lastDeliveredSignature) {
+        subscription.seq = prepared.seq;
+        subscription.lastDeliveredSignature = prepared.lastDeliveredSignature;
+        if (!prepared.update) {
           return null;
         }
-        subscription.lastDeliveredSignature = deliverySignature;
-        subscription.seq += 1;
         subscription.lastSentAt = now;
-        const interactionId = this.getSessionInteractionId(subscription.params.targetSessionId);
         recordDebugTrace({
           interactionId,
           category: "topic",
@@ -53566,23 +53760,12 @@ var init_adhdev_daemon = __esm({
           sessionId: subscription.params.targetSessionId,
           payload: {
             status,
-            hasTitle: !!title,
-            modalMessage: modalMessage ? modalMessage.slice(0, 140) : void 0,
-            modalButtonCount: modalButtons.length
+            hasTitle: !!prepared.update.title,
+            modalMessage: prepared.update.modalMessage ? prepared.update.modalMessage.slice(0, 140) : void 0,
+            modalButtonCount: prepared.update.modalButtons?.length || 0
           }
         });
-        return {
-          topic: "session.modal",
-          key: subscription.key,
-          sessionId: subscription.params.targetSessionId,
-          status,
-          ...title ? { title } : {},
-          ...modalMessage ? { modalMessage } : {},
-          ...modalButtons.length > 0 ? { modalButtons } : {},
-          ...interactionId ? { interactionId } : {},
-          seq: subscription.seq,
-          timestamp: now
-        };
+        return prepared.update;
       }
       async flushP2PSessionModalSubscriptions() {
         if (!this.p2p?.isConnected || !this.p2p.hasSessionModalSubscriptions()) return;