@adhdev/daemon-standalone 0.9.82-rc.342 → 0.9.82-rc.345

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-standalone",
-  "version": "0.9.82-rc.342",
+  "version": "0.9.82-rc.345",
   "description": "ADHDev standalone daemon — embedded HTTP/WS server for local dashboard",
   "main": "dist/index.js",
   "bin": {
@@ -9,7 +9,7 @@
     "adhdev-mcp": "./vendor/mcp-server/index.js"
   },
   "scripts": {
-    "preinstall": "node -e \"const major=Number.parseInt(process.versions.node.split('.')[0],10); if (process.platform === 'win32' && major >= 24) { console.error('\\n✗ ADHDev standalone does not currently support Node.js 24+ on Windows.\\n  Install Node.js 22.x on Windows, then retry.\\n'); process.exit(1); }\"",
+    "preinstall": "node -e \"const major=Number.parseInt(process.versions.node.split('.')[0],10); if (process.platform === 'win32' && major >= 24 && !process.env.ADHDEV_BOOTSTRAP && !process.env.CI) { console.error('\\n✗ ADHDev standalone does not currently support Node.js 24+ on Windows.\\n  Install Node.js 22.x on Windows, then retry.\\n'); process.exit(1); }\"",
     "build": "tsup",
     "bundle:web": "node -e \"const{cpSync,mkdirSync}=require('fs');mkdirSync('public',{recursive:true});cpSync('../web-standalone/dist','public',{recursive:true});console.log('bundled web-standalone → public/')\"",
     "bundle:vendor": "node ./scripts/vendor-runtime-deps.mjs",

package/vendor/mcp-server/index.js

@@ -48,7 +48,23 @@ var IPC_COMMAND_TIMEOUTS_MS = {
   git_status: 45e3,
   git_diff_summary: 45e3,
   fast_forward_mesh_node: 12e4,
-  mesh_status: 12e4
+  mesh_status: 12e4,
+  // Heavy repo-mutating worktree ops (relay budgets: clone 90s, remove 60s). A local
+  // clone synchronously creates a worktree (~30s) plus a bounded setup-wait (~14s);
+  // 120s leaves headroom and matches the relay-wrapped remote path.
+  clone_mesh_node: 12e4,
+  remove_mesh_node: 6e4,
+  // A5: plan_mesh_refine_node is the SYNCHRONOUS refine dry-run — it runs several git
+  // probes (status/merge-tree/submodule) inline before replying, which can approach the
+  // 15s default on a slow (Windows) host. 45s defensively, matching git_status/diff.
+  plan_mesh_refine_node: 45e3,
+  // A2: refine_mesh_node / batch_refine_mesh_nodes are async-job-ack (the responder
+  // returns { async:true, status:'accepted' } immediately and works in the background),
+  // so 15s already suffices. 30s is a defensive floor guarding a future sync-dry-run
+  // regression; it is intentionally BELOW the relay 90s budget because the synchronous
+  // ack reply is sub-second and never bounded by the relay deadline.
+  refine_mesh_node: 3e4,
+  batch_refine_mesh_nodes: 3e4
 };
 var WS_CONNECTING = 0;
 var WS_OPEN = 1;
@@ -1078,7 +1094,7 @@ function chooseDispatchableSession(sessions, providerType, meshId, nodeId, coord
     const safety = classifyRemoteDelegateRelaySafety(session, meshId, nodeId, coordinatorDaemonId);
     return safety === "safe" || safety === "self_heal";
   });
-  return meshSessions.find((session) => isIdleSessionRecord(session) && matchingProvider(session)) || meshSessions.find(matchingProvider) || void 0;
+  return meshSessions.find((session) => isIdleSessionRecord(session) && matchingProvider(session)) || void 0;
 }
 function buildRelayUnsafeRemoteSessionFailure(ctx, node, sessionId, providerType) {
   return {
@@ -3368,7 +3384,7 @@ async function meshEnqueueTask(ctx, args) {
   const preferWorktree = args.preferWorktree === true || args.prefer_worktree === true;
   const targetNodeId = explicitTarget || (preferWorktree ? resolvePreferredWorktreeNodeId(ctx) : void 0);
   try {
-    const task = (0, import_daemon_core.enqueueTask)(ctx.mesh.id, args.message, { taskMode, requiredTags, dependsOn, missionId, targetNodeId });
+    const task = (0, import_daemon_core.enqueueTask)(ctx.mesh.id, args.message, { taskMode, requiredTags, dependsOn, missionId, targetNodeId, ...ctx.coordinatorSessionId ? { sourceCoordinatorSessionId: ctx.coordinatorSessionId } : {} });
     if (!(ctx.transport instanceof IpcTransport)) {
       const queueTrigger = await triggerMeshQueueAndReport(ctx);
       return JSON.stringify({
@@ -3725,7 +3741,11 @@ async function meshSendTask(ctx, args) {
           meshId: ctx.mesh.id,
           nodeId: args.node_id,
           taskId,
-          ...coordinatorDaemonId ? { coordinatorDaemonId } : {}
+          ...coordinatorDaemonId ? { coordinatorDaemonId } : {},
+          // (3) Stamp the originating coordinator session so the worker's completion
+          // routes back to THIS coordinator session (multi-coordinator). Survives the
+          // P2P dispatch to the remote worker, which echoes it on its completion event.
+          ...ctx.coordinatorSessionId ? { coordinatorSessionId: ctx.coordinatorSessionId } : {}
         }
       });
       if (result2.success) {
@@ -3899,7 +3919,9 @@ async function meshSendTask(ctx, args) {
           meshId: ctx.mesh.id,
           nodeId: args.node_id,
           taskId,
-          ...coordinatorDaemonId ? { coordinatorDaemonId } : {}
+          ...coordinatorDaemonId ? { coordinatorDaemonId } : {},
+          // (3) Originating coordinator session anchor — see the remote-dispatch path above.
+          ...ctx.coordinatorSessionId ? { coordinatorSessionId: ctx.coordinatorSessionId } : {}
         }
       });
       const dispatchPayload = unwrapCommandPayload(dispatchResult);
@@ -4121,6 +4143,10 @@ async function meshLaunchSession(ctx, args) {
           // Lands in settingsOverride and beats the global per-provider autoApprove.
           autoApprove: delegatedWorkerAutoApprove,
           ...coordinatorDaemonId ? { meshCoordinatorDaemonId: coordinatorDaemonId } : {},
+          // (3) Stamp the originating coordinator SESSION at launch too, so a worker
+          // launched via mesh_launch_session routes its completions back to the exact
+          // coordinator session (multi-coordinator). Absent → daemon-level fallback.
+          ...ctx.coordinatorSessionId ? { meshCoordinatorSessionId: ctx.coordinatorSessionId } : {},
           ...coordinatorNode?.id ? { meshCoordinatorNodeId: coordinatorNode.id } : {},
           launchedByCoordinator: true
         }
@@ -5588,7 +5614,8 @@ async function startMcpServer(opts) {
       } catch {
       }
     }
-    const meshCtx = { mesh, transport, ...localDaemonId ? { localDaemonId } : {}, ...localMachineId ? { localMachineId } : {}, ...coordinatorHostname ? { coordinatorHostname } : {} };
+    const coordinatorSessionId = typeof process.env.ADHDEV_COORDINATOR_SESSION_ID === "string" && process.env.ADHDEV_COORDINATOR_SESSION_ID.trim() ? process.env.ADHDEV_COORDINATOR_SESSION_ID.trim() : void 0;
+    const meshCtx = { mesh, transport, ...localDaemonId ? { localDaemonId } : {}, ...localMachineId ? { localMachineId } : {}, ...coordinatorHostname ? { coordinatorHostname } : {}, ...coordinatorSessionId ? { coordinatorSessionId } : {} };
     const coordinatorPrompt = await buildMeshModeCoordinatorPrompt(mesh);
     const server2 = new import_server.Server(
       { name: "adhdev-mcp-server", version: "0.9.82" },