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

package/dist/index.js

@@ -34485,9 +34485,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`;
-                LOG2.warn("CLI", `[${this.cliType}] ${message} elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs} screen=${JSON.stringify(diagnostic.screenText).slice(0, 240)}`);
-                completion.rejectOnce(new Error(message));
+                LOG2.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;
               }
               LOG2.warn("CLI", `[${this.cliType}] prompt echo was not observed before submit; sending submit key anyway elapsed=${elapsed}ms maxEchoWaitMs=${state.maxEchoWaitMs}`);
@@ -51574,6 +51573,98 @@ Run 'adhdev doctor' for detailed diagnostics.`
         return null;
       }
     }
+    init_mesh_config();
+    init_logger();
+    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();
+        LOG2.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
+        });
+      });
+    }
     var os18 = __toESM2(require("os"));
     init_config();
     init_terminal_screen();
@@ -52538,6 +52629,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":
@@ -61108,60 +61202,6 @@ data: ${JSON.stringify(msg.data)}
     };
     init_logger();
     init_config();
-    init_mesh_config();
-    init_logger();
-    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();
-          LOG2.info("MeshEvents", `Forwarding event from ${workspace} to coordinator ${coordState.instanceId}`);
-          coord.onEvent("send_message", { input: { text: messageText, textFallback: messageText } });
-        }
-      });
-    }
     async function initDaemonComponents2(config2) {
       installGlobalInterceptor();
       const appConfig = loadConfig2();