@enderfga/claw-orchestrator 6.4.0 → 7.0.0

package/README.md

@@ -110,17 +110,32 @@ block, and the cancellation and permission limitations are in
 
 | Engine      | CLI        | Tested Version |
 | ----------- | ---------- | -------------- |
-| Claude Code | `claude`   | 2.1.258        |
-| Codex       | `codex`    | 0.152.1        |
-| Antigravity | `agy`      | 1.1.22         |
+| Claude Code | `claude`   | 2.1.259        |
+| Codex       | `codex`    | 0.153.0        |
+| Antigravity | `agy`      | 1.1.25         |
 | Grok Build  | `grok`     | 1.0.13         |
-| OpenCode    | `opencode` | 1.18.26        |
+| OpenCode    | `opencode` | 1.18.27        |
 | Custom CLI  | any        | —              |
 
 Any coding CLI that runs as a subprocess can be wired up as a custom engine — see [`multi-engine.md`](./skills/references/multi-engine.md#custom-engine-enginecustom).
 
 ---
 
+## How the engine table stays honest
+
+The versions above are not typed in — they are what the weekly sweep last ran. `scripts/sweep.ts`
+measures each core engine's installed, pinned and upstream version, diffs the flags the wrapper
+passes against the binary's `--help`, runs one live turn **through the real wrapper class**, and
+smokes the ACP and MCP entry points. It has no LLM in it, so the thing that reports a wrapper as
+broken cannot share the wrapper's failure modes.
+
+`scripts/sweep-workflow.json` wraps it as a durable run on this project's own kernel: verifier →
+router → an agent that drafts the alignment on a `sweep/<date>` branch → a human gate. That is the
+bounded form of recursive self-improvement this project practises — the loop measures, proposes and
+verifies; a person merges. The orchestrator never edits its own code unattended, on purpose: the
+recovery path has to stay simpler than what it recovers. Its first scripted run found a default
+model an engine had silently dropped, which three weeks of by-hand sweeps had walked past.
+
 ## Contributing
 
 See [`CONTRIBUTING.md`](./CONTRIBUTING.md). Run `npm run build && npm run lint && npm run format:check && npm run test` before submitting.

package/dist/bin/mcp-server.js

@@ -148,9 +148,11 @@ server.setRequestHandler(CallToolRequestSchema, async (req) => {
     }
     try {
         const result = await tool.execute(`mcp-${Date.now()}`, (req.params.arguments ?? {}));
-        return {
-            content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
-        };
+        // The plugin entry already formatted the payload as MCP-shaped text blocks,
+        // so hand them straight over. Stringifying `result` here instead would ship
+        // the data twice — once escaped inside `content[0].text`, once again under
+        // `details` — which is what this line did before the results were normalised.
+        return { content: result.content };
     }
     catch (err) {
         const msg = err instanceof Error ? err.message : String(err);

package/dist/bin/mcp-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server.js","sourceRoot":"","sources":["../../bin/mcp-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-server.js","sourceRoot":"","sources":["../../bin/mcp-server.ts"],"names":[],"mappings":"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"}

package/dist/src/autoloop/dispatcher.d.ts

@@ -47,6 +47,8 @@ export interface ClaudeAgentDispatcherConfig {
     reviewerCustomEngine?: CustomEngineConfig;
     /** Per-message wall-clock cap. Default 10 min. */
     sendTimeoutMs?: number;
+    /** Internal failure-atomic resume marker; never accepted from an agent. */
+    suppressFailedStartAudit?: boolean;
     /**
      * Optional acceptance contract. When present the Reviewer's `advance` is no
      * longer sufficient on its own: the contract runs against the workspace and a
@@ -110,6 +112,23 @@ export declare class ClaudeAgentDispatcher extends EventEmitter implements Agent
     /** Where Reviewer reads from. Created lazily by stageReviewSandbox(). */
     private reviewerSandboxDir;
     private ledgerDir;
+    /**
+     * One promise per immutable logical dispatch, so a re-delivered message is
+     * coalesced onto the first send instead of spending a second agent turn.
+     *
+     * Bounded, because what these promises resolve to is not small: a Coder
+     * dispatch returns `iter_artifacts` carrying the iteration's entire diff, and
+     * a run may legitimately last up to `MAX_AUTOLOOP_HARD_TIMEOUT_MS` (72 h).
+     * Retaining every one of those for the run's lifetime grows without limit.
+     *
+     * Evicting the oldest is safe: the queue consumes each message once, and the
+     * only replay path (`restorePausedMessages`) re-queues messages that were
+     * parked *before* delivery. Re-delivery therefore happens within a few
+     * messages of the original, far inside this window — while an entry still
+     * in flight is never evicted, so concurrent duplicates always coalesce.
+     */
+    private logicalDispatches;
+    private readonly settledDispatches;
     constructor(config: ClaudeAgentDispatcherConfig);
     get sessionNames(): {
         planner: string;
@@ -121,6 +140,17 @@ export declare class ClaudeAgentDispatcher extends EventEmitter implements Agent
         purge?: boolean;
     }): Promise<void>;
     deliver(env: AnyAutoloopMessage): Promise<AnyAutoloopMessage[]>;
+    /** Drop the oldest settled dispatches once the retained set exceeds its cap. */
+    private trimLogicalDispatches;
+    /** Current per-agent deadline, including the backward-compatible default. */
+    get effectiveSendTimeoutMs(): number;
+    /**
+     * Apply an already-authorized timeout migration. This seam intentionally has
+     * no decrease mode: even an internal caller must supply a valid strict
+     * increase, while SessionManager owns persistence and dispatch matching.
+     */
+    increaseSendTimeoutMs(next: number): void;
+    private deliverOnce;
     private roleModel;
     private validateSelection;
     /**
@@ -171,10 +201,14 @@ export declare class ClaudeAgentDispatcher extends EventEmitter implements Agent
         force?: boolean;
         eagerRestart?: boolean;
     }): Promise<void>;
+    private pendingSendTimeout;
+    private recoverableSendTimeout;
+    /** One physical send attempt with strict timeout classification. */
+    private sendAttempt;
     /**
-     * Wrap a subagent send. If the underlying session throws or returns an
-     * error string, auto-reset the subagent once and retry. Used by
-     * deliverToCoder / deliverToReviewer to recover from subprocess deaths.
+     * Wrap a subagent send. Genuine timeouts are never retried because the first
+     * turn may still finish with side effects. Other throws/error results retain
+     * the established reset-once/retry-once subprocess recovery path.
      */
     private sendWithRecovery;
     /**

package/dist/src/autoloop/dispatcher.js

@@ -17,6 +17,7 @@
  *   into the runner queue.
  */
 import { EventEmitter } from 'node:events';
+import { createHash } from 'node:crypto';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -27,7 +28,7 @@ import { capturePatch, changedFilesSince } from '../verify/baseline.js';
 import { runContract } from '../verify/runner.js';
 import { writeEvidence } from '../verify/evidence.js';
 import { Msg } from './messages.js';
-import { LEDGER_SCHEMA_VERSION, } from './types.js';
+import { DEFAULT_SEND_TIMEOUT_MS, LEDGER_SCHEMA_VERSION, validateAutoloopTimeoutConfig, } from './types.js';
 import { applyPlannerToolCalls, parsePlannerReply, } from './planner-tools.js';
 import { extractIterComplete, extractReviewComplete, parseAgentReply } from './agent-tools.js';
 /**
@@ -66,6 +67,35 @@ function resolveConfigByName(filename) {
 const resolveDefaultPlannerPrompt = () => resolveConfigByName('autoloop-planner-prompt.md');
 const resolveDefaultCoderPrompt = () => resolveConfigByName('autoloop-coder-prompt.md');
 const resolveDefaultReviewerPrompt = () => resolveConfigByName('autoloop-reviewer-prompt.md');
+/**
+ * Adapter send deadlines use one of these explicit signals. Deliberately do
+ * not classify arbitrary messages containing "timeout": configuration errors
+ * and other subprocess failures must retain reset-once/retry-once recovery.
+ */
+function genuineSendTimeoutMessage(error) {
+    const record = error;
+    const message = typeof error === 'string' ? error : typeof record?.message === 'string' ? record.message : '';
+    const namedTimeout = record?.name === 'TimeoutError';
+    const codedTimeout = record?.code === 'ETIMEDOUT';
+    const adapterTimeout = /^Timeout waiting for (?:(?:.+ )?response|.+ turn to complete)$/i.test(message);
+    return namedTimeout || codedTimeout || adapterTimeout ? message || 'Agent send timed out' : null;
+}
+/**
+ * How many settled logical dispatches stay cached for dedup. One iteration
+ * spends a handful, so this holds many iterations' worth of replay window while
+ * keeping the retained diffs bounded.
+ */
+const MAX_RETAINED_DISPATCHES = 64;
+/**
+ * Hash only immutable logical routing identity. `msg_id` distinguishes two
+ * intentional sends with otherwise identical content; envelope timestamps,
+ * wall-clock time, random values, retry attempts, and mutable counters are not
+ * inputs, so re-delivery in this or another dispatcher derives the same ID.
+ */
+function deriveDispatchId(runId, env) {
+    const identity = JSON.stringify([runId, env.msg_id, env.iter, env.from, env.to, env.type]);
+    return `dispatch_${createHash('sha256').update(identity).digest('hex')}`;
+}
 export class ClaudeAgentDispatcher extends EventEmitter {
     config;
     logger;
@@ -85,6 +115,23 @@ export class ClaudeAgentDispatcher extends EventEmitter {
     /** Where Reviewer reads from. Created lazily by stageReviewSandbox(). */
     reviewerSandboxDir;
     ledgerDir;
+    /**
+     * One promise per immutable logical dispatch, so a re-delivered message is
+     * coalesced onto the first send instead of spending a second agent turn.
+     *
+     * Bounded, because what these promises resolve to is not small: a Coder
+     * dispatch returns `iter_artifacts` carrying the iteration's entire diff, and
+     * a run may legitimately last up to `MAX_AUTOLOOP_HARD_TIMEOUT_MS` (72 h).
+     * Retaining every one of those for the run's lifetime grows without limit.
+     *
+     * Evicting the oldest is safe: the queue consumes each message once, and the
+     * only replay path (`restorePausedMessages`) re-queues messages that were
+     * parked *before* delivery. Re-delivery therefore happens within a few
+     * messages of the original, far inside this window — while an entry still
+     * in flight is never evicted, so concurrent duplicates always coalesce.
+     */
+    logicalDispatches = new Map();
+    settledDispatches = new Set();
     constructor(config) {
         super();
         this.config = config;
@@ -122,11 +169,13 @@ export class ClaudeAgentDispatcher extends EventEmitter {
         await this.ensurePlanner();
     }
     async shutdown(reason, opts = {}) {
-        this.appendDecisionLog({
-            kind: 'terminate',
-            actor: reason === 'phase_error_circuit' ? 'runner' : 'planner',
-            payload: { reason },
-        });
+        if (!(reason === 'start-failed' && this.config.suppressFailedStartAudit)) {
+            this.appendDecisionLog({
+                kind: 'terminate',
+                actor: reason === 'phase_error_circuit' ? 'runner' : 'planner',
+                payload: { reason },
+            });
+        }
         // Best-effort cleanup. Stopping a non-existent session is a no-op.
         // keepPersisted: true keeps the persistedSessions entry on disk so a
         // later /autoloop/<id>/resume can re-attach the Planner's Claude
@@ -141,13 +190,61 @@ export class ClaudeAgentDispatcher extends EventEmitter {
         }
     }
     async deliver(env) {
+        const dispatchId = deriveDispatchId(this.config.runId, env);
+        const existing = this.logicalDispatches.get(dispatchId);
+        if (existing)
+            return await existing;
+        const pending = this.deliverOnce(env, dispatchId);
+        this.logicalDispatches.set(dispatchId, pending);
+        // Mark settled before trimming so eviction can tell an in-flight dispatch
+        // from a finished one. A rejection settles too; `deliver` still rethrows it
+        // to this caller, and the entry is only a dedup record afterwards.
+        void pending.then(() => this.settledDispatches.add(dispatchId), () => this.settledDispatches.add(dispatchId));
+        try {
+            return await pending;
+        }
+        finally {
+            this.trimLogicalDispatches();
+        }
+    }
+    /** Drop the oldest settled dispatches once the retained set exceeds its cap. */
+    trimLogicalDispatches() {
+        if (this.logicalDispatches.size <= MAX_RETAINED_DISPATCHES)
+            return;
+        for (const id of this.logicalDispatches.keys()) {
+            if (this.logicalDispatches.size <= MAX_RETAINED_DISPATCHES)
+                break;
+            if (!this.settledDispatches.has(id))
+                continue; // still in flight — must stay
+            this.logicalDispatches.delete(id);
+            this.settledDispatches.delete(id);
+        }
+    }
+    /** Current per-agent deadline, including the backward-compatible default. */
+    get effectiveSendTimeoutMs() {
+        return this.config.sendTimeoutMs ?? DEFAULT_SEND_TIMEOUT_MS;
+    }
+    /**
+     * Apply an already-authorized timeout migration. This seam intentionally has
+     * no decrease mode: even an internal caller must supply a valid strict
+     * increase, while SessionManager owns persistence and dispatch matching.
+     */
+    increaseSendTimeoutMs(next) {
+        validateAutoloopTimeoutConfig({ sendTimeoutMs: next });
+        const current = this.effectiveSendTimeoutMs;
+        if (next <= current) {
+            throw new Error(`sendTimeoutMs must be strictly greater than the current effective value ${current}`);
+        }
+        this.config.sendTimeoutMs = next;
+    }
+    async deliverOnce(env, dispatchId) {
         switch (env.to) {
             case 'planner':
-                return await this.deliverToPlanner(env);
+                return await this.deliverToPlanner(env, dispatchId);
             case 'coder':
-                return await this.deliverToCoder(env);
+                return await this.deliverToCoder(env, dispatchId);
             case 'reviewer':
-                return await this.deliverToReviewer(env);
+                return await this.deliverToReviewer(env, dispatchId);
             default:
                 throw new Error(`[autoloop] unexpected dispatcher target: ${env.to}`);
         }
@@ -375,17 +472,54 @@ export class ClaudeAgentDispatcher extends EventEmitter {
                 await this.ensureReviewer();
         }
     }
-    /**
-     * Wrap a subagent send. If the underlying session throws or returns an
-     * error string, auto-reset the subagent once and retry. Used by
-     * deliverToCoder / deliverToReviewer to recover from subprocess deaths.
-     */
-    async sendWithRecovery(agent, name, promptText) {
+    pendingSendTimeout(env, agent, dispatchId) {
+        return {
+            status: 'awaiting_resume',
+            dispatch_id: dispatchId,
+            agent,
+            message_id: env.msg_id,
+            message_type: env.type,
+            iter: env.iter,
+            timeout_ms: this.config.sendTimeoutMs ?? DEFAULT_SEND_TIMEOUT_MS,
+        };
+    }
+    recoverableSendTimeout(pending, error) {
+        const timeout = { ...pending, error };
+        this.appendDecisionLog({
+            kind: 'send_timeout',
+            actor: 'dispatcher',
+            payload: { ...timeout },
+        });
+        return { output: '', error, recoverable_timeout: timeout };
+    }
+    /** One physical send attempt with strict timeout classification. */
+    async sendAttempt(name, promptText, pending) {
         try {
-            return (await this.config.manager.sendMessage(name, promptText, {
-                timeout: this.config.sendTimeoutMs ?? 10 * 60_000,
+            const result = (await this.config.manager.sendMessage(name, promptText, {
+                timeout: this.config.sendTimeoutMs ?? DEFAULT_SEND_TIMEOUT_MS,
                 parentRunId: this.config.runId,
             }));
+            const timeoutMessage = result.error ? genuineSendTimeoutMessage(result.error) : null;
+            return timeoutMessage ? this.recoverableSendTimeout(pending, timeoutMessage) : result;
+        }
+        catch (err) {
+            const timeoutMessage = genuineSendTimeoutMessage(err);
+            if (timeoutMessage)
+                return this.recoverableSendTimeout(pending, timeoutMessage);
+            throw err;
+        }
+    }
+    /**
+     * Wrap a subagent send. Genuine timeouts are never retried because the first
+     * turn may still finish with side effects. Other throws/error results retain
+     * the established reset-once/retry-once subprocess recovery path.
+     */
+    async sendWithRecovery(agent, name, promptText, pending) {
+        try {
+            const result = await this.sendAttempt(name, promptText, pending);
+            if (result.recoverable_timeout || !result.error)
+                return result;
+            throw new Error(result.error);
         }
         catch (err) {
             this.logger.warn?.(`[autoloop] ${agent} send threw, attempting reset+retry: ${err.message}`);
@@ -396,10 +530,10 @@ export class ClaudeAgentDispatcher extends EventEmitter {
             // lockstep retries across concurrent runs.
             await new Promise((r) => setTimeout(r, 500 + Math.floor(Math.random() * 250)));
             try {
-                return (await this.config.manager.sendMessage(name, promptText, {
-                    timeout: this.config.sendTimeoutMs ?? 10 * 60_000,
-                    parentRunId: this.config.runId,
-                }));
+                const result = await this.sendAttempt(name, promptText, pending);
+                if (result.recoverable_timeout || !result.error)
+                    return result;
+                throw new Error(result.error);
             }
             catch (err2) {
                 this.logger.error?.(`[autoloop] ${agent} second attempt failed after reset: ${err2.message}`);
@@ -530,7 +664,7 @@ export class ClaudeAgentDispatcher extends EventEmitter {
         });
         this.plannerStarted = true;
     }
-    async deliverToPlanner(env) {
+    async deliverToPlanner(env, dispatchId) {
         if (env.type !== 'chat' && env.type !== 'directive_ack' && env.type !== 'iter_done') {
             // Other types (push_user / pause / resume / terminate) are runner-only
             // or planner-emitted; they should never arrive *to* planner.
@@ -553,10 +687,11 @@ export class ClaudeAgentDispatcher extends EventEmitter {
             // iter_done
             promptText = `[system] iter ${env.iter} done. verdict=${env.payload.verdict} metric=${env.payload.metric}`;
         }
-        const result = (await this.config.manager.sendMessage(this.plannerName, this.withRoleInstructions('planner', this.plannerSelection, this.plannerSystemPrompt, promptText), {
-            timeout: this.config.sendTimeoutMs ?? 10 * 60_000,
-            parentRunId: this.config.runId,
-        }));
+        const pendingTimeout = this.pendingSendTimeout(env, 'planner', dispatchId);
+        const result = await this.sendAttempt(this.plannerName, this.withRoleInstructions('planner', this.plannerSelection, this.plannerSystemPrompt, promptText), pendingTimeout);
+        if (result.recoverable_timeout) {
+            return [Msg.sendTimeout(env.iter, result.recoverable_timeout)];
+        }
         if (result.error) {
             this.logger.error?.(`[autoloop] planner send error: ${result.error}`);
             this.emit('planner_error', new Error(result.error));
@@ -681,7 +816,7 @@ export class ClaudeAgentDispatcher extends EventEmitter {
         });
         this.coderStarted = true;
     }
-    async deliverToCoder(env) {
+    async deliverToCoder(env, dispatchId) {
         if (env.type !== 'directive') {
             throw new Error(`[autoloop] coder does not accept message type=${env.type}`);
         }
@@ -727,7 +862,10 @@ export class ClaudeAgentDispatcher extends EventEmitter {
             text: `🔨 Coder iter ${env.iter} working…`,
             ts: new Date().toISOString(),
         });
-        const result = await this.sendWithRecovery('coder', this.coderName, this.withRoleInstructions('coder', this.coderSelection, this.coderSystemPrompt, promptText));
+        const result = await this.sendWithRecovery('coder', this.coderName, this.withRoleInstructions('coder', this.coderSelection, this.coderSystemPrompt, promptText), this.pendingSendTimeout(env, 'coder', dispatchId));
+        if (result.recoverable_timeout) {
+            return [Msg.sendTimeout(env.iter, result.recoverable_timeout)];
+        }
         this.recordTurn('coder', 'user', promptText);
         this.recordTurn('coder', 'agent', (result.output ?? '').trim());
         // A3: subprocess died (recovery retry exhausted). Surface as phase_error
@@ -921,7 +1059,7 @@ export class ClaudeAgentDispatcher extends EventEmitter {
             }
         }
     }
-    async deliverToReviewer(env) {
+    async deliverToReviewer(env, dispatchId) {
         if (env.type !== 'review_request') {
             throw new Error(`[autoloop] reviewer does not accept message type=${env.type}`);
         }
@@ -942,7 +1080,10 @@ export class ClaudeAgentDispatcher extends EventEmitter {
             text: `🔍 Reviewer iter ${env.payload.iter} auditing…`,
             ts: new Date().toISOString(),
         });
-        const result = await this.sendWithRecovery('reviewer', this.reviewerName, this.withRoleInstructions('reviewer', this.reviewerSelection, this.reviewerSessionPrompt ?? this.reviewerSystemPrompt, promptText));
+        const result = await this.sendWithRecovery('reviewer', this.reviewerName, this.withRoleInstructions('reviewer', this.reviewerSelection, this.reviewerSessionPrompt ?? this.reviewerSystemPrompt, promptText), this.pendingSendTimeout(env, 'reviewer', dispatchId));
+        if (result.recoverable_timeout) {
+            return [Msg.sendTimeout(env.iter, result.recoverable_timeout)];
+        }
         this.recordTurn('reviewer', 'user', promptText);
         this.recordTurn('reviewer', 'agent', (result.output ?? '').trim());
         if (result.fatal) {