@adhdev/daemon-standalone 0.9.76-rc.31 → 0.9.76-rc.33

package/package.json

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

package/vendor/mcp-server/index.js

@@ -34578,6 +34578,96 @@ function normalizeExistingPath(filePath) {
     return null;
   }
 }
+function readNonEmptyString(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : "";
+}
+function formatCompletionMetadata(event) {
+  const parts = [
+    readNonEmptyString(event.targetSessionId) ? `session_id=${readNonEmptyString(event.targetSessionId)}` : "",
+    readNonEmptyString(event.providerType) ? `provider=${readNonEmptyString(event.providerType)}` : "",
+    readNonEmptyString(event.providerSessionId) ? `provider_session_id=${readNonEmptyString(event.providerSessionId)}` : ""
+  ].filter(Boolean);
+  return parts.length > 0 ? ` (${parts.join("; ")})` : "";
+}
+function buildMeshSystemMessage(args) {
+  const metadata = formatCompletionMetadata(args.metadataEvent);
+  if (args.event === "agent:generating_completed") {
+    return `[System] ${args.nodeLabel} has completed its task and is now idle${metadata}. You may use mesh_read_chat to review its progress.`;
+  }
+  if (args.event === "agent:waiting_approval") {
+    return `[System] ${args.nodeLabel} is waiting for approval to proceed${metadata}. You may use mesh_read_chat and mesh_approve to handle it.`;
+  }
+  return "";
+}
+function injectMeshSystemMessage(components, args) {
+  const coordinatorInstances = components.instanceManager.getByCategory("cli").filter((inst) => {
+    const instState = inst.getState();
+    if (instState.settings?.meshCoordinatorFor !== args.meshId) return false;
+    if (args.sourceInstanceId && instState.instanceId === args.sourceInstanceId) return false;
+    return true;
+  });
+  if (coordinatorInstances.length === 0) return { success: true, forwarded: 0 };
+  const messageText = buildMeshSystemMessage({
+    event: args.event,
+    nodeLabel: args.nodeLabel,
+    metadataEvent: args.metadataEvent
+  });
+  if (!messageText) return { success: false, error: "unsupported mesh event" };
+  for (const coord of coordinatorInstances) {
+    const coordState = coord.getState();
+    LOG.info("MeshEvents", `Forwarding mesh event to coordinator ${coordState.instanceId}`);
+    coord.onEvent("send_message", { input: { text: messageText, textFallback: messageText } });
+  }
+  return { success: true, forwarded: coordinatorInstances.length };
+}
+function handleMeshForwardEvent(components, payload) {
+  const eventName = readNonEmptyString(payload.event);
+  if (eventName !== "agent:generating_completed" && eventName !== "agent:waiting_approval") {
+    return { success: false, error: "unsupported mesh event" };
+  }
+  const meshId = readNonEmptyString(payload.meshId);
+  if (!meshId) return { success: false, error: "meshId required" };
+  const nodeId = readNonEmptyString(payload.nodeId);
+  const workspace = readNonEmptyString(payload.workspace);
+  const nodeLabel = nodeId ? `Node '${nodeId}'` : workspace ? `Agent at ${workspace}` : "Remote agent";
+  return injectMeshSystemMessage(components, {
+    meshId,
+    nodeLabel,
+    event: eventName,
+    metadataEvent: {
+      targetSessionId: readNonEmptyString(payload.targetSessionId) || readNonEmptyString(payload.sessionId),
+      providerType: readNonEmptyString(payload.providerType),
+      providerSessionId: readNonEmptyString(payload.providerSessionId)
+    }
+  });
+}
+function setupMeshEventForwarding(components) {
+  components.instanceManager.onEvent((event) => {
+    if (event.event !== "agent:generating_completed" && event.event !== "agent:waiting_approval") return;
+    const instanceId = readNonEmptyString(event.instanceId);
+    if (!instanceId) return;
+    const sourceInstance = components.instanceManager.getInstance(instanceId);
+    if (!sourceInstance || sourceInstance.category !== "cli") return;
+    const state = sourceInstance.getState();
+    const workspace = readNonEmptyString(state.workspace);
+    if (!workspace) return;
+    const settings = state.settings && typeof state.settings === "object" ? state.settings : {};
+    const meshIdFromRuntime = readNonEmptyString(settings.meshNodeFor);
+    const mesh = meshIdFromRuntime ? getMesh(meshIdFromRuntime) : getMeshByRepo(workspace);
+    const meshId = meshIdFromRuntime || readNonEmptyString(mesh?.id);
+    if (!meshId) return;
+    const targetNode = mesh?.nodes?.find((n) => n.workspace === workspace);
+    const runtimeNodeId = readNonEmptyString(settings.meshNodeId);
+    const nodeLabel = targetNode ? `Node '${targetNode.id}'` : runtimeNodeId ? `Node '${runtimeNodeId}'` : `Agent at ${workspace}`;
+    injectMeshSystemMessage(components, {
+      meshId,
+      sourceInstanceId: instanceId,
+      nodeLabel,
+      event: event.event,
+      metadataEvent: event
+    });
+  });
+}
 function buildRecentReadDebugSignature(snapshot) {
   return [
     snapshot.providerType,
@@ -39498,58 +39588,6 @@ function launchIDE(ide, workspacePath) {
     return false;
   }
 }
-function readNonEmptyString(value) {
-  return typeof value === "string" && value.trim() ? value.trim() : "";
-}
-function formatCompletionMetadata(event) {
-  const parts = [
-    readNonEmptyString(event.targetSessionId) ? `session_id=${readNonEmptyString(event.targetSessionId)}` : "",
-    readNonEmptyString(event.providerType) ? `provider=${readNonEmptyString(event.providerType)}` : "",
-    readNonEmptyString(event.providerSessionId) ? `provider_session_id=${readNonEmptyString(event.providerSessionId)}` : ""
-  ].filter(Boolean);
-  return parts.length > 0 ? ` (${parts.join("; ")})` : "";
-}
-function setupMeshEventForwarding(components) {
-  components.instanceManager.onEvent((event) => {
-    if (event.event !== "agent:generating_completed" && event.event !== "agent:waiting_approval") return;
-    const instanceId = readNonEmptyString(event.instanceId);
-    if (!instanceId) return;
-    const sourceInstance = components.instanceManager.getInstance(instanceId);
-    if (!sourceInstance || sourceInstance.category !== "cli") return;
-    const state = sourceInstance.getState();
-    const workspace = readNonEmptyString(state.workspace);
-    if (!workspace) return;
-    const settings = state.settings && typeof state.settings === "object" ? state.settings : {};
-    const meshIdFromRuntime = readNonEmptyString(settings.meshNodeFor);
-    const mesh = meshIdFromRuntime ? getMesh(meshIdFromRuntime) : getMeshByRepo(workspace);
-    const meshId = meshIdFromRuntime || readNonEmptyString(mesh?.id);
-    if (!meshId) return;
-    const allInstances = components.instanceManager.getByCategory("cli");
-    const coordinatorInstances = allInstances.filter((inst) => {
-      const instState = inst.getState();
-      if (instState.settings?.meshCoordinatorFor !== meshId) return false;
-      if (instState.instanceId === instanceId) return false;
-      return true;
-    });
-    if (coordinatorInstances.length === 0) return;
-    const targetNode = mesh?.nodes?.find((n) => n.workspace === workspace);
-    const runtimeNodeId = readNonEmptyString(settings.meshNodeId);
-    const nodeLabel = targetNode ? `Node '${targetNode.id}'` : runtimeNodeId ? `Node '${runtimeNodeId}'` : `Agent at ${workspace}`;
-    const metadata = formatCompletionMetadata(event);
-    let messageText = "";
-    if (event.event === "agent:generating_completed") {
-      messageText = `[System] ${nodeLabel} has completed its task and is now idle${metadata}. You may use mesh_read_chat to review its progress.`;
-    } else if (event.event === "agent:waiting_approval") {
-      messageText = `[System] ${nodeLabel} is waiting for approval to proceed${metadata}. You may use mesh_read_chat and mesh_approve to handle it.`;
-    }
-    if (!messageText) return;
-    for (const coord of coordinatorInstances) {
-      const coordState = coord.getState();
-      LOG.info("MeshEvents", `Forwarding event from ${workspace} to coordinator ${coordState.instanceId}`);
-      coord.onEvent("send_message", { input: { text: messageText, textFallback: messageText } });
-    }
-  });
-}
 async function initDaemonComponents(config2) {
   installGlobalInterceptor();
   const appConfig = loadConfig();
@@ -41906,9 +41944,8 @@ ${lastSnapshot}`;
               };
               this.recordTrace("submit_echo_missing", diagnostic);
               if (this.requirePromptEchoBeforeSubmit) {
-                const message = `${this.cliName} prompt echo was not observed on the PTY screen before submit`;
-                LOG.warn("CLI", `[${this.cliType}] ${message} elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs} screen=${JSON.stringify(diagnostic.screenText).slice(0, 240)}`);
-                completion.rejectOnce(new Error(message));
+                LOG.warn("CLI", `[${this.cliType}] prompt echo was not observed before submit; sending guarded submit key anyway elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs} screen=${JSON.stringify(diagnostic.screenText).slice(0, 240)}`);
+                this.submitSendKey(state, completion);
                 return;
               }
               LOG.warn("CLI", `[${this.cliType}] prompt echo was not observed before submit; sending submit key anyway elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs}`);
@@ -50625,6 +50662,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
     DEFAULT_ADHDEV_MCP_COMMAND = "adhdev-mcp";
     HERMES_CLI_TYPE = "hermes-cli";
     HERMES_MCP_CONFIG_PATH = "~/.hermes/config.yaml";
+    init_mesh_config();
+    init_logger();
     init_config();
     init_terminal_screen();
     init_logger();
@@ -50806,6 +50845,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
       async executeDaemonCommand(cmd, args) {
         switch (cmd) {
           // ─── CLI / ACP commands ───
+          case "mesh_forward_event": {
+            return handleMeshForwardEvent({ instanceManager: this.deps.instanceManager }, args);
+          }
           case "launch_cli":
           case "stop_cli":
           case "set_cli_view_mode":
@@ -55214,8 +55256,6 @@ data: ${JSON.stringify(msg.data)}
     };
     init_logger();
     init_config();
-    init_mesh_config();
-    init_logger();
   }
 });
 
@@ -56630,6 +56670,17 @@ function extractGitDiff(value) {
 function extractLaunchPayload(value) {
   return findNestedPayload(value, (payload) => Boolean(payload?.sessionId || payload?.id || payload?.runtimeSessionId));
 }
+function resolveCoordinatorNode(ctx) {
+  const preferredNodeId = typeof ctx.mesh.coordinator?.preferredNodeId === "string" ? ctx.mesh.coordinator.preferredNodeId.trim() : "";
+  if (preferredNodeId) {
+    const preferred = ctx.mesh.nodes.find((n) => n.id === preferredNodeId && typeof n.daemonId === "string" && n.daemonId.trim());
+    if (preferred) return preferred;
+  }
+  if (ctx.localDaemonId) {
+    return ctx.mesh.nodes.find((n) => n.daemonId === ctx.localDaemonId);
+  }
+  return void 0;
+}
 function meshSessionCacheKey(nodeId, runtimeSessionId) {
   return `${nodeId}:${runtimeSessionId}`;
 }
@@ -56935,12 +56986,15 @@ async function meshLaunchSession(ctx, args) {
         return JSON.stringify({ success: false, error: `No usable provider detected for node '${args.node_id}' from providerPriority: ${failed.join("; ")}` });
       }
     }
+    const coordinatorNode = resolveCoordinatorNode(ctx);
     const result = await commandForNode(ctx, node, "launch_cli", {
       cliType: resolvedProviderType,
       dir: node.workspace,
       settings: {
         meshNodeFor: ctx.mesh.id,
         meshNodeId: args.node_id,
+        ...coordinatorNode?.daemonId ? { meshCoordinatorDaemonId: coordinatorNode.daemonId } : {},
+        ...coordinatorNode?.id ? { meshCoordinatorNodeId: coordinatorNode.id } : {},
         launchedByCoordinator: true
       }
     });
@@ -57175,7 +57229,16 @@ async function startMcpServer(opts) {
 `);
       process.exit(1);
     }
-    const meshCtx = { mesh, transport };
+    let localDaemonId;
+    if (transport instanceof IpcTransport) {
+      try {
+        const statusResult = await transport.getStatus();
+        const instanceId = typeof statusResult?.status?.instanceId === "string" ? statusResult.status.instanceId.trim() : "";
+        if (instanceId) localDaemonId = instanceId;
+      } catch {
+      }
+    }
+    const meshCtx = { mesh, transport, ...localDaemonId ? { localDaemonId } : {} };
     const coordinatorPrompt = await buildMeshModeCoordinatorPrompt(mesh);
     const server2 = new import_server.Server(
       { name: "adhdev-mcp-server", version: "0.9.75" },