@caelo-cms/shared 0.10.22 → 0.10.24

package/dist/subagents.d.ts

@@ -15,6 +15,7 @@
  *       verdict ({pass, issues[], suggestions[]})
  *       tree    ({tree: [...], rationale})
  *       freeform ({text})
+ *       rebuild ({pages[], contentNotes[], skipped[], summary})
  *   - parseSubagentResult — pulls JSON out of the subagent's final
  *     assistant message (handles ```json fences) and validates against
  *     the requested shape.
@@ -24,8 +25,41 @@ declare const expectedReturnShape: z.ZodEnum<{
     verdict: "verdict";
     tree: "tree";
     freeform: "freeform";
+    rebuild: "rebuild";
 }>;
 export type ExpectedReturnShape = z.infer<typeof expectedReturnShape>;
+/**
+ * Run #8 R2a — the SINGLE source of truth for the return-shape enum.
+ *
+ * The spawn tools' hand-written provider `inputSchema` (JSON Schema) must
+ * carry the same enum values as this Zod schema; in run #8 the live
+ * validator rejected `"rebuild"` because the runtime resolved a stale
+ * pre-#266 build of this module while the provider schema advertised the
+ * new value (issue #251 drift class, resolution flavour). Tool files
+ * derive their JSON-Schema enums from this array instead of re-typing the
+ * literals, and a unit test asserts the tool schema accepts every shape
+ * this parser knows.
+ */
+export declare const EXPECTED_RETURN_SHAPES: readonly ExpectedReturnShape[];
+/**
+ * issue #306 — model tier a subagent runs at. `inherit` (the default) is
+ * today's behaviour: the child reuses the parent chat's provider+model.
+ * `mid` / `small` route the child onto a cheaper model the Owner mapped
+ * in the active provider's config (`ai_providers.config.modelTiers`).
+ * The tier VOCABULARY is deliberately abstract — tool results and
+ * editor-facing text never name the underlying model (CLAUDE.md §2:
+ * provider brand never surfaces in the editor chat UI); concrete model
+ * ids appear only on Owner surfaces (security panel, cost dashboard).
+ */
+export declare const subagentModelTier: z.ZodEnum<{
+    small: "small";
+    inherit: "inherit";
+    mid: "mid";
+}>;
+export type SubagentModelTier = z.infer<typeof subagentModelTier>;
+/** Single source of truth for the tier enum (same #251 drift-guard pattern
+ *  as EXPECTED_RETURN_SHAPES — tool JSON schemas derive from this array). */
+export declare const SUBAGENT_MODEL_TIERS: readonly SubagentModelTier[];
 /**
  * One subagent spec. The parent supplies role + task + optional
  * narrowing. The handler creates the ephemeral chat session, appends
@@ -41,9 +75,15 @@ export declare const subagentSpec: z.ZodObject<{
         verdict: "verdict";
         tree: "tree";
         freeform: "freeform";
+        rebuild: "rebuild";
     }>>;
-    maxCostMicrocents: z.ZodDefault<z.ZodNumber>;
+    maxCostMicrocents: z.ZodOptional<z.ZodNumber>;
     timeoutMs: z.ZodDefault<z.ZodNumber>;
+    tier: z.ZodDefault<z.ZodEnum<{
+        small: "small";
+        inherit: "inherit";
+        mid: "mid";
+    }>>;
     activePageId: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
 export type SubagentSpec = z.infer<typeof subagentSpec>;
@@ -55,9 +95,15 @@ export declare const spawnSubagentToolInput: z.ZodObject<{
         verdict: "verdict";
         tree: "tree";
         freeform: "freeform";
+        rebuild: "rebuild";
     }>>;
-    maxCostMicrocents: z.ZodDefault<z.ZodNumber>;
+    maxCostMicrocents: z.ZodOptional<z.ZodNumber>;
     timeoutMs: z.ZodDefault<z.ZodNumber>;
+    tier: z.ZodDefault<z.ZodEnum<{
+        small: "small";
+        inherit: "inherit";
+        mid: "mid";
+    }>>;
     activePageId: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
 export type SpawnSubagentToolInput = SubagentSpec;
@@ -70,9 +116,15 @@ export declare const spawnSubagentsToolInput: z.ZodObject<{
             verdict: "verdict";
             tree: "tree";
             freeform: "freeform";
+            rebuild: "rebuild";
         }>>;
-        maxCostMicrocents: z.ZodDefault<z.ZodNumber>;
+        maxCostMicrocents: z.ZodOptional<z.ZodNumber>;
         timeoutMs: z.ZodDefault<z.ZodNumber>;
+        tier: z.ZodDefault<z.ZodEnum<{
+            small: "small";
+            inherit: "inherit";
+            mid: "mid";
+        }>>;
         activePageId: z.ZodOptional<z.ZodString>;
     }, z.core.$strict>>;
 }, z.core.$strict>;
@@ -92,6 +144,35 @@ export declare const freeformReturnShape: z.ZodObject<{
     text: z.ZodString;
 }, z.core.$strict>;
 export type FreeformReturn = z.infer<typeof freeformReturnShape>;
+/**
+ * issue #264 — compact per-page rebuild summary for migration fan-out
+ * subagents. The orchestrator chat's context grows by THIS shape only
+ * (never by the subagent's full transcript), so it is deliberately
+ * bounded: per-page status + short notes, deliberate omissions with a
+ * reason, and a one-paragraph summary. `pageId`/`slug` are both
+ * optional because a subagent that failed before resolving a page can
+ * still report the slug it was briefed with (or vice versa).
+ */
+export declare const rebuildReturnShape: z.ZodObject<{
+    pages: z.ZodArray<z.ZodObject<{
+        pageId: z.ZodOptional<z.ZodString>;
+        slug: z.ZodOptional<z.ZodString>;
+        status: z.ZodEnum<{
+            rebuilt: "rebuilt";
+            skipped: "skipped";
+            failed: "failed";
+            needs_escalation: "needs_escalation";
+        }>;
+        notes: z.ZodOptional<z.ZodString>;
+    }, z.core.$strict>>;
+    contentNotes: z.ZodDefault<z.ZodArray<z.ZodString>>;
+    skipped: z.ZodDefault<z.ZodArray<z.ZodObject<{
+        item: z.ZodString;
+        reason: z.ZodString;
+    }, z.core.$strict>>>;
+    summary: z.ZodDefault<z.ZodString>;
+}, z.core.$strict>;
+export type RebuildReturn = z.infer<typeof rebuildReturnShape>;
 export type ParseSuccess = {
     ok: true;
     shape: "verdict";
@@ -104,11 +185,28 @@ export type ParseSuccess = {
     ok: true;
     shape: "freeform";
     value: FreeformReturn;
+} | {
+    ok: true;
+    shape: "rebuild";
+    value: RebuildReturn;
 };
 export type ParseResult = ParseSuccess | {
     ok: false;
     error: string;
 };
+/**
+ * Run #10 D2 — validate an ALREADY-PARSED value against the requested
+ * return shape. This is the structured half of the result channel: the
+ * `submit_result` tool hands the payload straight from the tool-call
+ * arguments (already JSON — no fence-stripping, no brace-balancing),
+ * so the "response is not valid JSON" failure class cannot occur.
+ * `parseSubagentResult` (final-text fallback) delegates here after its
+ * JSON extraction.
+ *
+ * For `freeform`, accepts `{text: "..."}` OR a bare string (wrapped as
+ * `{text}`) so the model can pass its prose directly.
+ */
+export declare function validateSubagentResultValue(value: unknown, shape: ExpectedReturnShape): ParseResult;
 /**
  * Pull JSON out of the subagent's final assistant text and validate
  * against the requested shape. On schema mismatch, returns
@@ -117,6 +215,10 @@ export type ParseResult = ParseSuccess | {
  * For `freeform`, accepts EITHER `{text: "..."}` JSON or raw text;
  * raw text is wrapped as `{text: rawText}` so the caller always gets
  * the same shape.
+ *
+ * Run #10 D2 — this is now the FALLBACK channel; the canonical path is
+ * the child calling `submit_result`, whose payload is validated by
+ * `validateSubagentResultValue` without any text extraction.
  */
 export declare function parseSubagentResult(text: string, shape: ExpectedReturnShape): ParseResult;
 export {};

package/dist/subagents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagents.d.ts","sourceRoot":"","sources":["../src/subagents.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,QAAA,MAAM,mBAAmB;;;;EAA0C,CAAC;AACpE,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEtE;;;;;;GAMG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;kBA4Bd,CAAC;AACZ,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAExD,eAAO,MAAM,sBAAsB;;;;;;;;;;;;kBAAe,CAAC;AACnD,MAAM,MAAM,sBAAsB,GAAG,YAAY,CAAC;AAElD,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;kBAIzB,CAAC;AACZ,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAM9E,eAAO,MAAM,kBAAkB;;;;kBAQpB,CAAC;AACZ,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE/D,eAAO,MAAM,eAAe;;;kBAKjB,CAAC;AACZ,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAEzD,eAAO,MAAM,mBAAmB;;kBAIrB,CAAC;AACZ,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAiDjE,MAAM,MAAM,YAAY,GACpB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE,GACpD;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GAC9C;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,cAAc,CAAA;CAAE,CAAC;AAE3D,MAAM,MAAM,WAAW,GAAG,YAAY,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,GAAG,WAAW,CA8DzF"}
+{"version":3,"file":"subagents.d.ts","sourceRoot":"","sources":["../src/subagents.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,QAAA,MAAM,mBAAmB;;;;;EAAqD,CAAC;AAC/E,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEtE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,sBAAsB,EAAE,SAAS,mBAAmB,EAAgC,CAAC;AAElG;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB;;;;EAAsC,CAAC;AACrE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAClE;6EAC6E;AAC7E,eAAO,MAAM,oBAAoB,EAAE,SAAS,iBAAiB,EAA8B,CAAC;AAE5F;;;;;;GAMG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;kBAwDd,CAAC;AACZ,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAExD,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;kBAAe,CAAC;AACnD,MAAM,MAAM,sBAAsB,GAAG,YAAY,CAAC;AAElD,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;kBAUzB,CAAC;AACZ,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAM9E,eAAO,MAAM,kBAAkB;;;;kBAQpB,CAAC;AACZ,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE/D,eAAO,MAAM,eAAe;;;kBAKjB,CAAC;AACZ,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAEzD,eAAO,MAAM,mBAAmB;;kBAIrB,CAAC;AACZ,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEjE;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;kBAuDpB,CAAC;AACZ,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAiD/D,MAAM,MAAM,YAAY,GACpB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE,GACpD;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GAC9C;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,cAAc,CAAA;CAAE,GACtD;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE,CAAC;AAEzD,MAAM,MAAM,WAAW,GAAG,YAAY,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,mBAAmB,GACzB,WAAW,CAiFb;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,GAAG,WAAW,CA0BzF"}

package/dist/subagents.js

@@ -16,12 +16,40 @@
  *       verdict ({pass, issues[], suggestions[]})
  *       tree    ({tree: [...], rationale})
  *       freeform ({text})
+ *       rebuild ({pages[], contentNotes[], skipped[], summary})
  *   - parseSubagentResult — pulls JSON out of the subagent's final
  *     assistant message (handles ```json fences) and validates against
  *     the requested shape.
  */
 import { z } from "zod";
-const expectedReturnShape = z.enum(["verdict", "tree", "freeform"]);
+const expectedReturnShape = z.enum(["verdict", "tree", "freeform", "rebuild"]);
+/**
+ * Run #8 R2a — the SINGLE source of truth for the return-shape enum.
+ *
+ * The spawn tools' hand-written provider `inputSchema` (JSON Schema) must
+ * carry the same enum values as this Zod schema; in run #8 the live
+ * validator rejected `"rebuild"` because the runtime resolved a stale
+ * pre-#266 build of this module while the provider schema advertised the
+ * new value (issue #251 drift class, resolution flavour). Tool files
+ * derive their JSON-Schema enums from this array instead of re-typing the
+ * literals, and a unit test asserts the tool schema accepts every shape
+ * this parser knows.
+ */
+export const EXPECTED_RETURN_SHAPES = expectedReturnShape.options;
+/**
+ * issue #306 — model tier a subagent runs at. `inherit` (the default) is
+ * today's behaviour: the child reuses the parent chat's provider+model.
+ * `mid` / `small` route the child onto a cheaper model the Owner mapped
+ * in the active provider's config (`ai_providers.config.modelTiers`).
+ * The tier VOCABULARY is deliberately abstract — tool results and
+ * editor-facing text never name the underlying model (CLAUDE.md §2:
+ * provider brand never surfaces in the editor chat UI); concrete model
+ * ids appear only on Owner surfaces (security panel, cost dashboard).
+ */
+export const subagentModelTier = z.enum(["inherit", "mid", "small"]);
+/** Single source of truth for the tier enum (same #251 drift-guard pattern
+ *  as EXPECTED_RETURN_SHAPES — tool JSON schemas derive from this array). */
+export const SUBAGENT_MODEL_TIERS = subagentModelTier.options;
 /**
  * One subagent spec. The parent supplies role + task + optional
  * narrowing. The handler creates the ephemeral chat session, appends
@@ -44,10 +72,38 @@ export const subagentSpec = z
     allowedToolNames: z.array(z.string().min(1).max(120)).optional(),
     /** Zod-validated return shape. Defaults to `verdict`. */
     expectedReturnShape: expectedReturnShape.default("verdict"),
-    /** Per-spawn cost cap; default 50_000_000 microcents = $0.50. */
-    maxCostMicrocents: z.number().int().nonnegative().default(50_000_000),
-    /** Per-spawn timeout; default 60s. */
-    timeoutMs: z.number().int().min(1000).max(600_000).default(60_000),
+    /**
+     * Per-spawn cost cap in microcents. OPTIONAL on purpose (issue #304):
+     * when omitted, the spawn orchestrator derives the cap from the armed
+     * run budget (#297) or falls back to SUBAGENT_CHILD_CAP_MICROCENTS.
+     * The old schema default (50M µ¢ = $0.50) sat BELOW the empirically
+     * observed 90–167M µ¢ per-child spend of migration page batches
+     * (runs #14/#15), so every child errored at the cap — a default here
+     * would make "AI omitted it" indistinguishable from "AI chose $0.50".
+     */
+    maxCostMicrocents: z.number().int().nonnegative().optional(),
+    /**
+     * Per-spawn wall-clock timeout. Default 300s (5 min): the documented
+     * fan-out use cases are page BUILDS — a Genesis design draft (full page +
+     * image generation) and a migration per-type rebuild each legitimately run
+     * 2–4 min. The old 60s default aborted every build child mid-work (Genesis
+     * live-run 2026-07: all 3 draft children `timed_out` at ~60000ms, so the
+     * flow saved 0 drafts; the abort also skips the child's `ai_calls` write, so
+     * the roll-up read `$0.00` — the child WAS building, not idle). Quick
+     * reviewer children (qa/legal/menu/categorizer) finish well under this
+     * ceiling, so the higher default is harmless for them. The AI can still
+     * pass a smaller `timeoutMs` for a known-fast child.
+     */
+    timeoutMs: z.number().int().min(1000).max(600_000).default(300_000),
+    /**
+     * issue #306 — model tier for this child. Default `inherit` keeps
+     * single-model behaviour byte-identical to pre-#306 (conservative
+     * default: nothing changes until a caller opts in per-spawn AND the
+     * Owner has mapped the tier). A requested-but-unmapped tier is a
+     * LOUD structured error at spawn time — never a silent downgrade to
+     * the parent's model (CLAUDE.md §2 no-fallbacks).
+     */
+    tier: subagentModelTier.default("inherit"),
     /**
      * Optional active page id. When passed, the spawn handler routes
      * it through to the runChatTurn invocation as `activePageId`,
@@ -61,7 +117,13 @@ export const subagentSpec = z
 export const spawnSubagentToolInput = subagentSpec;
 export const spawnSubagentsToolInput = z
     .object({
-    subagents: z.array(subagentSpec).min(1).max(8),
+    // issue #304 — 32 matches the tool's advertised provider-schema
+    // maxItems (SUBAGENT_MAX_BATCH default). The previous max(8) silently
+    // rejected the very batches the provider schema invited (#251 drift
+    // class): a 14-page migration fan-out failed Zod validation at
+    // dispatch and fell back to serial building. SUBAGENT_MAX_BATCH must
+    // never be env-raised past this hard bound.
+    subagents: z.array(subagentSpec).min(1).max(32),
 })
     .strict();
 // ---------------------------------------------------------------------
@@ -87,6 +149,66 @@ export const freeformReturnShape = z
     text: z.string().min(1).max(40_000),
 })
     .strict();
+/**
+ * issue #264 — compact per-page rebuild summary for migration fan-out
+ * subagents. The orchestrator chat's context grows by THIS shape only
+ * (never by the subagent's full transcript), so it is deliberately
+ * bounded: per-page status + short notes, deliberate omissions with a
+ * reason, and a one-paragraph summary. `pageId`/`slug` are both
+ * optional because a subagent that failed before resolving a page can
+ * still report the slug it was briefed with (or vice versa).
+ */
+export const rebuildReturnShape = z
+    .object({
+    pages: z
+        .array(z
+        .object({
+        pageId: z.string().uuid().optional(),
+        slug: z.string().min(1).max(500).optional(),
+        /**
+         * issue #306 — `needs_escalation`: the child detected the page
+         * needs something it is not equipped to BUILD (no matching
+         * module/pattern, a layout decision, unexpected source
+         * structure) and hands it back instead of improvising. The
+         * orchestrator re-dispatches exactly those pages one capability
+         * step up (see subagent-batch.ts escalation waves). The reason
+         * lives in `notes` and is REQUIRED for this status — a blind
+         * escalation would just re-run the same confusion at higher
+         * cost (enforced by the superRefine below).
+         */
+        status: z.enum(["rebuilt", "skipped", "failed", "needs_escalation"]),
+        /** Content-completeness note: what was dropped/merged and why, or
+         *  why skipped/failed — or, for `needs_escalation`, the REQUIRED
+         *  reason the page needs a more capable pass. */
+        notes: z.string().max(2000).optional(),
+    })
+        .strict()
+        .superRefine((page, ctx) => {
+        if (page.status === "needs_escalation" && !page.notes?.trim()) {
+            ctx.addIssue({
+                code: "custom",
+                path: ["notes"],
+                message: 'status "needs_escalation" requires `notes` explaining WHAT new thing this page needs (missing pattern, layout decision, unexpected structure) — the escalated pass is briefed from it',
+            });
+        }
+    }))
+        .min(1)
+        .max(100),
+    /** Cross-page content-completeness observations (e.g. "source pricing table had a footnote row I folded into the caption"). */
+    contentNotes: z.array(z.string().min(1).max(2000)).max(50).default([]),
+    /** Items deliberately left out — the orchestrator relays these verbatim. */
+    skipped: z
+        .array(z
+        .object({
+        item: z.string().min(1).max(500),
+        reason: z.string().min(1).max(1000),
+    })
+        .strict())
+        .max(100)
+        .default([]),
+    summary: z.string().max(4000).default(""),
+})
+    .strict();
 // ---------------------------------------------------------------------
 // Result parser — handles `````json {…} ````` fences + raw JSON.
 // ---------------------------------------------------------------------
@@ -136,6 +258,97 @@ function stripFences(text) {
     }
     return trimmed;
 }
+/**
+ * Run #10 D2 — validate an ALREADY-PARSED value against the requested
+ * return shape. This is the structured half of the result channel: the
+ * `submit_result` tool hands the payload straight from the tool-call
+ * arguments (already JSON — no fence-stripping, no brace-balancing),
+ * so the "response is not valid JSON" failure class cannot occur.
+ * `parseSubagentResult` (final-text fallback) delegates here after its
+ * JSON extraction.
+ *
+ * For `freeform`, accepts `{text: "..."}` OR a bare string (wrapped as
+ * `{text}`) so the model can pass its prose directly.
+ */
+export function validateSubagentResultValue(value, shape) {
+    // Defense-in-depth for the structured shapes: a provider can
+    // double-encode the payload so `value` arrives as a JSON string even
+    // after the `submit_result` inputSchema fix (and the final-text
+    // fallback path never passes through normalize-args at all). The
+    // structured shapes want an object/array, so decode a JSON-looking
+    // string before parsing. `freeform` legitimately wants a bare string,
+    // so it is left untouched.
+    let coerced = value;
+    if (shape !== "freeform" && typeof coerced === "string") {
+        const trimmed = coerced.trim();
+        if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+            try {
+                coerced = JSON.parse(trimmed);
+            }
+            catch {
+                // leave as-is; the shape parse below reports the real mismatch
+            }
+        }
+    }
+    // v0.2.67 — when the schema rejects, include the actual top-level
+    // keys the subagent returned so the parent AI can tell whether the
+    // subagent ignored the schema entirely (returned freeform text under
+    // a different shape) vs. got close but mistyped a single field.
+    const observedKeys = typeof coerced === "object" && coerced !== null && !Array.isArray(coerced)
+        ? Object.keys(coerced)
+        : [];
+    const observedSummary = observedKeys.length > 0
+        ? ` got keys: [${observedKeys.slice(0, 8).join(", ")}]`
+        : ` got: ${typeof coerced} (${Array.isArray(coerced) ? "array" : "scalar"})`;
+    const issueSummary = (issues) => issues
+        .slice(0, 3)
+        .map((i) => `${i.path.join(".") || "<root>"}: ${i.message}`)
+        .join("; ");
+    if (shape === "freeform") {
+        if (typeof value === "string") {
+            if (value.trim().length === 0)
+                return { ok: false, error: "subagent returned empty text" };
+            return { ok: true, shape: "freeform", value: { text: value.trim() } };
+        }
+        const validated = freeformReturnShape.safeParse(value);
+        if (!validated.success) {
+            return {
+                ok: false,
+                error: `freeform shape mismatch (expected {text: string} or a plain string):${observedSummary}; ${issueSummary(validated.error.issues)}`,
+            };
+        }
+        return { ok: true, shape: "freeform", value: validated.data };
+    }
+    if (shape === "verdict") {
+        const validated = verdictReturnShape.safeParse(coerced);
+        if (!validated.success) {
+            return {
+                ok: false,
+                error: `verdict shape mismatch (expected {pass: boolean, issues: array, suggestions?: array}):${observedSummary}; ${issueSummary(validated.error.issues)}`,
+            };
+        }
+        return { ok: true, shape: "verdict", value: validated.data };
+    }
+    if (shape === "rebuild") {
+        const validated = rebuildReturnShape.safeParse(coerced);
+        if (!validated.success) {
+            return {
+                ok: false,
+                error: `rebuild shape mismatch (expected {pages: [{pageId?, slug?, status: "rebuilt"|"skipped"|"failed"|"needs_escalation", notes?}], contentNotes?: string[], skipped?: [{item, reason}], summary?: string}):${observedSummary}; ${issueSummary(validated.error.issues)}`,
+            };
+        }
+        return { ok: true, shape: "rebuild", value: validated.data };
+    }
+    // tree
+    const validated = treeReturnShape.safeParse(coerced);
+    if (!validated.success) {
+        return {
+            ok: false,
+            error: `tree shape mismatch (expected {tree: array, rationale?: string}):${observedSummary}; ${issueSummary(validated.error.issues)}`,
+        };
+    }
+    return { ok: true, shape: "tree", value: validated.data };
+}
 /**
  * Pull JSON out of the subagent's final assistant text and validate
  * against the requested shape. On schema mismatch, returns
@@ -144,6 +357,10 @@ function stripFences(text) {
  * For `freeform`, accepts EITHER `{text: "..."}` JSON or raw text;
  * raw text is wrapped as `{text: rawText}` so the caller always gets
  * the same shape.
+ *
+ * Run #10 D2 — this is now the FALLBACK channel; the canonical path is
+ * the child calling `submit_result`, whose payload is validated by
+ * `validateSubagentResultValue` without any text extraction.
  */
 export function parseSubagentResult(text, shape) {
     if (shape === "freeform") {
@@ -173,40 +390,6 @@ export function parseSubagentResult(text, shape) {
             error: `subagent response is not valid JSON: ${e.message}; first 200 chars: ${stripped.slice(0, 200)}`,
         };
     }
-    // v0.2.67 — when the schema rejects, include the actual top-level
-    // keys the subagent returned so the parent AI can tell whether the
-    // subagent ignored the schema entirely (returned freeform text under
-    // a different shape) vs. got close but mistyped a single field.
-    const observedKeys = typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)
-        ? Object.keys(parsed)
-        : [];
-    const observedSummary = observedKeys.length > 0
-        ? ` got keys: [${observedKeys.slice(0, 8).join(", ")}]`
-        : ` got: ${typeof parsed} (${Array.isArray(parsed) ? "array" : "scalar"})`;
-    if (shape === "verdict") {
-        const validated = verdictReturnShape.safeParse(parsed);
-        if (!validated.success) {
-            return {
-                ok: false,
-                error: `verdict shape mismatch (expected {pass: boolean, issues: array, suggestions?: array}):${observedSummary}; ${validated.error.issues
-                    .slice(0, 3)
-                    .map((i) => `${i.path.join(".") || "<root>"}: ${i.message}`)
-                    .join("; ")}`,
-            };
-        }
-        return { ok: true, shape: "verdict", value: validated.data };
-    }
-    // tree
-    const validated = treeReturnShape.safeParse(parsed);
-    if (!validated.success) {
-        return {
-            ok: false,
-            error: `tree shape mismatch (expected {tree: array, rationale?: string}):${observedSummary}; ${validated.error.issues
-                .slice(0, 3)
-                .map((i) => `${i.path.join(".") || "<root>"}: ${i.message}`)
-                .join("; ")}`,
-        };
-    }
-    return { ok: true, shape: "tree", value: validated.data };
+    return validateSubagentResultValue(parsed, shape);
 }
 //# sourceMappingURL=subagents.js.map

package/dist/subagents.js.map

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

package/dist/template-engine.d.ts

@@ -0,0 +1,85 @@
+import { type ModuleFieldKind } from "./content.js";
+/**
+ * Subset of `modules.fields[]` the engine cares about. The full
+ * schema lives in `content.ts`; the engine only needs `name`, `kind`,
+ * and the optional `default`. Importers pass the full row through.
+ */
+export interface TemplateField {
+    readonly name: string;
+    readonly kind: ModuleFieldKind;
+    readonly default?: unknown;
+}
+export interface RenderTemplateInput {
+    readonly html: string;
+    readonly fields: readonly TemplateField[];
+    /** Per-placement values from `content_instances.values`. */
+    readonly contentValues?: Readonly<Record<string, unknown>>;
+    /**
+     * Pre-rendered nested-module HTML keyed by:
+     *   - `<name>`            for single `{{>name}}` (module field kind)
+     *   - `<name>__<index>`   for each `{{#name}}` element (module-list)
+     * Compose path: empty map (no DB → loud HTML comments emit).
+     * Preview-render path: built from RenderResolver walks.
+     */
+    readonly partials?: Readonly<Record<string, string>>;
+    /**
+     * v0.11.1 (issue #76) — active theme's resolved asset URLs. When
+     * present, `{{theme_logo_url}}` / `{{theme_logo_dark_url}}` /
+     * `{{theme_favicon_url}}` / `{{theme_social_share_url}}` substitute
+     * to the asset URL string. Unbound slots (null/absent) follow the
+     * existing loud-raw invariant (CLAUDE.md §2): the `{{…}}` stays in
+     * the output verbatim AND `theme-asset-unbound:<slot>` lands in
+     * `missingSlots`. Per-placement `contentValues` still take
+     * precedence so an operator can override on a single module.
+     */
+    readonly themeAssets?: {
+        readonly logo: string | null;
+        readonly logoDark: string | null;
+        readonly favicon: string | null;
+        readonly socialShare: string | null;
+    };
+}
+export interface RenderTemplateOutput {
+    readonly html: string;
+    /** Structured failure channel — see file-level comment for the markers. */
+    readonly missingSlots: readonly string[];
+}
+/**
+ * Render a `caelo:missing` HTML comment carrying a failure reason.
+ * The shape (`<!-- caelo:missing reason=<…> -->`) is part of the
+ * public failure-marker contract — the chat-runner diag pass reads
+ * the comment text out of rendered HTML, and the editor's missing-
+ * content surface highlights it for the operator. Exported so the
+ * DB-aware preview-render path (`packages/admin-core/src/ops/content/
+ * preview-render.ts`) emits the exact same shape without redeclaring.
+ */
+export declare function caeloMissingComment(reason: string): string;
+/**
+ * Render `html` against `contentValues` + `fields` + `partials`,
+ * returning the substituted HTML plus a structured `missingSlots`
+ * channel. Pure / sync / no IO.
+ *
+ * @example
+ * // AC #1 fixture (issue #71). Iterates a link-list field per element.
+ * renderTemplate({
+ *   html: '<nav>{{#nav_items}}<a href="{{href}}">{{label}}</a>{{/nav_items}}</nav>',
+ *   fields: [{ name: 'nav_items', kind: 'link-list' }],
+ *   contentValues: {
+ *     nav_items: [
+ *       { label: 'Docs', href: '/docs' },
+ *       { label: 'Blog', href: '/blog' },
+ *     ],
+ *   },
+ * });
+ * // → {
+ * //     html: '<nav><a href="/docs">Docs</a><a href="/blog">Blog</a></nav>',
+ * //     missingSlots: [],
+ * //   }
+ *
+ * @see {@link TemplateField} for the field shape (name + kind + optional default).
+ * @see {@link ./content.js#MODULE_FIELD_KINDS} for the canonical kind union.
+ * @see {@link ./content.js#MODULE_FIELD_SECTION_KINDS} for the kinds the engine
+ *      iterates via `{{#name}}` (text-list / link-list / module-list).
+ */
+export declare function renderTemplate(input: RenderTemplateInput): RenderTemplateOutput;
+//# sourceMappingURL=template-engine.d.ts.map

package/dist/template-engine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"template-engine.d.ts","sourceRoot":"","sources":["../src/template-engine.ts"],"names":[],"mappings":"AA8DA,OAAO,EAA8B,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAShF;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,4DAA4D;IAC5D,QAAQ,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3D;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACrD;;;;;;;;;OASG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE;QACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;QACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QAChC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;KACrC,CAAC;CACH;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,2EAA2E;IAC3E,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1C;AAsDD;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE1D;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,oBAAoB,CA+G/E"}