@nowcrew/daemon 0.5.29 → 0.5.31

package/dist/shared-execution-slots.js

@@ -1,46 +1,58 @@
 export function createSharedSlotManager(limits) {
     const activeByHandle = new Map();
-    const queuesByHandle = new Map();
-    const promoteNext = (handle) => {
-        const queue = queuesByHandle.get(handle) ?? [];
-        while ((activeByHandle.get(handle) ?? 0) < limits.maxParallelPerAgent && queue.length > 0) {
-            const next = queue.shift();
-            if (next.released)
+    const queue = [];
+    let activeTotal = 0;
+    const queuedFor = (handle) => queue.filter((entry) => !entry.released && entry.handle === handle).length;
+    const promote = () => {
+        while (activeTotal < limits.maxParallelTotal) {
+            const index = queue.findIndex((entry) => !entry.released
+                && (activeByHandle.get(entry.handle) ?? 0) < limits.maxParallelPerAgent);
+            if (index < 0)
+                return;
+            const [next] = queue.splice(index, 1);
+            if (!next || next.released)
                 continue;
             next.promoted = true;
-            activeByHandle.set(handle, (activeByHandle.get(handle) ?? 0) + 1);
+            activeTotal += 1;
+            activeByHandle.set(next.handle, (activeByHandle.get(next.handle) ?? 0) + 1);
             next.resolve();
         }
-        if (queue.length === 0)
-            queuesByHandle.delete(handle);
     };
     return {
         reserve: (handle, kind) => {
-            const active = activeByHandle.get(handle) ?? 0;
-            const queued = queuesByHandle.get(handle)?.length ?? 0;
-            const facts = { activeForAgent: active, queuedForAgent: queued };
-            if (kind === "execution" && active >= limits.maxParallelPerAgent
-                && queued >= limits.maxQueuedPerAgent) {
-                return { facts, ready: Promise.resolve(), isQueued: () => false, release: () => { } };
+            const activeForAgent = activeByHandle.get(handle) ?? 0;
+            const queuedForAgent = queuedFor(handle);
+            const facts = {
+                activeForAgent,
+                queuedForAgent,
+                activeTotal,
+                queuedTotal: queue.length,
+            };
+            const canStartImmediately = activeTotal < limits.maxParallelTotal
+                && activeForAgent < limits.maxParallelPerAgent
+                && queue.length === 0;
+            if (kind === "execution" && !canStartImmediately && (queuedForAgent >= limits.maxQueuedPerAgent
+                || queue.length >= limits.maxQueuedTotal)) {
+                return {
+                    accepted: false,
+                    facts,
+                    ready: Promise.resolve(),
+                    isQueued: () => false,
+                    release: () => { },
+                };
             }
             let resolveReady;
             const ready = new Promise((resolve) => { resolveReady = resolve; });
             const entry = {
-                kind,
+                handle,
                 released: false,
-                promoted: active < limits.maxParallelPerAgent,
+                promoted: false,
                 resolve: resolveReady,
             };
-            if (entry.promoted) {
-                activeByHandle.set(handle, active + 1);
-                resolveReady();
-            }
-            else {
-                const queue = queuesByHandle.get(handle) ?? [];
-                queue.push(entry);
-                queuesByHandle.set(handle, queue);
-            }
+            queue.push(entry);
+            promote();
             return {
+                accepted: true,
                 facts,
                 state: entry.promoted ? "ready" : "queued",
                 ready,
@@ -50,19 +62,22 @@ export function createSharedSlotManager(limits) {
                         return;
                     entry.released = true;
                     if (entry.promoted) {
-                        activeByHandle.set(handle, Math.max(0, (activeByHandle.get(handle) ?? 1) - 1));
+                        activeTotal = Math.max(0, activeTotal - 1);
+                        const nextForAgent = Math.max(0, (activeByHandle.get(handle) ?? 1) - 1);
+                        if (nextForAgent === 0)
+                            activeByHandle.delete(handle);
+                        else
+                            activeByHandle.set(handle, nextForAgent);
                     }
                     else {
-                        const queue = queuesByHandle.get(handle);
-                        const index = queue?.indexOf(entry) ?? -1;
-                        if (queue !== undefined && index >= 0)
+                        const index = queue.indexOf(entry);
+                        if (index >= 0)
                             queue.splice(index, 1);
-                        if (queue?.length === 0)
-                            queuesByHandle.delete(handle);
                     }
-                    promoteNext(handle);
+                    promote();
                 },
             };
         },
+        snapshot: () => ({ activeTotal, queuedTotal: queue.length }),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.5.29",
+  "version": "0.5.31",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",