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(daemon): daemon-queue entries no longer count as a manual trigger (#4515)

rUv0219fc5d025d
diff --git a/v3/@claude-flow/cli/__tests__/daemon-queue-supervisor-gate-sec.test.ts b/v3/@claude-flow/cli/__tests__/daemon-queue-supervisor-gate-sec.test.ts
new file mode 100644
index 0000000000..0fd3329e83
--- /dev/null
+++ b/v3/@claude-flow/cli/__tests__/daemon-queue-supervisor-gate-sec.test.ts
@@ -0,0 +1,30 @@
+import { describe, it, expect, afterEach, vi } from 'vitest';
+import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { WorkerDaemon } from '../src/services/worker-daemon.js';
+
+const dirs: string[] = [];
+afterEach(() => { vi.restoreAllMocks(); for (const d of dirs.splice(0)) rmSync(d, { recursive: true, force: true }); });
+
+describe('daemon-queue entries stay behind the supervisor gate', () => {
+ it('a committed queue file runs the worker as a scheduled run, never a manual trigger', async () => {
+ const dir = mkdtempSync(join(tmpdir(), 'ruflo-queue-')); dirs.push(dir);
+ mkdirSync(join(dir, '.claude-flow', 'daemon-queue'), { recursive: true });
+ writeFileSync(join(dir, '.claude-flow', 'daemon-queue', 'planted.json'), JSON.stringify({ trigger: 'audit', workerId: 'x' }));
+ const daemon = new WorkerDaemon(dir, { aiWorkersEnabled: false });
+ const execute = vi.spyOn(daemon as never, 'executeWorker' as never).mockResolvedValue({} as never);
+ (daemon as unknown as { running: boolean }).running = true;
+ await (daemon as unknown as { processDispatchQueue(): Promise<void> }).processDispatchQueue();
+ expect(execute).toHaveBeenCalledOnce();
+ expect((execute.mock.calls[0] as unknown[])[1]).toEqual({ manualTrigger: false });
+ });
+
+ it('an operator\'s own triggerWorker call is still manual', async () => {
+ const dir = mkdtempSync(join(tmpdir(), 'ruflo-queue-')); dirs.push(dir);
+ const daemon = new WorkerDaemon(dir, { aiWorkersEnabled: false });
+ const execute = vi.spyOn(daemon as never, 'executeWorker' as never).mockResolvedValue({} as never);
+ await daemon.triggerWorker('audit');
+ expect((execute.mock.calls[0] as unknown[])[1]).toEqual({ manualTrigger: true });
+ });
+});
diff --git a/v3/@claude-flow/cli/src/services/worker-daemon.ts b/v3/@claude-flow/cli/src/services/worker-daemon.ts
index 16910a133c..c75b05e62d 100644
--- a/v3/@claude-flow/cli/src/services/worker-daemon.ts
+++ b/v3/@claude-flow/cli/src/services/worker-daemon.ts
@@ -1116,7 +1116,7 @@ export class WorkerDaemon extends EventEmitter {
}
try {
this.log('info', `Dequeued ${trigger}${workerId ? ` (id=${workerId})` : ''} from MCP dispatch queue`);
- await this.triggerWorker(trigger);
+ await this.triggerWorker(trigger, { manualTrigger: false });
} catch (err) {
this.log('warn', `Queued worker ${trigger} failed: ${(err as Error).message}`);
} finally {
@@ -2161,7 +2161,7 @@ export class WorkerDaemon extends EventEmitter {
/**
* Manually trigger a worker
*/
- async triggerWorker(type: WorkerType): Promise<WorkerResult> {
+ async triggerWorker(type: WorkerType, opts: { manualTrigger?: boolean } = {}): Promise<WorkerResult> {
const workerConfig = this.config.workers.find(w => w.type === type);
if (!workerConfig) {
throw new Error(`Unknown worker type: ${type}`);
@@ -2176,7 +2176,9 @@ export class WorkerDaemon extends EventEmitter {
// #2661 root-fix — an explicit manual trigger bypasses the repository-
// supervisor gate (still budget/dedup-gated) — see runWorkerLogic()'s
// doc comment.
- return this.executeWorker(workerConfig, { manualTrigger: true });
+ // Only an operator's own `daemon trigger` is manual. A file in daemon-queue/ can come from a
+ // cloned repo, so queue runs pass `manualTrigger: false` and stay behind the supervisor gate.
+ return this.executeWorker(workerConfig, { manualTrigger: opts.manualTrigger ?? true });
}
/**