@adhdev/daemon-core 0.8.71 → 0.8.73

package/dist/index.mjs

@@ -3907,6 +3907,27 @@ function getSavedProviderSessions(state, filters) {
 init_config();
 import { existsSync as existsSync3, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
 import { join as join3 } from "path";
+
+// src/providers/provider-session-id.ts
+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://");
+}
+
+// src/config/state-store.ts
 var DEFAULT_STATE = {
   recentActivity: [],
   savedProviderSessions: [],
@@ -3921,15 +3942,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
   };
@@ -8283,6 +8320,32 @@ function reconcileIdeRuntimeSessions(instanceManager, sessionRegistry) {
 // src/commands/handler.ts
 init_logger();
 
+// 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;
+}
+
 // src/commands/chat-commands.ts
 init_contracts();
 
@@ -8471,10 +8534,7 @@ function createInteractionId(prefix = "ix") {
   return `${prefix}_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
 }
 
-// src/commands/chat-commands.ts
-init_chat_message_normalization();
-var RECENT_SEND_WINDOW_MS = 1200;
-var recentSendByTarget = /* @__PURE__ */ new Map();
+// src/chat/chat-signatures.ts
 function hashSignatureParts(parts) {
   let hash = 2166136261;
   for (const part of parts) {
@@ -8488,6 +8548,58 @@ function hashSignatureParts(parts) {
   }
   return hash.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("") : ""
+  ]);
+}
+
+// src/commands/chat-commands.ts
+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;
 }
@@ -8584,20 +8696,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));
@@ -10645,27 +10744,7 @@ var DaemonCommandHandler = class {
     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;
@@ -11260,7 +11339,10 @@ var CliProviderInstance = class {
     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);
     }
@@ -11524,7 +11606,10 @@ var CliProviderInstance = class {
   }
   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);
     }
@@ -17109,6 +17194,141 @@ init_logger();
 var DEFAULT_DAEMON_PORT = 19222;
 var DAEMON_WS_PATH = "/ipc";
 
+// 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
+    }
+  };
+}
+
 // src/agent-stream/provider-adapter.ts
 init_read_chat_contract();
 init_chat_message_normalization();
@@ -22303,7 +22523,8 @@ var DevServer = class _DevServer {
   }
   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` });
@@ -22320,13 +22541,7 @@ var DevServer = class _DevServer {
       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;
@@ -22343,6 +22558,17 @@ var DevServer = class _DevServer {
             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 (error) {
+            this.log(`Extension attach fallback failed for ${type}: ${error?.message || String(error)}`);
+          }
+        }
         if (sessionId) {
           raw = await cdp.evaluateInSessionFrame(sessionId, scriptCode);
         } else if (cdp.evaluateInWebviewFrame) {
@@ -23913,10 +24139,19 @@ var SessionHostPtyTransportFactory = class {
 // src/session-host/app-name.ts
 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 resolveSessionHostAppName(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;
 }
 
@@ -24493,9 +24728,12 @@ export {
   appendRecentActivity,
   buildAssistantChatMessage,
   buildChatMessage,
+  buildChatMessageSignature,
+  buildChatTailDeliverySignature,
   buildMachineInfo,
   buildRuntimeSystemChatMessage,
   buildSessionEntries,
+  buildSessionModalDeliverySignature,
   buildStatusSnapshot,
   buildSystemChatMessage,
   buildTerminalChatMessage,
@@ -24531,6 +24769,7 @@ export {
   getSessionHostSurfaceKind,
   getWorkspaceState,
   hasCdpManager,
+  hashSignatureParts,
   initDaemonComponents,
   installExtensions,
   installGlobalInterceptor,
@@ -24556,12 +24795,16 @@ export {
   normalizeChatMessage,
   normalizeChatMessageKind,
   normalizeChatMessages,
+  normalizeChatTailActiveModal,
   normalizeInputEnvelope,
   normalizeManagedStatus,
   normalizeMessageParts,
+  normalizeSessionModalFields,
   parseProviderSourceConfigUpdate,
   partitionSessionHostDiagnosticsSessions,
   partitionSessionHostRecords,
+  prepareSessionChatTailUpdate,
+  prepareSessionModalUpdate,
   probeCdpPort,
   readChatHistory,
   recordDebugTrace,