@adhdev/daemon-core 0.9.76-rc.24 → 0.9.76-rc.26

package/dist/index.js

@@ -12493,7 +12493,7 @@ async function handleChatHistory(h, args) {
   }
 }
 async function handleReadChat(h, args) {
-  const provider = h.getProvider(args?.agentType);
+  const provider = h.getProvider(args?.agentType || args?.providerType);
   const transport = getTargetTransport(h, provider);
   const historySessionId = getHistorySessionId(h, args);
   const _log = (msg) => LOG.debug("Command", `[read_chat] ${msg}`);
@@ -15457,7 +15457,19 @@ var CliProviderInstance = class {
     }
   }
   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];
@@ -21179,6 +21191,40 @@ function normalizeReleaseChannel(value) {
 function resolveUpgradeChannel(args) {
   return normalizeReleaseChannel(args?.channel) || normalizeReleaseChannel(args?.updatePolicy?.channel) || normalizeReleaseChannel(args?.npmTag) || normalizeReleaseChannel(loadConfig().updateChannel) || "stable";
 }
+function readProviderPriorityFromPolicy(policy) {
+  const record = policy && typeof policy === "object" && !Array.isArray(policy) ? policy : {};
+  const raw = record.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;
 }
@@ -22014,7 +22060,13 @@ var DaemonCommandRouter = class {
         if (!workspace) return { success: false, error: "workspace required" };
         try {
           const { addNode: addNode3 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
-          const node = addNode3(meshId, { workspace });
+          const providerPriority = Array.isArray(args?.providerPriority) ? args.providerPriority.map((type) => typeof type === "string" ? type.trim() : "").filter(Boolean) : [];
+          const readOnly = args?.readOnly === true;
+          const policy = {
+            ...readOnly ? { readOnly: true } : {},
+            ...providerPriority.length ? { providerPriority } : {}
+          };
+          const node = addNode3(meshId, { workspace, ...policy ? { policy } : {} });
           if (!node) return { success: false, error: "Mesh not found" };
           return { success: true, node };
         } catch (e) {
@@ -22117,7 +22169,7 @@ var DaemonCommandRouter = class {
       // ─── 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));
@@ -22145,6 +22197,25 @@ var DaemonCommandRouter = class {
           }
           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,
@@ -22459,6 +22530,12 @@ var DaemonStatusReporter = class {
     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;
     }
@@ -23706,7 +23783,10 @@ var ProviderInstanceManager = class {
       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
@@ -23868,6 +23948,17 @@ var ProviderInstanceManager = class {
   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) {