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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.227",
+  "version": "0.9.82-rc.228",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/commands/router.ts

@@ -5852,14 +5852,28 @@ export class DaemonCommandRouter {
                 let submoduleIgnorePaths = Array.isArray(args?.submoduleIgnorePaths)
                     ? args.submoduleIgnorePaths.filter((value: unknown): value is string => typeof value === 'string')
                     : undefined;
-                if (!workspace && meshId && nodeId) {
+                let nodeDaemonId: string | undefined;
+                if (meshId && nodeId) {
                     const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh);
                     const mesh = meshRecord?.mesh;
                     const node = mesh?.nodes?.find((n: any) => 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: unknown): value is string => typeof value === 'string');
                     }
+                    nodeDaemonId = typeof node?.daemonId === 'string' ? node.daemonId.trim() : undefined;
+                }
+                // If the target node belongs to a remote daemon, forward the command there.
+                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 as Record<string, unknown> : {}),
+                        workspace,
+                    });
+                    return (forwarded ?? { success: false, error: 'no response from remote node' }) as CommandRouterResult;
                 }
                 const result = await (fastForwardMeshNode({
                     meshId: meshId || undefined,
@@ -5901,6 +5915,15 @@ export class DaemonCommandRouter {
 
                     let worktreeCleanup: Record<string, unknown> | undefined;
                     if (node?.isLocalWorktree) {
+                        const nodeDaemonId = typeof node.daemonId === 'string' ? node.daemonId.trim() : undefined;
+                        const isRemoteWorktree = nodeDaemonId && nodeDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand;
+                        if (isRemoteWorktree) {
+                            // Worktree lives on a different machine — ask that daemon to clean it up.
+                            const forwarded = await this.deps.dispatchMeshCommand!(nodeDaemonId!, 'remove_mesh_node', {
+                                ...(typeof args === 'object' && args !== null ? args as Record<string, unknown> : {}),
+                            });
+                            return (forwarded ?? { success: false, error: 'no response from remote node' }) as CommandRouterResult;
+                        }
                         const cleanupResult = await this.cleanupLocalWorktreeNode({ mesh, node, nodeId, force: args?.force === true });
                         if (cleanupResult.success === false) {
                             return {
@@ -5983,6 +6006,15 @@ export class DaemonCommandRouter {
                     const sourceNode = mesh.nodes?.find((n: any) => n.id === sourceNodeId || n.nodeId === sourceNodeId);
                     if (!sourceNode) return { success: false, error: `Source node '${sourceNodeId}' not found in mesh` };
 
+                    // Forward to the source node's daemon if it's on a different machine.
+                    const sourceDaemonId = typeof sourceNode.daemonId === 'string' ? sourceNode.daemonId.trim() : undefined;
+                    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 as Record<string, unknown> : {}),
+                        });
+                        return (forwarded ?? { success: false, error: 'no response from remote node' }) as CommandRouterResult;
+                    }
+
                     const repoRoot = sourceNode.repoRoot || sourceNode.workspace;
                     const { createWorktree } = await import('../git/git-worktree.js');
                     const result = await createWorktree({
@@ -6238,6 +6270,15 @@ export class DaemonCommandRouter {
                     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' };
 
+                    // Bootstrap runs scripts in the worktree path — forward to the node's daemon if remote.
+                    const nodeDaemonId = typeof node.daemonId === 'string' ? node.daemonId.trim() : undefined;
+                    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 as Record<string, unknown> : {}),
+                        });
+                        return (forwarded ?? { success: false, error: 'no response from remote node' }) as CommandRouterResult;
+                    }
+
                     const currentBootstrap = node.worktreeBootstrap as WorktreeBootstrapState | undefined;
                     if (currentBootstrap?.status === 'running') {
                         return { success: false, error: 'Bootstrap is already running for this node' };

package/src/status/builders.ts

@@ -326,7 +326,7 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
         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,
@@ -342,6 +342,7 @@ function buildCliSession(state: CliProviderState, options: SessionEntryBuildOpti
         settings: state.settings,
         ...(coordinator && { coordinator }),
         ...(meshQueueStats && { meshQueueStats }),
+        ...(state.settings?.spawnedSessionVisibility === 'hidden' && { surfaceHidden: true }),
     };
 }
 
@@ -383,6 +384,7 @@ function buildAcpSession(state: AcpProviderState, options: SessionEntryBuildOpti
         settings: state.settings,
         ...(coordinator && { coordinator }),
         ...(meshQueueStats && { meshQueueStats }),
+        ...(state.settings?.spawnedSessionVisibility === 'hidden' && { surfaceHidden: true }),
     };
 }