@adhdev/daemon-standalone 0.9.76-rc.17 → 0.9.76-rc.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-standalone",
-  "version": "0.9.76-rc.17",
+  "version": "0.9.76-rc.19",
   "description": "ADHDev standalone daemon — embedded HTTP/WS server for local dashboard",
   "main": "dist/index.js",
   "bin": {

package/vendor/mcp-server/index.js

@@ -30935,6 +30935,34 @@ function normalizeReadChatCommandStatus(status, activeModal) {
       return raw;
   }
 }
+function isGeneratingLikeStatus(status) {
+  return status === "generating" || status === "streaming" || status === "long_generating" || status === "starting";
+}
+function shouldTrustCliAdapterTerminalStatus(parsedStatus, activeModal, adapter, adapterStatus) {
+  if (!isGeneratingLikeStatus(parsedStatus)) return false;
+  if (hasNonEmptyModalButtons(activeModal)) return false;
+  const adapterRawStatus = typeof adapterStatus?.status === "string" ? adapterStatus.status.trim() : "";
+  if (adapterRawStatus !== "idle") return false;
+  if (typeof adapter.isProcessing === "function" && adapter.isProcessing()) return false;
+  return true;
+}
+function normalizeCliReadChatStatus(parsedStatus, activeModal, adapter, adapterStatus) {
+  if (shouldTrustCliAdapterTerminalStatus(parsedStatus, activeModal, adapter, adapterStatus)) return "idle";
+  return typeof parsedStatus === "string" && parsedStatus.trim() ? parsedStatus : "idle";
+}
+function finalizeStreamingMessagesWhenIdle(messages, status) {
+  if (status !== "idle") return messages;
+  return messages.map((message) => {
+    const meta3 = message.meta && typeof message.meta === "object" ? message.meta : void 0;
+    const hasStreamingMeta = meta3?.streaming === true;
+    if (message.bubbleState !== "streaming" && !hasStreamingMeta) return message;
+    return {
+      ...message,
+      ...message.bubbleState === "streaming" ? { bubbleState: "final" } : {},
+      ...hasStreamingMeta ? { meta: { ...meta3, streaming: false } } : {}
+    };
+  });
+}
 function buildReadChatCommandResult(payload, args) {
   let validatedPayload;
   const debugReadChat = payload?.debugReadChat && typeof payload.debugReadChat === "object" ? payload.debugReadChat : void 0;
@@ -31366,9 +31394,10 @@ async function handleReadChat(h, args) {
       const transcriptAuthority = parsedRecord.transcriptAuthority === "provider" || parsedRecord.transcriptAuthority === "daemon" ? parsedRecord.transcriptAuthority : void 0;
       const coverage = parsedRecord.coverage === "full" || parsedRecord.coverage === "tail" || parsedRecord.coverage === "current-turn" ? parsedRecord.coverage : void 0;
       const activeModal = parsedRecord.activeModal ?? parsedRecord.modal ?? null;
-      const returnedStatus = parsedRecord.status || "idle";
+      const returnedStatus = normalizeCliReadChatStatus(parsedRecord.status, activeModal, adapter, adapterStatus);
       const runtimeMessageMerger = getTargetInstance(h, args);
-      const returnedMessages = runtimeMessageMerger?.category === "cli" && runtimeMessageMerger.type === adapter.cliType && typeof runtimeMessageMerger.mergeRuntimeChatMessages === "function" ? runtimeMessageMerger.mergeRuntimeChatMessages(parsedRecord.messages) : parsedRecord.messages;
+      const parsedMessages = finalizeStreamingMessagesWhenIdle(parsedRecord.messages, returnedStatus);
+      const returnedMessages = runtimeMessageMerger?.category === "cli" && runtimeMessageMerger.type === adapter.cliType && typeof runtimeMessageMerger.mergeRuntimeChatMessages === "function" ? runtimeMessageMerger.mergeRuntimeChatMessages(parsedMessages) : parsedMessages;
       LOG.debug("Command", `[read_chat] cli-like parsed provider=${adapter.cliType} target=${String(args?.targetSessionId || "")} adapterStatus=${String(adapterStatus.status || "")} parsedStatus=${String(parsedRecord.status || "")} parsedMsgCount=${parsedRecord.messages.length} returnedMsgCount=${returnedMessages.length}`);
       return buildReadChatCommandResult({
         messages: returnedMessages,
@@ -56293,27 +56322,49 @@ ${lines.join("\n\n")}`;
 }
 
 // src/tools/mesh-tools.ts
+async function refreshMeshFromDaemon(ctx) {
+  if (!(ctx.transport instanceof IpcTransport)) return;
+  try {
+    const result = await ctx.transport.command("get_mesh", { meshId: ctx.mesh.id });
+    if (!result?.success || !Array.isArray(result.mesh?.nodes)) return;
+    const refreshedNodes = result.mesh.nodes.filter((n) => n?.id).map((n) => n);
+    if (!refreshedNodes.length) return;
+    ctx.mesh.nodes.splice(0, ctx.mesh.nodes.length, ...refreshedNodes);
+    ctx.mesh.updatedAt = result.mesh.updatedAt ?? ctx.mesh.updatedAt;
+  } catch {
+  }
+}
 async function findNodeWithRefresh(ctx, nodeId) {
   const hit = ctx.mesh.nodes.find((n) => n.id === nodeId);
   if (hit) return hit;
-  if (ctx.transport instanceof IpcTransport) {
-    try {
-      const result = await ctx.transport.command("get_mesh", { meshId: ctx.mesh.id });
-      if (result?.success && Array.isArray(result.mesh?.nodes)) {
-        for (const n of result.mesh.nodes) {
-          if (n?.id && !ctx.mesh.nodes.find((existing) => existing.id === n.id)) {
-            ctx.mesh.nodes.push(n);
-          }
-        }
-        ctx.mesh.updatedAt = result.mesh.updatedAt ?? ctx.mesh.updatedAt;
-      }
-    } catch {
-    }
-  }
+  await refreshMeshFromDaemon(ctx);
   const refreshed = ctx.mesh.nodes.find((n) => n.id === nodeId);
   if (!refreshed) throw new Error(`Node '${nodeId}' is not a member of mesh '${ctx.mesh.name}'`);
   return refreshed;
 }
+function unwrapCommandPayload(value) {
+  return value?.result?.result ?? value?.result ?? value;
+}
+function extractGitStatus(value) {
+  const payload = unwrapCommandPayload(value);
+  return payload?.status ?? value?.status ?? payload;
+}
+function extractGitDiff(value) {
+  const payload = unwrapCommandPayload(value);
+  return payload?.diffSummary ?? payload?.diff ?? value?.diffSummary ?? value?.diff ?? payload;
+}
+function countUncommittedChanges(status) {
+  if (typeof status?.uncommittedChanges === "number") return status.uncommittedChanges;
+  const keys = ["staged", "modified", "untracked", "deleted", "renamed"];
+  const counted = keys.reduce((sum, key) => sum + (Number.isFinite(Number(status?.[key])) ? Number(status[key]) : 0), 0);
+  const conflicts = Array.isArray(status?.conflictFiles) ? status.conflictFiles.length : status?.hasConflicts ? 1 : 0;
+  return counted + conflicts;
+}
+function isGitStatusDirty(status) {
+  if (typeof status?.isDirty === "boolean") return status.isDirty;
+  if (typeof status?.dirty === "boolean") return status.dirty;
+  return countUncommittedChanges(status) > 0;
+}
 async function commandForNode(ctx, node, command, args = {}) {
   if (ctx.transport instanceof IpcTransport && node.daemonId) {
     return ctx.transport.meshCommand(node.daemonId, command, args);
@@ -56450,6 +56501,7 @@ var ALL_MESH_TOOLS = [
   MESH_REMOVE_NODE_TOOL
 ];
 async function meshStatus(ctx) {
+  await refreshMeshFromDaemon(ctx);
   const { mesh, transport } = ctx;
   const results = [];
   for (const node of mesh.nodes) {
@@ -56460,18 +56512,22 @@ async function meshStatus(ctx) {
     try {
       if (!isLocalTransport(transport) && node.daemonId) {
         const result = await transport.gitStatus(node.daemonId, node.workspace, false);
-        const status = result?.status ?? result;
-        entry.health = status?.isGitRepo ? status?.isDirty ? "dirty" : "online" : "degraded";
+        const status = extractGitStatus(result);
+        const uncommittedChanges = countUncommittedChanges(status);
+        const dirty = isGitStatusDirty(status);
+        entry.health = status?.isGitRepo ? dirty ? "dirty" : "online" : "degraded";
         entry.branch = status?.branch;
-        entry.isDirty = status?.isDirty;
-        entry.uncommittedChanges = status?.uncommittedChanges ?? 0;
+        entry.isDirty = dirty;
+        entry.uncommittedChanges = uncommittedChanges;
       } else if (isLocalTransport(transport)) {
         const statusResult = await commandForNode(ctx, node, "git_status", { workspace: node.workspace });
-        const status = statusResult?.status ?? statusResult;
-        entry.health = status?.isGitRepo ? status?.isDirty ? "dirty" : "online" : "degraded";
+        const status = extractGitStatus(statusResult);
+        const uncommittedChanges = countUncommittedChanges(status);
+        const dirty = isGitStatusDirty(status);
+        entry.health = status?.isGitRepo ? dirty ? "dirty" : "online" : "degraded";
         entry.branch = status?.branch;
-        entry.isDirty = status?.isDirty;
-        entry.uncommittedChanges = status?.uncommittedChanges ?? 0;
+        entry.isDirty = dirty;
+        entry.uncommittedChanges = uncommittedChanges;
       } else {
         entry.health = "unknown";
         entry.note = "No daemonId available for cloud status probe";
@@ -56492,6 +56548,7 @@ async function meshStatus(ctx) {
   }, null, 2);
 }
 async function meshListNodes(ctx) {
+  await refreshMeshFromDaemon(ctx);
   const { mesh } = ctx;
   return JSON.stringify({
     meshId: mesh.id,
@@ -56558,8 +56615,8 @@ async function meshGitStatus(ctx, args) {
     return JSON.stringify({
       nodeId: args.node_id,
       workspace: node.workspace,
-      status: result?.status ?? result,
-      diff: result?.diff ?? null
+      status: extractGitStatus(result),
+      diff: extractGitDiff(result)
     }, null, 2);
   } else if (isLocalTransport(ctx.transport)) {
     const statusResult = await commandForNode(ctx, node, "git_status", {
@@ -56571,8 +56628,8 @@ async function meshGitStatus(ctx, args) {
     return JSON.stringify({
       nodeId: args.node_id,
       workspace: node.workspace,
-      status: statusResult?.status ?? statusResult,
-      diff: diffResult?.diffSummary ?? diffResult
+      status: extractGitStatus(statusResult),
+      diff: extractGitDiff(diffResult)
     }, null, 2);
   } else {
     return JSON.stringify({ error: "No daemonId available for cloud git_status probe" });