@enderfga/claw-orchestrator 6.5.0 → 7.0.0

package/dist/src/index.js

@@ -16,6 +16,7 @@ import { ENGINE_TYPES, } from './types.js';
 import { councilWorkflow, fanoutWorkflow, solveWorkflow } from './kernel/templates/index.js';
 import { readEvents as readKernelEvents } from './kernel/store.js';
 import { resolveSecretRefs } from './kernel/secrets.js';
+import { AUTOLOOP_TIMEOUT_SCHEMA, validateAutoloopTimeoutConfig } from './autoloop/types.js';
 // ─── Standalone Export ───────────────────────────────────────────────────────
 export { SessionManager } from './session-manager.js';
 export { PersistentClaudeSession } from './persistent-session.js';
@@ -37,6 +38,22 @@ export { createConsoleLogger, nullLogger } from './logger.js';
 export { CircuitBreaker } from './circuit-breaker.js';
 export { InboxManager } from './inbox-manager.js';
 export * from './types.js';
+function isAgentToolResult(result) {
+    return (typeof result === 'object' &&
+        result !== null &&
+        'content' in result &&
+        Array.isArray(result.content) &&
+        'details' in result);
+}
+function normalizeToolResult(result) {
+    if (isAgentToolResult(result))
+        return result;
+    const text = JSON.stringify(result, (_key, value) => (typeof value === 'bigint' ? value.toString() : value), 2);
+    return {
+        content: [{ type: 'text', text: text ?? 'null' }],
+        details: result,
+    };
+}
 const CUSTOM_ENGINE_SCHEMA = {
     type: 'object',
     description: 'Custom engine config (required when the corresponding engine is "custom").',
@@ -93,6 +110,12 @@ const plugin = {
     description: 'Run Claude Code, Codex, Gemini, Cursor Agent and custom coding CLIs as one unified runtime — persistent sessions, multi-agent council, worktree isolation, multi-model proxy',
     register(api) {
         const rawConfig = (api.pluginConfig || {});
+        const registerTool = (definition) => {
+            api.registerTool({
+                ...definition,
+                execute: async (toolCallId, params) => normalizeToolResult(await definition.execute(toolCallId, params)),
+            });
+        };
         // ─── Lazy Init ────────────────────────────────────────────────────────
         //
         // Neither SessionManager nor EmbeddedServer is created at plugin load
@@ -165,7 +188,7 @@ const plugin = {
             }
         }
         // ─── Tool: session_start ──────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'session_start',
             description: 'Start a persistent coding session. Supports multiple engines: claude (default) for Claude Code CLI, codex for OpenAI Codex CLI, gemini for Google Gemini CLI, agy for Google Antigravity CLI, cursor for Cursor Agent CLI, opencode for sst/opencode CLI, or custom for any user-configured coding agent CLI.',
             parameters: {
@@ -311,7 +334,7 @@ const plugin = {
             },
         });
         // ─── Tool: session_send ───────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'session_send',
             description: 'Send a message to a persistent coding session and get the response',
             parameters: {
@@ -356,7 +379,7 @@ const plugin = {
             },
         });
         // ─── Tool: session_stop ───────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'session_stop',
             description: 'Stop a persistent coding session',
             parameters: {
@@ -370,7 +393,7 @@ const plugin = {
             },
         });
         // ─── Tool: session_list ───────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'session_list',
             description: 'List all active coding sessions',
             parameters: { type: 'object', properties: {} },
@@ -381,7 +404,7 @@ const plugin = {
             },
         });
         // ─── Tool: sessions_overview ──────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'sessions_overview',
             description: 'Get an aggregate overview of all active coding sessions — readiness, busy/paused state, cost, context usage, and last activity for each. Use this for a dashboard view across all sessions. For single-session detail, use coding_session_status instead.',
             parameters: { type: 'object', properties: {} },
@@ -399,7 +422,7 @@ const plugin = {
             },
         });
         // ─── Tool: coding_session_status ──────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'coding_session_status',
             description: 'Get detailed status of a coding session (context %, tokens, cost, uptime)',
             parameters: {
@@ -413,7 +436,7 @@ const plugin = {
             },
         });
         // ─── Tool: session_grep ───────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'session_grep',
             description: 'Search session history for events matching a regex pattern',
             parameters: {
@@ -432,7 +455,7 @@ const plugin = {
             },
         });
         // ─── Tool: session_compact ────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'session_compact',
             description: 'Compact a session to reclaim context window space',
             parameters: {
@@ -449,7 +472,7 @@ const plugin = {
             },
         });
         // ─── Tool: coding_agents_list ─────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'coding_agents_list',
             description: 'List agent definitions from .claude/agents/',
             parameters: {
@@ -462,7 +485,7 @@ const plugin = {
             },
         });
         // ─── Tool: team_list ──────────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'team_list',
             description: 'List teammates in an agent team session (requires enableAgentTeams)',
             parameters: {
@@ -476,7 +499,7 @@ const plugin = {
             },
         });
         // ─── Tool: team_send ──────────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'team_send',
             description: 'Send a message to a specific teammate in an agent team session',
             parameters: {
@@ -494,7 +517,7 @@ const plugin = {
             },
         });
         // ─── Tool: session_update_tools ───────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'session_update_tools',
             description: 'Update allowedTools or disallowedTools for a running session. Restarts the session process with --resume to apply the new tool constraints while preserving conversation history. Rejects if the session is currently busy.',
             parameters: {
@@ -531,7 +554,7 @@ const plugin = {
             },
         });
         // ─── Tool: session_switch_model ───────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'session_switch_model',
             description: 'Switch the model for a running session immediately. Restarts the session process with --resume so the new model takes effect on the next message while preserving conversation history.',
             parameters: {
@@ -548,7 +571,7 @@ const plugin = {
             },
         });
         // ─── Tool: project_purge (CLI 2.1.126) ────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'project_purge',
             description: 'Delete Claude Code project state (transcripts, tasks, file history, config entry) via `claude project purge`. Defaults to dry-run for safety — pass dry_run=false to actually delete. Use all=true to purge every project.',
             parameters: {
@@ -578,7 +601,7 @@ const plugin = {
             },
         });
         // ─── Tool: plugin_details (CLI 2.1.139) ─────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'plugin_details',
             description: "Show a plugin's component inventory (commands, hooks, MCP servers, agents, skills) plus the per-session token cost of loading it. Wraps `claude plugin details <name>` (CLI 2.1.139+).",
             parameters: {
@@ -604,7 +627,7 @@ const plugin = {
         // These tools just pre-format the slash text and send it via the
         // normal session channel — there is no separate goal-state event to
         // intercept (unlike Codex). Engine must be "claude".
-        api.registerTool({
+        registerTool({
             name: 'claude_goal_set',
             description: 'Set a goal condition on a claude session. Claude Code keeps working across turns until the condition is met, evaluating after each turn via Haiku. Sends `/goal <objective>`. Requires engine: "claude".',
             parameters: {
@@ -623,7 +646,7 @@ const plugin = {
                 return await getManager().claudeGoalSet(args.name, args.objective, args.timeout);
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'claude_goal_clear',
             description: 'Clear the active goal on a claude session. Sends `/goal clear`. Requires engine: "claude".',
             parameters: {
@@ -638,7 +661,7 @@ const plugin = {
                 return await getManager().claudeGoalClear(args.name, args.timeout);
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'claude_goal_status',
             description: 'Query the active goal on a claude session (objective, elapsed, turns, tokens). Sends bare `/goal` and returns the assistant reply. Requires engine: "claude".',
             parameters: {
@@ -654,7 +677,7 @@ const plugin = {
             },
         });
         // ─── Tool: codex_resume (Codex 0.119+) ──────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'codex_resume',
             description: 'Resume a previously recorded Codex thread by UUID/name, or pick the most recent with last=true. Spawns `codex exec resume` with --json so the output is parsed into structured fields. Independent of session manager state — useful for cross-process continuity.',
             parameters: {
@@ -681,7 +704,7 @@ const plugin = {
             },
         });
         // ─── Tool: codex_review ─────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'codex_review',
             description: 'Run a non-interactive Codex code review (`codex review`). Pick exactly one diff scope: uncommitted (working-tree changes), base (vs branch), or commit (vs SHA). Output is plain text — Codex `review` does not emit JSON.',
             parameters: {
@@ -726,7 +749,7 @@ const plugin = {
         // tools are convenience wrappers around that pattern, scoped to sessions
         // started with engine: "codex-app". Calls against any other engine
         // surface a clear error rather than silently no-op'ing.
-        api.registerTool({
+        registerTool({
             name: 'codex_goal_set',
             description: 'Set a long-horizon objective on a codex-app session. Sends `/goal <objective>` via the app-server slash command. Requires engine: "codex-app".',
             parameters: {
@@ -745,7 +768,7 @@ const plugin = {
                 return await getManager().codexGoalCommand(args.name, args.objective, args.timeout);
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'codex_goal_get',
             description: 'Read the cached goal state on a codex-app session (objective, status, tokensUsed, timeUsedSeconds, tokenBudget). Returns null if no goal is active. Pure read — does not send any turn.',
             parameters: {
@@ -757,7 +780,7 @@ const plugin = {
                 return getManager().codexGoalGet(args.name);
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'codex_goal_pause',
             description: 'Pause goal pursuit on a codex-app session. Sends `/goal pause`.',
             parameters: {
@@ -772,7 +795,7 @@ const plugin = {
                 return await getManager().codexGoalCommand(args.name, 'pause', args.timeout);
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'codex_goal_resume',
             description: 'Resume a paused goal on a codex-app session. Sends `/goal resume`.',
             parameters: {
@@ -787,7 +810,7 @@ const plugin = {
                 return await getManager().codexGoalCommand(args.name, 'resume', args.timeout);
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'codex_goal_clear',
             description: 'Clear the active goal on a codex-app session. Sends `/goal clear`.',
             parameters: {
@@ -803,7 +826,7 @@ const plugin = {
             },
         });
         // ─── Codex app-server v2 RPC tools (codex-app engine, Codex 0.137) ────
-        api.registerTool({
+        registerTool({
             name: 'codex_interrupt',
             description: 'Cancel the in-flight turn on a codex-app session (`turn/interrupt`).',
             parameters: {
@@ -813,7 +836,7 @@ const plugin = {
             },
             execute: async (_id, args) => getManager().codexInterrupt(args.name),
         });
-        api.registerTool({
+        registerTool({
             name: 'codex_steer',
             description: 'Add input to the in-flight turn on a codex-app session without restarting it (`turn/steer`). Falls back to a normal turn when idle.',
             parameters: {
@@ -826,7 +849,7 @@ const plugin = {
             },
             execute: async (_id, args) => getManager().codexSteer(args.name, args.message),
         });
-        api.registerTool({
+        registerTool({
             name: 'codex_fork',
             description: 'Branch a codex-app thread into a new one (`thread/fork`); returns the forked thread id.',
             parameters: {
@@ -836,7 +859,7 @@ const plugin = {
             },
             execute: async (_id, args) => getManager().codexForkThread(args.name),
         });
-        api.registerTool({
+        registerTool({
             name: 'codex_rollback',
             description: 'Drop the last N turns from a codex-app thread (`thread/rollback`).',
             parameters: {
@@ -849,7 +872,7 @@ const plugin = {
             },
             execute: async (_id, args) => getManager().codexRollback(args.name, args.numTurns),
         });
-        api.registerTool({
+        registerTool({
             name: 'codex_models',
             description: 'List models available to a codex-app session (`model/list`), incl. supported reasoning efforts.',
             parameters: {
@@ -859,8 +882,8 @@ const plugin = {
             },
             execute: async (_id, args) => getManager().codexModels(args.name),
         });
-        api.registerTool({
-            name: 'codex_threads',
+        registerTool({
+            name: 'codex_thread_list',
             description: 'List Codex threads visible to a codex-app session (`thread/list`), with optional filters.',
             parameters: {
                 type: 'object',
@@ -883,7 +906,7 @@ const plugin = {
             }),
         });
         // ─── Tool: claude_agents_list (Claude CLI 2.1.x, claude engine) ───────
-        api.registerTool({
+        registerTool({
             name: 'claude_agents_list',
             description: 'List Claude Code background agent sessions via `claude agents --json` (state/model/title/progress). One-shot, not tied to a managed session.',
             parameters: {
@@ -896,7 +919,7 @@ const plugin = {
             execute: async (_id, args) => getManager().claudeAgentsList({ all: args.all, cwd: args.cwd }),
         });
         // ─── Fan-out tools (parallel multi-engine task, no consensus) ─────────
-        api.registerTool({
+        registerTool({
             name: 'fanout_start',
             description: 'Run one task across N engine/model agents IN PARALLEL and collect their answers (optional synthesis). Cross-engine best-of-N / diverse-perspective primitive. No rounds, votes, or worktrees — use council for isolated parallel edits. Runs in background; poll with fanout_status.',
             parameters: {
@@ -957,7 +980,7 @@ const plugin = {
                 return { ok: true, ...session, note: 'Fan-out running in background. Poll with fanout_status.' };
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'fanout_status',
             description: 'Poll a running or finished fan-out by id; returns per-agent results and any synthesis.',
             parameters: {
@@ -967,7 +990,7 @@ const plugin = {
             },
             execute: async (_id, args) => ({ ok: true, ...getManager().fanoutStatus(args.id) }),
         });
-        api.registerTool({
+        registerTool({
             name: 'fanout_abort',
             description: 'Abort a running fan-out by id (already-started agents finish; synthesis is skipped).',
             parameters: {
@@ -981,7 +1004,7 @@ const plugin = {
             },
         });
         // ─── Tools: workflow_* (durable run kernel) ─────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'workflow_start',
             description: "Start a durable workflow run. Nodes: agent | fanout | council | verifier | human_gate | router | subflow. Every state transition is checkpointed to disk, so a run survives a process restart and can be resumed. When a contract is supplied the run cannot reach `completed` unless the runtime's own checks pass — without one it completes as `unverified`, which means nothing checked it. Runs in background; poll with workflow_status.",
             parameters: {
@@ -1137,7 +1160,7 @@ const plugin = {
                 };
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'workflow_status',
             description: 'Poll a workflow run. Returns state, per-node status, and the outcome: `verified` (a contract passed), `refuted` (it failed), or `unverified` (none was declared — nothing checked the work).',
             parameters: {
@@ -1167,7 +1190,7 @@ const plugin = {
                 };
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'workflow_list',
             description: 'List workflow runs on this machine, newest first. Survives restarts.',
             parameters: {
@@ -1190,7 +1213,7 @@ const plugin = {
                 }),
             }),
         });
-        api.registerTool({
+        registerTool({
             name: 'workflow_resume',
             description: 'Re-attach to a workflow whose process died. Nodes already marked succeeded are not re-run; the node that was in flight is retried, because a half-finished node left no result to trust.',
             parameters: {
@@ -1213,13 +1236,13 @@ const plugin = {
                 return { ok: true, runId: record.runId, state: record.state, currentNode: record.currentNode };
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'workflow_cancel',
             description: 'Cancel a running workflow. The current node is asked to stop; the run ends in `cancelled`.',
             parameters: { type: 'object', properties: { runId: { type: 'string' } }, required: ['runId'] },
             execute: async (_id, args) => ({ ok: true, ...getManager().workflowCancel(args.runId) }),
         });
-        api.registerTool({
+        registerTool({
             name: 'workflow_steer',
             description: "Queue a correction for a running workflow. The text is prepended to the next agent node's prompt — corrections belong before the task, not after it.",
             parameters: {
@@ -1232,7 +1255,7 @@ const plugin = {
                 ...getManager().workflowSteer(args.runId, args.text),
             }),
         });
-        api.registerTool({
+        registerTool({
             name: 'workflow_approve',
             description: 'Answer a workflow parked at a human_gate node.',
             parameters: {
@@ -1245,7 +1268,7 @@ const plugin = {
                 ...getManager().workflowApprove(args.runId, args.approved),
             }),
         });
-        api.registerTool({
+        registerTool({
             name: 'verify_run',
             description: 'Run an acceptance contract against a directory and return the evidence bundle. Use it to check work that did not come through a workflow — a plain session that edited a repo, say. The contract is yours; nothing is taken from agent output.',
             parameters: {
@@ -1333,7 +1356,7 @@ const plugin = {
             },
         });
         // ─── Tool: council_start ────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'council_start',
             description: 'Start a multi-agent council that collaborates on a task using git worktree isolation, round-based execution, and consensus voting. Agents can use different engines (Claude, Codex) and models.',
             parameters: {
@@ -1402,7 +1425,7 @@ const plugin = {
             },
         });
         // ─── Tool: council_status ───────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'council_status',
             description: 'Get the status of a running council session',
             parameters: {
@@ -1418,7 +1441,7 @@ const plugin = {
             },
         });
         // ─── Tool: council_abort ────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'council_abort',
             description: 'Abort a running council, stopping all agent sessions',
             parameters: {
@@ -1432,7 +1455,7 @@ const plugin = {
             },
         });
         // ─── Tool: council_inject ───────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'council_inject',
             description: 'Inject a user message into the next round of a running council. The message will be appended to all agent prompts in the next round.',
             parameters: {
@@ -1449,7 +1472,7 @@ const plugin = {
             },
         });
         // ─── Tool: council_review ──────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'council_review',
             description: 'Review a completed council session. Returns a structured report of all changed files, branches, worktrees, plan.md status, review files, and agent summaries. Does not modify any state — purely informational. Use this before deciding to accept or reject.',
             parameters: {
@@ -1463,7 +1486,7 @@ const plugin = {
             },
         });
         // ─── Tool: council_accept ──────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'council_accept',
             description: 'Accept and finalize council work. Cleans up all council scaffolding: removes worktrees, deletes council/* branches, removes plan.md and reviews/ directory. Only call after reviewing with council_review.',
             parameters: {
@@ -1477,7 +1500,7 @@ const plugin = {
             },
         });
         // ─── Tool: council_reject ──────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'council_reject',
             description: 'Reject council work and provide feedback. Rewrites plan.md with rejection feedback and commits it. Does NOT delete any worktrees or branches — the council can be restarted to retry. Use this when the council output is incomplete or broken.',
             parameters: {
@@ -1497,7 +1520,7 @@ const plugin = {
             },
         });
         // ─── Tool: session_send_to ────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'session_send_to',
             description: 'Send a cross-session message from one session to another. If the target is idle, the message is delivered immediately. If busy, it is queued in the inbox for later delivery. Use "*" as target to broadcast to all other sessions.',
             parameters: {
@@ -1516,7 +1539,7 @@ const plugin = {
             },
         });
         // ─── Tool: session_inbox ──────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'session_inbox',
             description: 'Read inbox messages for a session. Returns unread messages by default.',
             parameters: {
@@ -1533,7 +1556,7 @@ const plugin = {
             },
         });
         // ─── Tool: session_deliver_inbox ──────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'session_deliver_inbox',
             description: 'Deliver all queued inbox messages to an idle session. Call this when a session finishes a task to process waiting messages.',
             parameters: {
@@ -1547,7 +1570,7 @@ const plugin = {
             },
         });
         // ─── Tool: ultraplan_start ──────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'ultraplan_start',
             description: 'Start an Ultraplan session: a dedicated Opus planning session that explores your project for up to 30 minutes and produces a detailed implementation plan. Runs in background.',
             parameters: {
@@ -1570,7 +1593,7 @@ const plugin = {
             },
         });
         // ─── Tool: ultraplan_status ─────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'ultraplan_status',
             description: 'Get the status of an Ultraplan session. Returns the plan text when completed.',
             parameters: {
@@ -1586,7 +1609,7 @@ const plugin = {
             },
         });
         // ─── Tool: ultrareview_start ────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'ultrareview_start',
             description: 'Start an Ultrareview: a fleet of bug-hunting agents (5-20) that review your codebase from different angles in parallel. Each agent specializes in a different area (security, performance, logic, types, etc.). Runs in background.',
             parameters: {
@@ -1620,7 +1643,7 @@ const plugin = {
             },
         });
         // ─── Tool: ultrareview_status ───────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'ultrareview_status',
             description: 'Get the status of an Ultrareview. Returns all findings when completed.',
             parameters: {
@@ -1640,7 +1663,7 @@ const plugin = {
         // v2 architecture: three persistent agents (Planner / Coder / Reviewer).
         // Starting a run only launches the Planner — Coder and Reviewer are
         // spawned later by the Planner once the user approves the plan (S3).
-        api.registerTool({
+        registerTool({
             name: 'autoloop_start',
             description: 'Start a v2 autoloop run in chat mode. Planner, Coder, and Reviewer default to Claude (opus/sonnet/sonnet) but each role can use a different engine/model. Coder and Reviewer are spawned later by the Planner after plan approval. Returns a run_id and the Planner session name.',
             parameters: {
@@ -1673,11 +1696,28 @@ const plugin = {
                         description: 'Default Reviewer model (default: sonnet for Claude; engine default otherwise)',
                     },
                     reviewer_custom_engine: CUSTOM_ENGINE_SCHEMA,
-                    send_timeout_ms: { type: 'number', description: 'Per-message wall-clock cap (default 600000 = 10 min)' },
+                    send_timeout_ms: {
+                        ...AUTOLOOP_TIMEOUT_SCHEMA.sendTimeoutMs,
+                        description: 'Per-agent send wall-clock cap in milliseconds (default 600000; inclusive range 5000–7200000)',
+                    },
+                    activity_lease_ms: {
+                        ...AUTOLOOP_TIMEOUT_SCHEMA.activityLeaseMs,
+                        description: 'Inactivity lease in milliseconds, renewed by qualified progress (default 1800000; inclusive range 60000–7200000)',
+                    },
+                    autoloop_hard_timeout_ms: {
+                        ...AUTOLOOP_TIMEOUT_SCHEMA.autoloopHardTimeoutMs,
+                        description: 'Absolute non-renewable run deadline in milliseconds (default 86400000; inclusive range 600000–259200000)',
+                    },
                 },
                 required: ['run_id', 'workspace'],
             },
             execute: async (_id, args) => {
+                const timeoutConfig = {
+                    sendTimeoutMs: args.send_timeout_ms,
+                    activityLeaseMs: args.activity_lease_ms,
+                    autoloopHardTimeoutMs: args.autoloop_hard_timeout_ms,
+                };
+                validateAutoloopTimeoutConfig(timeoutConfig);
                 const result = await getManager().autoloopStart({
                     runId: args.run_id,
                     workspace: sanitizeCwd(args.workspace),
@@ -1690,7 +1730,7 @@ const plugin = {
                     reviewerEngine: args.reviewer_engine,
                     reviewerModel: args.reviewer_model,
                     reviewerCustomEngine: args.reviewer_custom_engine,
-                    sendTimeoutMs: args.send_timeout_ms,
+                    ...timeoutConfig,
                 });
                 return {
                     ok: true,
@@ -1700,7 +1740,7 @@ const plugin = {
             },
         });
         // ─── Tool: autoloop_chat ─────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'autoloop_chat',
             description: "Send a chat message to the Planner of a v2 autoloop run. Returns the Planner's natural-language reply. Blocking: resolves after the Planner finishes its turn.",
             parameters: {
@@ -1717,7 +1757,7 @@ const plugin = {
             },
         });
         // ─── Tool: autoloop_status ───────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'autoloop_status',
             description: 'Get current state of a v2 autoloop run (status, iter, push count, subagents_spawned).',
             parameters: {
@@ -1733,7 +1773,7 @@ const plugin = {
             },
         });
         // ─── Tool: autoloop_list ─────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'autoloop_list',
             description: 'List all v2 autoloop runs in this manager process.',
             parameters: { type: 'object', properties: {} },
@@ -1744,7 +1784,7 @@ const plugin = {
             },
         });
         // ─── Tool: autoloop_reset_agent ──────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'autoloop_reset_agent',
             description: 'Reset a single subagent (Coder or Reviewer) on a v2 run. Stops its persistent session; the next directive/review_request will re-prime from the system prompt + ledger artifacts. Use when an agent has drifted (repeated rejects, hallucinated context, token bloat). Planner reset requires force=true because it discards chat history with the user.',
             parameters: {
@@ -1771,7 +1811,7 @@ const plugin = {
             },
         });
         // ─── Tool: autoloop_stop ─────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'autoloop_stop',
             description: 'Terminate a v2 autoloop run. Stops Planner (and Coder/Reviewer once spawned).',
             parameters: {
@@ -1790,7 +1830,7 @@ const plugin = {
             },
         });
         // ─── ultraapp (read-only) ─────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_list',
             description: 'List all ultraapp runs (interview/build/done) with title, mode, and timestamps. Read-only — to start a new run, open the Forge dashboard tab.',
             parameters: { type: 'object', properties: {} },
@@ -1800,7 +1840,7 @@ const plugin = {
                 return { ok: true, runs };
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_get',
             description: 'Get the AppSpec, chat history, and state for one ultraapp run. Pass `runId` from ultraapp_list.',
             parameters: {
@@ -1819,7 +1859,7 @@ const plugin = {
                 return { ok: true, spec, chat, state };
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_status',
             description: 'Get the run state (mode, failure reason if any) for one ultraapp run. Cheap; no chat or spec data.',
             parameters: {
@@ -1834,7 +1874,7 @@ const plugin = {
             },
         });
         // ─── ultraapp (write) ─────────────────────────────────────────────────
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_new',
             description: 'Start a new ultraapp run. Spawns the interview Claude Opus session; the first question lands on the SSE stream / next ultraapp_get call. Returns the runId.',
             parameters: { type: 'object', properties: {} },
@@ -1844,7 +1884,7 @@ const plugin = {
                 return { ok: true, runId };
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_answer',
             description: 'Submit an answer to the current interview question. Either pick `value` (one of the option values from the latest question) or pass `freeform` text — both can be used together for "selected X with caveat".',
             parameters: {
@@ -1865,7 +1905,7 @@ const plugin = {
                 return { ok: true };
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_add_file',
             description: 'Reference a local example file by absolute path (under $HOME or /tmp; symlinks and dotfiles rejected). Use this to attach reference inputs the interview can extract metadata from. For binary uploads from a browser, use the dashboard.',
             parameters: {
@@ -1885,7 +1925,7 @@ const plugin = {
                 return { ok: true, ...r };
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_spec_edit',
             description: 'Manually edit the AppSpec via a JSON Patch (RFC 6902). Use sparingly — the interview engine produces and updates the spec automatically. Useful to correct a slot before clicking build.',
             parameters: {
@@ -1906,7 +1946,7 @@ const plugin = {
                 return { ok: true };
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_build_start',
             description: 'Enqueue a build for the run. Builds run serially. Watch ultraapp_status for transitions: queued → building → build-complete (or → deploying → done if a router is wired).',
             parameters: {
@@ -1920,7 +1960,7 @@ const plugin = {
                 return { ok: true };
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_build_cancel',
             description: 'Cancel a queued or in-flight build. Best-effort for in-flight; the worker is expected to honour its own cancellation signal (v0.2 only emits the event).',
             parameters: {
@@ -1934,7 +1974,7 @@ const plugin = {
                 return { ok: true };
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_feedback',
             description: 'Submit a done-mode feedback message (after the run reaches `done`). The text is classified by Haiku into cosmetic / spec-delta / structural and routed: cosmetic runs the patcher (Opus diff + validate + auto-revert + version snapshot); spec-delta flips the run back to `interview` with a focused bootstrap; structural posts a "start fresh" suggestion.',
             parameters: {
@@ -1951,7 +1991,7 @@ const plugin = {
                 return { ok: true };
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_promote_version',
             description: "Atomically swap which previously-built version is currently deployed. Stops the old container, starts the target version's container, updates the router map. Requires a router to be wired (see clawo serve).",
             parameters: {
@@ -1968,7 +2008,7 @@ const plugin = {
                 return r;
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_start_container',
             description: 'Start the deployed container for a run (e.g., after `ultraapp_stop_container` or after orchestrator restart with a stopped container). Re-registers the slug on the router.',
             parameters: {
@@ -1982,7 +2022,7 @@ const plugin = {
                 return r;
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_stop_container',
             description: 'Stop the deployed container and deregister the slug from the router. URL returns 404 until ultraapp_start_container.',
             parameters: {
@@ -1996,7 +2036,7 @@ const plugin = {
                 return r;
             },
         });
-        api.registerTool({
+        registerTool({
             name: 'ultraapp_delete',
             description: 'Delete a run completely: stops the container, removes the image, deregisters the slug, and removes the on-disk run dir at ~/.claw-orchestrator/ultraapps/<runId>/. Irreversible.',
             parameters: {