@adhdev/daemon-standalone 0.9.76-rc.30 → 0.9.76-rc.32

package/package.json

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

package/vendor/mcp-server/index.js

@@ -39498,33 +39498,49 @@ 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 = event.instanceId;
+    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 = state.workspace;
+    const workspace = readNonEmptyString(state.workspace);
     if (!workspace) return;
-    const mesh = getMeshByRepo(workspace);
-    if (!mesh) 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 !== mesh.id) return false;
+      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 nodeLabel = targetNode ? `Node '${targetNode.id}'` : `Agent at ${workspace}`;
+    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. You may use mesh_read_chat to review its progress.`;
+      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. You may use mesh_read_chat and mesh_approve to handle it.`;
+      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) {
@@ -41890,9 +41906,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}`);
@@ -56629,6 +56644,28 @@ function isGitStatusDirty(status) {
   if (typeof status?.dirty === "boolean") return status.dirty;
   return countUncommittedChanges(status) > 0;
 }
+function readProviderPriority(policy) {
+  const raw = policy?.providerPriority;
+  return Array.isArray(raw) ? raw.map((type2) => typeof type2 === "string" ? type2.trim() : "").filter(Boolean) : [];
+}
+function missingProviderPriorityMessage(nodeId) {
+  return `Node '${nodeId}' has no providerPriority policy; pass type explicitly or configure node.policy.providerPriority`;
+}
+function getNodeLaunchReadiness(node) {
+  const providerPriority = readProviderPriority(node.policy);
+  if (providerPriority.length) {
+    return {
+      providerPriority,
+      launchReady: true
+    };
+  }
+  return {
+    providerPriority,
+    launchReady: false,
+    launchBlockedReason: "missing_provider_priority",
+    launchBlockedMessage: missingProviderPriorityMessage(node.id)
+  };
+}
 async function commandForNode(ctx, node, command, args = {}) {
   if (ctx.transport instanceof IpcTransport && node.daemonId) {
     return ctx.transport.meshCommand(node.daemonId, command, args);
@@ -56772,7 +56809,8 @@ async function meshStatus(ctx) {
   for (const node of mesh.nodes) {
     const entry = {
       nodeId: node.id,
-      workspace: node.workspace
+      workspace: node.workspace,
+      ...getNodeLaunchReadiness(node)
     };
     try {
       if (!isLocalTransport(transport) && node.daemonId) {
@@ -56824,6 +56862,7 @@ async function meshListNodes(ctx) {
       repoRoot: n.repoRoot,
       isLocalWorktree: n.isLocalWorktree,
       policy: n.policy,
+      ...getNodeLaunchReadiness(n),
       userOverrides: n.userOverrides
     }))
   }, null, 2);
@@ -56877,10 +56916,9 @@ async function meshLaunchSession(ctx, args) {
   if (isLocalTransport(ctx.transport)) {
     let resolvedProviderType = typeof args.type === "string" && args.type.trim() ? args.type : "";
     if (!resolvedProviderType) {
-      const rawProviderPriority = node.policy?.providerPriority;
-      const providerPriority = Array.isArray(rawProviderPriority) ? rawProviderPriority.map((type2) => typeof type2 === "string" ? type2.trim() : "").filter(Boolean) : [];
+      const providerPriority = readProviderPriority(node.policy);
       if (!providerPriority.length) {
-        return JSON.stringify({ success: false, error: `Node '${args.node_id}' has no providerPriority policy; pass type explicitly or configure node.policy.providerPriority` });
+        return JSON.stringify({ success: false, error: missingProviderPriorityMessage(args.node_id) });
       }
       const failed = [];
       for (const providerType of providerPriority) {
@@ -56901,6 +56939,7 @@ async function meshLaunchSession(ctx, args) {
       dir: node.workspace,
       settings: {
         meshNodeFor: ctx.mesh.id,
+        meshNodeId: args.node_id,
         launchedByCoordinator: true
       }
     });