@adhdev/daemon-standalone 0.8.71 → 0.8.73

package/dist/index.js

@@ -31419,9 +31419,12 @@ ${data.message || ""}`.trim();
       appendRecentActivity: () => appendRecentActivity,
       buildAssistantChatMessage: () => buildAssistantChatMessage,
       buildChatMessage: () => buildChatMessage,
+      buildChatMessageSignature: () => buildChatMessageSignature,
+      buildChatTailDeliverySignature: () => buildChatTailDeliverySignature,
       buildMachineInfo: () => buildMachineInfo2,
       buildRuntimeSystemChatMessage: () => buildRuntimeSystemChatMessage,
       buildSessionEntries: () => buildSessionEntries,
+      buildSessionModalDeliverySignature: () => buildSessionModalDeliverySignature,
       buildStatusSnapshot: () => buildStatusSnapshot2,
       buildSystemChatMessage: () => buildSystemChatMessage,
       buildTerminalChatMessage: () => buildTerminalChatMessage,
@@ -31457,6 +31460,7 @@ ${data.message || ""}`.trim();
       getSessionHostSurfaceKind: () => getSessionHostSurfaceKind,
       getWorkspaceState: () => getWorkspaceState2,
       hasCdpManager: () => hasCdpManager,
+      hashSignatureParts: () => hashSignatureParts,
       initDaemonComponents: () => initDaemonComponents2,
       installExtensions: () => installExtensions,
       installGlobalInterceptor: () => installGlobalInterceptor,
@@ -31482,12 +31486,16 @@ ${data.message || ""}`.trim();
       normalizeChatMessage: () => normalizeChatMessage,
       normalizeChatMessageKind: () => normalizeChatMessageKind,
       normalizeChatMessages: () => normalizeChatMessages,
+      normalizeChatTailActiveModal: () => normalizeChatTailActiveModal,
       normalizeInputEnvelope: () => normalizeInputEnvelope,
       normalizeManagedStatus: () => normalizeManagedStatus,
       normalizeMessageParts: () => normalizeMessageParts,
+      normalizeSessionModalFields: () => normalizeSessionModalFields,
       parseProviderSourceConfigUpdate: () => parseProviderSourceConfigUpdate,
       partitionSessionHostDiagnosticsSessions: () => partitionSessionHostDiagnosticsSessions,
       partitionSessionHostRecords: () => partitionSessionHostRecords,
+      prepareSessionChatTailUpdate: () => prepareSessionChatTailUpdate2,
+      prepareSessionModalUpdate: () => prepareSessionModalUpdate2,
       probeCdpPort: () => probeCdpPort,
       readChatHistory: () => readChatHistory,
       recordDebugTrace: () => recordDebugTrace,
@@ -31867,6 +31875,23 @@ ${data.message || ""}`.trim();
     var import_fs2 = require("fs");
     var import_path22 = require("path");
     init_config();
+    var HERMES_SESSION_ID_RE = /^\d{8}_\d{6}_[a-z0-9]+$/i;
+    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 DEFAULT_STATE = {
       recentActivity: [],
       savedProviderSessions: [],
@@ -31881,15 +31906,31 @@ ${data.message || ""}`.trim();
     }
     function normalizeState(raw) {
       const parsed = isPlainObject22(raw) ? raw : {};
+      const recentActivity = (Array.isArray(parsed.recentActivity) ? parsed.recentActivity : []).filter((entry) => {
+        if (!isPlainObject22(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 (!isPlainObject22(entry)) return false;
+        return !!normalizeProviderSessionId(
+          typeof entry.providerType === "string" ? entry.providerType : "",
+          typeof entry.providerSessionId === "string" ? entry.providerSessionId : ""
+        );
+      });
       const sessionReads = Object.fromEntries(
-        Object.entries(isPlainObject22(parsed.sessionReads) ? parsed.sessionReads : {}).filter(([, value]) => typeof value === "number" && Number.isFinite(value))
+        Object.entries(isPlainObject22(parsed.sessionReads) ? parsed.sessionReads : {}).filter(([key, value]) => !isLegacyVolatileSessionReadKey(key) && typeof value === "number" && Number.isFinite(value))
       );
       const sessionReadMarkers = Object.fromEntries(
-        Object.entries(isPlainObject22(parsed.sessionReadMarkers) ? parsed.sessionReadMarkers : {}).filter(([, value]) => typeof value === "string")
+        Object.entries(isPlainObject22(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
       };
@@ -31914,7 +31955,7 @@ ${data.message || ""}`.trim();
     function resetState() {
       saveState({ ...DEFAULT_STATE });
     }
-    var import_child_process2 = require("child_process");
+    var import_child_process = require("child_process");
     var import_fs3 = require("fs");
     var import_os22 = require("os");
     var path42 = __toESM2(require("path"));
@@ -31942,7 +31983,7 @@ ${data.message || ""}`.trim();
         return (0, import_fs3.existsSync)(resolved) ? resolved : null;
       }
       try {
-        const result = (0, import_child_process2.execSync)(
+        const result = (0, import_child_process.execSync)(
           (0, import_os22.platform)() === "win32" ? `where ${trimmed}` : `which ${trimmed}`,
           { encoding: "utf-8", timeout: 5e3, stdio: ["pipe", "pipe", "pipe"] }
         ).trim();
@@ -31953,7 +31994,7 @@ ${data.message || ""}`.trim();
     }
     function getIdeVersion(cliCommand) {
       try {
-        const result = (0, import_child_process2.execSync)(`"${cliCommand}" --version`, {
+        const result = (0, import_child_process.execSync)(`"${cliCommand}" --version`, {
           encoding: "utf-8",
           timeout: 1e4,
           stdio: ["pipe", "pipe", "pipe"]
@@ -32020,7 +32061,7 @@ ${data.message || ""}`.trim();
       }
       return results;
     }
-    var import_child_process22 = require("child_process");
+    var import_child_process2 = require("child_process");
     var os22 = __toESM2(require("os"));
     var path52 = __toESM2(require("path"));
     var import_fs4 = require("fs");
@@ -32053,7 +32094,7 @@ ${data.message || ""}`.trim();
     }
     function execAsync(cmd, timeoutMs = 5e3) {
       return new Promise((resolve11) => {
-        const child = (0, import_child_process22.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
+        const child = (0, import_child_process2.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
           if (err || !stdout?.trim()) {
             resolve11(null);
           } else {
@@ -36192,6 +36233,30 @@ ${effect.notification.body || ""}`.trim();
       }
     }
     init_logger();
+    function resolveLegacyProviderScript(fn2, scriptName, params) {
+      if (typeof fn2 !== "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 = fn2(firstVal);
+          if (legacyScript) return legacyScript;
+        }
+        const script = fn2(params);
+        const likelyLegacyObjectLeak = typeof script === "string" && script.includes("[object Object]") && typeof firstVal === "string";
+        if (!likelyLegacyObjectLeak && script) return script;
+        if (firstVal !== void 0) {
+          const legacyScript = fn2(firstVal);
+          if (legacyScript) return legacyScript;
+        }
+        if (script) return script;
+        return null;
+      }
+      if (params !== void 0) {
+        const script = fn2(params);
+        if (script) return script;
+      }
+      return fn2() || null;
+    }
     init_contracts();
     var VALID_INPUT_MEDIA_TYPES = /* @__PURE__ */ new Set(["text", "image", "audio", "video", "resource"]);
     function getProviderLabel(provider) {
@@ -36370,10 +36435,7 @@ ${effect.notification.body || ""}`.trim();
     function createInteractionId(prefix = "ix") {
       return `${prefix}_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
     }
-    init_chat_message_normalization();
-    var RECENT_SEND_WINDOW_MS = 1200;
-    var recentSendByTarget = /* @__PURE__ */ new Map();
-    function hashSignatureParts2(parts) {
+    function hashSignatureParts(parts) {
       let hash2 = 2166136261;
       for (const part of parts) {
         const text = String(part || "");
@@ -36386,6 +36448,56 @@ ${effect.notification.body || ""}`.trim();
       }
       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("") : ""
+      ]);
+    }
+    init_chat_message_normalization();
+    var RECENT_SEND_WINDOW_MS = 1200;
+    var recentSendByTarget = /* @__PURE__ */ new Map();
     function getCurrentProviderType(h, fallback = "") {
       return h.currentSession?.providerType || h.currentProviderType || fallback;
     }
@@ -36482,20 +36594,7 @@ ${effect.notification.body || ""}`.trim();
       }
     }
     function getChatMessageSignature(message) {
-      if (!message) return "";
-      let content = "";
-      try {
-        content = JSON.stringify(message.content ?? "");
-      } catch {
-        content = String(message.content ?? "");
-      }
-      return hashSignatureParts2([
-        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));
@@ -38529,27 +38628,7 @@ ${effect.notification.body || ""}`.trim();
         if (provider?.scripts) {
           const fn2 = provider.scripts[scriptName];
           if (typeof fn2 === "function") {
-            const callScript = fn2;
-            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(fn2, scriptName, params);
           }
         }
         return null;
@@ -39140,7 +39219,10 @@ ${effect.notification.body || ""}`.trim();
         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);
         }
@@ -39404,7 +39486,10 @@ ${effect.notification.body || ""}`.trim();
       }
       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);
         }
@@ -44945,6 +45030,139 @@ Run 'adhdev doctor' for detailed diagnostics.`
     init_logger();
     var DEFAULT_DAEMON_PORT = 19222;
     var DAEMON_WS_PATH = "/ipc";
+    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 prepareSessionChatTailUpdate2(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 prepareSessionModalUpdate2(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
+        }
+      };
+    }
     init_read_chat_contract();
     init_chat_message_normalization();
     var ProviderStreamAdapter = class {
@@ -50112,7 +50330,8 @@ data: ${JSON.stringify(msg.data)}
       }
       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` });
@@ -50129,13 +50348,7 @@ data: ${JSON.stringify(msg.data)}
           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 ? fn2(firstVal) : fn2();
-          } else {
-            scriptCode = params !== void 0 ? fn2(params) : fn2();
-          }
+          const scriptCode = resolveLegacyProviderScript(fn2, scriptName, rawParams);
           if (!scriptCode) {
             this.json(res, 500, { error: "Script function returned null" });
             return;
@@ -50152,6 +50365,17 @@ data: ${JSON.stringify(msg.data)}
                 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) {
@@ -51714,10 +51938,19 @@ data: ${JSON.stringify(msg.data)}
     };
     var DEFAULT_SESSION_HOST_APP_NAME = "adhdev";
     var DEFAULT_STANDALONE_SESSION_HOST_APP_NAME = "adhdev-standalone";
+    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 resolveSessionHostAppName2(options = {}) {
       const env = options.env || process.env;
       const explicit = typeof env.ADHDEV_SESSION_HOST_NAME === "string" ? env.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 import_session_host_core32 = require_dist();
@@ -52261,7 +52494,7 @@ var os5 = __toESM(require("os"));
 var import_daemon_core2 = __toESM(require_dist2());
 
 // src/session-host.ts
-var import_child_process = require("child_process");
+var childProcess = __toESM(require("child_process"));
 var fs2 = __toESM(require("fs"));
 var os2 = __toESM(require("os"));
 var path = __toESM(require("path"));
@@ -52311,7 +52544,7 @@ function getSessionHostPidFile() {
 function killPid(pid) {
   try {
     if (process.platform === "win32") {
-      (0, import_child_process.execFileSync)("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore" });
+      childProcess.execFileSync("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore" });
     } else {
       process.kill(pid, "SIGTERM");
     }
@@ -52320,13 +52553,13 @@ function killPid(pid) {
     return false;
   }
 }
-function stopSessionHost() {
+function stopManagedSessionHostProcess() {
   let stopped = false;
   const pidFile = getSessionHostPidFile();
   try {
     if (fs2.existsSync(pidFile)) {
       const pid = Number.parseInt(fs2.readFileSync(pidFile, "utf8").trim(), 10);
-      if (Number.isFinite(pid)) {
+      if (Number.isFinite(pid) && pid !== process.pid) {
         stopped = killPid(pid) || stopped;
       }
     }
@@ -52337,23 +52570,14 @@ function stopSessionHost() {
     } catch {
     }
   }
-  if (process.platform !== "win32") {
-    try {
-      const raw = (0, import_child_process.execFileSync)("pgrep", ["-f", "session-host-daemon"], { encoding: "utf8" }).trim();
-      for (const line of raw.split("\n")) {
-        const pid = Number.parseInt(line.trim(), 10);
-        if (Number.isFinite(pid)) {
-          stopped = killPid(pid) || stopped;
-        }
-      }
-    } catch {
-    }
-  }
   return stopped;
 }
+function stopSessionHost() {
+  return stopManagedSessionHostProcess();
+}
 async function runSessionHostCli(args) {
   const entry = resolveSessionHostEntry();
-  const child = (0, import_child_process.spawn)(process.execPath, [entry, ...args], {
+  const child = childProcess.spawn(process.execPath, [entry, ...args], {
     stdio: "inherit",
     env: buildSessionHostEnv(process.env)
   });
@@ -52365,7 +52589,7 @@ async function runSessionHostCli(args) {
 async function ensureSessionHostReady() {
   const spawnHost = () => {
     const entry = resolveSessionHostEntry();
-    const child = (0, import_child_process.spawn)(process.execPath, [entry], {
+    const child = childProcess.spawn(process.execPath, [entry], {
       detached: true,
       stdio: "ignore",
       windowsHide: true,
@@ -52810,48 +53034,6 @@ var SESSION_TARGET_COMMANDS = /* @__PURE__ */ new Set([
   "restart_session",
   "agent_command"
 ]);
-function hashSignatureParts(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 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("")}` : "",
-    messages
-  ]);
-}
-function buildSessionModalDeliverySignature(payload) {
-  return hashSignatureParts([
-    payload.sessionId,
-    payload.status,
-    payload.title || "",
-    payload.modalMessage || "",
-    Array.isArray(payload.modalButtons) ? payload.modalButtons.join("") : ""
-  ]);
-}
 var StandaloneServer = class {
   httpServer = null;
   wss = null;
@@ -53537,59 +53719,20 @@ var StandaloneServer = class {
       lastMessageSignature: state.cursor.lastMessageSignature,
       ...state.cursor.tailLimit > 0 ? { tailLimit: state.cursor.tailLimit } : {}
     });
-    if (!result?.success || result.syncMode === "noop") {
-      if (result?.success) {
-        state.cursor = {
-          knownMessageCount: Math.max(0, Number(result.totalMessages || state.cursor.knownMessageCount)),
-          lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : state.cursor.lastMessageSignature,
-          tailLimit: state.cursor.tailLimit
-        };
-      }
-      return null;
-    }
-    state.seq += 1;
-    const syncMode = result.syncMode === "append" || result.syncMode === "replace_tail" || result.syncMode === "noop" || result.syncMode === "full" ? result.syncMode : "full";
-    state.cursor = {
-      knownMessageCount: Math.max(0, Number(result.totalMessages || 0)),
-      lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : "",
-      tailLimit: state.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({
-      sessionId: request.targetSessionId,
-      ...request.historySessionId ? { historySessionId: request.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 : ""
-    });
-    if (deliverySignature === state.lastDeliveredSignature) {
-      return null;
-    }
-    state.lastDeliveredSignature = deliverySignature;
-    return {
-      topic: "session.chat_tail",
+    const prepared = (0, import_daemon_core2.prepareSessionChatTailUpdate)({
       key,
       sessionId: request.targetSessionId,
       ...request.historySessionId ? { historySessionId: request.historySessionId } : {},
       seq: state.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 : ""
-    };
+      cursor: state.cursor,
+      lastDeliveredSignature: state.lastDeliveredSignature,
+      result
+    });
+    state.cursor = prepared.cursor;
+    state.seq = prepared.seq;
+    state.lastDeliveredSignature = prepared.lastDeliveredSignature;
+    return prepared.update;
   }
   getHotChatSessionIdsForWsFlush() {
     const snapshot = this.buildSharedSnapshot("live");
@@ -53716,35 +53859,26 @@ var StandaloneServer = class {
     const providerState = this.findProviderStateBySessionId(state.request.params.targetSessionId);
     if (!providerState) return null;
     const now = Date.now();
-    state.seq += 1;
-    state.lastSentAt = now;
     const activeModal = providerState.activeChat?.activeModal;
-    const modalButtons = Array.isArray(activeModal?.buttons) ? activeModal.buttons.filter((button) => typeof button === "string") : [];
     const status = String(providerState.activeChat?.status || providerState.status || "idle");
     const title = typeof providerState.activeChat?.title === "string" ? providerState.activeChat.title : void 0;
-    const modalMessage = typeof activeModal?.message === "string" ? activeModal.message : void 0;
-    const deliverySignature = buildSessionModalDeliverySignature({
+    const prepared = (0, import_daemon_core2.prepareSessionModalUpdate)({
+      key,
       sessionId: state.request.params.targetSessionId,
       status,
-      ...title ? { title } : {},
-      ...modalMessage ? { modalMessage } : {},
-      ...modalButtons.length > 0 ? { modalButtons } : {}
+      title,
+      activeModal,
+      seq: state.seq,
+      timestamp: now,
+      lastDeliveredSignature: state.lastDeliveredSignature
     });
-    if (deliverySignature === state.lastDeliveredSignature) {
+    state.seq = prepared.seq;
+    state.lastDeliveredSignature = prepared.lastDeliveredSignature;
+    if (!prepared.update) {
       return null;
     }
-    state.lastDeliveredSignature = deliverySignature;
-    return {
-      topic: "session.modal",
-      key,
-      sessionId: state.request.params.targetSessionId,
-      status,
-      ...title ? { title } : {},
-      ...modalMessage ? { modalMessage } : {},
-      ...modalButtons.length > 0 ? { modalButtons } : {},
-      seq: state.seq,
-      timestamp: now
-    };
+    state.lastSentAt = now;
+    return prepared.update;
   }
   async flushWsSessionModalSubscriptions(targetWs) {
     const targets = targetWs ? [targetWs] : Array.from(this.clients);