adhdev 0.8.71 → 0.8.74

package/dist/cli/index.js

@@ -1153,6 +1153,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);
@@ -1162,15 +1187,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
   };
@@ -1202,6 +1243,7 @@ var init_state_store = __esm({
     import_fs2 = require("fs");
     import_path2 = require("path");
     init_config();
+    init_provider_session_id();
     DEFAULT_STATE = {
       recentActivity: [],
       savedProviderSessions: [],
@@ -3820,19 +3862,91 @@ function sanitizeHistoryMessage(agentType, message) {
     content
   };
 }
-function readChatHistory(agentType, offset = 0, limit = 30, historySessionId) {
+function sanitizeHistoryFileSegment(value) {
+  return String(value || "").replace(/[^a-zA-Z0-9_-]/g, "_");
+}
+function listHistoryFiles(dir, historySessionId) {
+  const sanitizedSessionId = historySessionId ? sanitizeHistoryFileSegment(historySessionId) : "";
+  return fs3.readdirSync(dir).filter((file2) => {
+    if (!file2.endsWith(".jsonl")) return false;
+    if (sanitizedSessionId) {
+      return file2.startsWith(`${sanitizedSessionId}_`);
+    }
+    return true;
+  }).sort().reverse();
+}
+function buildSavedHistoryCacheSignature(dir, files) {
+  return files.map((file2) => {
+    try {
+      const stat4 = fs3.statSync(path7.join(dir, file2));
+      return `${file2}:${stat4.size}:${Math.trunc(stat4.mtimeMs)}`;
+    } catch {
+      return `${file2}:missing`;
+    }
+  }).join("|");
+}
+function computeSavedHistorySessionSummaries(agentType, dir, files) {
+  const groupedFiles = /* @__PURE__ */ new Map();
+  const filePattern = /^([A-Za-z0-9_-]+)_\d{4}-\d{2}-\d{2}\.jsonl$/;
+  for (const file2 of files) {
+    const match = file2.match(filePattern);
+    if (!match?.[1]) continue;
+    const historySessionId = match[1];
+    const grouped = groupedFiles.get(historySessionId) || [];
+    grouped.push(file2);
+    groupedFiles.set(historySessionId, grouped);
+  }
+  const summaries = [];
+  for (const [historySessionId, grouped] of groupedFiles.entries()) {
+    let messageCount = 0;
+    let firstMessageAt = 0;
+    let lastMessageAt = 0;
+    let sessionTitle = "";
+    let preview = "";
+    let workspace = "";
+    for (const file2 of grouped.sort()) {
+      const filePath = path7.join(dir, file2);
+      const content = fs3.readFileSync(filePath, "utf-8");
+      const lines = content.split("\n").filter(Boolean);
+      for (const line of lines) {
+        let parsed = null;
+        try {
+          parsed = JSON.parse(line);
+        } catch {
+          parsed = null;
+        }
+        if (!parsed || parsed.historySessionId !== historySessionId) continue;
+        if (parsed.kind === "session_start") {
+          if (!workspace && parsed.workspace) workspace = parsed.workspace;
+          continue;
+        }
+        messageCount += 1;
+        if (!firstMessageAt || parsed.receivedAt < firstMessageAt) firstMessageAt = parsed.receivedAt;
+        if (!lastMessageAt || parsed.receivedAt > lastMessageAt) lastMessageAt = parsed.receivedAt;
+        if (parsed.sessionTitle) sessionTitle = parsed.sessionTitle;
+        if (parsed.role !== "system" && parsed.content.trim()) preview = parsed.content.trim();
+      }
+    }
+    if (messageCount === 0 || !lastMessageAt) continue;
+    summaries.push({
+      historySessionId,
+      sessionTitle: sessionTitle || void 0,
+      messageCount,
+      firstMessageAt,
+      lastMessageAt,
+      preview: preview || void 0,
+      workspace: workspace || void 0
+    });
+  }
+  summaries.sort((a, b) => b.lastMessageAt - a.lastMessageAt);
+  return summaries;
+}
+function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, excludeRecentCount = 0) {
   try {
     const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
     const dir = path7.join(HISTORY_DIR, sanitized);
     if (!fs3.existsSync(dir)) return { messages: [], hasMore: false };
-    const sanitizedInstance = historySessionId?.replace(/[^a-zA-Z0-9_-]/g, "_");
-    const files = fs3.readdirSync(dir).filter((f) => {
-      if (!f.endsWith(".jsonl")) return false;
-      if (sanitizedInstance) {
-        return f.startsWith(`${sanitizedInstance}_`);
-      }
-      return true;
-    }).sort().reverse();
+    const files = listHistoryFiles(dir, historySessionId);
     const allMessages = [];
     const seen = /* @__PURE__ */ new Set();
     for (const file2 of files) {
@@ -3863,8 +3977,13 @@ function readChatHistory(agentType, offset = 0, limit = 30, historySessionId) {
       if (message.role !== "system") lastTurn = message;
     }
     const collapsed = collapseReplayAssistantTurns(agentType, chronological);
-    const sliced = collapsed.slice(offset, offset + limit);
-    const hasMore = collapsed.length > offset + limit;
+    const boundedLimit = Math.max(1, limit);
+    const boundedOffset = Math.max(0, offset);
+    const boundedExclude = Math.max(0, Math.min(excludeRecentCount, collapsed.length));
+    const endExclusive = Math.max(0, collapsed.length - boundedExclude - boundedOffset);
+    const startInclusive = Math.max(0, endExclusive - boundedLimit);
+    const sliced = collapsed.slice(startInclusive, endExclusive);
+    const hasMore = startInclusive > 0;
     return { messages: sliced, hasMore };
   } catch {
     return { messages: [], hasMore: false };
@@ -3874,61 +3993,20 @@ function listSavedHistorySessions(agentType, options = {}) {
   try {
     const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
     const dir = path7.join(HISTORY_DIR, sanitized);
-    if (!fs3.existsSync(dir)) return { sessions: [], hasMore: false };
-    const groupedFiles = /* @__PURE__ */ new Map();
-    const filePattern = /^([A-Za-z0-9_-]+)_\d{4}-\d{2}-\d{2}\.jsonl$/;
-    for (const file2 of fs3.readdirSync(dir)) {
-      if (!file2.endsWith(".jsonl")) continue;
-      const match = file2.match(filePattern);
-      if (!match?.[1]) continue;
-      const historySessionId = match[1];
-      const files = groupedFiles.get(historySessionId) || [];
-      files.push(file2);
-      groupedFiles.set(historySessionId, files);
-    }
-    const summaries = [];
-    for (const [historySessionId, files] of groupedFiles.entries()) {
-      let messageCount = 0;
-      let firstMessageAt = 0;
-      let lastMessageAt = 0;
-      let sessionTitle = "";
-      let preview = "";
-      let workspace = "";
-      for (const file2 of files.sort()) {
-        const filePath = path7.join(dir, file2);
-        const content = fs3.readFileSync(filePath, "utf-8");
-        const lines = content.split("\n").filter(Boolean);
-        for (const line of lines) {
-          let parsed = null;
-          try {
-            parsed = JSON.parse(line);
-          } catch {
-            parsed = null;
-          }
-          if (!parsed || parsed.historySessionId !== historySessionId) continue;
-          if (parsed.kind === "session_start") {
-            if (!workspace && parsed.workspace) workspace = parsed.workspace;
-            continue;
-          }
-          messageCount += 1;
-          if (!firstMessageAt || parsed.receivedAt < firstMessageAt) firstMessageAt = parsed.receivedAt;
-          if (!lastMessageAt || parsed.receivedAt > lastMessageAt) lastMessageAt = parsed.receivedAt;
-          if (parsed.sessionTitle) sessionTitle = parsed.sessionTitle;
-          if (parsed.role !== "system" && parsed.content.trim()) preview = parsed.content.trim();
-        }
-      }
-      if (messageCount === 0 || !lastMessageAt) continue;
-      summaries.push({
-        historySessionId,
-        sessionTitle: sessionTitle || void 0,
-        messageCount,
-        firstMessageAt,
-        lastMessageAt,
-        preview: preview || void 0,
-        workspace: workspace || void 0
+    if (!fs3.existsSync(dir)) {
+      savedHistorySessionCache.delete(sanitized);
+      return { sessions: [], hasMore: false };
+    }
+    const files = listHistoryFiles(dir);
+    const signature = buildSavedHistoryCacheSignature(dir, files);
+    const cached2 = savedHistorySessionCache.get(sanitized);
+    const summaries = cached2?.signature === signature ? cached2.summaries : computeSavedHistorySessionSummaries(agentType, dir, files);
+    if (!cached2 || cached2.signature !== signature) {
+      savedHistorySessionCache.set(sanitized, {
+        signature,
+        summaries
       });
     }
-    summaries.sort((a, b) => b.lastMessageAt - a.lastMessageAt);
     const offset = Math.max(0, options.offset || 0);
     const limit = Math.max(1, options.limit || 30);
     const sliced = summaries.slice(offset, offset + limit);
@@ -3940,7 +4018,7 @@ function listSavedHistorySessions(agentType, options = {}) {
     return { sessions: [], hasMore: false };
   }
 }
-var fs3, path7, os6, HISTORY_DIR, RETAIN_DAYS, CODEX_STARTER_PROMPT_RE, ChatHistoryWriter;
+var fs3, path7, os6, HISTORY_DIR, RETAIN_DAYS, savedHistorySessionCache, CODEX_STARTER_PROMPT_RE, ChatHistoryWriter;
 var init_chat_history = __esm({
   "../../oss/packages/daemon-core/src/config/chat-history.ts"() {
     "use strict";
@@ -3950,6 +4028,7 @@ var init_chat_history = __esm({
     init_chat_message_normalization();
     HISTORY_DIR = path7.join(os6.homedir(), ".adhdev", "history");
     RETAIN_DAYS = 30;
+    savedHistorySessionCache = /* @__PURE__ */ new Map();
     CODEX_STARTER_PROMPT_RE = /^(?:[›❯]\s*)?(?:Find and fix a bug in @filename|Improve documentation in @filename|Write tests for @filename|Explain this codebase|Summarize recent commits|Implement \{feature\}|Use \/skills(?: to list available skills)?|Run \/review on my current changes)$/i;
     ChatHistoryWriter = class {
       /** Last seen message count per agent (deduplication) */
@@ -4912,7 +4991,7 @@ var init_read_chat_contract = __esm({
 
 // ../../oss/packages/daemon-core/src/providers/approval-utils.ts
 function normalizeApprovalLabel(value) {
-  return String(value || "").toLowerCase().replace(/[^\p{L}\p{N}]+/gu, " ").trim();
+  return String(value || "").toLowerCase().replace(/^[\s\[(<{]*\d+(?:\s*[.)\]}>:-]|\s)+/, "").replace(/[^\p{L}\p{N}]+/gu, " ").trim();
 }
 function getApprovalPositiveHints(provider) {
   const customHints = Array.isArray(provider?.approvalPositiveHints) ? provider.approvalPositiveHints.map((hint) => normalizeApprovalLabel(String(hint || ""))).filter(Boolean) : [];
@@ -4946,19 +5025,19 @@ var init_approval_utils = __esm({
   "../../oss/packages/daemon-core/src/providers/approval-utils.ts"() {
     "use strict";
     DEFAULT_APPROVAL_POSITIVE_HINTS = [
-      "run",
+      "yes",
+      "allow once",
       "approve",
       "accept",
-      "allow once",
-      "always allow",
-      "allow",
-      "yes",
-      "proceed",
       "continue",
+      "run",
+      "proceed",
       "confirm",
       "save",
       "ok",
-      "trust"
+      "trust",
+      "allow",
+      "always allow"
     ];
   }
 });
@@ -6382,6 +6461,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";
@@ -6582,7 +6692,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) {
@@ -6596,6 +6706,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;
 }
@@ -6692,20 +6856,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));
@@ -6717,6 +6868,41 @@ function normalizeReadChatMessages(payload) {
   const messages = Array.isArray(payload.messages) ? payload.messages : [];
   return normalizeChatMessages(messages);
 }
+function buildReadChatReplayCollapseSignature(message) {
+  if (!message) return "";
+  const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
+  const kind = typeof message.kind === "string" ? message.kind.trim().toLowerCase() : "standard";
+  const senderName = typeof message.senderName === "string" ? message.senderName.trim().toLowerCase() : "";
+  const content = flattenContent(message.content || "").replace(/\s+/g, " ").trim();
+  return `${role}:${kind}:${senderName}:${content}`;
+}
+function shouldCollapseReadChatReplayDuplicate(message) {
+  if (!message) return false;
+  const role = typeof message.role === "string" ? message.role.trim().toLowerCase() : "";
+  if (role !== "assistant" && role !== "system") return false;
+  const kind = typeof message.kind === "string" ? message.kind.trim().toLowerCase() : "standard";
+  return kind === "tool" || kind === "terminal" || kind === "thought" || kind === "system";
+}
+function collapseReplayDuplicatesFromReadChat(messages) {
+  const collapsed = [];
+  let lastReplayTurnSignature = "";
+  for (const message of messages) {
+    const signature = buildReadChatReplayCollapseSignature(message);
+    const previous = collapsed[collapsed.length - 1];
+    const previousSignature = buildReadChatReplayCollapseSignature(previous);
+    if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
+      if (previousSignature === signature) continue;
+      if (lastReplayTurnSignature === signature) continue;
+    }
+    collapsed.push(message);
+    if (shouldCollapseReadChatReplayDuplicate(message) && signature) {
+      lastReplayTurnSignature = signature;
+    } else if ((message.role || "").toLowerCase() === "user") {
+      lastReplayTurnSignature = "";
+    }
+  }
+  return collapsed;
+}
 function deriveHistoryDedupKey(message) {
   const unitKey = typeof message._unitKey === "string" ? message._unitKey.trim() : "";
   if (unitKey) return `read_chat:${unitKey}`;
@@ -6792,14 +6978,38 @@ function computeReadChatSync(messages, cursor) {
     lastMessageSignature
   };
 }
+function hasNonEmptyModalButtons(activeModal) {
+  if (!activeModal || typeof activeModal !== "object") return false;
+  const buttons = activeModal.buttons;
+  return Array.isArray(buttons) && buttons.some((button) => typeof button === "string" && button.trim().length > 0);
+}
+function normalizeReadChatCommandStatus(status, activeModal) {
+  const raw = typeof status === "string" ? status.trim() : "";
+  if (!raw) {
+    return hasNonEmptyModalButtons(activeModal) ? "waiting_approval" : "idle";
+  }
+  switch (raw) {
+    case "starting":
+      return hasNonEmptyModalButtons(activeModal) ? "waiting_approval" : "generating";
+    case "stopped":
+    case "disconnected":
+    case "not_monitored":
+      return "error";
+    default:
+      return raw;
+  }
+}
 function buildReadChatCommandResult(payload, args) {
   let validatedPayload;
   try {
-    validatedPayload = validateReadChatResultPayload(payload, "read_chat command result");
+    validatedPayload = validateReadChatResultPayload({
+      ...payload,
+      status: normalizeReadChatCommandStatus(payload?.status, payload?.activeModal)
+    }, "read_chat command result");
   } catch (error48) {
     return { success: false, error: error48?.message || String(error48) };
   }
-  const messages = normalizeReadChatMessages(validatedPayload);
+  const messages = collapseReplayDuplicatesFromReadChat(normalizeReadChatMessages(validatedPayload));
   const cursor = normalizeReadChatCursor(args);
   if (!cursor.knownMessageCount && !cursor.lastMessageSignature && cursor.tailLimit > 0 && messages.length > cursor.tailLimit) {
     const tailMessages = messages.slice(-cursor.tailLimit);
@@ -6881,7 +7091,15 @@ async function handleChatHistory(h, args) {
   try {
     const provider = h.getProvider(agentType);
     const agentStr = provider?.type || agentType || getCurrentProviderType(h);
-    const result = readChatHistory(agentStr, offset || 0, limit || 30, historySessionId);
+    const transport = getTargetTransport(h, provider);
+    let excludeRecentCount = Math.max(0, Number(args?.excludeRecentCount || 0));
+    if (isCliLikeTransport(transport)) {
+      const adapter = getTargetedCliAdapter(h, args, provider?.type);
+      const status = adapter?.getStatus?.();
+      const visibleCount = Array.isArray(status?.messages) ? status.messages.length : 0;
+      if (visibleCount > excludeRecentCount) excludeRecentCount = visibleCount;
+    }
+    const result = readChatHistory(agentStr, offset || 0, limit || 30, historySessionId, excludeRecentCount);
     return { success: true, ...result, agent: agentStr };
   } catch (e) {
     return { success: false, error: e.message };
@@ -7728,6 +7946,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();
@@ -8168,13 +8387,6 @@ var init_cli_script_results = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/commands/stream-commands.ts
-function getCliPresentationMode(h, targetSessionId) {
-  if (!targetSessionId) return null;
-  const instance = h.ctx.instanceManager?.getInstance(targetSessionId);
-  if (instance?.category !== "cli") return null;
-  const mode = instance.getPresentationMode?.();
-  return mode === "chat" || mode === "terminal" ? mode : null;
-}
 function normalizeOpenPanelCommandResult(result) {
   const payload = Object.prototype.hasOwnProperty.call(result, "result") ? result.result : result;
   if (payload === true) return { opened: true, visible: true, focused: false };
@@ -8247,9 +8459,6 @@ async function handleOpenPanel(h, args) {
 function handlePtyInput(h, args) {
   const { cliType, data, targetSessionId } = args || {};
   if (!data) return { success: false, error: "data required" };
-  if (getCliPresentationMode(h, targetSessionId) === "chat") {
-    return { success: false, error: "CLI session is in chat mode", code: "CLI_VIEW_MODE_NOT_TERMINAL" };
-  }
   const adapter = h.getCliAdapter(targetSessionId || cliType);
   if (!adapter || typeof adapter.writeRaw !== "function") {
     return { success: false, error: `CLI adapter not found: ${targetSessionId || cliType || "unknown"}` };
@@ -8257,24 +8466,10 @@ function handlePtyInput(h, args) {
   adapter.writeRaw(data);
   return { success: true };
 }
-function handlePtyResize(h, args) {
-  const { cliType, cols, rows, force, targetSessionId } = args || {};
+function handlePtyResize(_h, args) {
+  const { cols, rows } = args || {};
   if (!cols || !rows) return { success: false, error: "cols and rows required" };
-  if (getCliPresentationMode(h, targetSessionId) === "chat") {
-    return { success: false, error: "CLI session is in chat mode", code: "CLI_VIEW_MODE_NOT_TERMINAL" };
-  }
-  const adapter = h.getCliAdapter(targetSessionId || cliType);
-  if (!adapter || typeof adapter.resize !== "function") {
-    return { success: false, error: `CLI adapter not found: ${targetSessionId || cliType || "unknown"}` };
-  }
-  const resize = adapter.resize;
-  if (force) {
-    resize(cols - 1, rows);
-    setTimeout(() => resize(cols, rows), 50);
-  } else {
-    resize(cols, rows);
-  }
-  return { success: true };
+  return { success: false, error: "PTY resize temporarily disabled", code: "PTY_RESIZE_DISABLED" };
 }
 function handleGetProviderSettings(h, args) {
   const loader = h.ctx.providerLoader;
@@ -8361,15 +8556,45 @@ function normalizeProviderScriptArgs(args, scriptName) {
 }
 function buildControlScriptResult(scriptName, payload) {
   if (!payload || typeof payload !== "object") return {};
-  if (Array.isArray(payload.options)) {
-    return { controlResult: normalizeControlListResult(payload) };
+  const legacyListPayload = (() => {
+    if (Array.isArray(payload.options)) return payload;
+    if (/^listmodels$/i.test(scriptName) && Array.isArray(payload.models)) {
+      return {
+        options: payload.models,
+        currentValue: payload.currentValue ?? payload.current ?? payload.currentModel,
+        ...typeof payload.error === "string" ? { error: payload.error } : {}
+      };
+    }
+    if (/^listmodes$/i.test(scriptName) && Array.isArray(payload.modes)) {
+      return {
+        options: payload.modes,
+        currentValue: payload.currentValue ?? payload.current ?? payload.currentMode ?? payload.mode,
+        ...typeof payload.error === "string" ? { error: payload.error } : {}
+      };
+    }
+    return null;
+  })();
+  if (legacyListPayload) {
+    return { controlResult: normalizeControlListResult(legacyListPayload) };
   }
-  const looksLikeValueMutation = /^set|^change/i.test(scriptName) || payload.currentValue !== void 0 || payload.value !== void 0;
+  const legacyMutationPayload = (() => {
+    if (typeof payload.ok === "boolean") return payload;
+    if (typeof payload.success === "boolean") {
+      return {
+        ok: payload.success,
+        currentValue: payload.currentValue ?? payload.value ?? payload.model ?? payload.mode ?? payload.selectedModel ?? payload.selectedMode,
+        ...Array.isArray(payload.effects) ? { effects: payload.effects } : {},
+        ...typeof payload.error === "string" ? { error: payload.error } : {}
+      };
+    }
+    return null;
+  })();
+  const looksLikeValueMutation = /^set|^change/i.test(scriptName) || payload.currentValue !== void 0 || payload.value !== void 0 || payload.success !== void 0;
   if (looksLikeValueMutation) {
-    return { controlResult: normalizeControlSetResult(payload) };
+    return { controlResult: normalizeControlSetResult(legacyMutationPayload || payload) };
   }
   if (payload.ok !== void 0 || Array.isArray(payload.effects) || typeof payload.error === "string") {
-    return { controlResult: normalizeControlInvokeResult(payload) };
+    return { controlResult: normalizeControlInvokeResult(legacyMutationPayload || payload) };
   }
   return {};
 }
@@ -8444,7 +8669,7 @@ async function executeProviderScript(h, args, scriptName) {
       }
       const managed = runtimeSessionId ? h.agentStream?.getManagedSession(runtimeSessionId) : null;
       const targetSessionId = managed?.cdpSessionId || null;
-      const IDE_LEVEL_SCRIPTS = provider.type === "claude-code-vscode" ? ["listModes", "setMode"] : ["listModes", "setMode", "listModels", "setModel"];
+      const IDE_LEVEL_SCRIPTS = provider.type === "claude-code-vscode" ? ["listModes", "setMode", "listModels", "setModel", "setModelGui"] : ["listModes", "setMode", "listModels", "setModel"];
       if (IDE_LEVEL_SCRIPTS.includes(scriptName)) {
         if (targetSessionId) {
           try {
@@ -8734,6 +8959,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();
@@ -8809,27 +9035,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;
@@ -12395,6 +12601,8 @@ ${data.message || ""}`.trim();
       }
       async sendMessage(text) {
         if (!this.ptyProcess) throw new Error(`${this.cliName} is not running`);
+        const allowInputDuringGeneration = this.provider.allowInputDuringGeneration === true;
+        const allowInterventionPrompt = allowInputDuringGeneration && this.isWaitingForResponse && this.currentStatus !== "waiting_approval";
         if (this.startupParseGate) {
           const deadline = Date.now() + 1e4;
           while (this.startupParseGate && Date.now() < deadline) {
@@ -12402,7 +12610,9 @@ ${data.message || ""}`.trim();
             await new Promise((resolve17) => setTimeout(resolve17, 50));
           }
         }
-        await this.waitForInteractivePrompt();
+        if (!allowInterventionPrompt) {
+          await this.waitForInteractivePrompt();
+        }
         if (!this.ready) {
           this.resolveStartupState("send_precheck");
           const screenText = this.terminalScreen.getText() || "";
@@ -12414,7 +12624,7 @@ ${data.message || ""}`.trim();
           }
         }
         if (!this.ready) throw new Error(`${this.cliName} not ready (status: ${this.currentStatus})`);
-        if (this.isWaitingForResponse) {
+        if (this.isWaitingForResponse && !allowInputDuringGeneration) {
           throw new Error(`${this.cliName} is still processing the previous prompt`);
         }
         const blockingModal = this.activeModal || this.getStartupConfirmationModal(this.terminalScreen.getText() || "");
@@ -12995,6 +13205,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 {
@@ -13157,7 +13368,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);
         }
@@ -13421,7 +13635,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);
         }
@@ -37165,6 +37382,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({
@@ -42184,6 +42542,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;
@@ -42447,7 +42806,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` });
@@ -42464,13 +42824,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;
@@ -42487,6 +42841,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) {
@@ -42551,6 +42916,20 @@ var init_dev_server = __esm({
       async handleReload(_req, res) {
         try {
           this.providerLoader.reload();
+          let refreshedInstances = 0;
+          if (this.instanceManager) {
+            for (const id of this.instanceManager.listInstanceIds()) {
+              const instance = this.instanceManager.getInstance(id);
+              const providerType = typeof instance?.type === "string" ? instance.type : "";
+              if (!providerType) continue;
+              const resolved = this.providerLoader.resolve(providerType);
+              if (!resolved) continue;
+              if (instance && typeof instance === "object" && "provider" in instance) {
+                instance.provider = resolved;
+                refreshedInstances += 1;
+              }
+            }
+          }
           const providers = this.providerLoader.getAll().map((p) => ({
             type: p.type,
             name: p.name,
@@ -42561,7 +42940,7 @@ var init_dev_server = __esm({
               cdp.clearTargetId();
             }
           }
-          this.json(res, 200, { reloaded: true, providers });
+          this.json(res, 200, { reloaded: true, refreshedInstances, providers });
         } catch (e) {
           this.json(res, 500, { error: e.message });
         }
@@ -44057,10 +44436,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;
@@ -44687,9 +45075,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,
@@ -44725,6 +45116,7 @@ __export(src_exports, {
   getSessionHostSurfaceKind: () => getSessionHostSurfaceKind2,
   getWorkspaceState: () => getWorkspaceState,
   hasCdpManager: () => hasCdpManager,
+  hashSignatureParts: () => hashSignatureParts,
   initDaemonComponents: () => initDaemonComponents,
   installExtensions: () => installExtensions,
   installGlobalInterceptor: () => installGlobalInterceptor,
@@ -44750,12 +45142,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,
@@ -44811,6 +45207,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();
@@ -76516,15 +76914,7 @@ function routeDataChannelMessage(peerId, msg, peers, handlers) {
       return;
     }
     if (parsed.type === "pty_resize") {
-      const permission = peers.get(peerId)?.sharePermission;
-      if (permission) {
-        log(`pty_resize: REJECTED \u2014 permission=${permission} peer=${peerId}`);
-        return;
-      }
-      const sessionId = parsed.sessionId || parsed.targetSessionId || parsed.cliId || parsed.cliType || "";
-      if (handlers.ptyResizeHandler && parsed.cols && parsed.rows && sessionId) {
-        handlers.ptyResizeHandler(sessionId, parsed.cols, parsed.rows);
-      }
+      logDebug(`pty_resize ignored: peer=${peerId} reason=temporarily_disabled`);
       return;
     }
     handleFileRequest(peerId, parsed, peers, handlers);
@@ -84745,48 +85135,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;
 }
@@ -84919,7 +85267,7 @@ var init_adhdev_daemon = __esm({
     init_source();
     init_version();
     init_src();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.71" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.74" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -84990,9 +85338,6 @@ var init_adhdev_daemon = __esm({
         const mode = instance.getPresentationMode?.();
         return mode === "chat" || mode === "terminal" ? mode : null;
       }
-      isTerminalCliSession(sessionId) {
-        return this.getCliPresentationMode(sessionId) === "terminal";
-      }
       isCliSession(sessionId) {
         const mode = this.getCliPresentationMode(sessionId);
         return mode === "chat" || mode === "terminal";
@@ -85060,44 +85405,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",
@@ -85105,30 +85430,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({
@@ -85244,24 +85553,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",
@@ -85270,23 +85581,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;
@@ -85475,14 +85775,14 @@ ${err?.stack || ""}`);
               }
             });
             this.p2p.onPtyInput((sessionId, data) => {
-              if (!this.isTerminalCliSession(sessionId)) return;
+              if (!this.isCliSession(sessionId)) return;
               const found = this.components.cliManager.findAdapter(sessionId, { instanceKey: sessionId });
               if (found && typeof found.adapter.writeRaw === "function") {
                 found.adapter.writeRaw(data);
               }
             });
             this.p2p.onPtyResize((sessionId, cols, rows) => {
-              if (!this.isTerminalCliSession(sessionId)) return;
+              if (!this.isCliSession(sessionId)) return;
               const found = this.components.cliManager.findAdapter(sessionId, { instanceKey: sessionId });
               if (found && typeof found.adapter.resize === "function") {
                 found.adapter.resize(cols, rows);
@@ -88703,7 +89003,16 @@ function registerDaemonCommands(program2, pkgVersion3) {
     if (options.open === false) args.push("--no-open");
     if (options.token) args.push("--token", options.token);
     if (options.dev) args.push("--dev");
-    const sessionHostName = resolveSessionHostAppName2({ standalone: true, env: process.env });
+    let sessionHostName;
+    try {
+      sessionHostName = resolveSessionHostAppName2({ standalone: true, env: process.env });
+    } catch (error48) {
+      console.error(source_default.red(`
+  \u2717 ${error48 instanceof Error ? error48.message : String(error48)}
+`));
+      process.exitCode = 1;
+      return;
+    }
     const standaloneEnv = {
       ...process.env,
       ADHDEV_SESSION_HOST_NAME: process.env.ADHDEV_SESSION_HOST_NAME || sessionHostName