@adhdev/daemon-core 0.8.63 → 0.8.64

package/dist/index.mjs

@@ -454,19 +454,75 @@ var init_logger = __esm({
 });
 
 // src/providers/chat-message-normalization.ts
+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 meta = message?.meta && typeof message.meta === "object" ? message.meta : void 0;
+  const hintCandidates = [
+    message?._sub,
+    message?._type,
+    meta?.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) {
@@ -489,6 +545,24 @@ function buildAssistantChatMessage(message) {
     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,
@@ -502,12 +576,30 @@ function normalizeChatMessage(message) {
 function normalizeChatMessages(messages) {
   return (Array.isArray(messages) ? messages : []).map((message) => normalizeChatMessage(message));
 }
-var BUILTIN_CHAT_MESSAGE_KINDS, KNOWN_CHAT_MESSAGE_KINDS;
+var BUILTIN_CHAT_MESSAGE_KINDS, KNOWN_CHAT_MESSAGE_KINDS, CHAT_MESSAGE_KIND_ALIASES;
 var init_chat_message_normalization = __esm({
   "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"
+    };
   }
 });
 
@@ -3775,6 +3867,45 @@ function getHostMemorySnapshot() {
   return { totalMem, freeMem, availableMem };
 }
 
+// src/status/chat-tail-hot-sessions.ts
+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 classifyHotChatSessionsForSubscriptionFlush(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 };
+}
+
 // src/cdp/manager.ts
 init_logger();
 import WebSocket from "ws";
@@ -6832,11 +6963,13 @@ var IdeProviderInstance = class {
         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");
@@ -11431,6 +11564,7 @@ var AcpProviderInstance = class {
   activeToolCalls = [];
   stopReason = null;
   partialContent = "";
+  partialThoughtContent = "";
   /** Rich content blocks accumulated during streaming */
   partialBlocks = [];
   /** Tool calls collected during current turn */
@@ -11476,6 +11610,10 @@ var AcpProviderInstance = class {
         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) {
@@ -12034,6 +12172,7 @@ var AcpProviderInstance = class {
     }));
     this.currentStatus = "generating";
     this.partialContent = "";
+    this.partialThoughtContent = "";
     this.partialBlocks = [];
     this.turnToolCalls = [];
     this.detectStatusTransition();
@@ -12116,7 +12255,14 @@ var AcpProviderInstance = class {
         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;
       }
@@ -12271,8 +12417,82 @@ var AcpProviderInstance = class {
     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((b) => {
       if (b.type === "text" && b.text.endsWith("...")) {
@@ -12288,6 +12508,7 @@ var AcpProviderInstance = class {
       }));
     }
     this.partialContent = "";
+    this.partialThoughtContent = "";
     this.partialBlocks = [];
     this.turnToolCalls = [];
   }
@@ -15133,6 +15354,9 @@ function parseMessageTime(value) {
   }
   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)) {
@@ -15177,7 +15401,7 @@ function getLastDisplayMessage(session) {
     return {
       role,
       preview,
-      receivedAt: parseMessageTime(candidate?.receivedAt),
+      receivedAt: getMessageEventTime(candidate),
       hash: simplePreviewHash(`${role}:${preview}`)
     };
   }
@@ -15186,7 +15410,7 @@ function getLastDisplayMessage(session) {
 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);
@@ -15196,7 +15420,7 @@ function getSessionCompletionMarker(session) {
   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) {
@@ -16463,6 +16687,7 @@ var DEFAULT_DAEMON_PORT = 19222;
 var DAEMON_WS_PATH = "/ipc";
 
 // src/agent-stream/provider-adapter.ts
+init_chat_message_normalization();
 var ProviderStreamAdapter = class {
   agentType;
   agentName;
@@ -16572,7 +16797,7 @@ var ProviderStreamAdapter = class {
         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
       };
@@ -23710,6 +23935,8 @@ export {
   CdpDomHandlers,
   CliProviderInstance,
   DAEMON_WS_PATH,
+  DEFAULT_ACTIVE_CHAT_POLL_STATUSES,
+  DEFAULT_CHAT_TAIL_RECENT_MESSAGE_GRACE_MS,
   DEFAULT_DAEMON_PORT,
   DEFAULT_SESSION_HOST_APP_NAME,
   DEFAULT_STANDALONE_SESSION_HOST_APP_NAME,
@@ -23738,7 +23965,11 @@ export {
   buildSessionEntries,
   buildStatusSnapshot,
   buildSystemChatMessage,
+  buildTerminalChatMessage,
+  buildThoughtChatMessage,
+  buildToolChatMessage,
   buildUserChatMessage,
+  classifyHotChatSessionsForSubscriptionFlush,
   clearDebugTrace,
   configureDebugTraceStore,
   connectCdpManager,
@@ -23805,6 +24036,7 @@ export {
   resetConfig,
   resetDebugRuntimeConfig,
   resetState,
+  resolveChatMessageKind,
   resolveDebugRuntimeConfig,
   resolveSessionHostAppName,
   saveConfig,