Merge pull request 'refactor: outputSchema only accepts inline JSON Schema' (#325) from fix/319-validate-schema-only-inline into main

packages/cli-uwf/src/commands/workflow.ts

@@ -13,7 +13,7 @@ import {
   saveWorkflowRegistry,
   type UwfStore,
 } from "../store.js";
-import { isCasRef, parseWorkflowPayload } from "../validate.js";
+import { parseWorkflowPayload } from "../validate.js";
 
 export type WorkflowListEntry = {
   name: string;
@@ -45,25 +45,15 @@ function isJsonSchema(value: unknown): value is JSONSchema {
 async function resolveOutputSchemaRef(
   uwf: UwfStore,
   roleName: string,
-  outputSchema: string | JSONSchema,
+  outputSchema: unknown,
 ): Promise<CasRef> {
-  if (typeof outputSchema === "string") {
-    if (!isCasRef(outputSchema)) {
-      fail(`invalid outputSchema cas_ref: ${outputSchema}`);
-    }
-    if (!uwf.store.has(outputSchema)) {
-      fail(`outputSchema not found in CAS: ${outputSchema}`);
-    }
-    return outputSchema;
-  }
   if (!isJsonSchema(outputSchema)) {
-    fail("outputSchema must be a cas_ref string or JSON Schema object");
+    fail(`role "${roleName}": outputSchema must be a JSON Schema object`);
   }
-  // Auto-set title from role name if not already present
+  const schema: JSONSchema = outputSchema.title === undefined
-  if (outputSchema.title === undefined) {
+    ? { ...outputSchema, title: roleName }
-    outputSchema = { ...outputSchema, title: roleName };
+    : outputSchema;
-  }
+  return putSchema(uwf.store, schema);
-  return putSchema(uwf.store, outputSchema);
 }
 
 async function materializeWorkflowPayload(
@@ -75,7 +65,7 @@ async function materializeWorkflowPayload(
     const outputSchema = await resolveOutputSchemaRef(
       uwf,
       `${raw.name}.${roleName}`,
-      role.outputSchema as string | JSONSchema,
+      role.outputSchema,
     );
     roles[roleName] = {
       description: role.description,

packages/cli-uwf/src/validate.ts

@@ -15,9 +15,7 @@ function isRoleDefinition(value: unknown): boolean {
     return false;
   }
   const outputSchema = value.outputSchema;
-  const schemaOk =
+  const schemaOk = isRecord(outputSchema) && typeof outputSchema.type === "string";
-    typeof outputSchema === "string" ||
-    (isRecord(outputSchema) && typeof outputSchema.type === "string");
   return (
     typeof value.description === "string" && typeof value.systemPrompt === "string" && schemaOk
   );