refactor(contracts): centralize output schema lookup

Author: morluto

src/contracts/artifactToolContracts.ts

@@ -5,6 +5,7 @@ import type { ToolContract } from "./toolContracts.js";
 import { artifactOutputSchemas } from "./toolOutputSchemas.js";
 import { jsonValueSchema } from "../domain/jsonValue.js";
 import { toolContractMetadata } from "./toolEffects.js";
+import { requireOutputSchema } from "./toolOutputSchemaPrimitives.js";
 import { artifactInspectionLimitsSchema } from "../domain/artifactInspection.js";
 
 const pageInput = {
@@ -104,9 +105,7 @@ const artifact = <Name extends string>(
   description: string,
   inputSchema: z.ZodType<Readonly<Record<string, unknown>>>,
 ): ToolContract<Name> => {
-  const outputSchema = artifactOutputSchemas[name];
-  if (outputSchema === undefined)
-    throw new Error(`Missing artifact output schema for ${name}`);
+  const outputSchema = requireOutputSchema(artifactOutputSchemas, name);
   return {
     name,
     ...toolContractMetadata(name),

src/contracts/functionWorkflowToolContracts.ts

@@ -4,6 +4,7 @@ import { TOOL_EXAMPLE_OVERRIDES } from "./toolContractExamples.js";
 import type { ToolContract } from "./toolContractTypes.js";
 import { toolContractMetadata } from "./toolEffects.js";
 import { enhancedOutputSchemas } from "./toolOutputSchemas.js";
+import { requireOutputSchema } from "./toolOutputSchemaPrimitives.js";
 
 type FunctionWorkflowName = "analyze_function" | "inspect_native_api";
 
@@ -12,9 +13,7 @@ const functionWorkflow = <Name extends FunctionWorkflowName>(
   description: string,
 ): ToolContract<Name> => {
   const inputSchema = enhancedInputSchemas[name];
-  const outputSchema = enhancedOutputSchemas[name];
-  if (outputSchema === undefined)
-    throw new Error(`Missing function workflow output schema for ${name}`);
+  const outputSchema = requireOutputSchema(enhancedOutputSchemas, name);
   return {
     name,
     ...toolContractMetadata(name),

src/contracts/managedToolContracts.ts

@@ -3,6 +3,7 @@ import { z } from "zod";
 import type { ToolContract } from "./toolContracts.js";
 import { managedOutputSchemas } from "./toolOutputSchemas.js";
 import { toolContractMetadata } from "./toolEffects.js";
+import { requireOutputSchema } from "./toolOutputSchemaPrimitives.js";
 
 /** Exact caller boundary for execution-free PE/CLI triage and identity. */
 export const managedArtifactInputSchema = z.object({
@@ -110,18 +111,18 @@ export const managedNativeBoundaryInputSchema = z.object({
     .default(1_048_576),
 });
 
-const outputSchema = managedOutputSchemas.inspect_managed_artifact;
-if (outputSchema === undefined)
-  throw new Error("Missing managed output schema for inspect_managed_artifact");
-const memberOutputSchema = managedOutputSchemas.inspect_managed_members;
-if (memberOutputSchema === undefined)
-  throw new Error("Missing managed output schema for inspect_managed_members");
-const nativeBoundaryOutputSchema =
-  managedOutputSchemas.inspect_managed_native_boundaries;
-if (nativeBoundaryOutputSchema === undefined)
-  throw new Error(
-    "Missing managed output schema for inspect_managed_native_boundaries",
-  );
+const outputSchema = requireOutputSchema(
+  managedOutputSchemas,
+  "inspect_managed_artifact",
+);
+const memberOutputSchema = requireOutputSchema(
+  managedOutputSchemas,
+  "inspect_managed_members",
+);
+const nativeBoundaryOutputSchema = requireOutputSchema(
+  managedOutputSchemas,
+  "inspect_managed_native_boundaries",
+);
 
 /** Read-only managed artifact contracts. */
 export const MANAGED_TOOL_CONTRACTS = [

src/contracts/managedWorkflowToolContracts.ts

@@ -15,6 +15,7 @@ import {
   MANAGED_RUNTIME_CORRELATION_EXAMPLE,
 } from "./managedWorkflowExamples.js";
 import { toolContractMetadata } from "./toolEffects.js";
+import { requireOutputSchema } from "./toolOutputSchemaPrimitives.js";
 
 const evidenceIdSchema = z.string().regex(/^ev_[a-f0-9]{64}$/u);
 const managedEvidenceIdSchema = evidenceIdSchema.describe(
@@ -137,36 +138,26 @@ export const managedApplicationGraphReferenceInputSchema = z
       });
   });
 
-const comparisonOutputSchema =
-  managedWorkflowOutputSchemas.compare_managed_members;
-if (comparisonOutputSchema === undefined)
-  throw new Error(
-    "Missing managed workflow output schema for compare_managed_members",
-  );
-const runtimeOutputSchema =
-  managedWorkflowOutputSchemas.plan_managed_runtime_correlation;
-if (runtimeOutputSchema === undefined)
-  throw new Error(
-    "Missing managed workflow output schema for plan_managed_runtime_correlation",
-  );
-const reconstructionOutputSchema =
-  managedWorkflowOutputSchemas.import_managed_reconstruction;
-if (reconstructionOutputSchema === undefined)
-  throw new Error(
-    "Missing managed workflow output schema for import_managed_reconstruction",
-  );
-const nativeVerificationOutputSchema =
-  managedWorkflowOutputSchemas.verify_managed_native_boundaries;
-if (nativeVerificationOutputSchema === undefined)
-  throw new Error(
-    "Missing managed workflow output schema for verify_managed_native_boundaries",
-  );
-const managedApplicationGraphOutputSchema =
-  managedWorkflowOutputSchemas.project_managed_application_graph;
-if (managedApplicationGraphOutputSchema === undefined)
-  throw new Error(
-    "Missing managed workflow output schema for project_managed_application_graph",
-  );
+const comparisonOutputSchema = requireOutputSchema(
+  managedWorkflowOutputSchemas,
+  "compare_managed_members",
+);
+const runtimeOutputSchema = requireOutputSchema(
+  managedWorkflowOutputSchemas,
+  "plan_managed_runtime_correlation",
+);
+const reconstructionOutputSchema = requireOutputSchema(
+  managedWorkflowOutputSchemas,
+  "import_managed_reconstruction",
+);
+const nativeVerificationOutputSchema = requireOutputSchema(
+  managedWorkflowOutputSchemas,
+  "verify_managed_native_boundaries",
+);
+const managedApplicationGraphOutputSchema = requireOutputSchema(
+  managedWorkflowOutputSchemas,
+  "project_managed_application_graph",
+);
 
 /** Provider-neutral managed-code workflow contracts. */
 export const MANAGED_WORKFLOW_TOOL_CONTRACTS = [

src/contracts/nativeToolContracts.ts

@@ -4,6 +4,7 @@ import type { ToolContract } from "./toolContracts.js";
 import { nativeOutputSchemas } from "./toolOutputSchemas.js";
 import { jsonValueSchema } from "../domain/jsonValue.js";
 import { toolContractMetadata } from "./toolEffects.js";
+import { requireOutputSchema } from "./toolOutputSchemaPrimitives.js";
 
 const examples: Readonly<Record<string, Readonly<Record<string, unknown>>>> = {
   inspect_macho: {},
@@ -18,9 +19,7 @@ const native = <Name extends string>(
   description: string,
   inputSchema: z.ZodObject,
 ): ToolContract<Name> => {
-  const outputSchema = nativeOutputSchemas[name];
-  if (outputSchema === undefined)
-    throw new Error(`Missing native output schema for ${name}`);
+  const outputSchema = requireOutputSchema(nativeOutputSchemas, name);
   return {
     name,
     ...toolContractMetadata(name),

tests/composition/analysis-sessions/contractValidation.test.ts

@@ -84,6 +84,17 @@ describe("contract validation boundaries", () => {
     ).toBe(false);
   });
 
+  it("accepts each complete managed application Evidence source", () => {
+    for (const input of [
+      { managed_artifact_evidence_id: EVIDENCE_ID },
+      { managed_members_evidence_id: EVIDENCE_ID },
+      { managed_native_boundaries_evidence_id: EVIDENCE_ID },
+    ])
+      expect(
+        managedApplicationGraphReferenceInputSchema.safeParse(input).success,
+      ).toBe(true);
+  });
+
   it("requires explicit approval for record-and-continue artifact inspection", () => {
     const input = {
       integrity_policy: "record-and-continue" as const,