@adhdev/daemon-core 0.9.82-rc.228 → 0.9.82-rc.229

package/dist/index.js

@@ -6860,7 +6860,7 @@ function markAutoLaunch(meshId, taskId, args) {
     error: args.error
   });
 }
-async function resolveUsableProvider(components, nodeId, node) {
+async function resolveUsableProvider(components, nodeId, node, requiredTags) {
   const providerPriority = normalizeProviderPriority(node?.policy);
   if (!providerPriority.length) return { reason: "missing_provider_priority" };
   const providerLoader = components.providerLoader;
@@ -6868,6 +6868,10 @@ async function resolveUsableProvider(components, nodeId, node) {
   const failed = [];
   for (const requestedType of providerPriority) {
     const normalizedType = typeof providerLoader.resolveAlias === "function" ? providerLoader.resolveAlias(requestedType) : requestedType;
+    if (requiredTags?.length && !nodeSatisfiesRequiredTags(requiredTags, buildMeshNodeCapabilityTags(node, normalizedType))) {
+      failed.push(`${requestedType}: required_tags_mismatch`);
+      continue;
+    }
     if (typeof providerLoader.isMachineProviderEnabled === "function" && !providerLoader.isMachineProviderEnabled(normalizedType)) {
       failed.push(`${requestedType}: disabled`);
       continue;
@@ -6906,9 +6910,19 @@ async function maybeAutoLaunchOneQueueSession(components, meshId, mesh) {
       markAutoLaunch(meshId, task.id, { status: "skipped", reason: "target_session_constraint" });
       continue;
     }
-    const candidateNodes = Array.isArray(mesh?.nodes) ? mesh.nodes.filter((node) => task.targetNodeId ? node?.id === task.targetNodeId : true) : [];
+    const candidateNodes = Array.isArray(mesh?.nodes) ? mesh.nodes.filter((node) => {
+      if (task.targetNodeId && node?.id !== task.targetNodeId) return false;
+      if (task.requiredTags?.length) {
+        const priorities = normalizeProviderPriority(node?.policy);
+        const providerCandidates = priorities.length ? priorities : [void 0];
+        return providerCandidates.some(
+          (p) => nodeSatisfiesRequiredTags(task.requiredTags, buildMeshNodeCapabilityTags(node, p))
+        );
+      }
+      return true;
+    }) : [];
     if (!candidateNodes.length) {
-      markAutoLaunch(meshId, task.id, { status: "skipped", reason: "no_matching_node", nodeId: task.targetNodeId });
+      markAutoLaunch(meshId, task.id, { status: "skipped", reason: "no_node_satisfies_required_tags", nodeId: task.targetNodeId });
       continue;
     }
     for (const node of candidateNodes) {
@@ -6950,7 +6964,7 @@ async function maybeAutoLaunchOneQueueSession(components, meshId, mesh) {
       }
       autoLaunchInProgress.add(launchKey);
       try {
-        const resolved = await resolveUsableProvider(components, nodeId, node);
+        const resolved = await resolveUsableProvider(components, nodeId, node, task.requiredTags);
         if (!resolved.providerType) {
           markAutoLaunch(meshId, task.id, { status: "skipped", reason: resolved.reason || "provider_unusable", nodeId });
           continue;
@@ -25130,8 +25144,10 @@ async function handleReadChat(h, args) {
       const agentStr = provider?.type || args?.agentType || getCurrentProviderType(h);
       const targetSid = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
       const registrySessionWorkspace = targetSid ? h.ctx?.sessionRegistry?.get?.(targetSid)?.workspace : void 0;
-      const workspace = typeof h.currentSession?.workspace === "string" ? h.currentSession.workspace : typeof registrySessionWorkspace === "string" ? registrySessionWorkspace : void 0;
-      const intendedWorkspace = typeof args?.workspace === "string" ? args.workspace : void 0;
+      const currentSessionWorkspace = typeof h.currentSession?.workspace === "string" ? h.currentSession.workspace : void 0;
+      const argsWorkspace = typeof args?.workspace === "string" ? args.workspace : void 0;
+      const workspace = targetSid ? typeof registrySessionWorkspace === "string" ? registrySessionWorkspace : argsWorkspace ?? currentSessionWorkspace : typeof currentSessionWorkspace === "string" ? currentSessionWorkspace : void 0;
+      const intendedWorkspace = argsWorkspace;
       const supportsNative = supportsCliNativeTranscript(agentStr, provider) && isNativeSourceCanonicalHistory(provider?.nativeHistory);
       const history = supportsNative ? readCliProviderNativeHistory(agentStr, {
         canonicalHistory: provider?.nativeHistory,