Validate submit_result with arktype instead of adding ajv

The repo already validates with arktype; ajv was added only because
arktype cannot consume a JSON Schema document (it exports toJsonSchema
but has no fromJsonSchema). Declaring the contract as an arktype type
instead removes the need for a second validator, gives compile-time
types for free, and produces better correction text for the worker.

No director package had declared an outputSchema yet, so no adopted
contract changes.

Author: TheGreatAxios

CHANGELOG.md

@@ -16,8 +16,8 @@ parallel copies under `docs/` or `scripts/notes/`. At cut time: rename
 ### Agent
 
 - Tier 3 leaf workers can now report via `submit_result`, a typed channel alongside
-  the markdown envelope that validates against a director-declared JSON Schema
-  and returns a correction (capped at 3 rounds) on an invalid submission.
+  the markdown envelope that validates against a director-declared shape and
+  returns a correction (capped at 3 rounds) on an invalid submission.
 - **`spawn_agent` / `wait_agents` split the fused spawn+wait out of `task()`.**
   `spawn_agent` starts a worker and returns immediately with `{ agent_id,
   status: "running" }` — it never awaits the worker's completion. `wait_agents`

bun.lock

@@ -54,7 +54,6 @@
   },
   "catalog": {
     "@types/semver": "^7.7.1",
-    "ajv": "^8.17.1",
     "arktype": "^2.1.29",
     "better-auth": "^1.4.18",
     "drizzle-orm": "^0.45.1",
@@ -77,7 +76,6 @@
     "@opentui/core": "0.5.1",
     "@opentui/keymap": "0.5.1",
     "@opentui/solid": "0.5.1",
-    "ajv": "catalog:",
     "arktype": "catalog:",
     "highlight.js": "^11.11.1",
     "solid-js": "1.9.14"

package.json

@@ -1,6 +1,8 @@
 // Closed director package contract for the v1 fleet (CL-5818).
 // Prompt-first: system prompt is the opinionated core; skills are optional.
 
+import type { OutputType } from "../../subagent/submit-result.js";
+
 export const DIRECTOR_IDS = [
   "skywalker",
   "build",
@@ -68,8 +70,8 @@ export interface NudgePolicy {
  * Omit entirely to keep a director on the markdown-only path.
  */
 export interface ReportContract {
-  /** JSON Schema for submit_result's payload, validated with ajv (see subagent/submit-result.ts). */
-  readonly outputSchema?: Record<string, unknown>;
+  /** Shape of submit_result's payload, validated with arktype (see subagent/submit-result.ts). */
+  readonly outputType?: OutputType;
 }
 
 /**

src/agent/directors/types.ts

@@ -466,7 +466,7 @@ export async function runSubAgent(params: RunSubAgentParams): Promise<string> {
               turnToken: turnToken!,
               submittedToken: rawArgs.turn_token,
               result: rawArgs.result,
-              ...(params.reportSchema !== undefined ? { schema: params.reportSchema } : {}),
+              ...(params.reportType !== undefined ? { outputType: params.reportType } : {}),
               state: submitResultState,
             });
             return outcome.message;

src/subagent/run.ts

@@ -1,24 +1,19 @@
 import { describe, expect, test } from "bun:test";
 
+import { type } from "arktype";
+
 import { createSubmitResultState, evaluateSubmitResult } from "./submit-result.js";
 
 const TOKEN = "turn-abc123";
 
 describe("evaluateSubmitResult", () => {
-  test("a valid submission against a declared schema succeeds", () => {
+  test("a valid submission against a declared output type succeeds", () => {
     const state = createSubmitResultState();
     const outcome = evaluateSubmitResult({
       turnToken: TOKEN,
       submittedToken: TOKEN,
       result: { verdict: "pass", score: 5 },
-      schema: {
-        type: "object",
-        required: ["verdict", "score"],
-        properties: {
-          verdict: { type: "string", enum: ["pass", "fail"] },
-          score: { type: "number", minimum: 0, maximum: 10 },
-        },
-      },
+      outputType: type({ verdict: "'pass'|'fail'", score: "0<=number<=10" }),
       state,
     });
     expect(outcome.ok).toBe(true);
@@ -28,17 +23,13 @@ describe("evaluateSubmitResult", () => {
 
   test("an invalid submission returns a correction and a resubmit then succeeds", () => {
     const state = createSubmitResultState();
-    const schema = {
-      type: "object" as const,
-      required: ["verdict"],
-      properties: { verdict: { type: "string", enum: ["pass", "fail"] } },
-    };
+    const outputType = type({ verdict: "'pass'|'fail'" });
 
     const first = evaluateSubmitResult({
       turnToken: TOKEN,
       submittedToken: TOKEN,
       result: { verdict: "maybe" },
-      schema,
+      outputType,
       state,
     });
     expect(first.ok).toBe(false);
@@ -49,7 +40,7 @@ describe("evaluateSubmitResult", () => {
       turnToken: TOKEN,
       submittedToken: TOKEN,
       result: { verdict: "pass" },
-      schema,
+      outputType,
       state,
     });
     expect(second.ok).toBe(true);
@@ -71,21 +62,21 @@ describe("evaluateSubmitResult", () => {
 
   test("correction cap refuses further attempts once reached", () => {
     const state = createSubmitResultState();
-    const schema = { type: "object" as const, required: ["x"] };
+    const outputType = type({ x: "number" });
     for (let i = 0; i < 3; i++) {
       evaluateSubmitResult({
         turnToken: TOKEN,
         submittedToken: TOKEN,
         result: {},
-        schema,
+        outputType,
         state,
       });
     }
     const capped = evaluateSubmitResult({
       turnToken: TOKEN,
       submittedToken: TOKEN,
       result: { x: 1 },
-      schema,
+      outputType,
       state,
     });
     expect(capped.ok).toBe(false);

src/subagent/submit-result.test.ts

@@ -4,11 +4,10 @@
  * owns the per-turn `SubmitResultState` (one instance per runSubAgent call).
  */
 
-import Ajv, { type Schema } from "ajv";
+import { ArkErrors, type Type } from "arktype";
 
-const ajv = new Ajv({ allErrors: true, strict: false });
-
-export type JsonSchema = Schema;
+/** A director's declared shape for submit_result's payload. */
+export type OutputType = Type<unknown>;
 
 export const SUBMIT_RESULT_MAX_CORRECTIONS = 3;
 
@@ -27,8 +26,8 @@ export interface SubmitResultInput {
   submittedToken: unknown;
   /** The result argument the worker passed. */
   result: unknown;
-  /** Declared output schema, if the director's report contract has one. */
-  schema?: JsonSchema;
+  /** Declared output shape, if the director's report contract has one. */
+  outputType?: OutputType;
   state: SubmitResultState;
   maxCorrections?: number;
 }
@@ -52,16 +51,15 @@ export function evaluateSubmitResult(input: SubmitResultInput): {
       message: `Error: submit_result correction cap (${cap}) reached for this turn. No further attempts accepted — finish with the markdown report envelope instead.`,
     };
   }
-  if (input.schema !== undefined) {
-    const validate = ajv.compile(input.schema);
-    const valid = validate(input.result);
-    if (!valid) {
+  if (input.outputType !== undefined) {
+    const checked = input.outputType(input.result);
+    if (checked instanceof ArkErrors) {
       input.state.corrections += 1;
       return {
         ok: false,
         message: [
           `Invalid submission (${input.state.corrections}/${cap} corrections used):`,
-          ajv.errorsText(validate.errors, { separator: "\n", dataVar: "result" }),
+          checked.summary,
           "Fix and call submit_result again with the same turn_token.",
         ].join("\n"),
       };

src/subagent/submit-result.ts

@@ -835,10 +835,10 @@ export function createTaskTool(deps: TaskToolDeps): AgentTool {
             maxTurns: resolvedMaxTurns,
             ...(deps.deadlineMs !== undefined ? { deadlineMs: deps.deadlineMs } : {}),
             // submit_result mount gate (CL-6946): only a resolved Tier 3 leaf
-            // director gets tier here, and only if it declared an outputSchema.
+            // director gets tier here, and only if it declared an outputType.
             ...(resolvedPackage !== undefined ? { tier: resolvedPackage.tier } : {}),
-            ...(resolvedPackage?.reportContract?.outputSchema !== undefined
-              ? { reportSchema: resolvedPackage.reportContract.outputSchema }
+            ...(resolvedPackage?.reportContract?.outputType !== undefined
+              ? { reportType: resolvedPackage.reportContract.outputType }
               : {}),
           };
           const result = await run(params);

src/subagent/task-tool.ts

@@ -10,6 +10,7 @@ import type { ToolPlugin } from "@intx/tools-posix";
 
 import type { CapabilityFilter, AgentProfile } from "../agent/profiles.js";
 import type { ProviderCatalogEntry } from "../config/index.js";
+import type { OutputType } from "./submit-result.js";
 import type { Settings } from "../config/settings.js";
 import type { ShellTimeoutConfig } from "../plugins/shell-guard-plugin.js";
 import type { PermissionGate } from "../permission/gate.js";
@@ -144,6 +145,6 @@ export type RunSubAgentParams = {
    * gates it, not a new mechanism.
    */
   tier?: SubagentTier;
-  /** DirectorPackage.reportContract.outputSchema, when the resolved leaf declares one. */
-  reportSchema?: Record<string, unknown>;
+  /** DirectorPackage.reportContract.outputType, when the resolved leaf declares one. */
+  reportType?: OutputType;
 } & SubAgentSandboxDeps;