@adhdev/daemon-standalone 0.9.76-rc.25 → 0.9.76-rc.26

package/dist/index.js

@@ -46534,7 +46534,19 @@ ${effect.notification.body || ""}`.trim();
         }
       }
       pushEvent(event) {
-        this.events.push(event);
+        const enrichedEvent = {
+          ...event,
+          instanceId: typeof event.instanceId === "string" && event.instanceId.trim() ? event.instanceId : this.instanceId,
+          targetSessionId: typeof event.targetSessionId === "string" && event.targetSessionId.trim() ? event.targetSessionId : this.instanceId,
+          providerType: typeof event.providerType === "string" && event.providerType.trim() ? event.providerType : this.type,
+          workspaceName: typeof event.workspaceName === "string" && event.workspaceName.trim() ? event.workspaceName : this.workingDir,
+          providerSessionId: typeof event.providerSessionId === "string" && event.providerSessionId.trim() ? event.providerSessionId : this.providerSessionId
+        };
+        if (this.context?.emitProviderEvent) {
+          this.context.emitProviderEvent(enrichedEvent);
+          return;
+        }
+        this.events.push(enrichedEvent);
       }
       flushEvents() {
         const events = [...this.events];
@@ -52222,6 +52234,40 @@ Run 'adhdev doctor' for detailed diagnostics.`
     function resolveUpgradeChannel(args) {
       return normalizeReleaseChannel(args?.channel) || normalizeReleaseChannel(args?.updatePolicy?.channel) || normalizeReleaseChannel(args?.npmTag) || normalizeReleaseChannel(loadConfig2().updateChannel) || "stable";
     }
+    function readProviderPriorityFromPolicy(policy) {
+      const record2 = policy && typeof policy === "object" && !Array.isArray(policy) ? policy : {};
+      const raw = record2.providerPriority;
+      if (!Array.isArray(raw)) return [];
+      const seen = /* @__PURE__ */ new Set();
+      return raw.map((type) => typeof type === "string" ? type.trim() : "").filter(Boolean).filter((type) => {
+        if (seen.has(type)) return false;
+        seen.add(type);
+        return true;
+      });
+    }
+    async function resolveProviderTypeFromPriority(args) {
+      if (!args.providerPriority.length) {
+        return { error: `Node '${args.nodeId}' has no providerPriority policy; pass cliType explicitly or configure node.policy.providerPriority` };
+      }
+      const failed = [];
+      for (const requestedType of args.providerPriority) {
+        const normalizedType = args.providerLoader.resolveAlias(requestedType);
+        if (!args.providerLoader.isMachineProviderEnabled(normalizedType)) {
+          failed.push(`${requestedType}: disabled`);
+          continue;
+        }
+        const detected = await detectCLI(normalizedType, args.providerLoader, { includeVersion: false });
+        args.providerLoader.setCliDetectionResults([{
+          id: normalizedType,
+          installed: !!detected,
+          path: detected?.path
+        }], false);
+        args.onStatusChange?.();
+        if (detected) return { providerType: normalizedType };
+        failed.push(`${requestedType}: not detected`);
+      }
+      return { error: `No usable provider detected for node '${args.nodeId}' from providerPriority: ${failed.join("; ")}` };
+    }
     function loadYamlModule() {
       return yaml;
     }
@@ -53166,7 +53212,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
           // ─── Mesh Coordinator Launch ───
           case "launch_mesh_coordinator": {
             const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
-            const cliType = typeof args?.cliType === "string" ? args.cliType.trim() : "claude-cli";
+            let cliType = typeof args?.cliType === "string" ? args.cliType.trim() : "";
             if (!meshId) return { success: false, error: "meshId required" };
             try {
               const { buildCoordinatorSystemPrompt: buildCoordinatorSystemPrompt2 } = await Promise.resolve().then(() => (init_coordinator_prompt(), coordinator_prompt_exports));
@@ -53194,6 +53240,25 @@ Run 'adhdev doctor' for detailed diagnostics.`
               }
               const workspace = typeof coordinatorNode.workspace === "string" ? coordinatorNode.workspace.trim() : "";
               if (!workspace) return { success: false, error: "Coordinator node workspace required", meshId, cliType };
+              if (!cliType) {
+                const resolved = await resolveProviderTypeFromPriority({
+                  nodeId: String(coordinatorNode.id || coordinatorNode.nodeId || preferredCoordinatorNodeId || "coordinator"),
+                  providerPriority: readProviderPriorityFromPolicy(coordinatorNode.policy),
+                  providerLoader: this.deps.providerLoader,
+                  onStatusChange: this.deps.onStatusChange
+                });
+                if (!resolved.providerType) {
+                  return {
+                    success: false,
+                    code: "mesh_coordinator_provider_priority_unusable",
+                    error: resolved.error || "No usable provider found from node providerPriority",
+                    meshId,
+                    cliType,
+                    workspace
+                  };
+                }
+                cliType = resolved.providerType;
+              }
               const providerMeta = this.deps.providerLoader.resolve?.(cliType) || this.deps.providerLoader.getMeta(cliType);
               const coordinatorSetup = resolveMeshCoordinatorSetup({
                 provider: providerMeta,
@@ -53506,6 +53571,12 @@ Run 'adhdev doctor' for detailed diagnostics.`
         if (providerType) {
           payload.providerType = providerType;
         }
+        if (typeof event.providerSessionId === "string" && event.providerSessionId.trim()) {
+          payload.providerSessionId = event.providerSessionId.trim();
+        }
+        if (typeof event.workspaceName === "string" && event.workspaceName.trim()) {
+          payload.workspaceName = event.workspaceName.trim();
+        }
         if (typeof event.duration === "number" && Number.isFinite(event.duration)) {
           payload.duration = event.duration;
         }
@@ -54735,7 +54806,10 @@ Run 'adhdev doctor' for detailed diagnostics.`
           this.instances.get(id).dispose();
         }
         this.instances.set(id, instance);
-        await instance.init(context);
+        await instance.init({
+          ...context,
+          emitProviderEvent: (event) => this.emitProviderEvent(instance.type, id, event)
+        });
       }
       /**
       * Instance remove
@@ -54897,6 +54971,17 @@ Run 'adhdev doctor' for detailed diagnostics.`
       onEvent(listener) {
         this.eventListeners.push(listener);
       }
+      emitProviderEvent(providerType, instanceId, event) {
+        const payload = {
+          ...event,
+          providerType,
+          instanceId: typeof event.instanceId === "string" && event.instanceId.trim() ? event.instanceId : instanceId,
+          targetSessionId: typeof event.targetSessionId === "string" && event.targetSessionId.trim() ? event.targetSessionId : instanceId
+        };
+        for (const listener of this.eventListeners) {
+          listener(payload);
+        }
+      }
       emitPendingEvents(providerType, state, extra = {}) {
         for (const event of state.pendingEvents) {
           for (const listener of this.eventListeners) {