@h-rig/supervisor-plugin 0.0.6-alpha.136 → 0.0.6-alpha.138

package/dist/src/cli.d.ts

@@ -0,0 +1,29 @@
+import type { RuntimeCliContext } from "@rig/core";
+export declare const SUPERVISOR_LOOP_CLI_ID = "supervisor.loop";
+export declare const SUPERVISOR_UNBLOCK_CLI_ID = "supervisor.unblock";
+type CommandOutcome = {
+    readonly ok: boolean;
+    readonly group: string;
+    readonly command: string;
+    readonly details?: Record<string, unknown>;
+};
+export declare function executeLoop(context: RuntimeCliContext, args: readonly string[]): Promise<CommandOutcome>;
+export declare function executeUnblock(context: RuntimeCliContext, args: readonly string[]): Promise<CommandOutcome>;
+export declare const supervisorCliCommands: readonly [{
+    readonly id: "supervisor.loop";
+    readonly family: "loop";
+    readonly command: "rig loop [--max-tasks <n>] [--concurrency <n>] [--dry-run]";
+    readonly description: "Run the autonomous supervisor loop over ready tasks.";
+    readonly usage: "rig loop [--max-tasks <n>] [--concurrency <n>] [--stop-when <csv>] [--dry-run] [--json]";
+    readonly projectRequired: true;
+    readonly run: typeof executeLoop;
+}, {
+    readonly id: "supervisor.unblock";
+    readonly family: "unblock";
+    readonly command: "rig unblock [task-id] [--dry-run]";
+    readonly description: "Plan or dispatch work that unblocks a blocked task.";
+    readonly usage: "rig unblock [task-id] [--dry-run] [--json]";
+    readonly projectRequired: true;
+    readonly run: typeof executeUnblock;
+}];
+export {};

package/dist/src/cli.js

@@ -0,0 +1,209 @@
+// @bun
+// packages/supervisor-plugin/src/cli.ts
+import {
+  dispatchRun,
+  listRuns,
+  listTasks,
+  runSupervisorLoop,
+  unblockTask
+} from "@rig/client";
+
+// packages/supervisor-plugin/src/awaiter.ts
+var TERMINAL_RUN_STATUSES = {
+  created: false,
+  queued: false,
+  preparing: false,
+  running: false,
+  "waiting-approval": false,
+  "waiting-user-input": false,
+  paused: false,
+  validating: false,
+  reviewing: false,
+  "closing-out": false,
+  "needs-attention": true,
+  completed: true,
+  failed: true,
+  stopped: true
+};
+async function awaitTerminalRun(options) {
+  const startedAt = Date.now();
+  const pollMs = Math.max(0, Math.floor(options.pollMs ?? 5000));
+  while (true) {
+    const snapshot = await options.readStatus(options.runId);
+    if (snapshot && TERMINAL_RUN_STATUSES[snapshot.status]) {
+      return {
+        runId: options.runId,
+        status: snapshot.status,
+        failed: snapshot.status !== "completed"
+      };
+    }
+    if (options.timeoutMs !== undefined && Date.now() - startedAt >= options.timeoutMs) {
+      return { runId: options.runId, status: "needs-attention", failed: true };
+    }
+    await options.waitForChange(pollMs);
+  }
+}
+
+// packages/supervisor-plugin/src/cli.ts
+var SUPERVISOR_LOOP_CLI_ID = "supervisor.loop";
+var SUPERVISOR_UNBLOCK_CLI_ID = "supervisor.unblock";
+function printJson(value) {
+  console.log(JSON.stringify(value, null, 2));
+}
+function takeFlag(args, flag) {
+  const rest = [...args];
+  const index = rest.indexOf(flag);
+  if (index < 0)
+    return { value: false, rest };
+  rest.splice(index, 1);
+  return { value: true, rest };
+}
+function takeOption(args, flag) {
+  const rest = [...args];
+  const index = rest.indexOf(flag);
+  if (index < 0)
+    return { rest };
+  const value = rest[index + 1];
+  if (!value || value.startsWith("-"))
+    throw new Error(`${flag} requires a value.`);
+  rest.splice(index, 2);
+  return { value, rest };
+}
+function requireNoExtraArgs(args, usage) {
+  if (args.length > 0)
+    throw new Error(`Unexpected argument: ${args[0]}
+Usage: ${usage}`);
+}
+function parsePositiveInt(value, flag, fallback) {
+  if (value === undefined)
+    return fallback;
+  const parsed = Number.parseInt(value, 10);
+  if (!Number.isFinite(parsed) || parsed <= 0 || String(parsed) !== value.trim()) {
+    throw new Error(`${flag} must be a positive integer.`);
+  }
+  return parsed;
+}
+function parseCsv(value) {
+  return value?.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0) ?? [];
+}
+function asRunStatus(value) {
+  switch (value) {
+    case "created":
+    case "queued":
+    case "preparing":
+    case "running":
+    case "waiting-approval":
+    case "waiting-user-input":
+    case "paused":
+    case "validating":
+    case "reviewing":
+    case "closing-out":
+    case "needs-attention":
+    case "completed":
+    case "failed":
+    case "stopped":
+      return value;
+    default:
+      return "needs-attention";
+  }
+}
+function delay(ms) {
+  const { promise, resolve } = Promise.withResolvers();
+  setTimeout(resolve, ms);
+  return promise;
+}
+function supervisorDeps(timeoutMs) {
+  return {
+    listTasks,
+    listRuns,
+    dispatchRun,
+    awaitRunTerminal: async (projectRoot, runId) => {
+      const awaitedRunId = runId;
+      return awaitTerminalRun({
+        runId: awaitedRunId,
+        timeoutMs,
+        readStatus: async (id) => {
+          const run = (await listRuns(projectRoot)).find((candidate) => candidate.runId === id);
+          return run ? { runId: id, status: asRunStatus(run.status), ...run.errorSummary ? { diagnostic: run.errorSummary } : {} } : null;
+        },
+        waitForChange: delay
+      });
+    }
+  };
+}
+function formatSupervisorResult(result) {
+  return [
+    `ok: ${result.ok}`,
+    `dry-run: ${result.dryRun}`,
+    `planned: ${result.plannedOrder.length > 0 ? result.plannedOrder.join(", ") : "none"}`,
+    `processed: ${result.projection.processed}`,
+    `succeeded: ${result.projection.succeeded}`,
+    `failed: ${result.projection.failed}`,
+    result.projection.idleReason ? `idle: ${result.projection.idleReason}` : null
+  ].filter((line) => line !== null).join(`
+`);
+}
+async function executeLoop(context, args) {
+  const dry = takeFlag(args, "--dry-run");
+  const json = takeFlag(dry.rest, "--json");
+  const maxTasks = takeOption(json.rest, "--max-tasks");
+  const concurrency = takeOption(maxTasks.rest, "--concurrency");
+  const stopWhen = takeOption(concurrency.rest, "--stop-when");
+  const timeout = takeOption(stopWhen.rest, "--timeout-ms");
+  requireNoExtraArgs(timeout.rest, "rig loop [--max-tasks <n>] [--concurrency <n>] [--stop-when <csv>] [--dry-run] [--json]");
+  const result = await runSupervisorLoop(context.projectRoot, supervisorDeps(parsePositiveInt(timeout.value, "--timeout-ms", 30 * 60 * 1000)), {
+    maxTasks: parsePositiveInt(maxTasks.value, "--max-tasks", 1),
+    concurrency: parsePositiveInt(concurrency.value, "--concurrency", 1),
+    dryRun: dry.value || context.dryRun
+  });
+  const details = { ...result, stopWhen: parseCsv(stopWhen.value) };
+  if (context.outputMode === "text") {
+    if (json.value)
+      printJson(details);
+    else
+      console.log(formatSupervisorResult(result));
+  }
+  return { ok: result.ok, group: "loop", command: "run", details };
+}
+async function executeUnblock(context, args) {
+  const dry = takeFlag(args, "--dry-run");
+  const json = takeFlag(dry.rest, "--json");
+  const timeout = takeOption(json.rest, "--timeout-ms");
+  const taskId = timeout.rest[0]?.startsWith("-") ? undefined : timeout.rest[0];
+  requireNoExtraArgs(taskId ? timeout.rest.slice(1) : timeout.rest, "rig unblock [task-id] [--dry-run] [--json]");
+  const result = await unblockTask(context.projectRoot, taskId ?? null, supervisorDeps(parsePositiveInt(timeout.value, "--timeout-ms", 30 * 60 * 1000)), { dryRun: dry.value || context.dryRun });
+  if (context.outputMode === "text") {
+    if (json.value)
+      printJson(result);
+    else
+      console.log(formatSupervisorResult(result));
+  }
+  return { ok: result.ok, group: "unblock", command: "run", details: result };
+}
+var supervisorCliCommands = [
+  {
+    id: SUPERVISOR_LOOP_CLI_ID,
+    family: "loop",
+    command: "rig loop [--max-tasks <n>] [--concurrency <n>] [--dry-run]",
+    description: "Run the autonomous supervisor loop over ready tasks.",
+    usage: "rig loop [--max-tasks <n>] [--concurrency <n>] [--stop-when <csv>] [--dry-run] [--json]",
+    projectRequired: true,
+    run: executeLoop
+  },
+  {
+    id: SUPERVISOR_UNBLOCK_CLI_ID,
+    family: "unblock",
+    command: "rig unblock [task-id] [--dry-run]",
+    description: "Plan or dispatch work that unblocks a blocked task.",
+    usage: "rig unblock [task-id] [--dry-run] [--json]",
+    projectRequired: true,
+    run: executeUnblock
+  }
+];
+export {
+  supervisorCliCommands,
+  executeUnblock,
+  executeLoop,
+  SUPERVISOR_UNBLOCK_CLI_ID,
+  SUPERVISOR_LOOP_CLI_ID
+};

package/dist/src/closureStage.d.ts

@@ -1,8 +1,22 @@
-import type { StageContext, StageMutation, StageResult, TaskClosureSummary } from "@rig/contracts";
+import type { StageContext, StageMutation, StageResult, StageRun, TaskClosureSummary } from "@rig/contracts";
 export declare const SUPERVISOR_CLOSURE_STAGE_ID = "supervisor-closure-observer";
 export interface ClosureSummaryPort {
     summarize(ctx: StageContext): Promise<TaskClosureSummary | null> | TaskClosureSummary | null;
     record?(summary: TaskClosureSummary): Promise<void> | void;
 }
 export declare function createClosureStage(port: ClosureSummaryPort): (ctx: StageContext) => Promise<StageResult>;
+/** Live closeout state threaded into `ctx.metadata.closeoutState`. */
+export interface ClosureCloseoutState {
+    readonly prUrl?: string | null;
+    readonly mergeGate?: "passed" | "blocked" | "skipped" | null;
+    readonly merged?: boolean;
+    readonly unblockedTaskIds?: readonly string[];
+}
+export declare function createSupervisorClosureStage(): StageRun;
+/**
+ * Default closure stage: appends a `supervisor.outcome` event carrying the
+ * {@link TaskClosureSummary} to `<projectRoot>/.rig/supervisor.jsonl`, so the
+ * supervisor projection's `closures` are populated by real closeouts.
+ */
+export declare function createDefaultSupervisorClosureStage(): StageRun;
 export declare const supervisorClosureStageMutation: StageMutation;

package/dist/src/closureStage.js

@@ -1,4 +1,6 @@
 // @bun
+var __require = import.meta.require;
+
 // packages/supervisor-plugin/src/closureStage.ts
 var SUPERVISOR_CLOSURE_STAGE_ID = "supervisor-closure-observer";
 function createClosureStage(port) {
@@ -11,6 +13,39 @@ function createClosureStage(port) {
     return { kind: "continue", ctx: { ...ctx, metadata } };
   };
 }
+function summarizeClosure(ctx) {
+  const state = (ctx.metadata ?? {}).closeoutState ?? null;
+  const taskId = typeof ctx.taskId === "string" ? ctx.taskId : null;
+  if (!state || !taskId)
+    return null;
+  return {
+    taskId,
+    runId: ctx.runId,
+    prUrl: state.prUrl ?? null,
+    mergeGate: state.mergeGate ?? null,
+    acceptanceChecked: [],
+    unblockedTaskIds: state.unblockedTaskIds ?? []
+  };
+}
+function createSupervisorClosureStage() {
+  return createClosureStage({ summarize: summarizeClosure });
+}
+function createDefaultSupervisorClosureStage() {
+  return async (ctx) => {
+    const summary = summarizeClosure(ctx);
+    const projectRoot = (ctx.metadata ?? {}).projectRoot;
+    if (summary && typeof projectRoot === "string") {
+      const { appendFileSync, mkdirSync } = await import("fs");
+      const { join } = await import("path");
+      try {
+        mkdirSync(join(projectRoot, ".rig"), { recursive: true });
+        appendFileSync(join(projectRoot, ".rig", "supervisor.jsonl"), `${JSON.stringify({ kind: "supervisor.outcome", at: new Date().toISOString(), taskId: summary.taskId, runId: summary.runId, status: summary.mergeGate === "passed" ? "completed" : "needs-attention", failed: false, unblockedTaskIds: summary.unblockedTaskIds, closure: summary })}
+`);
+      } catch {}
+    }
+    return { kind: "continue", ctx };
+  };
+}
 var supervisorClosureStageMutation = {
   op: "insert",
   contributedBy: "@rig/supervisor-plugin",
@@ -25,6 +60,8 @@ var supervisorClosureStageMutation = {
 };
 export {
   supervisorClosureStageMutation,
+  createSupervisorClosureStage,
+  createDefaultSupervisorClosureStage,
   createClosureStage,
   SUPERVISOR_CLOSURE_STAGE_ID
 };

package/dist/src/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./awaiter";
 export * from "./closureStage";
+export * from "./cli";
 export * from "./journal";
 export * from "./plugin";
 export * from "./supervisor";

package/dist/src/index.js

@@ -1,4 +1,6 @@
 // @bun
+var __require = import.meta.require;
+
 // packages/supervisor-plugin/src/awaiter.ts
 var TERMINAL_RUN_STATUSES = {
   created: false,
@@ -46,6 +48,39 @@ function createClosureStage(port) {
     return { kind: "continue", ctx: { ...ctx, metadata } };
   };
 }
+function summarizeClosure(ctx) {
+  const state = (ctx.metadata ?? {}).closeoutState ?? null;
+  const taskId = typeof ctx.taskId === "string" ? ctx.taskId : null;
+  if (!state || !taskId)
+    return null;
+  return {
+    taskId,
+    runId: ctx.runId,
+    prUrl: state.prUrl ?? null,
+    mergeGate: state.mergeGate ?? null,
+    acceptanceChecked: [],
+    unblockedTaskIds: state.unblockedTaskIds ?? []
+  };
+}
+function createSupervisorClosureStage() {
+  return createClosureStage({ summarize: summarizeClosure });
+}
+function createDefaultSupervisorClosureStage() {
+  return async (ctx) => {
+    const summary = summarizeClosure(ctx);
+    const projectRoot = (ctx.metadata ?? {}).projectRoot;
+    if (summary && typeof projectRoot === "string") {
+      const { appendFileSync, mkdirSync } = await import("fs");
+      const { join } = await import("path");
+      try {
+        mkdirSync(join(projectRoot, ".rig"), { recursive: true });
+        appendFileSync(join(projectRoot, ".rig", "supervisor.jsonl"), `${JSON.stringify({ kind: "supervisor.outcome", at: new Date().toISOString(), taskId: summary.taskId, runId: summary.runId, status: summary.mergeGate === "passed" ? "completed" : "needs-attention", failed: false, unblockedTaskIds: summary.unblockedTaskIds, closure: summary })}
+`);
+      } catch {}
+    }
+    return { kind: "continue", ctx };
+  };
+}
 var supervisorClosureStageMutation = {
   op: "insert",
   contributedBy: "@rig/supervisor-plugin",
@@ -58,6 +93,169 @@ var supervisorClosureStageMutation = {
     protected: false
   }
 };
+// packages/supervisor-plugin/src/cli.ts
+import {
+  dispatchRun,
+  listRuns,
+  listTasks,
+  runSupervisorLoop,
+  unblockTask
+} from "@rig/client";
+var SUPERVISOR_LOOP_CLI_ID = "supervisor.loop";
+var SUPERVISOR_UNBLOCK_CLI_ID = "supervisor.unblock";
+function printJson(value) {
+  console.log(JSON.stringify(value, null, 2));
+}
+function takeFlag(args, flag) {
+  const rest = [...args];
+  const index = rest.indexOf(flag);
+  if (index < 0)
+    return { value: false, rest };
+  rest.splice(index, 1);
+  return { value: true, rest };
+}
+function takeOption(args, flag) {
+  const rest = [...args];
+  const index = rest.indexOf(flag);
+  if (index < 0)
+    return { rest };
+  const value = rest[index + 1];
+  if (!value || value.startsWith("-"))
+    throw new Error(`${flag} requires a value.`);
+  rest.splice(index, 2);
+  return { value, rest };
+}
+function requireNoExtraArgs(args, usage) {
+  if (args.length > 0)
+    throw new Error(`Unexpected argument: ${args[0]}
+Usage: ${usage}`);
+}
+function parsePositiveInt(value, flag, fallback) {
+  if (value === undefined)
+    return fallback;
+  const parsed = Number.parseInt(value, 10);
+  if (!Number.isFinite(parsed) || parsed <= 0 || String(parsed) !== value.trim()) {
+    throw new Error(`${flag} must be a positive integer.`);
+  }
+  return parsed;
+}
+function parseCsv(value) {
+  return value?.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0) ?? [];
+}
+function asRunStatus(value) {
+  switch (value) {
+    case "created":
+    case "queued":
+    case "preparing":
+    case "running":
+    case "waiting-approval":
+    case "waiting-user-input":
+    case "paused":
+    case "validating":
+    case "reviewing":
+    case "closing-out":
+    case "needs-attention":
+    case "completed":
+    case "failed":
+    case "stopped":
+      return value;
+    default:
+      return "needs-attention";
+  }
+}
+function delay(ms) {
+  const { promise, resolve } = Promise.withResolvers();
+  setTimeout(resolve, ms);
+  return promise;
+}
+function supervisorDeps(timeoutMs) {
+  return {
+    listTasks,
+    listRuns,
+    dispatchRun,
+    awaitRunTerminal: async (projectRoot, runId) => {
+      const awaitedRunId = runId;
+      return awaitTerminalRun({
+        runId: awaitedRunId,
+        timeoutMs,
+        readStatus: async (id) => {
+          const run = (await listRuns(projectRoot)).find((candidate) => candidate.runId === id);
+          return run ? { runId: id, status: asRunStatus(run.status), ...run.errorSummary ? { diagnostic: run.errorSummary } : {} } : null;
+        },
+        waitForChange: delay
+      });
+    }
+  };
+}
+function formatSupervisorResult(result) {
+  return [
+    `ok: ${result.ok}`,
+    `dry-run: ${result.dryRun}`,
+    `planned: ${result.plannedOrder.length > 0 ? result.plannedOrder.join(", ") : "none"}`,
+    `processed: ${result.projection.processed}`,
+    `succeeded: ${result.projection.succeeded}`,
+    `failed: ${result.projection.failed}`,
+    result.projection.idleReason ? `idle: ${result.projection.idleReason}` : null
+  ].filter((line) => line !== null).join(`
+`);
+}
+async function executeLoop(context, args) {
+  const dry = takeFlag(args, "--dry-run");
+  const json = takeFlag(dry.rest, "--json");
+  const maxTasks = takeOption(json.rest, "--max-tasks");
+  const concurrency = takeOption(maxTasks.rest, "--concurrency");
+  const stopWhen = takeOption(concurrency.rest, "--stop-when");
+  const timeout = takeOption(stopWhen.rest, "--timeout-ms");
+  requireNoExtraArgs(timeout.rest, "rig loop [--max-tasks <n>] [--concurrency <n>] [--stop-when <csv>] [--dry-run] [--json]");
+  const result = await runSupervisorLoop(context.projectRoot, supervisorDeps(parsePositiveInt(timeout.value, "--timeout-ms", 30 * 60 * 1000)), {
+    maxTasks: parsePositiveInt(maxTasks.value, "--max-tasks", 1),
+    concurrency: parsePositiveInt(concurrency.value, "--concurrency", 1),
+    dryRun: dry.value || context.dryRun
+  });
+  const details = { ...result, stopWhen: parseCsv(stopWhen.value) };
+  if (context.outputMode === "text") {
+    if (json.value)
+      printJson(details);
+    else
+      console.log(formatSupervisorResult(result));
+  }
+  return { ok: result.ok, group: "loop", command: "run", details };
+}
+async function executeUnblock(context, args) {
+  const dry = takeFlag(args, "--dry-run");
+  const json = takeFlag(dry.rest, "--json");
+  const timeout = takeOption(json.rest, "--timeout-ms");
+  const taskId = timeout.rest[0]?.startsWith("-") ? undefined : timeout.rest[0];
+  requireNoExtraArgs(taskId ? timeout.rest.slice(1) : timeout.rest, "rig unblock [task-id] [--dry-run] [--json]");
+  const result = await unblockTask(context.projectRoot, taskId ?? null, supervisorDeps(parsePositiveInt(timeout.value, "--timeout-ms", 30 * 60 * 1000)), { dryRun: dry.value || context.dryRun });
+  if (context.outputMode === "text") {
+    if (json.value)
+      printJson(result);
+    else
+      console.log(formatSupervisorResult(result));
+  }
+  return { ok: result.ok, group: "unblock", command: "run", details: result };
+}
+var supervisorCliCommands = [
+  {
+    id: SUPERVISOR_LOOP_CLI_ID,
+    family: "loop",
+    command: "rig loop [--max-tasks <n>] [--concurrency <n>] [--dry-run]",
+    description: "Run the autonomous supervisor loop over ready tasks.",
+    usage: "rig loop [--max-tasks <n>] [--concurrency <n>] [--stop-when <csv>] [--dry-run] [--json]",
+    projectRequired: true,
+    run: executeLoop
+  },
+  {
+    id: SUPERVISOR_UNBLOCK_CLI_ID,
+    family: "unblock",
+    command: "rig unblock [task-id] [--dry-run]",
+    description: "Plan or dispatch work that unblocks a blocked task.",
+    usage: "rig unblock [task-id] [--dry-run] [--json]",
+    projectRequired: true,
+    run: executeUnblock
+  }
+];
 // packages/supervisor-plugin/src/journal.ts
 import { mkdir, readFile, writeFile } from "fs/promises";
 import { dirname } from "path";
@@ -124,9 +322,24 @@ var supervisorPlugin = definePlugin({
   provides: [],
   requires: ["journal", "transport"],
   contributes: {
+    capabilities: [
+      { id: "supervisor.loop", title: "Supervisor loop", commandId: SUPERVISOR_LOOP_CLI_ID },
+      { id: "supervisor.unblock", title: "Supervisor unblock", commandId: SUPERVISOR_UNBLOCK_CLI_ID }
+    ],
+    cliCommands: supervisorCliCommands.map(({ run: _run, ...metadata }) => metadata),
     stageMutations: [supervisorClosureStageMutation]
   }
+}, {
+  stages: { [SUPERVISOR_CLOSURE_STAGE_ID]: createDefaultSupervisorClosureStage() },
+  featureCapabilities: [
+    { id: "supervisor.loop", title: "Supervisor loop", commandId: SUPERVISOR_LOOP_CLI_ID },
+    { id: "supervisor.unblock", title: "Supervisor unblock", commandId: SUPERVISOR_UNBLOCK_CLI_ID }
+  ],
+  cliCommands: supervisorCliCommands
 });
+function createSupervisorPlugin() {
+  return supervisorPlugin;
+}
 // packages/supervisor-plugin/src/supervisor.ts
 import {
   computeTaskDependencyBadges,
@@ -298,13 +511,21 @@ async function runSupervisor(ctx, options = {}) {
 export {
   supervisorPlugin,
   supervisorClosureStageMutation,
+  supervisorCliCommands,
   runSupervisor,
   parseSupervisorJournal,
+  executeUnblock,
+  executeLoop,
+  createSupervisorPlugin,
   createSupervisorJournal,
+  createSupervisorClosureStage,
   createInMemorySupervisorJournalStore,
   createFileSupervisorJournal,
+  createDefaultSupervisorClosureStage,
   createClosureStage,
   awaitTerminalRun,
+  SUPERVISOR_UNBLOCK_CLI_ID,
   SUPERVISOR_PLUGIN_NAME,
+  SUPERVISOR_LOOP_CLI_ID,
   SUPERVISOR_CLOSURE_STAGE_ID
 };

package/dist/src/plugin.d.ts

@@ -1,3 +1,4 @@
 export declare const SUPERVISOR_PLUGIN_NAME = "@rig/supervisor-plugin";
 export declare const supervisorPlugin: import("@rig/core").RigPluginWithRuntime;
+export declare function createSupervisorPlugin(): import("@rig/core").RigPluginWithRuntime;
 export default supervisorPlugin;

package/dist/src/plugin.js

@@ -1,9 +1,41 @@
 // @bun
+var __require = import.meta.require;
+
 // packages/supervisor-plugin/src/plugin.ts
 import { definePlugin } from "@rig/core";
 
 // packages/supervisor-plugin/src/closureStage.ts
 var SUPERVISOR_CLOSURE_STAGE_ID = "supervisor-closure-observer";
+function summarizeClosure(ctx) {
+  const state = (ctx.metadata ?? {}).closeoutState ?? null;
+  const taskId = typeof ctx.taskId === "string" ? ctx.taskId : null;
+  if (!state || !taskId)
+    return null;
+  return {
+    taskId,
+    runId: ctx.runId,
+    prUrl: state.prUrl ?? null,
+    mergeGate: state.mergeGate ?? null,
+    acceptanceChecked: [],
+    unblockedTaskIds: state.unblockedTaskIds ?? []
+  };
+}
+function createDefaultSupervisorClosureStage() {
+  return async (ctx) => {
+    const summary = summarizeClosure(ctx);
+    const projectRoot = (ctx.metadata ?? {}).projectRoot;
+    if (summary && typeof projectRoot === "string") {
+      const { appendFileSync, mkdirSync } = await import("fs");
+      const { join } = await import("path");
+      try {
+        mkdirSync(join(projectRoot, ".rig"), { recursive: true });
+        appendFileSync(join(projectRoot, ".rig", "supervisor.jsonl"), `${JSON.stringify({ kind: "supervisor.outcome", at: new Date().toISOString(), taskId: summary.taskId, runId: summary.runId, status: summary.mergeGate === "passed" ? "completed" : "needs-attention", failed: false, unblockedTaskIds: summary.unblockedTaskIds, closure: summary })}
+`);
+      } catch {}
+    }
+    return { kind: "continue", ctx };
+  };
+}
 var supervisorClosureStageMutation = {
   op: "insert",
   contributedBy: "@rig/supervisor-plugin",
@@ -17,6 +49,208 @@ var supervisorClosureStageMutation = {
   }
 };
 
+// packages/supervisor-plugin/src/cli.ts
+import {
+  dispatchRun,
+  listRuns,
+  listTasks,
+  runSupervisorLoop,
+  unblockTask
+} from "@rig/client";
+
+// packages/supervisor-plugin/src/awaiter.ts
+var TERMINAL_RUN_STATUSES = {
+  created: false,
+  queued: false,
+  preparing: false,
+  running: false,
+  "waiting-approval": false,
+  "waiting-user-input": false,
+  paused: false,
+  validating: false,
+  reviewing: false,
+  "closing-out": false,
+  "needs-attention": true,
+  completed: true,
+  failed: true,
+  stopped: true
+};
+async function awaitTerminalRun(options) {
+  const startedAt = Date.now();
+  const pollMs = Math.max(0, Math.floor(options.pollMs ?? 5000));
+  while (true) {
+    const snapshot = await options.readStatus(options.runId);
+    if (snapshot && TERMINAL_RUN_STATUSES[snapshot.status]) {
+      return {
+        runId: options.runId,
+        status: snapshot.status,
+        failed: snapshot.status !== "completed"
+      };
+    }
+    if (options.timeoutMs !== undefined && Date.now() - startedAt >= options.timeoutMs) {
+      return { runId: options.runId, status: "needs-attention", failed: true };
+    }
+    await options.waitForChange(pollMs);
+  }
+}
+
+// packages/supervisor-plugin/src/cli.ts
+var SUPERVISOR_LOOP_CLI_ID = "supervisor.loop";
+var SUPERVISOR_UNBLOCK_CLI_ID = "supervisor.unblock";
+function printJson(value) {
+  console.log(JSON.stringify(value, null, 2));
+}
+function takeFlag(args, flag) {
+  const rest = [...args];
+  const index = rest.indexOf(flag);
+  if (index < 0)
+    return { value: false, rest };
+  rest.splice(index, 1);
+  return { value: true, rest };
+}
+function takeOption(args, flag) {
+  const rest = [...args];
+  const index = rest.indexOf(flag);
+  if (index < 0)
+    return { rest };
+  const value = rest[index + 1];
+  if (!value || value.startsWith("-"))
+    throw new Error(`${flag} requires a value.`);
+  rest.splice(index, 2);
+  return { value, rest };
+}
+function requireNoExtraArgs(args, usage) {
+  if (args.length > 0)
+    throw new Error(`Unexpected argument: ${args[0]}
+Usage: ${usage}`);
+}
+function parsePositiveInt(value, flag, fallback) {
+  if (value === undefined)
+    return fallback;
+  const parsed = Number.parseInt(value, 10);
+  if (!Number.isFinite(parsed) || parsed <= 0 || String(parsed) !== value.trim()) {
+    throw new Error(`${flag} must be a positive integer.`);
+  }
+  return parsed;
+}
+function parseCsv(value) {
+  return value?.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0) ?? [];
+}
+function asRunStatus(value) {
+  switch (value) {
+    case "created":
+    case "queued":
+    case "preparing":
+    case "running":
+    case "waiting-approval":
+    case "waiting-user-input":
+    case "paused":
+    case "validating":
+    case "reviewing":
+    case "closing-out":
+    case "needs-attention":
+    case "completed":
+    case "failed":
+    case "stopped":
+      return value;
+    default:
+      return "needs-attention";
+  }
+}
+function delay(ms) {
+  const { promise, resolve } = Promise.withResolvers();
+  setTimeout(resolve, ms);
+  return promise;
+}
+function supervisorDeps(timeoutMs) {
+  return {
+    listTasks,
+    listRuns,
+    dispatchRun,
+    awaitRunTerminal: async (projectRoot, runId) => {
+      const awaitedRunId = runId;
+      return awaitTerminalRun({
+        runId: awaitedRunId,
+        timeoutMs,
+        readStatus: async (id) => {
+          const run = (await listRuns(projectRoot)).find((candidate) => candidate.runId === id);
+          return run ? { runId: id, status: asRunStatus(run.status), ...run.errorSummary ? { diagnostic: run.errorSummary } : {} } : null;
+        },
+        waitForChange: delay
+      });
+    }
+  };
+}
+function formatSupervisorResult(result) {
+  return [
+    `ok: ${result.ok}`,
+    `dry-run: ${result.dryRun}`,
+    `planned: ${result.plannedOrder.length > 0 ? result.plannedOrder.join(", ") : "none"}`,
+    `processed: ${result.projection.processed}`,
+    `succeeded: ${result.projection.succeeded}`,
+    `failed: ${result.projection.failed}`,
+    result.projection.idleReason ? `idle: ${result.projection.idleReason}` : null
+  ].filter((line) => line !== null).join(`
+`);
+}
+async function executeLoop(context, args) {
+  const dry = takeFlag(args, "--dry-run");
+  const json = takeFlag(dry.rest, "--json");
+  const maxTasks = takeOption(json.rest, "--max-tasks");
+  const concurrency = takeOption(maxTasks.rest, "--concurrency");
+  const stopWhen = takeOption(concurrency.rest, "--stop-when");
+  const timeout = takeOption(stopWhen.rest, "--timeout-ms");
+  requireNoExtraArgs(timeout.rest, "rig loop [--max-tasks <n>] [--concurrency <n>] [--stop-when <csv>] [--dry-run] [--json]");
+  const result = await runSupervisorLoop(context.projectRoot, supervisorDeps(parsePositiveInt(timeout.value, "--timeout-ms", 30 * 60 * 1000)), {
+    maxTasks: parsePositiveInt(maxTasks.value, "--max-tasks", 1),
+    concurrency: parsePositiveInt(concurrency.value, "--concurrency", 1),
+    dryRun: dry.value || context.dryRun
+  });
+  const details = { ...result, stopWhen: parseCsv(stopWhen.value) };
+  if (context.outputMode === "text") {
+    if (json.value)
+      printJson(details);
+    else
+      console.log(formatSupervisorResult(result));
+  }
+  return { ok: result.ok, group: "loop", command: "run", details };
+}
+async function executeUnblock(context, args) {
+  const dry = takeFlag(args, "--dry-run");
+  const json = takeFlag(dry.rest, "--json");
+  const timeout = takeOption(json.rest, "--timeout-ms");
+  const taskId = timeout.rest[0]?.startsWith("-") ? undefined : timeout.rest[0];
+  requireNoExtraArgs(taskId ? timeout.rest.slice(1) : timeout.rest, "rig unblock [task-id] [--dry-run] [--json]");
+  const result = await unblockTask(context.projectRoot, taskId ?? null, supervisorDeps(parsePositiveInt(timeout.value, "--timeout-ms", 30 * 60 * 1000)), { dryRun: dry.value || context.dryRun });
+  if (context.outputMode === "text") {
+    if (json.value)
+      printJson(result);
+    else
+      console.log(formatSupervisorResult(result));
+  }
+  return { ok: result.ok, group: "unblock", command: "run", details: result };
+}
+var supervisorCliCommands = [
+  {
+    id: SUPERVISOR_LOOP_CLI_ID,
+    family: "loop",
+    command: "rig loop [--max-tasks <n>] [--concurrency <n>] [--dry-run]",
+    description: "Run the autonomous supervisor loop over ready tasks.",
+    usage: "rig loop [--max-tasks <n>] [--concurrency <n>] [--stop-when <csv>] [--dry-run] [--json]",
+    projectRequired: true,
+    run: executeLoop
+  },
+  {
+    id: SUPERVISOR_UNBLOCK_CLI_ID,
+    family: "unblock",
+    command: "rig unblock [task-id] [--dry-run]",
+    description: "Plan or dispatch work that unblocks a blocked task.",
+    usage: "rig unblock [task-id] [--dry-run] [--json]",
+    projectRequired: true,
+    run: executeUnblock
+  }
+];
+
 // packages/supervisor-plugin/src/plugin.ts
 var SUPERVISOR_PLUGIN_NAME = "@rig/supervisor-plugin";
 var supervisorPlugin = definePlugin({
@@ -25,12 +259,28 @@ var supervisorPlugin = definePlugin({
   provides: [],
   requires: ["journal", "transport"],
   contributes: {
+    capabilities: [
+      { id: "supervisor.loop", title: "Supervisor loop", commandId: SUPERVISOR_LOOP_CLI_ID },
+      { id: "supervisor.unblock", title: "Supervisor unblock", commandId: SUPERVISOR_UNBLOCK_CLI_ID }
+    ],
+    cliCommands: supervisorCliCommands.map(({ run: _run, ...metadata }) => metadata),
     stageMutations: [supervisorClosureStageMutation]
   }
+}, {
+  stages: { [SUPERVISOR_CLOSURE_STAGE_ID]: createDefaultSupervisorClosureStage() },
+  featureCapabilities: [
+    { id: "supervisor.loop", title: "Supervisor loop", commandId: SUPERVISOR_LOOP_CLI_ID },
+    { id: "supervisor.unblock", title: "Supervisor unblock", commandId: SUPERVISOR_UNBLOCK_CLI_ID }
+  ],
+  cliCommands: supervisorCliCommands
 });
+function createSupervisorPlugin() {
+  return supervisorPlugin;
+}
 var plugin_default = supervisorPlugin;
 export {
   supervisorPlugin,
   plugin_default as default,
+  createSupervisorPlugin,
   SUPERVISOR_PLUGIN_NAME
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/supervisor-plugin",
-  "version": "0.0.6-alpha.136",
+  "version": "0.0.6-alpha.138",
   "type": "module",
   "description": "First-party autonomous supervisor loop plugin for Rig.",
   "license": "UNLICENSED",
@@ -41,8 +41,9 @@
   "module": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
   "dependencies": {
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.136",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.136",
+    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.138",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.138",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.138",
     "effect": "https://pkg.pr.new/Effect-TS/effect-smol/effect@8881a9b"
   }
 }