@adhdev/daemon-standalone 0.8.63 → 0.8.65

package/dist/index.js

@@ -28313,19 +28313,75 @@ var require_dist2 = __commonJS({
         LOG_PATH = path6.join(LOG_DIR, `daemon-${getDateStr()}.log`);
       }
     });
+    function canonicalizeKindHint(value) {
+      return value.trim().toLowerCase().replace(/[\s-]+/g, "_");
+    }
+    function resolveBuiltinOrAliasKind(kind) {
+      if (typeof kind !== "string") return null;
+      const normalizedKind = canonicalizeKindHint(kind);
+      if (!normalizedKind) return null;
+      if (KNOWN_CHAT_MESSAGE_KINDS.has(normalizedKind)) return normalizedKind;
+      return CHAT_MESSAGE_KIND_ALIASES[normalizedKind] || null;
+    }
+    function inferHintKind(value) {
+      const direct = resolveBuiltinOrAliasKind(value);
+      if (direct) return direct;
+      if (typeof value !== "string") return null;
+      const normalized = canonicalizeKindHint(value);
+      if (!normalized) return null;
+      if (/thought|thinking|reasoning/.test(normalized)) return "thought";
+      if (/tool/.test(normalized)) return "tool";
+      if (/terminal|command|shell|console/.test(normalized)) return "terminal";
+      return null;
+    }
+    function inferKindFromToolCalls(message) {
+      const toolCalls = Array.isArray(message?.toolCalls) ? message.toolCalls : [];
+      if (toolCalls.length === 0) return null;
+      if (toolCalls.some((toolCall) => toolCall?.kind === "think")) return "thought";
+      if (toolCalls.some((toolCall) => toolCall?.kind === "execute")) return "terminal";
+      if (toolCalls.some((toolCall) => Array.isArray(toolCall?.content) && toolCall.content.some((entry) => entry?.type === "terminal"))) {
+        return "terminal";
+      }
+      return "tool";
+    }
+    function inferMissingChatMessageKind(message) {
+      const role = typeof message?.role === "string" ? message.role.trim().toLowerCase() : "";
+      if (role === "system") return "system";
+      const meta3 = message?.meta && typeof message.meta === "object" ? message.meta : void 0;
+      const hintCandidates = [
+        message?._sub,
+        message?._type,
+        meta3?.label,
+        typeof message?.senderName === "string" ? message.senderName : void 0
+      ];
+      for (const candidate of hintCandidates) {
+        const inferred = inferHintKind(candidate);
+        if (inferred) return inferred;
+      }
+      const inferredFromToolCalls = inferKindFromToolCalls(message);
+      if (inferredFromToolCalls) return inferredFromToolCalls;
+      return null;
+    }
     function isBuiltinChatMessageKind(kind) {
-      return typeof kind === "string" && KNOWN_CHAT_MESSAGE_KINDS.has(kind.trim().toLowerCase());
+      return resolveBuiltinOrAliasKind(kind) !== null;
     }
     function normalizeChatMessageKind(kind, role) {
-      const normalizedKind = typeof kind === "string" ? kind.trim().toLowerCase() : "";
-      if (normalizedKind && KNOWN_CHAT_MESSAGE_KINDS.has(normalizedKind)) return normalizedKind;
+      const resolvedKind = resolveBuiltinOrAliasKind(kind);
+      if (resolvedKind) return resolvedKind;
       const normalizedRole = typeof role === "string" ? role.trim().toLowerCase() : "";
       return normalizedRole === "system" ? "system" : "standard";
     }
+    function resolveChatMessageKind(message) {
+      const explicitKind = resolveBuiltinOrAliasKind(message?.kind);
+      if (explicitKind) return explicitKind;
+      const inferredKind = inferMissingChatMessageKind(message);
+      if (inferredKind) return inferredKind;
+      return normalizeChatMessageKind(message?.kind, message?.role);
+    }
     function buildChatMessage(message) {
       return {
         ...message,
-        kind: normalizeChatMessageKind(message?.kind, message?.role)
+        kind: resolveChatMessageKind(message)
       };
     }
     function buildSystemChatMessage(message) {
@@ -28348,6 +28404,24 @@ var require_dist2 = __commonJS({
         kind: message?.kind || "standard"
       });
     }
+    function buildThoughtChatMessage(message) {
+      return buildAssistantChatMessage({
+        ...message,
+        kind: message?.kind || "thought"
+      });
+    }
+    function buildToolChatMessage(message) {
+      return buildAssistantChatMessage({
+        ...message,
+        kind: message?.kind || "tool"
+      });
+    }
+    function buildTerminalChatMessage(message) {
+      return buildAssistantChatMessage({
+        ...message,
+        kind: message?.kind || "terminal"
+      });
+    }
     function buildUserChatMessage(message) {
       return buildChatMessage({
         ...message,
@@ -28363,11 +28437,30 @@ var require_dist2 = __commonJS({
     }
     var BUILTIN_CHAT_MESSAGE_KINDS;
     var KNOWN_CHAT_MESSAGE_KINDS;
+    var CHAT_MESSAGE_KIND_ALIASES;
     var init_chat_message_normalization = __esm2({
       "src/providers/chat-message-normalization.ts"() {
         "use strict";
         BUILTIN_CHAT_MESSAGE_KINDS = ["standard", "thought", "tool", "terminal", "system"];
         KNOWN_CHAT_MESSAGE_KINDS = new Set(BUILTIN_CHAT_MESSAGE_KINDS);
+        CHAT_MESSAGE_KIND_ALIASES = {
+          text: "standard",
+          message: "standard",
+          assistant: "standard",
+          thinking: "thought",
+          think: "thought",
+          reasoning: "thought",
+          reason: "thought",
+          toolcall: "tool",
+          tool_call: "tool",
+          tooluse: "tool",
+          tool_use: "tool",
+          action: "tool",
+          command: "terminal",
+          cmd: "terminal",
+          shell: "terminal",
+          console: "terminal"
+        };
       }
     });
     function isModuleNotFoundError(error48, ref) {
@@ -30953,6 +31046,8 @@ ${data.message || ""}`.trim();
       CdpDomHandlers: () => CdpDomHandlers,
       CliProviderInstance: () => CliProviderInstance,
       DAEMON_WS_PATH: () => DAEMON_WS_PATH,
+      DEFAULT_ACTIVE_CHAT_POLL_STATUSES: () => DEFAULT_ACTIVE_CHAT_POLL_STATUSES,
+      DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS: () => DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS,
       DEFAULT_DAEMON_PORT: () => DEFAULT_DAEMON_PORT,
       DEFAULT_SESSION_HOST_APP_NAME: () => DEFAULT_SESSION_HOST_APP_NAME,
       DEFAULT_STANDALONE_SESSION_HOST_APP_NAME: () => DEFAULT_STANDALONE_SESSION_HOST_APP_NAME,
@@ -30981,7 +31076,11 @@ ${data.message || ""}`.trim();
       buildSessionEntries: () => buildSessionEntries,
       buildStatusSnapshot: () => buildStatusSnapshot2,
       buildSystemChatMessage: () => buildSystemChatMessage,
+      buildTerminalChatMessage: () => buildTerminalChatMessage,
+      buildThoughtChatMessage: () => buildThoughtChatMessage,
+      buildToolChatMessage: () => buildToolChatMessage,
       buildUserChatMessage: () => buildUserChatMessage,
+      classifyHotChatSessionsForSubscriptionFlush: () => classifyHotChatSessionsForSubscriptionFlush2,
       clearDebugTrace: () => clearDebugTrace,
       configureDebugTraceStore: () => configureDebugTraceStore,
       connectCdpManager: () => connectCdpManager,
@@ -31048,6 +31147,7 @@ ${data.message || ""}`.trim();
       resetConfig: () => resetConfig,
       resetDebugRuntimeConfig: () => resetDebugRuntimeConfig,
       resetState: () => resetState,
+      resolveChatMessageKind: () => resolveChatMessageKind,
       resolveDebugRuntimeConfig: () => resolveDebugRuntimeConfig,
       resolveSessionHostAppName: () => resolveSessionHostAppName2,
       saveConfig: () => saveConfig,
@@ -31725,6 +31825,43 @@ ${data.message || ""}`.trim();
       const availableMem = darwinAvail != null ? darwinAvail : freeMem;
       return { totalMem, freeMem, availableMem };
     }
+    var DEFAULT_ACTIVE_CHAT_POLL_STATUSES = /* @__PURE__ */ new Set([
+      "generating",
+      "waiting_approval",
+      "starting"
+    ]);
+    var DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS = 8e3;
+    function parseMessageTimestamp(value) {
+      if (typeof value === "number" && Number.isFinite(value)) return value;
+      if (typeof value === "string") {
+        const parsed = Date.parse(value);
+        if (Number.isFinite(parsed)) return parsed;
+      }
+      return 0;
+    }
+    function classifyHotChatSessionsForSubscriptionFlush2(sessions, previousHotSessionIds, options = {}) {
+      const now = options.now ?? Date.now();
+      const recentMessageGraceMs = Math.max(
+        0,
+        Number.isFinite(options.recentMessageGraceMs) ? Number(options.recentMessageGraceMs) : DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS
+      );
+      const activeStatuses = options.activeStatuses ?? DEFAULT_ACTIVE_CHAT_POLL_STATUSES;
+      const active = /* @__PURE__ */ new Set();
+      for (const session of sessions) {
+        const sessionId = typeof session?.id === "string" ? session.id : "";
+        if (!sessionId) continue;
+        const status = String(session?.status || "").toLowerCase();
+        const lastMessageAt = parseMessageTimestamp(session?.lastMessageAt);
+        const recentlyUpdated = lastMessageAt > 0 && now - lastMessageAt <= recentMessageGraceMs;
+        if (activeStatuses.has(status) || recentlyUpdated) {
+          active.add(sessionId);
+        }
+      }
+      const finalizing = new Set(
+        Array.from(previousHotSessionIds).filter((sessionId) => !active.has(sessionId))
+      );
+      return { active, finalizing };
+    }
     var import_ws2 = __toESM2(require("ws"));
     var http = __toESM2(require("http"));
     init_logger();
@@ -34757,11 +34894,13 @@ ${effect.notification.body || ""}`.trim();
             if (pm.receivedAt) prevByHash.set(h, pm.receivedAt);
           }
           const now = Date.now();
-          const messages = chat.messages || [];
-          for (const msg of messages) {
+          const rawMessages = chat.messages || [];
+          for (const msg of rawMessages) {
             const h = `${msg.role}:${(msg.content || "").slice(0, 100)}`;
             msg.receivedAt = prevByHash.get(h) || now;
           }
+          chat.messages = normalizeChatMessages(rawMessages);
+          const messages = chat.messages || [];
           if (messages.length > 0) {
             const hiddenKinds = /* @__PURE__ */ new Set();
             if (this.settings.showThinking === false) hiddenKinds.add("thought");
@@ -39309,6 +39448,7 @@ ${effect.notification.body || ""}`.trim();
       activeToolCalls = [];
       stopReason = null;
       partialContent = "";
+      partialThoughtContent = "";
       /** Rich content blocks accumulated during streaming */
       partialBlocks = [];
       /** Tool calls collected during current turn */
@@ -39354,6 +39494,10 @@ ${effect.notification.body || ""}`.trim();
             content
           });
         }));
+        if (this.currentStatus === "generating") {
+          const partialThoughtMessage = this.buildPartialThoughtMessage(Date.now());
+          if (partialThoughtMessage) recentMessages.push(partialThoughtMessage);
+        }
         if (this.currentStatus === "generating" && (this.partialContent || this.partialBlocks.length > 0)) {
           const blocks = this.buildPartialBlocks();
           if (blocks.length > 0) {
@@ -39912,6 +40056,7 @@ ${effect.notification.body || ""}`.trim();
         }));
         this.currentStatus = "generating";
         this.partialContent = "";
+        this.partialThoughtContent = "";
         this.partialBlocks = [];
         this.turnToolCalls = [];
         this.detectStatusTransition();
@@ -39994,7 +40139,14 @@ ${effect.notification.body || ""}`.trim();
             this.currentStatus = "generating";
             break;
           }
-          case "agent_thought_chunk":
+          case "agent_thought_chunk": {
+            const content = update.content;
+            if (content?.type === "text" && typeof content.text === "string") {
+              this.partialThoughtContent += content.text;
+            }
+            this.currentStatus = "generating";
+            break;
+          }
           case "user_message_chunk": {
             break;
           }
@@ -40149,8 +40301,82 @@ ${effect.notification.body || ""}`.trim();
         blocks.push(...this.partialBlocks);
         return blocks;
       }
+      buildPartialThoughtMessage(timestamp = Date.now()) {
+        const content = this.partialThoughtContent.trim();
+        if (!content) return null;
+        return buildThoughtChatMessage({
+          content,
+          timestamp,
+          meta: {
+            label: "Thought",
+            isRunning: this.currentStatus === "generating"
+          }
+        });
+      }
+      buildToolCallBubbleKind(toolCall) {
+        if (toolCall.kind === "think") return "thought";
+        if (toolCall.kind === "execute") return "terminal";
+        if (Array.isArray(toolCall.content) && toolCall.content.some((entry) => entry?.type === "terminal")) return "terminal";
+        return "tool";
+      }
+      summarizeToolCallBubbleContent(toolCall) {
+        const rawOutput = typeof toolCall.rawOutput === "string" ? toolCall.rawOutput.trim() : toolCall.rawOutput != null ? JSON.stringify(toolCall.rawOutput) : "";
+        if (rawOutput) return rawOutput;
+        const contentText = Array.isArray(toolCall.content) ? toolCall.content.map((entry) => {
+          if (!entry || typeof entry !== "object") return "";
+          if (entry.type === "content") return flattenContent([entry.content]).trim();
+          if (entry.type === "diff") return `${entry.path}
+${entry.newText || ""}`.trim();
+          if (entry.type === "terminal") return `Terminal: ${entry.terminalId || ""}`.trim();
+          return "";
+        }).filter(Boolean).join("\n\n").trim() : "";
+        if (contentText) return contentText;
+        const rawInput = typeof toolCall.rawInput === "string" ? toolCall.rawInput.trim() : toolCall.rawInput != null ? JSON.stringify(toolCall.rawInput) : "";
+        if (rawInput) {
+          return toolCall.title ? `${toolCall.title}
+${rawInput}` : rawInput;
+        }
+        return toolCall.title || "";
+      }
+      buildTurnToolCallMessages(timestamp = Date.now()) {
+        return this.turnToolCalls.map((toolCall) => {
+          const content = this.summarizeToolCallBubbleContent(toolCall);
+          if (!content) return null;
+          const isRunning = toolCall.status === "pending" || toolCall.status === "in_progress";
+          const label = toolCall.title || void 0;
+          const kind = this.buildToolCallBubbleKind(toolCall);
+          if (kind === "thought") {
+            return buildThoughtChatMessage({
+              content,
+              timestamp,
+              meta: { label: label || "Thought", isRunning }
+            });
+          }
+          if (kind === "terminal") {
+            return buildTerminalChatMessage({
+              content,
+              timestamp,
+              meta: { label: label || "Ran command", isRunning }
+            });
+          }
+          return buildToolChatMessage({
+            content,
+            timestamp,
+            meta: { label: label || "Tool call", isRunning }
+          });
+        }).filter(Boolean);
+      }
       /** Finalize streaming content into an assistant message */
       finalizeAssistantMessage() {
+        const timestamp = Date.now();
+        const thoughtMessage = this.buildPartialThoughtMessage(timestamp);
+        if (thoughtMessage) {
+          this.messages.push(thoughtMessage);
+        }
+        const toolCallMessages = this.buildTurnToolCallMessages(timestamp);
+        if (toolCallMessages.length > 0) {
+          this.messages.push(...toolCallMessages);
+        }
         const blocks = this.buildPartialBlocks();
         const finalBlocks = blocks.map((b2) => {
           if (b2.type === "text" && b2.text.endsWith("...")) {
@@ -40166,6 +40392,7 @@ ${effect.notification.body || ""}`.trim();
           }));
         }
         this.partialContent = "";
+        this.partialThoughtContent = "";
         this.partialBlocks = [];
         this.turnToolCalls = [];
       }
@@ -42985,6 +43212,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
       return 0;
     }
+    function getMessageEventTime(message) {
+      return parseMessageTime(message?.receivedAt) || parseMessageTime(message?.timestamp) || 0;
+    }
     function stringifyPreviewContent(content) {
       if (typeof content === "string") return content;
       if (Array.isArray(content)) {
@@ -43029,7 +43259,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         return {
           role,
           preview,
-          receivedAt: parseMessageTime(candidate?.receivedAt),
+          receivedAt: getMessageEventTime(candidate),
           hash: simplePreviewHash(`${role}:${preview}`)
         };
       }
@@ -43038,7 +43268,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
     function getSessionMessageUpdatedAt(session) {
       const lastMessage = session.activeChat?.messages?.at?.(-1);
       if (!lastMessage) return 0;
-      return parseMessageTime(lastMessage.receivedAt) || 0;
+      return getMessageEventTime(lastMessage);
     }
     function getSessionCompletionMarker(session) {
       const lastMessage = session.activeChat?.messages?.at?.(-1);
@@ -43048,7 +43278,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       if (typeof lastMessage._turnKey === "string" && lastMessage._turnKey) return `turn:${lastMessage._turnKey}`;
       if (typeof lastMessage.id === "string" && lastMessage.id) return `id:${lastMessage.id}`;
       if (typeof lastMessage.index === "number" && Number.isFinite(lastMessage.index)) return `idx:${lastMessage.index}`;
-      const timestamp = parseMessageTime(lastMessage.receivedAt);
+      const timestamp = getMessageEventTime(lastMessage);
       return timestamp > 0 ? `ts:${timestamp}` : "";
     }
     function getSessionLastUsedAt(session) {
@@ -44303,6 +44533,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
     init_logger();
     var DEFAULT_DAEMON_PORT = 19222;
     var DAEMON_WS_PATH = "/ipc";
+    init_chat_message_normalization();
     var ProviderStreamAdapter = class {
       agentType;
       agentName;
@@ -44412,7 +44643,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
             agentName: this.agentName,
             extensionId: this.extensionId,
             status: data.status || "idle",
-            messages: data.messages || [],
+            messages: normalizeChatMessages(Array.isArray(data.messages) ? data.messages : []),
             inputContent: data.inputContent || "",
             activeModal: data.activeModal
           };
@@ -52016,6 +52247,7 @@ async function getWorkspaceSocketInfo(workspaceName) {
 }
 
 // src/index.ts
+var import_daemon_core3 = __toESM(require_dist2());
 var DEFAULT_PORT = 3847;
 var STATUS_INTERVAL = 2e3;
 var pkgVersion = process.env.ADHDEV_PKG_VERSION || "unknown";
@@ -52056,11 +52288,6 @@ var SESSION_TARGET_COMMANDS = /* @__PURE__ */ new Set([
   "restart_session",
   "agent_command"
 ]);
-var ACTIVE_CHAT_POLL_STATUSES = /* @__PURE__ */ new Set([
-  "generating",
-  "waiting_approval",
-  "starting"
-]);
 function hashSignatureParts(parts) {
   let hash2 = 2166136261;
   for (const part of parts) {
@@ -52838,14 +53065,12 @@ var StandaloneServer = class {
   }
   getHotChatSessionIdsForWsFlush() {
     const snapshot = this.buildSharedSnapshot("live");
-    const active = new Set(
-      snapshot.sessions.filter((session) => ACTIVE_CHAT_POLL_STATUSES.has(String(session.status || "").toLowerCase())).map((session) => session.id)
-    );
-    const finalizing = new Set(
-      Array.from(this.hotWsChatSessionIds).filter((sessionId) => !active.has(sessionId))
+    const hotSessions = (0, import_daemon_core3.classifyHotChatSessionsForSubscriptionFlush)(
+      snapshot.sessions,
+      this.hotWsChatSessionIds
     );
-    this.hotWsChatSessionIds = active;
-    return { active, finalizing };
+    this.hotWsChatSessionIds = hotSessions.active;
+    return hotSessions;
   }
   async flushWsChatSubscriptions(targetWs, options = {}) {
     if (this.wsChatFlushInFlight) {