@adhdev/daemon-core 0.9.82-rc.227 → 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;
@@ -22768,7 +22782,7 @@ function buildCliSession(state, options) {
     mode: state.mode,
     resume: state.resume,
     activeChat,
-    ...state.activeInteractivePrompt ? { activeInteractivePrompt: state.activeInteractivePrompt } : {},
+    activeInteractivePrompt: state.activeInteractivePrompt ?? null,
     ...summaryMetadata && { summaryMetadata },
     ...includeSessionMetadata && {
       capabilities: state.mode === "terminal" ? PTY_SESSION_CAPABILITIES : CLI_CHAT_SESSION_CAPABILITIES,
@@ -22783,7 +22797,8 @@ function buildCliSession(state, options) {
     lastUpdated: state.lastUpdated,
     settings: state.settings,
     ...coordinator && { coordinator },
-    ...meshQueueStats && { meshQueueStats }
+    ...meshQueueStats && { meshQueueStats },
+    ...state.settings?.spawnedSessionVisibility === "hidden" && { surfaceHidden: true }
   };
 }
 function buildAcpSession(state, options) {
@@ -22823,7 +22838,8 @@ function buildAcpSession(state, options) {
     lastUpdated: state.lastUpdated,
     settings: state.settings,
     ...coordinator && { coordinator },
-    ...meshQueueStats && { meshQueueStats }
+    ...meshQueueStats && { meshQueueStats },
+    ...state.settings?.spawnedSessionVisibility === "hidden" && { surfaceHidden: true }
   };
 }
 function buildSessionEntries(allStates, cdpManagers, options = {}) {
@@ -25128,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,
@@ -43793,14 +43811,27 @@ ${tail}` : ""
         const nodeId = typeof args?.nodeId === "string" ? args.nodeId.trim() : "";
         let workspace = typeof args?.workspace === "string" ? args.workspace.trim() : "";
         let submoduleIgnorePaths = Array.isArray(args?.submoduleIgnorePaths) ? args.submoduleIgnorePaths.filter((value) => typeof value === "string") : void 0;
-        if (!workspace && meshId && nodeId) {
+        let nodeDaemonId;
+        if (meshId && nodeId) {
           const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh);
           const mesh = meshRecord?.mesh;
           const node = mesh?.nodes?.find((n) => n.id === nodeId || n.nodeId === nodeId);
-          workspace = typeof node?.workspace === "string" ? node.workspace.trim() : "";
+          if (!workspace) {
+            workspace = typeof node?.workspace === "string" ? node.workspace.trim() : "";
+          }
           if (!submoduleIgnorePaths && Array.isArray(node?.policy?.submoduleIgnorePaths)) {
             submoduleIgnorePaths = node.policy.submoduleIgnorePaths.filter((value) => typeof value === "string");
           }
+          nodeDaemonId = typeof node?.daemonId === "string" ? node.daemonId.trim() : void 0;
+        }
+        const selfDaemonId = this.deps.statusInstanceId;
+        const isRemote = nodeDaemonId && selfDaemonId && nodeDaemonId !== selfDaemonId;
+        if (isRemote && this.deps.dispatchMeshCommand) {
+          const forwarded = await this.deps.dispatchMeshCommand(nodeDaemonId, "fast_forward_mesh_node", {
+            ...typeof args === "object" && args !== null ? args : {},
+            workspace
+          });
+          return forwarded ?? { success: false, error: "no response from remote node" };
         }
         const result = await fastForwardMeshNode({
           meshId: meshId || void 0,
@@ -43838,6 +43869,14 @@ ${tail}` : ""
           }
           let worktreeCleanup;
           if (node?.isLocalWorktree) {
+            const nodeDaemonId = typeof node.daemonId === "string" ? node.daemonId.trim() : void 0;
+            const isRemoteWorktree = nodeDaemonId && nodeDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand;
+            if (isRemoteWorktree) {
+              const forwarded = await this.deps.dispatchMeshCommand(nodeDaemonId, "remove_mesh_node", {
+                ...typeof args === "object" && args !== null ? args : {}
+              });
+              return forwarded ?? { success: false, error: "no response from remote node" };
+            }
             const cleanupResult = await this.cleanupLocalWorktreeNode({ mesh, node, nodeId, force: args?.force === true });
             if (cleanupResult.success === false) {
               return {
@@ -43904,6 +43943,13 @@ ${tail}` : ""
           if (!mesh) return { success: false, error: "Mesh not found" };
           const sourceNode = mesh.nodes?.find((n) => n.id === sourceNodeId || n.nodeId === sourceNodeId);
           if (!sourceNode) return { success: false, error: `Source node '${sourceNodeId}' not found in mesh` };
+          const sourceDaemonId = typeof sourceNode.daemonId === "string" ? sourceNode.daemonId.trim() : void 0;
+          if (sourceDaemonId && sourceDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand) {
+            const forwarded = await this.deps.dispatchMeshCommand(sourceDaemonId, "clone_mesh_node", {
+              ...typeof args === "object" && args !== null ? args : {}
+            });
+            return forwarded ?? { success: false, error: "no response from remote node" };
+          }
           const repoRoot = sourceNode.repoRoot || sourceNode.workspace;
           const { createWorktree: createWorktree2 } = await Promise.resolve().then(() => (init_git_worktree(), git_worktree_exports));
           const result = await createWorktree2({
@@ -44136,6 +44182,13 @@ ${tail}` : ""
           const node = mesh.nodes?.find((n) => n.id === nodeId || n.nodeId === nodeId);
           if (!node) return { success: false, error: `Node '${nodeId}' not found in mesh` };
           if (!node.isLocalWorktree) return { success: false, error: "Node is not a local worktree node" };
+          const nodeDaemonId = typeof node.daemonId === "string" ? node.daemonId.trim() : void 0;
+          if (nodeDaemonId && nodeDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand) {
+            const forwarded = await this.deps.dispatchMeshCommand(nodeDaemonId, "retry_mesh_node_bootstrap", {
+              ...typeof args === "object" && args !== null ? args : {}
+            });
+            return forwarded ?? { success: false, error: "no response from remote node" };
+          }
           const currentBootstrap = node.worktreeBootstrap;
           if (currentBootstrap?.status === "running") {
             return { success: false, error: "Bootstrap is already running for this node" };