adhdev 0.9.59 → 0.9.61

package/dist/cli/index.js

@@ -9277,18 +9277,31 @@ function collapseReplayDuplicatesFromReadChat(messages) {
   const collapsed = [];
   const replaySignaturesInCurrentTurn = /* @__PURE__ */ new Set();
   let stableAssistantAnswerContentInCurrentTurn = "";
+  let stableAssistantAnswerCollapsedIndex = -1;
+  let stableAssistantAnswerHadInterveningActivity = false;
   let previousReplaySignature = "";
   for (const message of messages) {
     const info = getReadChatReplayCollapseInfo(message);
     if (info?.role === "user") {
       replaySignaturesInCurrentTurn.clear();
       stableAssistantAnswerContentInCurrentTurn = "";
+      stableAssistantAnswerCollapsedIndex = -1;
+      stableAssistantAnswerHadInterveningActivity = false;
       previousReplaySignature = "";
     }
     if (info?.collapsible && info.signature) {
       if (previousReplaySignature === info.signature) continue;
       if (replaySignaturesInCurrentTurn.has(info.signature)) continue;
-      if (isReplayedAssistantAnswerAfterStableAnswerInfo(info, stableAssistantAnswerContentInCurrentTurn)) continue;
+      if (isReplayedAssistantAnswerAfterStableAnswerInfo(info, stableAssistantAnswerContentInCurrentTurn)) {
+        const isAdjacentFullerAssistantAnswer = info.role === "assistant" && (!info.kind || info.kind === "standard") && stableAssistantAnswerCollapsedIndex >= 0 && stableAssistantAnswerCollapsedIndex === collapsed.length - 1 && !stableAssistantAnswerHadInterveningActivity && info.content.length > stableAssistantAnswerContentInCurrentTurn.length && info.content.startsWith(stableAssistantAnswerContentInCurrentTurn);
+        if (isAdjacentFullerAssistantAnswer) {
+          collapsed[stableAssistantAnswerCollapsedIndex] = message;
+          replaySignaturesInCurrentTurn.add(info.signature);
+          stableAssistantAnswerContentInCurrentTurn = info.content;
+          previousReplaySignature = info.signature;
+        }
+        continue;
+      }
     }
     collapsed.push(message);
     previousReplaySignature = info?.collapsible ? info.signature : "";
@@ -9297,6 +9310,10 @@ function collapseReplayDuplicatesFromReadChat(messages) {
     }
     if (isStableReadChatAssistantAnswerInfo(info)) {
       stableAssistantAnswerContentInCurrentTurn = info?.content || "";
+      stableAssistantAnswerCollapsedIndex = collapsed.length - 1;
+      stableAssistantAnswerHadInterveningActivity = false;
+    } else if (stableAssistantAnswerContentInCurrentTurn && info?.role === "assistant" && (!info.kind || info.kind !== "standard")) {
+      stableAssistantAnswerHadInterveningActivity = true;
     }
   }
   return collapsed;
@@ -80987,7 +81004,7 @@ var init_server_connection = __esm({
        */
       sendMeshCommand(targetDaemonId, command, args = {}, timeoutMs = 3e4) {
         return new Promise((resolve22, reject) => {
-          const requestId = `mesh_${Date.now()}_${Math.random().toString(36).substring(2, 8)}`;
+          const requestId = `mesh_${crypto.randomUUID()}`;
           const timer = setTimeout(() => {
             this.off("daemon_mesh_result", handler);
             reject(new Error(`Mesh command timed out after ${timeoutMs}ms`));
@@ -90010,15 +90027,38 @@ var init_daemon_mesh_manager = __esm({
   "src/daemon-mesh-manager.ts"() {
     "use strict";
     init_src();
-    DaemonMeshManager = class {
+    DaemonMeshManager = class _DaemonMeshManager {
       rules = [];
       serverConn;
       constructor(serverConn) {
         this.serverConn = serverConn;
       }
+      static COMMAND_ALLOWLIST = /* @__PURE__ */ new Set([
+        "send_chat",
+        "read_chat",
+        "git_status",
+        "git_diff_summary",
+        "launch_cli"
+      ]);
       setRules(rules) {
-        this.rules = rules;
-        LOG.info("Mesh", `[Mesh] ${rules.length} rule(s) loaded`);
+        const valid = [];
+        for (const rule of rules) {
+          if (!rule.trigger || typeof rule.trigger !== "string") {
+            LOG.warn("Mesh", `[Mesh] Skipping rule: missing or invalid 'trigger'`);
+            continue;
+          }
+          if (!rule.targetDaemonId || typeof rule.targetDaemonId !== "string") {
+            LOG.warn("Mesh", `[Mesh] Skipping rule trigger='${rule.trigger}': missing or invalid 'targetDaemonId'`);
+            continue;
+          }
+          if (!_DaemonMeshManager.COMMAND_ALLOWLIST.has(rule.command)) {
+            LOG.warn("Mesh", `[Mesh] Skipping rule trigger='${rule.trigger}': command '${rule.command}' not in allowlist`);
+            continue;
+          }
+          valid.push(rule);
+        }
+        this.rules = valid;
+        LOG.info("Mesh", `[Mesh] ${valid.length}/${rules.length} rule(s) loaded`);
       }
       async emit(event) {
         const matching = this.rules.filter((r) => r.trigger === event.trigger);
@@ -90289,7 +90329,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.59" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.61" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -91104,6 +91144,26 @@ ${err?.stack || ""}`);
         if (!result || result.success !== true) return false;
         return commandType === "launch_cli" || commandType === "launch_ide";
       }
+      async buildMeshCheckpointContext(workspace, base) {
+        if (!this.components) return base;
+        try {
+          const statusResult = await Promise.race([
+            this.components.router.execute("git_status", { workspace }, "mesh"),
+            new Promise((resolve22) => setTimeout(() => resolve22(null), 4e3))
+          ]);
+          const s = statusResult?.status ?? statusResult;
+          if (s?.isGitRepo) {
+            return {
+              ...base,
+              branch: s.branch ?? "",
+              ahead: s.ahead ?? 0,
+              behind: s.behind ?? 0
+            };
+          }
+        } catch {
+        }
+        return base;
+      }
       triggerImmediateLaunchStatusUpdate(reason) {
         this.statusReporter?.resetP2PHash();
         void this.statusReporter?.sendUnifiedStatusReport({ forceServer: true, reason });
@@ -91225,13 +91285,15 @@ ${err?.stack || ""}`);
             void this.flushP2PWorkspaceGitSubscriptions();
           }
           if (cmdType === "git_checkpoint" && routed.success && this.meshManager) {
-            void this.meshManager.emit({
-              trigger: "git_checkpoint_complete",
-              context: {
-                workspace: String(normalizedData.workspace ?? ""),
-                checkpoint_message: routed.checkpoint?.message ?? String(normalizedData.message ?? ""),
-                commit: routed.checkpoint?.commit ?? ""
-              }
+            const workspace = String(normalizedData.workspace ?? "");
+            const baseContext = {
+              workspace,
+              checkpoint_message: routed.checkpoint?.message ?? String(normalizedData.message ?? ""),
+              commit: routed.checkpoint?.commit ?? "",
+              source_session_id: String(normalizedData.targetSessionId ?? "")
+            };
+            void this.buildMeshCheckpointContext(workspace, baseContext).then((ctx) => {
+              this.meshManager.emit({ trigger: "git_checkpoint_complete", context: ctx });
             });
           }
           return { ...routed, interactionId };
@@ -96887,8 +96949,8 @@ Claude Desktop config (~/.claude_desktop_config.json):
     }
   }
 
-Tools available (local):  list_sessions, read_chat, send_chat, approve, screenshot, git_status
-Tools available (cloud):  list_sessions, read_chat, send_chat, approve
+Tools available (local):  list_daemons, list_sessions, launch_session, stop_session, check_pending, read_chat, send_chat, approve, git_status, screenshot
+Tools available (cloud):  list_daemons, list_sessions, launch_session, stop_session, check_pending, read_chat, send_chat, approve, git_status
         `).action(async (opts) => {
     const mcpBin = resolveMcpBin();
     if (!mcpBin) {