Skip to content

armgit / ruflo

Public Imported from GitHub
0

🌊 The original agent harness. Deploy intelligent multi-player swarms, coordinate autonomous workflows, and build conversational AI systems. Features adaptive memory, self-learning intelligence, federation, vector RAG integration, and native Claude Code / Codex / Hermes and many more Integrated

fix(queue): skip cancelled heads before selecting work

Rudy Celekliea6a7d21f12f
diff --git a/v3/@claude-flow/cli/__tests__/worker-queue-cancelled-head.test.ts b/v3/@claude-flow/cli/__tests__/worker-queue-cancelled-head.test.ts
new file mode 100644
index 0000000000..e01c1c5946
--- /dev/null
+++ b/v3/@claude-flow/cli/__tests__/worker-queue-cancelled-head.test.ts
@@ -0,0 +1,87 @@
+import { afterEach, describe, expect, it } from 'vitest';
+import { WorkerQueue } from '../src/services/worker-queue.js';
+
+const fixtures: { queue: WorkerQueue; ids: string[] }[] = [];
+function fixture() {
+ const entry = { queue: new WorkerQueue(), ids: [] as string[] };
+ fixtures.push(entry);
+ return entry;
+}
+
+afterEach(async () => {
+ for (const { queue, ids } of fixtures.splice(0)) {
+ for (const id of ids) {
+ if ((await queue.getTask(id))?.status === 'processing') {
+ await queue.fail(id, 'fixture cleanup', false);
+ }
+ }
+ await queue.shutdown();
+ }
+});
+
+describe('WorkerQueue cancelled entries', () => {
+ it('returns pending work behind multiple cancelled heads in one dequeue', async () => {
+ const { queue, ids } = fixture();
+ ids.push(await queue.enqueue('audit'), await queue.enqueue('audit'), await queue.enqueue('audit'));
+ await queue.cancel(ids[0]!);
+ await queue.cancel(ids[1]!);
+
+ const task = await queue.dequeue(['audit']);
+ expect(task?.id).toBe(ids[2]);
+ expect(task?.status).toBe('processing');
+ expect((await queue.getTask(ids[0]!))?.status).toBe('cancelled');
+ expect((await queue.getTask(ids[1]!))?.status).toBe('cancelled');
+ });
+
+ it('preserves requested worker-type order after skipping a cancelled head', async () => {
+ const { queue, ids } = fixture();
+ ids.push(await queue.enqueue('audit', {}, { priority: 'critical' }));
+ ids.push(await queue.enqueue('audit', {}, { priority: 'critical' }));
+ ids.push(await queue.enqueue('optimize', {}, { priority: 'low' }));
+ await queue.cancel(ids[0]!);
+
+ expect((await queue.dequeue(['audit', 'optimize']))?.id).toBe(ids[1]);
+ expect((await queue.dequeue(['audit', 'optimize']))?.id).toBe(ids[2]);
+ expect(await queue.dequeue(['audit', 'optimize'])).toBeNull();
+ });
+
+ it('returns null for an exhausted cancelled queue without consuming another type', async () => {
+ const { queue, ids } = fixture();
+ ids.push(await queue.enqueue('audit'), await queue.enqueue('audit'), await queue.enqueue('optimize'));
+ await queue.cancel(ids[0]!);
+ await queue.cancel(ids[1]!);
+
+ expect(await queue.dequeue(['audit'])).toBeNull();
+ expect((await queue.getTask(ids[2]!))?.status).toBe('pending');
+ expect((await queue.dequeue(['optimize']))?.id).toBe(ids[2]);
+ expect(await queue.dequeue(['audit'])).toBeNull();
+ });
+
+ it('keeps pending priority and FIFO order, assignment, events and completion accounting', async () => {
+ const { queue, ids } = fixture();
+ const workerId = await queue.registerWorker(['audit']);
+ ids.push(await queue.enqueue('audit', {}, { priority: 'low' }));
+ ids.push(await queue.enqueue('audit', {}, { priority: 'critical' }));
+ ids.push(await queue.enqueue('audit', {}, { priority: 'critical' }));
+ const events: string[] = [];
+ queue.on('taskDequeued', ({ taskId }) => events.push(taskId));
+
+ for (const id of [ids[1]!, ids[2]!, ids[0]!]) {
+ const task = await queue.dequeue(['audit']);
+ expect(task?.id).toBe(id);
+ expect(task?.workerId).toBe(workerId);
+ expect(task?.startedAt).toBeInstanceOf(Date);
+ expect(await queue.cancel(id)).toBe(false);
+ expect((await queue.getStats()).processing).toBe(1);
+ await queue.complete(id, {
+ success: true, output: 'local fixture result', durationMs: 0,
+ model: 'local-fixture', sandboxMode: 'strict', workerType: 'audit',
+ timestamp: new Date(), executionId: id,
+ });
+ expect((await queue.getResult(id))?.success).toBe(true);
+ expect((await queue.getStats()).processing).toBe(0);
+ }
+ expect(events).toEqual([ids[1], ids[2], ids[0]]);
+ expect(await queue.dequeue(['audit'])).toBeNull();
+ });
+});
diff --git a/v3/@claude-flow/cli/src/services/worker-queue.ts b/v3/@claude-flow/cli/src/services/worker-queue.ts
index 41bc17e109..736c295b66 100644
--- a/v3/@claude-flow/cli/src/services/worker-queue.ts
+++ b/v3/@claude-flow/cli/src/services/worker-queue.ts
@@ -367,9 +367,9 @@ export class WorkerQueue extends EventEmitter {
// Check queues in priority order
for (const workerType of workerTypes) {
const queueName = this.getQueueName(workerType);
- const taskId = this.store.popFromQueue(queueName);
-
- if (taskId) {
+ let taskId: string | null;
+ // Cancelled or otherwise stale entries do not exhaust this worker type.
+ while ((taskId = this.store.popFromQueue(queueName)) !== null) {
const task = this.store.getTask(taskId);
if (task && task.status === 'pending') {
task.status = 'processing';