@llblab/pi-actors 0.56.0 → 0.57.0

package/lib/registry.ts

@@ -92,17 +92,17 @@ function textContent(text: string) {
 }
 
 function registryListText(rows: readonly string[]): string {
-  const coverage = (shown: number, reason?: string) => "\n- registered_tools_coverage:" +
-    (reason ? `\n  - reason: ${reason}` : "") + `\n  - shown: ${shown}\n  - omitted: ${rows.length - shown}\n  - total: ${rows.length}`;
+  const budget = Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1;
+  const coverage = (shown: number, reason?: string) => ({ ...(reason ? { reason } : {}), shown, omitted: rows.length - shown, total: rows.length });
   const malformed = rows.some(row => !row.isWellFormed());
   if (!malformed) {
-    // Rows already contain the old compiler-owned bullet and selected key coercion.
-    const body = rows.length ? "- registered_tools:\n" + rows.map(row => "  " + row.replaceAll(/\r\n|\r|\n/gu, newline => newline + "    ")).join("\n")
-      : "- registered_tools: none";
-    const complete = body + coverage(rows.length);
-    if (Buffer.byteLength(complete) <= Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1) return complete;
+    // Remove only the compiler prefix after the original key coercion and join.
+    const complete = ToolsResponse.renderYamlMetadata({ registered_tools: rows.map(row => row.slice(2)), registered_tools_coverage: coverage(rows.length) }, budget);
+    if (complete.state === "available") return complete.text;
   }
-  return `- registered_tools: [${malformed ? "unavailable" : "omitted"}]` + coverage(0, malformed ? "malformed_selected_text" : "response_too_large");
+  const fallback = ToolsResponse.renderYamlMetadata({ registered_tools: malformed ? "[unavailable]" : "[omitted]", registered_tools_coverage: coverage(0, malformed ? "malformed_selected_text" : "response_too_large") }, budget);
+  // Fixed keys/reasons and finite array-length counts are bounded far below budget.
+  return (fallback as Extract<ToolsResponse.YamlMetadataRendering, { state: "available" }>).text;
 }
 
 function listTools<TContext>(
@@ -172,20 +172,46 @@ function registrationNextActions(
   ];
 }
 
+const REGISTRY_METADATA_BUDGET = Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1;
+
+type RegistryMetadata = Record<string, unknown>;
+
+/** Bare block-YAML registry document; builders own whole-value/omission policy and the byte budget. */
+function registryMetadataText(value: RegistryMetadata): string {
+  return (ToolsResponse.renderYamlMetadata(value, REGISTRY_METADATA_BUDGET) as
+    Extract<ToolsResponse.YamlMetadataRendering, { state: "available" }>).text;
+}
+
+/** One opaque selected scalar as a whole value or an explicit whole-field omission, never a clip. */
+function registrySelected(key: string, value: string): ToolsResponse.YamlPart {
+  return ToolsResponse.selectYamlField(key, value, REGISTRY_METADATA_BUDGET);
+}
+
+/** Grow whole selected fields in priority order while the complete document still fits. */
+function growRegistryDocument(render: () => RegistryMetadata, order: readonly ToolsResponse.YamlPart[]): string {
+  return ToolsResponse.growYamlDocument(render, order, REGISTRY_METADATA_BUDGET);
+}
+
 /** Read-time text only: callers supply the original post-activation selections, not live ports. */
 function registrationReceiptText(data: {
   tool: string; result: "registered" | "updated" | "persisted"; source: string; callable: boolean;
   boundary?: string; required: readonly unknown[]; optional: readonly unknown[];
   warnings: readonly unknown[]; next: string;
 }): string {
-  const field = ToolsResponse.formatMarkdownField;
-  const omission = (key: string, count: number, malformed: boolean) =>
-    `- ${key}: [${malformed ? "unavailable" : "omitted"}]\n- ${key}_omission:\n  - reason: ${malformed ? "malformed_selected_text" : "response_too_large"}\n  - shown: 0\n  - omitted: ${count}\n  - total: ${count}`;
-  const part = (full: string, omitted: string) => ({ full, selected: Buffer.byteLength(full) <= Buffer.byteLength(omitted) ? full : omitted });
-  const scalar = (key: string, value: string, literal = false) => {
+  const budget = Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1;
+  const renderPart = (value: Record<string, unknown>) => ToolsResponse.renderYamlMetadata(value, budget);
+  const omission = (key: string, count: number, malformed: boolean): Record<string, unknown> => ({
+    [key]: malformed ? "[unavailable]" : "[omitted]",
+    [key + "_omission"]: { reason: malformed ? "malformed_selected_text" : "response_too_large", shown: 0, omitted: count, total: count },
+  });
+  const part = (full: Record<string, unknown>, omitted: Record<string, unknown>) => {
+    const complete = renderPart(full), fallback = renderPart(omitted);
+    return { full, selected: complete.state === "available" && fallback.state === "available" && Buffer.byteLength(complete.text) <= Buffer.byteLength(fallback.text) ? full : omitted };
+  };
+  const scalar = (key: string, value: string) => {
     const wellFormed = value.isWellFormed();
     const omitted = omission(key, 1, !wellFormed);
-    return part(wellFormed ? field(key, literal ? ToolsResponse.formatLiteralBlock(value) : value) : omitted, omitted);
+    return part(wellFormed ? { [key]: value } : omitted, omitted);
   };
   const sequence = (key: string, values: readonly unknown[]) => {
     const rows: string[] = [];
@@ -193,32 +219,32 @@ function registrationReceiptText(data: {
     for (let index = 0; index < values.length; index++) {
       const value = values[index];
       if (typeof value !== "string" || !value.isWellFormed()) { malformed = true; break; }
-      rows.push("  - " + value.replaceAll(/\r\n|\r|\n/gu, newline => newline + "    "));
+      rows.push(value);
     }
     const omitted = omission(key, values.length, malformed);
-    return part(malformed ? omitted : rows.length ? `- ${key}:\n${rows.join("\n")}` : field(key, "none"), omitted);
+    return part(malformed ? omitted : { [key]: rows }, omitted);
   };
   const tool = scalar("tool", data.tool);
-  const source = scalar("source", data.source, data.source !== "template");
+  const source = scalar("source", data.source);
   const required = sequence("required_args", data.required), optional = sequence("optional_args", data.optional);
   const warnings = data.warnings.length ? sequence("warnings", data.warnings) : undefined;
   const nextWellFormed = data.next.isWellFormed();
   const omittedNext = omission("next_action", 1, !nextWellFormed);
   // This producer knows only its existing status hint; invocation advice stays opaque.
   const next = part(nextWellFormed
-    ? data.callable ? field("instruction", data.next) : ToolsResponse.formatInspectNextAction(`tool:${data.tool}`, "status")
+    ? data.callable ? { instruction: data.next } : { next: { tool: "inspect", target: `tool:${data.tool}`, view: "status" } }
     : omittedNext, omittedNext);
-  const render = () => [tool.selected, field("result", data.result), source.selected, field("callable_now", data.callable ? "true" : "false"),
-    ...(data.boundary === undefined ? [] : [field("activation_boundary", data.boundary)]), required.selected, optional.selected,
-    ...(warnings ? [warnings.selected] : []), next.selected].join("\n");
+  const render = () => renderPart({ ...tool.selected, result: data.result, ...source.selected, callable_now: data.callable,
+    ...(data.boundary === undefined ? {} : { activation_boundary: data.boundary }), ...required.selected, ...optional.selected,
+    ...(warnings ? warnings.selected : {}), ...next.selected });
   // Preserve complete safety notes before large argument lists; all seeds are monotone.
   for (const current of [...(warnings ? [warnings] : []), tool, source, next, required, optional]) {
     if (current.selected === current.full) continue;
     const previous = current.selected;
     current.selected = current.full;
-    if (Buffer.byteLength(render()) > Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1) current.selected = previous;
+    if (render().state !== "available") current.selected = previous;
   }
-  return render();
+  return (render() as Extract<ToolsResponse.YamlMetadataRendering, { state: "available" }>).text;
 }
 
 function registryNoticeText(kind: "activated" | "promoted" | "deleted", name: string): string {
@@ -229,74 +255,35 @@ function registryNoticeText(kind: "activated" | "promoted" | "deleted", name: st
 }
 
 function registrationTransactionFailureText(stage: string, generation: string, summary: string, error: string): string {
-  const field = ToolsResponse.formatMarkdownField;
-  const part = (key: string, value: string) => {
-    const wellFormed = value.isWellFormed();
-    const omitted = `- ${key}: [${wellFormed ? "omitted" : "unavailable"}]\n- ${key}_omission:\n  - reason: ${wellFormed ? "response_too_large" : "malformed_selected_text"}\n  - shown: 0\n  - omitted: 1\n  - total: 1`;
-    const full = wellFormed ? field(key, value) : omitted;
-    return { full, selected: Buffer.byteLength(full) <= Buffer.byteLength(omitted) ? full : omitted };
-  };
-  const selectedGeneration = part("resolution_generation", generation);
-  const selectedSummary = part("active_skills_summary", summary);
-  const selectedError = part("error", error);
-  const render = () => [field("result", "Tool registration transaction failed."), field("stage", stage),
-    selectedGeneration.selected, selectedSummary.selected, selectedError.selected].join("\n");
+  const selectedGeneration = registrySelected("resolution_generation", generation);
+  const selectedSummary = registrySelected("active_skills_summary", summary);
+  const selectedError = registrySelected("error", error);
+  const render = (): RegistryMetadata => ({ result: "Tool registration transaction failed.", stage,
+    ...selectedGeneration.selected, ...selectedSummary.selected, ...selectedError.selected });
   // Keep a fitting surfaced error before large optional resolution metadata.
-  for (const current of [selectedError, selectedGeneration, selectedSummary]) {
-    if (current.selected === current.full) continue;
-    const previous = current.selected;
-    current.selected = current.full;
-    if (Buffer.byteLength(render()) > Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1) current.selected = previous;
-  }
-  return render();
+  return growRegistryDocument(render, [selectedError, selectedGeneration, selectedSummary]);
 }
 
 function candidateAdmissionFailureText(data: { kind: "source"; source: string; diagnostics: string; summary: string; instruction: string } | { kind: "recipe"; diagnostics: string }): string {
-  const field = ToolsResponse.formatMarkdownField;
-  const part = (key: string, value: string, literal = false) => {
-    const wellFormed = value.isWellFormed();
-    const omitted = `- ${key}: [${wellFormed ? "omitted" : "unavailable"}]\n- ${key}_omission:\n  - reason: ${wellFormed ? "response_too_large" : "malformed_selected_text"}\n  - shown: 0\n  - omitted: 1\n  - total: 1`;
-    const full = wellFormed ? field(key, literal ? ToolsResponse.formatLiteralBlock(value) : value) : omitted;
-    return { full, selected: Buffer.byteLength(full) <= Buffer.byteLength(omitted) ? full : omitted };
-  };
-  const diagnostics = part("diagnostics_summary", data.diagnostics);
-  const source = data.kind === "source" ? part("source", data.source, true) : undefined;
-  const summary = data.kind === "source" ? part("active_skills_summary", data.summary) : undefined;
-  const instruction = data.kind === "source" ? part("instruction", data.instruction) : undefined;
-  const render = () => [field("field", "recipe"), ...(source ? [source.selected] : []),
-    field("result", data.kind === "source" ? "Recipe source validation failed." : "Tool recipe validation failed."),
-    diagnostics.selected, ...(summary ? [summary.selected] : []), ...(instruction ? [instruction.selected] : [])].join("\n");
+  const diagnostics = registrySelected("diagnostics_summary", data.diagnostics);
+  const source = data.kind === "source" ? registrySelected("source", data.source) : undefined;
+  const summary = data.kind === "source" ? registrySelected("active_skills_summary", data.summary) : undefined;
+  const instruction = data.kind === "source" ? registrySelected("instruction", data.instruction) : undefined;
+  const render = (): RegistryMetadata => ({ field: "recipe", ...(source ? source.selected : {}),
+    result: data.kind === "source" ? "Recipe source validation failed." : "Tool recipe validation failed.",
+    ...diagnostics.selected, ...(summary ? summary.selected : {}), ...(instruction ? instruction.selected : {}) });
   // Preserve fitting diagnostics before large optional source/context/advice fields.
-  for (const current of [diagnostics, source, summary, instruction]) {
-    if (!current || current.selected === current.full) continue;
-    const previous = current.selected;
-    current.selected = current.full;
-    if (Buffer.byteLength(render()) > Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1) current.selected = previous;
-  }
-  return render();
+  return growRegistryDocument(render, [diagnostics, ...(source ? [source] : []), ...(summary ? [summary] : []), ...(instruction ? [instruction] : [])]);
 }
 
 function sourceNormalizationFailureText(source: string, reason: string, summary: string, instruction: string): string {
-  const field = ToolsResponse.formatMarkdownField;
-  const part = (key: string, value: string, literal = false) => {
-    const wellFormed = value.isWellFormed();
-    const omitted = `- ${key}: [${wellFormed ? "omitted" : "unavailable"}]\n- ${key}_omission:\n  - reason: ${wellFormed ? "response_too_large" : "malformed_selected_text"}\n  - shown: 0\n  - omitted: 1\n  - total: 1`;
-    const full = wellFormed ? field(key, literal ? ToolsResponse.formatLiteralBlock(value) : value) : omitted;
-    return { full, selected: Buffer.byteLength(full) <= Buffer.byteLength(omitted) ? full : omitted };
-  };
-  const selectedSource = part("source", source, true);
-  const selectedReason = part("reason", reason);
-  const selectedSummary = part("active_skills_summary", summary);
-  const selectedInstruction = part("instruction", instruction);
-  const render = () => [field("field", "from"), selectedSource.selected, field("result", "Recipe source is invalid."),
-    selectedReason.selected, selectedSummary.selected, selectedInstruction.selected].join("\n");
-  for (const current of [selectedSource, selectedReason, selectedSummary, selectedInstruction]) {
-    if (current.selected === current.full) continue;
-    const previous = current.selected;
-    current.selected = current.full;
-    if (Buffer.byteLength(render()) > Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1) current.selected = previous;
-  }
-  return render();
+  const selectedSource = registrySelected("source", source);
+  const selectedReason = registrySelected("reason", reason);
+  const selectedSummary = registrySelected("active_skills_summary", summary);
+  const selectedInstruction = registrySelected("instruction", instruction);
+  const render = (): RegistryMetadata => ({ field: "from", ...selectedSource.selected, result: "Recipe source is invalid.",
+    ...selectedReason.selected, ...selectedSummary.selected, ...selectedInstruction.selected });
+  return growRegistryDocument(render, [selectedSource, selectedReason, selectedSummary, selectedInstruction]);
 }
 
 function activeSkillSummary(
@@ -313,16 +300,11 @@ function activeSkillSummary(
 }
 
 function draftPathFailureText(kind: "root" | "missing", reference: string): string {
-  const key = kind === "root" ? "allowed_root" : "path";
-  const render = (selected: string) => "- field: draft\n" + selected + (kind === "root"
-    ? "\n- result: Draft must be under the allowed root.\n- instruction: Use inspect target=recipes view=summary to list drafts."
-    : "\n- result: Draft not found.");
-  const wellFormed = reference.isWellFormed();
-  if (wellFormed) {
-    const complete = render(ToolsResponse.formatMarkdownField(key, ToolsResponse.formatLiteralBlock(reference)));
-    if (Buffer.byteLength(complete) <= Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1) return complete;
-  }
-  return render(`- ${key}: [${wellFormed ? "omitted" : "unavailable"}]\n- ${key}_omission:\n  - reason: ${wellFormed ? "response_too_large" : "malformed_selected_text"}\n  - shown: 0\n  - omitted: 1\n  - total: 1`);
+  const selected = registrySelected(kind === "root" ? "allowed_root" : "path", reference);
+  const render = (): RegistryMetadata => ({ field: "draft", ...selected.selected,
+    result: kind === "root" ? "Draft must be under the allowed root." : "Draft not found.",
+    ...(kind === "root" ? { instruction: "Use inspect target=recipes view=summary to list drafts." } : {}) });
+  return growRegistryDocument(render, [selected]);
 }
 
 function assertDraftPath<TContext>(
@@ -350,47 +332,42 @@ function assertDraftPath<TContext>(
 }
 
 function draftReceiptText(result: "updated" | "registered", tool: string, callable: string, next: string): string {
-  const field = ToolsResponse.formatMarkdownField;
-  const part = (key: string, value: string, rendered: string) => {
+  const budget = Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1;
+  const renderPart = (value: Record<string, unknown>) => ToolsResponse.renderYamlMetadata(value, budget);
+  const part = (key: string, value: string, rendered: Record<string, unknown>) => {
     const wellFormed = value.isWellFormed();
-    const omitted = `- ${key}: [${wellFormed ? "omitted" : "unavailable"}]\n- ${key}_omission:\n  - reason: ${wellFormed ? "response_too_large" : "malformed_selected_text"}\n  - shown: 0\n  - omitted: 1\n  - total: 1`;
+    const omitted: Record<string, unknown> = { [key]: wellFormed ? "[omitted]" : "[unavailable]",
+      [key + "_omission"]: { reason: wellFormed ? "response_too_large" : "malformed_selected_text", shown: 0, omitted: 1, total: 1 } };
     const full = wellFormed ? rendered : omitted;
-    return { full, selected: Buffer.byteLength(full) <= Buffer.byteLength(omitted) ? full : omitted };
+    const complete = renderPart(full), fallback = renderPart(omitted);
+    return { full, selected: complete.state === "available" && fallback.state === "available" && Buffer.byteLength(complete.text) <= Buffer.byteLength(fallback.text) ? full : omitted };
   };
-  const identity = part("tool", tool, field("tool", tool));
-  const flag = part("callable_now", callable, field("callable_now", callable));
+  const identity = part("tool", tool, { tool });
+  const flag = part("callable_now", callable, { callable_now: callable });
   // Only this producer's exact canonical read-only status hint is typed, never body advice.
   const status = /^inspect target=(tool:[a-z][a-z0-9_]{0,63}) view=status$/u.exec(next);
-  const hint = part("next_action", next, status ? ToolsResponse.formatInspectNextAction(status[1], "status") : field("instruction", next));
-  const render = () => [identity.selected, field("result", result), field("source", "draft"), flag.selected, hint.selected].join("\n");
+  const hint = part("next_action", next, status ? { next: { tool: "inspect", target: status[1], view: "status" } } : { instruction: next });
+  const render = () => renderPart({ ...identity.selected, result, source: "draft", ...flag.selected, ...hint.selected });
   for (const current of [identity, flag, hint]) {
     if (current.selected === current.full) continue;
     const previous = current.selected;
     current.selected = current.full;
-    if (Buffer.byteLength(render()) > Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1) current.selected = previous;
+    if (render().state !== "available") current.selected = previous;
   }
-  return render();
+  return (render() as Extract<ToolsResponse.YamlMetadataRendering, { state: "available" }>).text;
 }
 
 function duplicateRegistrationText(value: string): string {
-  const render = (selected: string) => "- field: name\n" + selected + "\n- result: Tool already registered.\n- instruction: Use update=true to overwrite.";
-  const wellFormed = value.isWellFormed();
-  if (wellFormed) {
-    const complete = render(ToolsResponse.formatMarkdownField("value", value));
-    if (Buffer.byteLength(complete) <= Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1) return complete;
-  }
-  return render(`- value: [${wellFormed ? "omitted" : "unavailable"}]\n- value_omission:\n  - reason: ${wellFormed ? "response_too_large" : "malformed_selected_text"}\n  - shown: 0\n  - omitted: 1\n  - total: 1`);
+  const selected = registrySelected("value", value);
+  const render = (): RegistryMetadata => ({ field: "name", ...selected.selected,
+    result: "Tool already registered.", instruction: "Use update=true to overwrite." });
+  return growRegistryDocument(render, [selected]);
 }
 
 function draftRecipeFailureText(key: "reason" | "diagnostics_summary", value?: string): string {
-  const header = "- field: draft\n- result: Draft recipe is invalid.";
-  if (value === undefined) return header;
-  const wellFormed = value.isWellFormed();
-  if (wellFormed) {
-    const complete = header + "\n" + ToolsResponse.formatMarkdownField(key, value);
-    if (Buffer.byteLength(complete) <= Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1) return complete;
-  }
-  return header + `\n- ${key}: [${wellFormed ? "omitted" : "unavailable"}]\n- ${key}_omission:\n  - reason: ${wellFormed ? "response_too_large" : "malformed_selected_text"}\n  - shown: 0\n  - omitted: 1\n  - total: 1`;
+  const selected = value === undefined ? undefined : registrySelected(key, value);
+  const render = (): RegistryMetadata => ({ field: "draft", result: "Draft recipe is invalid.", ...(selected ? selected.selected : {}) });
+  return growRegistryDocument(render, selected ? [selected] : []);
 }
 
 function promoteDraftRecipe<TContext>(
@@ -499,16 +476,16 @@ function persistToolRecipe<TContext>(
 }
 
 function registryDeletionText(name: string, result: "deleted" | "not found"): string {
-  const field = ToolsResponse.formatMarkdownField;
-  const facts = [field("result", result), ...(result === "deleted"
-    ? [field("instruction", "Reload to remove it from the complete registry.")] : [])];
-  const render = (identity: string) => [identity, ...facts].join("\n");
+  const budget = Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1;
+  const facts = { result, ...(result === "deleted" ? { instruction: "Reload to remove it from the complete registry." } : {}) };
   const wellFormed = name.isWellFormed();
   if (wellFormed) {
-    const complete = render(field("tool", name));
-    if (Buffer.byteLength(complete) <= Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1) return complete;
+    const complete = ToolsResponse.renderYamlMetadata({ tool: name, ...facts }, budget);
+    if (complete.state === "available") return complete.text;
   }
-  return render(`- tool: [${wellFormed ? "omitted" : "unavailable"}]\n- tool_omission:\n  - reason: ${wellFormed ? "response_too_large" : "malformed_selected_text"}\n  - shown: 0\n  - omitted: 1\n  - total: 1`);
+  const fallback = ToolsResponse.renderYamlMetadata({ tool: wellFormed ? "[omitted]" : "[unavailable]", tool_omission: { reason: wellFormed ? "response_too_large" : "malformed_selected_text", shown: 0, omitted: 1, total: 1 }, ...facts }, budget);
+  // Fixed metadata is well formed and bounded far below budget.
+  return (fallback as Extract<ToolsResponse.YamlMetadataRendering, { state: "available" }>).text;
 }
 
 function deleteTool<TContext>(
@@ -598,9 +575,9 @@ function assertTemplateIsNotNestedRecipe(value: unknown): void {
       ))
   ) {
     throw new Error(
-      ExecutionOutput.formatToolText(
-        "- field: template\n- result: Nested Recipe-shaped templates are not a register_tool source mode.\n- instruction: retry with from=<skill>/<recipe> and defaults={...}.",
-      ),
+      ExecutionOutput.formatToolText(registryMetadataText({ field: "template",
+        result: "Nested Recipe-shaped templates are not a register_tool source mode.",
+        instruction: "retry with from=<skill>/<recipe> and defaults={...}." })),
     );
   }
 }
@@ -617,7 +594,7 @@ function getInputTemplate(
     });
     if (steps.length === 0)
       throw new Error(
-        ExecutionOutput.formatToolText("- field: template\n- result: Tool template sequence is empty."),
+        ExecutionOutput.formatToolText(registryMetadataText({ field: "template", result: "Tool template sequence is empty." })),
       );
     return value;
   }
@@ -628,9 +605,8 @@ function getInputTemplate(
     return value as CommandTemplates.CommandTemplateConfig;
   }
   throw new Error(
-    ExecutionOutput.formatToolText(
-      "- field: template\n- result: unsupported template type\n- supported_types:\n  - string\n  - object\n  - sequence",
-    ),
+    ExecutionOutput.formatToolText(registryMetadataText({ field: "template", result: "unsupported template type",
+      supported_types: ["string", "object", "sequence"] })),
   );
 }
 
@@ -656,7 +632,7 @@ function normalizeDefaults(value: unknown): Record<string, unknown> | undefined
   if (value === undefined) return undefined;
   if (!value || typeof value !== "object" || Array.isArray(value)) {
     throw new Error(
-      ExecutionOutput.formatToolText("- field: defaults\n- result: Tool defaults must be an object."),
+      ExecutionOutput.formatToolText(registryMetadataText({ field: "defaults", result: "Tool defaults must be an object." })),
     );
   }
   return { ...(value as Record<string, unknown>) };
@@ -716,9 +692,8 @@ function buildAuthoredRecipe(
   const description = (input.description ?? existing?.description ?? "").trim();
   if (!description && !from) {
     throw new Error(
-      ExecutionOutput.formatToolText(
-        "- field: description\n- result: Tool description is required for command-template registration.",
-      ),
+      ExecutionOutput.formatToolText(registryMetadataText({ field: "description",
+        result: "Tool description is required for command-template registration." })),
     );
   }
   const inputDefaults = normalizeDefaults(input.defaults);
@@ -728,9 +703,10 @@ function buildAuthoredRecipe(
     );
     if (runtimeOwnedDefault) {
       throw new Error(
-        ExecutionOutput.formatToolText(
-          `- field: defaults\n- key: ${runtimeOwnedDefault}\n- result: Tool defaults cannot set runtime-owned input.\n- instruction: remove that default and retry register_tool; the runtime supplies it.`,
-        ),
+        ExecutionOutput.formatToolText(registryMetadataText({ field: "defaults",
+          ...registrySelected("key", runtimeOwnedDefault).selected,
+          result: "Tool defaults cannot set runtime-owned input.",
+          instruction: "remove that default and retry register_tool; the runtime supplies it." })),
       );
     }
     const authored: Record<string, unknown> = {
@@ -749,7 +725,7 @@ function buildAuthoredRecipe(
   const template = getInputTemplate(input.template);
   if (template === null) {
     throw new Error(
-      ExecutionOutput.formatToolText("- field: template\n- result: Tool template cannot be null here."),
+      ExecutionOutput.formatToolText(registryMetadataText({ field: "template", result: "Tool template cannot be null here." })),
     );
   }
   const finalTemplate =
@@ -758,7 +734,7 @@ function buildAuthoredRecipe(
       : template;
   if (!finalTemplate) {
     throw new Error(
-      ExecutionOutput.formatToolText("- field: template\n- result: Tool template is required."),
+      ExecutionOutput.formatToolText(registryMetadataText({ field: "template", result: "Tool template is required." })),
     );
   }
   const authored: Record<string, unknown> = {
@@ -783,9 +759,9 @@ function assertRegisterToolInputModes(input: RegisterToolInput): void {
   const record = input as RegisterToolInput & Record<string, unknown>;
   if (Object.hasOwn(record, "values")) {
     throw new Error(
-      ExecutionOutput.formatToolText(
-        "- field: values\n- result: register_tool values was removed.\n- replacement_fields:\n  - defaults\n  - from\n- instruction: retry register_tool with defaults for caller inputs, or use from=<skill>/<recipe> for maintained composition.",
-      ),
+      ExecutionOutput.formatToolText(registryMetadataText({ field: "values", result: "register_tool values was removed.",
+        replacement_fields: ["defaults", "from"],
+        instruction: "retry register_tool with defaults for caller inputs, or use from=<skill>/<recipe> for maintained composition." })),
     );
   }
   const fromProvided = Object.hasOwn(record, "from");
@@ -794,9 +770,10 @@ function assertRegisterToolInputModes(input: RegisterToolInput): void {
     (typeof input.from !== "string" || input.from.trim().length === 0)
   ) {
     throw new Error(
-      ExecutionOutput.formatToolText(
-        "- field: from\n- result: Tool from must be a non-empty Recipe reference.\n- reference_forms:\n  - <skill>/<recipe>\n  - explicit .json path\n  - explicit .md path\n- instruction: retry register_tool with from=<skill>/<recipe> or an explicit .json/.md path.",
-      ),
+      ExecutionOutput.formatToolText(registryMetadataText({ field: "from",
+        result: "Tool from must be a non-empty Recipe reference.",
+        reference_forms: ["<skill>/<recipe>", "explicit .json path", "explicit .md path"],
+        instruction: "retry register_tool with from=<skill>/<recipe> or an explicit .json/.md path." })),
     );
   }
   const draftProvided =
@@ -806,9 +783,9 @@ function assertRegisterToolInputModes(input: RegisterToolInput): void {
     Number(fromProvided) + Number(draftProvided) + Number(templateProvided);
   if (modeCount > 1) {
     throw new Error(
-      ExecutionOutput.formatToolText(
-        "- result: Use exactly one register_tool source mode.\n- source_modes:\n  - from\n  - template\n  - draft\n- instruction: remove the extra source fields and retry register_tool.",
-      ),
+      ExecutionOutput.formatToolText(registryMetadataText({ result: "Use exactly one register_tool source mode.",
+        source_modes: ["from", "template", "draft"],
+        instruction: "remove the extra source fields and retry register_tool." })),
     );
   }
   if (
@@ -816,21 +793,18 @@ function assertRegisterToolInputModes(input: RegisterToolInput): void {
     (Object.hasOwn(record, "args") || Object.hasOwn(record, "async"))
   ) {
     throw new Error(
-      ExecutionOutput.formatToolText(
-        "- field: from\n- result: register_tool from inherits args and async behavior.\n- inherited_fields:\n  - args\n  - async\n- instruction: retry register_tool with from and optional defaults only; omit args and async.",
-      ),
+      ExecutionOutput.formatToolText(registryMetadataText({ field: "from",
+        result: "register_tool from inherits args and async behavior.",
+        inherited_fields: ["args", "async"],
+        instruction: "retry register_tool with from and optional defaults only; omit args and async." })),
     );
   }
 }
 
 function reservedRegistrationNameText(value: string): string {
-  const render = (selected: string) => "- field: name\n" + selected + "\n- result: Reserved tool name.";
-  const wellFormed = value.isWellFormed();
-  if (wellFormed) {
-    const complete = render(ToolsResponse.formatMarkdownField("value", value));
-    if (Buffer.byteLength(complete) <= Limits.RUN_DELIVERY_MODEL_MAX_BYTES - 1) return complete;
-  }
-  return render(`- value: [${wellFormed ? "omitted" : "unavailable"}]\n- value_omission:\n  - reason: ${wellFormed ? "response_too_large" : "malformed_selected_text"}\n  - shown: 0\n  - omitted: 1\n  - total: 1`);
+  const selected = registrySelected("value", value);
+  const render = (): RegistryMetadata => ({ field: "name", ...selected.selected, result: "Reserved tool name." });
+  return growRegistryDocument(render, [selected]);
 }
 
 function executeRegisterToolUnlocked<TContext>(
@@ -847,7 +821,7 @@ function executeRegisterToolUnlocked<TContext>(
   if (!input.name) return listTools(deps);
   const name = Identity.normalizeToolName(input.name);
   if (!name)
-    throw new Error(ExecutionOutput.formatToolText("- field: name\n- result: Invalid tool name."));
+    throw new Error(ExecutionOutput.formatToolText(registryMetadataText({ field: "name", result: "Invalid tool name." })));
   if (deps.reservedToolNames.has(name)) {
     throw new Error(
       ExecutionOutput.formatToolText(reservedRegistrationNameText(`${name}`)),
@@ -895,9 +869,9 @@ function executeRegisterToolUnlocked<TContext>(
   }
   if (template === undefined && !input.from && !existing) {
     throw new Error(
-      ExecutionOutput.formatToolText(
-        "- result: New registration requires exactly one source mode.\n- source_modes:\n  - from\n  - template\n  - draft\n- instruction: retry register_tool with one source field.",
-      ),
+      ExecutionOutput.formatToolText(registryMetadataText({ result: "New registration requires exactly one source mode.",
+        source_modes: ["from", "template", "draft"],
+        instruction: "retry register_tool with one source field." })),
     );
   }
   const recipePath = getToolRecipePath(deps, name);

package/lib/run-ui-runtime.ts

@@ -14,7 +14,7 @@ import * as Pi from "./pi.ts";
 import * as RunDelivery from "./run-delivery.ts";
 import * as RunDeliveryLineage from "./run-delivery-lineage.ts";
 import * as RunIndex from "./runs-index.ts";
-import { formatLiteralBlock, formatMarkdownField } from "./tools-response.ts";
+import { formatLiteralBlock, formatYamlNotice } from "./tools-response.ts";
 
 export interface RunUiRuntime {
   close(): void;
@@ -48,21 +48,18 @@ export interface RunUiRuntimeDeps {
 }
 
 function formatSteerDiagnosticMessage(eventId: string, stage: "admission" | "delivery", message: string): string {
-  const fields = [formatMarkdownField("event", eventId), formatMarkdownField("attention", "steer"),
-    formatMarkdownField("stage", stage), formatMarkdownField("result", stage === "admission" ? "remains retryable" : "request failed")];
-  if (stage === "delivery") fields.push(formatMarkdownField("delivery", "unconfirmed"), formatMarkdownField("presentation", "unconfirmed"));
   let end = Math.min(message.length, 240);
   const last = message.charCodeAt(end - 1), next = message.charCodeAt(end);
   if (last >= 0xd800 && last <= 0xdbff && next >= 0xdc00 && next <= 0xdfff) end -= 1;
   const preview = message.slice(0, end), clipped = end < message.length;
-  if (Buffer.from(preview).toString("utf8") !== preview) {
-    fields.push(formatMarkdownField("diagnostic", "unavailable"), formatMarkdownField("diagnostic_reason", "malformed legacy preview"),
-      formatMarkdownField("diagnostic_omission", "[omitted: unknown]"));
-  } else {
-    fields.push(formatMarkdownField("diagnostic", preview + (clipped ? "…" : "")));
-    if (clipped) fields.push(formatMarkdownField("diagnostic_omission", "[omitted: unknown]"));
-  }
-  return fields.join("\n");
+  // The 240-pair-aligned preview and its explicit unknown-loss marker are unchanged; only metadata is YAML.
+  const diagnostic: Record<string, string> = Buffer.from(preview).toString("utf8") !== preview
+    ? { diagnostic: "unavailable", diagnostic_reason: "malformed legacy preview", diagnostic_omission: "[omitted: unknown]" }
+    : { diagnostic: preview + (clipped ? "…" : ""), ...(clipped ? { diagnostic_omission: "[omitted: unknown]" } : {}) };
+  return formatYamlNotice({ event: eventId, attention: "steer", stage,
+    result: stage === "admission" ? "remains retryable" : "request failed",
+    ...(stage === "delivery" ? { delivery: "unconfirmed", presentation: "unconfirmed" } : {}),
+    ...diagnostic });
 }
 
 /** Transcript-only view of the exact delivered content; never re-read a Run or infer body labels. */
@@ -184,8 +181,7 @@ export function createRunUiRuntime(deps: RunUiRuntimeDeps): RunUiRuntime {
     }
     const message = error instanceof Error ? error.message : String(error);
     try {
-      expectedContext.ui.notify([formatMarkdownField("callback", label), formatMarkdownField("result", "failed"),
-        formatMarkdownField("diagnostic", message)].join("\n"), "error");
+      expectedContext.ui.notify(formatYamlNotice({ callback: label, result: "failed", diagnostic: message }), "error");
     } catch {
       /* stale context or unavailable UI */
     }
@@ -369,12 +365,8 @@ export function createRunUiRuntime(deps: RunUiRuntimeDeps): RunUiRuntime {
         const key = `${batch.batch_id}:${evidence.status}:${evidence.reason ?? ""}`;
         if (!completionDiagnostics.has(key)) {
           completionDiagnostics.add(key);
-          ctx.ui.notify(
-            "\n" + [formatMarkdownField("batch", batch.batch_id), formatMarkdownField("stage", "completion recovery"),
-                formatMarkdownField("evidence", evidence.status), formatMarkdownField("phase", "pending"),
-                formatMarkdownField("reason", evidence.reason ?? "conflicting session evidence")].join("\n"),
-            "warning",
-          );
+          ctx.ui.notify("\n" + formatYamlNotice({ batch: batch.batch_id, stage: "completion recovery",
+            evidence: evidence.status, phase: "pending", reason: evidence.reason ?? "conflicting session evidence" }), "warning");
         }
         return true;
       }
@@ -440,12 +432,8 @@ export function createRunUiRuntime(deps: RunUiRuntimeDeps): RunUiRuntime {
           const key = `${steer.steer_id}:${evidence.status}:${evidence.reason ?? ""}`;
           if (!steerDiagnostics.has(key)) {
             steerDiagnostics.add(key);
-            ctx.ui.notify(
-              [formatMarkdownField("event", steer.event_id), formatMarkdownField("attention", "steer"),
-                formatMarkdownField("stage", "recovery"), formatMarkdownField("evidence", evidence.status),
-                formatMarkdownField("phase", "queued"), formatMarkdownField("reason", evidence.reason ?? "conflicting session evidence")].join("\n"),
-              "warning",
-            );
+            ctx.ui.notify(formatYamlNotice({ event: steer.event_id, attention: "steer", stage: "recovery",
+              evidence: evidence.status, phase: "queued", reason: evidence.reason ?? "conflicting session evidence" }), "warning");
           }
           continue;
         }
@@ -714,14 +702,10 @@ export function createRunUiRuntime(deps: RunUiRuntimeDeps): RunUiRuntime {
       );
       if (teardown.failed === 0 || !ctx) return;
       try {
-        ctx.ui.notify(
-          [formatMarkdownField("stage", "shutdown teardown"), formatMarkdownField("killed", String(teardown.killed)),
-            formatMarkdownField("failed", String(teardown.failed)), formatMarkdownField("skipped", String(teardown.skipped)),
-            formatMarkdownField("discovery_failed", String(teardown.discoveryFailed)),
-            formatMarkdownField("summary", teardown.summaryPath == null ? "unavailable" : formatLiteralBlock(teardown.summaryPath)),
-            formatMarkdownField("basis", "teardown report; not scope closure")].join("\n"),
-          "warning",
-        );
+        ctx.ui.notify(formatYamlNotice({ stage: "shutdown teardown", killed: teardown.killed,
+          failed: teardown.failed, skipped: teardown.skipped, discovery_failed: teardown.discoveryFailed,
+          summary: teardown.summaryPath ?? "unavailable",
+          basis: "teardown report; not scope closure" }), "warning");
       } catch {
         /* stale shutdown context */
       }