@darkhorseprojects/circuitry 0.2.31 → 0.2.33

package/dist/index.js

@@ -519,6 +519,96 @@ ${contextSection}`
   ].filter(Boolean).join("\n\n");
 };
 var collectImages = (contextInputs) => contextInputs.filter((item) => item.kind === "image" && item.image).map((item) => item.image);
+var stripJsonFence = (output) => {
+  const trimmed = output.trim();
+  const fenced = trimmed.match(/^```(?:json)?\s*([\s\S]*?)\s*```$/i);
+  return fenced ? fenced[1].trim() : trimmed;
+};
+var parseExpectedOutput = (nodeId, output) => {
+  try {
+    return JSON.parse(stripJsonFence(output));
+  } catch (error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    throw new Error(`Node ${nodeId} output does not match expect: output is not valid JSON (${detail})`);
+  }
+};
+var isFieldObject = (schema) => !!schema && typeof schema === "object" && !Array.isArray(schema) && typeof schema.type === "string";
+var describeExpectedType = (schema) => Array.isArray(schema) ? "list" : typeof schema === "string" ? schema : isFieldObject(schema) ? schema.type : "dict";
+var matchesPrimitiveType = (value, type) => {
+  switch (type) {
+    case "str":
+      return typeof value === "string";
+    case "int":
+      return Number.isInteger(value);
+    case "float":
+      return typeof value === "number" && Number.isFinite(value);
+    case "bool":
+      return typeof value === "boolean";
+    case "list":
+      return Array.isArray(value);
+    case "dict":
+      return !!value && typeof value === "object" && !Array.isArray(value);
+    default:
+      return true;
+  }
+};
+var validateExpectValue = (value, schema, path, errors) => {
+  if (typeof schema === "string") {
+    if (!matchesPrimitiveType(value, schema)) {
+      errors.push(`${path} expected ${schema}, got ${Array.isArray(value) ? "list" : typeof value}`);
+    }
+    return;
+  }
+  if (Array.isArray(schema)) {
+    if (!Array.isArray(value)) {
+      errors.push(`${path} expected list, got ${typeof value}`);
+      return;
+    }
+    if (schema.length > 0) {
+      value.forEach((item, index) => validateExpectValue(item, schema[0], `${path}[${index}]`, errors));
+    }
+    return;
+  }
+  if (isFieldObject(schema)) {
+    if (schema.optional && value === void 0) return;
+    if (!matchesPrimitiveType(value, schema.type)) {
+      errors.push(`${path} expected ${schema.type}, got ${Array.isArray(value) ? "list" : typeof value}`);
+      return;
+    }
+    if (schema.contains && typeof value === "string" && !value.includes(schema.contains)) {
+      errors.push(`${path} must include string: ${schema.contains}`);
+    }
+    if (schema.type === "list" && schema.items && Array.isArray(value)) {
+      value.forEach((item, index) => validateExpectValue(item, schema.items, `${path}[${index}]`, errors));
+    }
+    return;
+  }
+  if (schema && typeof schema === "object") {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+      errors.push(`${path} expected dict, got ${Array.isArray(value) ? "list" : typeof value}`);
+      return;
+    }
+    for (const [key, childSchema] of Object.entries(schema)) {
+      const childOptional = isFieldObject(childSchema) && childSchema.optional;
+      const childValue = value[key];
+      if (childValue === void 0 && !childOptional) {
+        errors.push(`${path}.${key} is missing required field of type ${describeExpectedType(childSchema)}`);
+        continue;
+      }
+      validateExpectValue(childValue, childSchema, `${path}.${key}`, errors);
+    }
+  }
+};
+var assertExpectedOutput = (node, output) => {
+  if (!node.expect) return;
+  const parsed = parseExpectedOutput(node.id, output);
+  const errors = [];
+  validateExpectValue(parsed, node.expect, node.id, errors);
+  if (errors.length) {
+    throw new Error(`Node ${node.id} output does not match expect:
+${errors.join("\n")}`);
+  }
+};
 var executeCircuitryNode = async ({
   graph,
   item,
@@ -542,8 +632,9 @@ var executeCircuitryNode = async ({
     };
   }
   const agent = item.node.agent || {};
+  let result;
   try {
-    const result = await executeNode({
+    result = await executeNode({
       nodeId: item.id,
       model: (agent.model === "inherit" ? void 0 : agent.model) || (defaultModel === "inherit" ? void 0 : defaultModel) || "inherit",
       tools: agent.tools || [],
@@ -556,13 +647,6 @@ var executeCircuitryNode = async ({
       images: collectImages(contextInputs),
       prompt: composeCircuitryPrompt(graph, item.node, inputPayload, contextInputs)
     });
-    onNodeComplete?.(item.id, { output: result.output });
-    return {
-      nodeId: item.id,
-      fallbackCycle,
-      inputNodeIds: inputPayload.map((input) => input.nodeId),
-      output: result.output
-    };
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     onNodeComplete?.(item.id, { error: message });
@@ -574,6 +658,14 @@ var executeCircuitryNode = async ({
       error: message
     };
   }
+  assertExpectedOutput(item.node, result.output);
+  onNodeComplete?.(item.id, { output: result.output });
+  return {
+    nodeId: item.id,
+    fallbackCycle,
+    inputNodeIds: inputPayload.map((input) => input.nodeId),
+    output: result.output
+  };
 };
 var runCircuitryGraphExecution = async ({
   graph,

package/dist/node.js

@@ -441,6 +441,96 @@ ${contextSection}`
   ].filter(Boolean).join("\n\n");
 };
 var collectImages = (contextInputs) => contextInputs.filter((item) => item.kind === "image" && item.image).map((item) => item.image);
+var stripJsonFence = (output) => {
+  const trimmed = output.trim();
+  const fenced = trimmed.match(/^```(?:json)?\s*([\s\S]*?)\s*```$/i);
+  return fenced ? fenced[1].trim() : trimmed;
+};
+var parseExpectedOutput = (nodeId, output) => {
+  try {
+    return JSON.parse(stripJsonFence(output));
+  } catch (error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    throw new Error(`Node ${nodeId} output does not match expect: output is not valid JSON (${detail})`);
+  }
+};
+var isFieldObject = (schema) => !!schema && typeof schema === "object" && !Array.isArray(schema) && typeof schema.type === "string";
+var describeExpectedType = (schema) => Array.isArray(schema) ? "list" : typeof schema === "string" ? schema : isFieldObject(schema) ? schema.type : "dict";
+var matchesPrimitiveType = (value, type) => {
+  switch (type) {
+    case "str":
+      return typeof value === "string";
+    case "int":
+      return Number.isInteger(value);
+    case "float":
+      return typeof value === "number" && Number.isFinite(value);
+    case "bool":
+      return typeof value === "boolean";
+    case "list":
+      return Array.isArray(value);
+    case "dict":
+      return !!value && typeof value === "object" && !Array.isArray(value);
+    default:
+      return true;
+  }
+};
+var validateExpectValue = (value, schema, path2, errors) => {
+  if (typeof schema === "string") {
+    if (!matchesPrimitiveType(value, schema)) {
+      errors.push(`${path2} expected ${schema}, got ${Array.isArray(value) ? "list" : typeof value}`);
+    }
+    return;
+  }
+  if (Array.isArray(schema)) {
+    if (!Array.isArray(value)) {
+      errors.push(`${path2} expected list, got ${typeof value}`);
+      return;
+    }
+    if (schema.length > 0) {
+      value.forEach((item, index) => validateExpectValue(item, schema[0], `${path2}[${index}]`, errors));
+    }
+    return;
+  }
+  if (isFieldObject(schema)) {
+    if (schema.optional && value === void 0) return;
+    if (!matchesPrimitiveType(value, schema.type)) {
+      errors.push(`${path2} expected ${schema.type}, got ${Array.isArray(value) ? "list" : typeof value}`);
+      return;
+    }
+    if (schema.contains && typeof value === "string" && !value.includes(schema.contains)) {
+      errors.push(`${path2} must include string: ${schema.contains}`);
+    }
+    if (schema.type === "list" && schema.items && Array.isArray(value)) {
+      value.forEach((item, index) => validateExpectValue(item, schema.items, `${path2}[${index}]`, errors));
+    }
+    return;
+  }
+  if (schema && typeof schema === "object") {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+      errors.push(`${path2} expected dict, got ${Array.isArray(value) ? "list" : typeof value}`);
+      return;
+    }
+    for (const [key, childSchema] of Object.entries(schema)) {
+      const childOptional = isFieldObject(childSchema) && childSchema.optional;
+      const childValue = value[key];
+      if (childValue === void 0 && !childOptional) {
+        errors.push(`${path2}.${key} is missing required field of type ${describeExpectedType(childSchema)}`);
+        continue;
+      }
+      validateExpectValue(childValue, childSchema, `${path2}.${key}`, errors);
+    }
+  }
+};
+var assertExpectedOutput = (node, output) => {
+  if (!node.expect) return;
+  const parsed = parseExpectedOutput(node.id, output);
+  const errors = [];
+  validateExpectValue(parsed, node.expect, node.id, errors);
+  if (errors.length) {
+    throw new Error(`Node ${node.id} output does not match expect:
+${errors.join("\n")}`);
+  }
+};
 var executeCircuitryNode = async ({
   graph,
   item,
@@ -464,8 +554,9 @@ var executeCircuitryNode = async ({
     };
   }
   const agent = item.node.agent || {};
+  let result;
   try {
-    const result = await executeNode({
+    result = await executeNode({
       nodeId: item.id,
       model: (agent.model === "inherit" ? void 0 : agent.model) || (defaultModel === "inherit" ? void 0 : defaultModel) || "inherit",
       tools: agent.tools || [],
@@ -478,13 +569,6 @@ var executeCircuitryNode = async ({
       images: collectImages(contextInputs),
       prompt: composeCircuitryPrompt(graph, item.node, inputPayload, contextInputs)
     });
-    onNodeComplete?.(item.id, { output: result.output });
-    return {
-      nodeId: item.id,
-      fallbackCycle,
-      inputNodeIds: inputPayload.map((input) => input.nodeId),
-      output: result.output
-    };
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     onNodeComplete?.(item.id, { error: message });
@@ -496,6 +580,14 @@ var executeCircuitryNode = async ({
       error: message
     };
   }
+  assertExpectedOutput(item.node, result.output);
+  onNodeComplete?.(item.id, { output: result.output });
+  return {
+    nodeId: item.id,
+    fallbackCycle,
+    inputNodeIds: inputPayload.map((input) => input.nodeId),
+    output: result.output
+  };
 };
 var runCircuitryGraphExecution = async ({
   graph,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkhorseprojects/circuitry",
-  "version": "0.2.31",
+  "version": "0.2.33",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",