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

package/dist/index.js

@@ -3274,9 +3274,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}`);
@@ -30121,33 +30120,49 @@ init_config();
 // src/mesh/mesh-events.ts
 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 = 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) {