Fully merge addon implementation into rig.ts

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

Author: Copilot

skills/rig/SKILL.md

@@ -134,7 +134,7 @@ Run inline input or a program file with `node skills/rig/rig.ts`; add `--server`
 
 - Known context uses `p.*`; true runtime data uses `input`.
 - Important outputs are explicitly typed and constrained.
-- Every helper and import uses the current `rig` or `rig/addons` API.
+- Every helper and import uses the current `rig` API.
 - Generated TypeScript passes `node skills/rig/eslint/lint.js <program.ts>` and typechecking.
 - Every subagent is named, reachable, and narrowly scoped.
 - Snippets have one default export and no `console.log`.

skills/rig/addons.ts

@@ -1,102 +1,2 @@
-import { analyzeResponse, defaultRepairPrompt } from "./rig.ts";
-import type { Agent, AgentAddon, AgentAddonContext } from "./rig.ts";
-
-const DEFAULT_STEERING_WARNING = "You are running out of turns. This is your final attempt before reaching the turn limit. Please correct your output now.";
-
-export type SteeringOptions = {
-  /** Warning appended to the final retry prompt. */
-  message?: string;
-};
-
-export type TimeoutOptions = {
-  timeout: number;
-};
-
-export type AgentRegistration = (
-  agent: Agent,
-  context: AgentAddonContext,
-) => void | Promise<void>;
-
-/**
- * Appends a final-attempt warning to the retry prompt produced by an inner addon.
- *
- * Place this before `repair()`, for example
- * `addons: [steering({ message: "Return valid JSON now." }), repair()]`.
- */
-export function steering(options: SteeringOptions = {}): AgentAddon {
-  const message = options.message ?? DEFAULT_STEERING_WARNING;
-  return async (context, next) => {
-    await next();
-    if (context.nextPrompt && context.turn + 1 === context.maxTurns) {
-      context.nextPrompt = `${context.nextPrompt}\n${message}`;
-    }
-  };
-}
-
-/**
- * Parses and validates responses, retrying failures within the agent's turn budget.
- *
- * Configure `maxTurns` on the agent spec.
- */
-export function repair(): AgentAddon {
-  return async (context, next) => {
-    await next();
-    if (context.completed || context.error !== undefined || context.nextPrompt !== undefined) {
-      return;
-    }
-    if (context.response === undefined) {
-      return;
-    }
-    const analysis = analyzeResponse(context.response, context.outputSchema, context.spec.name, context.turn);
-    if (analysis.ok) {
-      context.completed = true;
-      context.output = analysis.output;
-      return;
-    }
-    if (context.turn >= context.maxTurns) {
-      context.error = analysis.error;
-      return;
-    }
-    context.nextPrompt = defaultRepairPrompt(context.spec, analysis.error);
-  };
-}
-
-export function timeout(options: TimeoutOptions): AgentAddon {
-  return async (context, next) => {
-    context.signal = timeoutSignal(context.signal, options.timeout);
-    await next();
-  };
-}
-
-export function oncePerAgent(register: AgentRegistration): AgentAddon {
-  const seen = new WeakSet<Agent>();
-  return async (context, next) => {
-    if (!seen.has(context.agent)) {
-      await register(context.agent, context);
-      seen.add(context.agent);
-    }
-    await next();
-  };
-}
-
-function timeoutSignal(parent?: AbortSignal, timeoutMs?: number): AbortSignal | undefined {
-  if (!timeoutMs) {
-    return parent;
-  }
-  const controller = new AbortController();
-  const onAbort = () => controller.abort(parent?.reason);
-  parent?.addEventListener("abort", onAbort, { once: true });
-  const timer = setTimeout(
-    () => controller.abort(new Error(`Timed out after ${timeoutMs}ms`)),
-    timeoutMs,
-  );
-  controller.signal.addEventListener("abort", () => clearTimeout(timer), { once: true });
-  return controller.signal;
-}
-
-export const addons = {
-  oncePerAgent,
-  timeout,
-  repair,
-  steering,
-};
+export { addons, oncePerAgent, repair, steering, timeout } from "./rig.ts";
+export type { AgentRegistration, SteeringOptions, TimeoutOptions } from "./rig.ts";

skills/rig/references/agent-api.md

@@ -219,6 +219,6 @@ Use only the current API:
 - `agent({ name, ... })`
 - `p.*` and ``p`...` `` from `rig`
 - `s.*` for explicit schemas
-- `oncePerAgent`, `repair()`, `steering`, and `timeout` from `rig/addons`
+- `oncePerAgent`, `repair()`, `steering`, and `timeout` from `rig`
 
 Do not add deprecated hooks, alternate schema syntaxes, or compatibility bridges.

skills/rig/rig.ts

@@ -83,9 +83,6 @@ import { promisify } from "node:util";
 import { CopilotClient, RuntimeConnection, approveAll } from "@github/copilot-sdk";
 import type { CopilotClientOptions } from "@github/copilot-sdk";
 
-export { addons, oncePerAgent, repair, steering, timeout } from "./addons.ts";
-export type { AgentRegistration, SteeringOptions, TimeoutOptions } from "./addons.ts";
-
 export type Json = null | boolean | number | string | Json[] | { [key: string]: Json };
 export type ValidationResult = { ok: true } | { ok: false; error: string };
 
@@ -644,6 +641,16 @@ export type AgentAddon = (
   context: AgentAddonContext,
   next: () => Promise<void>,
 ) => void | Promise<void>;
+export type SteeringOptions = {
+  message?: string;
+};
+export type TimeoutOptions = {
+  timeout: number;
+};
+export type AgentRegistration = (
+  agent: Agent,
+  context: AgentAddonContext,
+) => void | Promise<void>;
 export type ToolHandler<TArgs = unknown> = (args: TArgs) => unknown | Promise<unknown>;
 export type ToolParameters = Schema | Record<string, unknown>;
 export type Tool<TArgs = unknown> = ToolConfig<TArgs> & { name: string };
@@ -1259,6 +1266,66 @@ export class AgentError extends Error {
   }
 }
 
+const DEFAULT_STEERING_WARNING = "You are running out of turns. This is your final attempt before reaching the turn limit. Please correct your output now.";
+
+export function steering(options: SteeringOptions = {}): AgentAddon {
+  const message = options.message ?? DEFAULT_STEERING_WARNING;
+  return async (context, next) => {
+    await next();
+    if (context.nextPrompt && context.turn + 1 === context.maxTurns) {
+      context.nextPrompt = `${context.nextPrompt}\n${message}`;
+    }
+  };
+}
+
+export function repair(): AgentAddon {
+  return async (context, next) => {
+    await next();
+    if (context.completed || context.error !== undefined || context.nextPrompt !== undefined) {
+      return;
+    }
+    if (context.response === undefined) {
+      return;
+    }
+    const analysis = analyzeResponse(context.response, context.outputSchema, context.spec.name, context.turn);
+    if (analysis.ok) {
+      context.completed = true;
+      context.output = analysis.output;
+      return;
+    }
+    if (context.turn >= context.maxTurns) {
+      context.error = analysis.error;
+      return;
+    }
+    context.nextPrompt = defaultRepairPrompt(context.spec, analysis.error);
+  };
+}
+
+export function timeout(options: TimeoutOptions): AgentAddon {
+  return async (context, next) => {
+    context.signal = timeoutSignal(context.signal, options.timeout);
+    await next();
+  };
+}
+
+export function oncePerAgent(register: AgentRegistration): AgentAddon {
+  const seen = new WeakSet<Agent>();
+  return async (context, next) => {
+    if (!seen.has(context.agent)) {
+      await register(context.agent, context);
+      seen.add(context.agent);
+    }
+    await next();
+  };
+}
+
+export const addons = {
+  oncePerAgent,
+  timeout,
+  repair,
+  steering,
+};
+
 let currentAgentFactory: AgentFactory = defaultAgentFactory();
 
 /**

skills/rig/samples/100-workspace-config-drift-2.md

@@ -1,8 +1,7 @@
 # 100 - Workspace Config Drift 2
 
 ```rig
-import { agent, p, s, defineTool } from "rig";
-import { repair } from "rig/addons";
+import { agent, p, s, defineTool, repair } from "rig";
 
 const parseJson = defineTool("parseJson", {
   description: "Parse a JSON string and return parsed object or error",

skills/rig/samples/101-commit-format-suggester-2.md

@@ -1,8 +1,7 @@
 # 101 - Commit Format Suggester 2
 
 ```rig
-import { agent, p, s } from "rig";
-import { repair, steering } from "rig/addons";
+import { agent, p, s, repair, steering } from "rig";
 
 // Agent role: suggest conventional commit format for recent git commit messages.
 const commitFormatSuggester = agent({

skills/rig/samples/103-hotspot-file-analyzer-2.md

@@ -1,8 +1,7 @@
 # 103 - Hotspot File Analyzer 2
 
 ```rig
-import { agent, p, s } from "rig";
-import { steering } from "rig/addons";
+import { agent, p, s, steering } from "rig";
 
 // Agent role: identify hot-spot files by measuring commit churn and contributor spread.
 const hotspotFileAnalyzer = agent({

skills/rig/samples/105-import-cycle-detector-2.md

@@ -1,8 +1,7 @@
 # 105 - Import Cycle Detector 2
 
 ```rig
-import { agent, p, s } from "rig";
-import { repair } from "rig/addons";
+import { agent, p, s, repair } from "rig";
 
 // Agent role: detect circular import cycles in TypeScript source files.
 const importCycleDetector = agent({

skills/rig/samples/107-git-rename-tracker.md

@@ -1,8 +1,7 @@
 # 107 - Git Rename Tracker
 
 ```rig
-import { agent, p, s } from "rig";
-import { repair } from "rig/addons";
+import { agent, p, s, repair } from "rig";
 
 // Agent role: track file renames in git history and produce a structured rename log.
 const gitRenameTracker = agent({

skills/rig/samples/110-workspace-config-drift-3.md

@@ -1,8 +1,7 @@
 # 110 - Workspace Config Drift 3
 
 ```rig
-import { agent, defineTool, p, s } from "rig";
-import { repair } from "rig/addons";
+import { agent, defineTool, p, s, repair } from "rig";
 
 // Agent role: detect drift in workspace config files against a baseline.
 const workspaceConfigDrift = agent({