@darkhorseprojects/circuitry 0.2.25 → 0.2.27

package/dist/graph.d.ts

@@ -1,6 +1,5 @@
 export declare const CIRCUITRY_SPEC_VERSION: "0.2";
-export declare const CIRCUITRY_SPEC_VERSION_LEGACY: "0.1";
-export type CircuitrySpecVersion = typeof CIRCUITRY_SPEC_VERSION | typeof CIRCUITRY_SPEC_VERSION_LEGACY;
+export type CircuitrySpecVersion = typeof CIRCUITRY_SPEC_VERSION;
 export type CircuitryNodeKind = "agent" | "input" | "tool" | "output" | string;
 export type CircuitryEdgeKind = "context" | "dependency" | "message" | "control" | string;
 export type CircuitryInputKind = "text" | "file" | "url" | "image" | "uri" | "canvas" | "mcp" | string;
@@ -178,12 +177,14 @@ export type CircuitryGraph = {
     title?: string;
     description?: string;
     resources?: Record<string, CircuitryResourceEntry>;
-    agents?: Record<string, Omit<CircuitryNode, "id" | "kind"> & {
-        kind?: "agent";
-    }>;
-    inputs?: Record<string, Omit<CircuitryInput, "id">>;
+    /** Internal normalized execution nodes. Authored graph files must not set this. */
     nodes?: CircuitryNode[];
+    /** Internal normalized execution edges. Authored graph files must not set this. */
     edges?: CircuitryEdge[];
+    /** Rejected legacy field. */
+    agents?: never;
+    /** Rejected legacy field. */
+    inputs?: never;
     runtime?: CircuitryRuntime;
     validation?: CircuitryGraphValidation;
     metadata?: Record<string, unknown>;
@@ -222,6 +223,7 @@ export declare const DEFAULT_CIRCUITRY_VALIDATION_STANDARD: {
 export declare const createCircuitryValidationStandard: (standard?: CircuitryValidationStandard, graph?: CircuitryGraph) => Required<CircuitryValidationStandard>;
 export declare const normalizeCircuitryGraph: (graph: CircuitryGraph) => CircuitryGraph;
 export declare const validateCircuitryGraphWithStandard: (graph: unknown, standard?: CircuitryValidationStandard) => CircuitryValidationResult;
+export declare const validateCircuitryExecutionGraphWithStandard: (graph: unknown, standard?: CircuitryValidationStandard) => CircuitryValidationResult;
 export declare const validateCircuitryGraph: (graph: unknown, standard?: CircuitryValidationStandard) => string[];
 export declare const parseCircuitryJson: (text: string, standard?: CircuitryValidationStandard, options?: {
     validate?: boolean;

package/dist/index.js

@@ -28,7 +28,6 @@ var isNodeElement = (element) => {
 
 // src/graph.ts
 var CIRCUITRY_SPEC_VERSION = "0.2";
-var CIRCUITRY_SPEC_VERSION_LEGACY = "0.1";
 var runtimeInputToText = (value) => {
   if (typeof value === "string") return value;
   if (value === void 0) return "";
@@ -39,12 +38,7 @@ var applyCircuitryRuntimeInputs = (graph, inputs = {}) => {
   if (entries.length === 0) return graph;
   const next = {
     ...graph,
-    resources: graph.resources ? { ...graph.resources } : graph.resources,
-    inputs: graph.inputs ? { ...graph.inputs } : graph.inputs,
-    nodes: graph.nodes ? graph.nodes.map((node) => ({
-      ...node,
-      input: node.input ? { ...node.input } : node.input
-    })) : graph.nodes
+    resources: graph.resources ? { ...graph.resources } : graph.resources
   };
   for (const [id, value] of entries) {
     const text = runtimeInputToText(value);
@@ -55,17 +49,7 @@ var applyCircuitryRuntimeInputs = (graph, inputs = {}) => {
       next.resources[id] = { ...resource, value: text };
       continue;
     }
-    const legacyInput = next.inputs?.[id];
-    if (legacyInput) {
-      next.inputs[id] = { ...legacyInput, value: text };
-      continue;
-    }
-    const node = next.nodes?.find((candidate) => candidate.id === id);
-    if (node?.kind === "input" && node.input) {
-      node.input.value = text;
-      continue;
-    }
-    throw new Error(`Runtime input does not match a graph text input: ${id}`);
+    throw new Error(`Runtime input does not match a graph text resource: ${id}`);
   }
   return next;
 };
@@ -148,69 +132,12 @@ var expandResources = (resources) => {
   return { nodes, edges };
 };
 var normalizeCircuitryGraph = (graph) => {
-  if (graph.resources && Object.keys(graph.resources).length > 0) {
-    const { nodes: nodes2, edges } = expandResources(graph.resources);
-    return { ...graph, nodes: nodes2, edges };
-  }
-  if (graph.nodes && graph.nodes.length > 0) {
-    const nodeIds = new Set(graph.nodes.map((n) => n.id));
-    const agents = graph.agents || {};
-    const inputs = graph.inputs || {};
-    const nodes2 = [...graph.nodes];
-    for (const [id, agent] of Object.entries(agents)) {
-      if (!nodeIds.has(id)) {
-        nodes2.push({
-          ...agent,
-          id,
-          kind: "agent",
-          label: agent.label || agent.agent?.identity || id,
-          agent: {
-            identity: agent.agent?.identity || agent.label || id,
-            ...agent.agent
-          }
-        });
-      }
-    }
-    for (const [id, input] of Object.entries(inputs)) {
-      if (!nodeIds.has(id)) {
-        nodes2.push({
-          id,
-          kind: "input",
-          label: input.label || id,
-          input
-        });
-      }
-    }
-    return { ...graph, nodes: nodes2 };
-  }
-  const nodes = [];
-  for (const [id, agent] of Object.entries(graph.agents || {})) {
-    nodes.push({
-      ...agent,
-      id,
-      kind: "agent",
-      label: agent.label || agent.agent?.identity || id,
-      agent: {
-        identity: agent.agent?.identity || agent.label || id,
-        ...agent.agent
-      }
-    });
-  }
-  for (const [id, input] of Object.entries(graph.inputs || {})) {
-    nodes.push({
-      id,
-      kind: "input",
-      label: input.label || id,
-      input
-    });
-  }
-  return {
-    ...graph,
-    nodes
-  };
+  if (!graph.resources || Object.keys(graph.resources).length === 0) return { ...graph };
+  const { nodes, edges } = expandResources(graph.resources);
+  return { ...graph, nodes, edges };
 };
 var VALID_SPEC_VERSIONS = /* @__PURE__ */ new Set([CIRCUITRY_SPEC_VERSION]);
-var validateCircuitryGraphWithStandard = (graph, standard = {}) => {
+var validateCircuitryGraphInternal = (graph, standard = {}, options) => {
   const resolvedStandard = createCircuitryValidationStandard(
     standard,
     graph && typeof graph === "object" && !Array.isArray(graph) ? graph : void 0
@@ -231,15 +158,21 @@ var validateCircuitryGraphWithStandard = (graph, standard = {}) => {
       ["circuitry"]
     );
   }
-  if (graphObject.circuitry === CIRCUITRY_SPEC_VERSION && graphObject.resources && Object.keys(graphObject.resources).length > 0) {
+  if (options.sourceFormat) {
+    if (!graphObject.resources || Object.keys(graphObject.resources).length === 0) {
+      addError("missing_resources", "Circuitry v0.2 graphs must use a resources: section", ["resources"]);
+    }
     if (graphObject.agents && Object.keys(graphObject.agents).length > 0) {
-      addError("v02_mixed_format", "v0.2 graphs with resources: must not use legacy agents: section", ["agents"]);
+      addError("legacy_agents", "Circuitry v0.2 graphs must not use legacy agents: section", ["agents"]);
     }
     if (graphObject.inputs && Object.keys(graphObject.inputs).length > 0) {
-      addError("v02_mixed_format", "v0.2 graphs with resources: must not use legacy inputs: section", ["inputs"]);
+      addError("legacy_inputs", "Circuitry v0.2 graphs must not use legacy inputs: section", ["inputs"]);
     }
-    if (graphObject.edges && graphObject.edges.length > 0 && !(graphObject.nodes && graphObject.nodes.length > 0)) {
-      addError("v02_mixed_format", "v0.2 graphs with resources: must not use legacy edges: section", ["edges"]);
+    if (graphObject.nodes && graphObject.nodes.length > 0) {
+      addError("legacy_nodes", "Circuitry v0.2 graph files must not use nodes:; use resources:", ["nodes"]);
+    }
+    if (graphObject.edges && graphObject.edges.length > 0) {
+      addError("legacy_edges", "Circuitry v0.2 graph files must not use edges:; use resource inputs:", ["edges"]);
     }
   }
   const normalized = normalizeCircuitryGraph(graphObject);
@@ -384,6 +317,8 @@ var validateCircuitryGraphWithStandard = (graph, standard = {}) => {
   }
   return { ok: errors.length === 0, errors, standard: resolvedStandard };
 };
+var validateCircuitryGraphWithStandard = (graph, standard = {}) => validateCircuitryGraphInternal(graph, standard, { sourceFormat: true });
+var validateCircuitryExecutionGraphWithStandard = (graph, standard = {}) => validateCircuitryGraphInternal(graph, standard, { sourceFormat: false });
 var validateCircuitryGraph = (graph, standard = {}) => validateCircuitryGraphWithStandard(graph, standard).errors.map(
   (error) => error.message
 );
@@ -396,12 +331,11 @@ var parseCircuitryJson = (text, standard = {}, options = {}) => {
     throw new Error(`Could not parse Circuitry JSON. Check commas, quotes, and braces.
 ${message}`);
   }
-  if (options.validate !== false) {
-    const errors = validateCircuitryGraph(graph, standard);
-    if (errors.length) {
-      throw new Error(`Invalid Circuitry graph:
+  if (options.validate === false) return graph;
+  const errors = validateCircuitryGraph(graph, standard);
+  if (errors.length) {
+    throw new Error(`Invalid Circuitry graph:
 ${errors.join("\n")}`);
-    }
   }
   return normalizeCircuitryGraph(graph);
 };
@@ -427,12 +361,11 @@ ${message}`);
   if (!graph || typeof graph !== "object" || Array.isArray(graph)) {
     throw new Error("Could not parse Circuitry YAML. Expected a graph object.");
   }
-  if (options.validate !== false) {
-    const errors = validateCircuitryGraph(graph, standard);
-    if (errors.length) {
-      throw new Error(`Invalid Circuitry graph:
+  if (options.validate === false) return graph;
+  const errors = validateCircuitryGraph(graph, standard);
+  if (errors.length) {
+    throw new Error(`Invalid Circuitry graph:
 ${errors.join("\n")}`);
-    }
   }
   return normalizeCircuitryGraph(graph);
 };
@@ -694,15 +627,15 @@ var runCircuitryGraphExecution = async ({
   const ready = [];
   for (const nodeId of nodeIds) {
     const node = executionGraph.nodes.get(nodeId);
-    if (node.completed) {
-      completed.add(nodeId);
-      if (node.output) {
-        outputs.set(nodeId, node.output);
-      }
-      continue;
-    }
+    if (!node.completed) continue;
+    completed.add(nodeId);
+    outputs.set(nodeId, node.output || "");
+  }
+  for (const nodeId of nodeIds) {
+    if (completed.has(nodeId)) continue;
+    const node = executionGraph.nodes.get(nodeId);
     const count = node.inputNodeIds.filter(
-      (sourceId) => executionGraph.nodes.has(sourceId)
+      (sourceId) => executionGraph.nodes.has(sourceId) && !completed.has(sourceId)
     ).length;
     remainingDependencies.set(nodeId, count);
     if (count === 0) {
@@ -1135,7 +1068,6 @@ export {
   CIRCUITRY_NODE_CUSTOM_TYPE,
   CIRCUITRY_NODE_KIND,
   CIRCUITRY_SPEC_VERSION,
-  CIRCUITRY_SPEC_VERSION_LEGACY,
   DEFAULT_CIRCUITRY_VALIDATION_RULES,
   DEFAULT_CIRCUITRY_VALIDATION_STANDARD,
   DEFAULT_MAX_PARALLEL_RUNS,
@@ -1169,6 +1101,7 @@ export {
   stringifyCircuitryJson,
   stringifyCircuitryText,
   stringifyCircuitryYaml,
+  validateCircuitryExecutionGraphWithStandard,
   validateCircuitryGraph,
   validateCircuitryGraphWithStandard
 };

package/dist/node.js

@@ -19,12 +19,7 @@ var applyCircuitryRuntimeInputs = (graph, inputs = {}) => {
   if (entries.length === 0) return graph;
   const next = {
     ...graph,
-    resources: graph.resources ? { ...graph.resources } : graph.resources,
-    inputs: graph.inputs ? { ...graph.inputs } : graph.inputs,
-    nodes: graph.nodes ? graph.nodes.map((node) => ({
-      ...node,
-      input: node.input ? { ...node.input } : node.input
-    })) : graph.nodes
+    resources: graph.resources ? { ...graph.resources } : graph.resources
   };
   for (const [id, value] of entries) {
     const text = runtimeInputToText(value);
@@ -35,17 +30,7 @@ var applyCircuitryRuntimeInputs = (graph, inputs = {}) => {
       next.resources[id] = { ...resource, value: text };
       continue;
     }
-    const legacyInput = next.inputs?.[id];
-    if (legacyInput) {
-      next.inputs[id] = { ...legacyInput, value: text };
-      continue;
-    }
-    const node = next.nodes?.find((candidate) => candidate.id === id);
-    if (node?.kind === "input" && node.input) {
-      node.input.value = text;
-      continue;
-    }
-    throw new Error(`Runtime input does not match a graph text input: ${id}`);
+    throw new Error(`Runtime input does not match a graph text resource: ${id}`);
   }
   return next;
 };
@@ -128,69 +113,12 @@ var expandResources = (resources) => {
   return { nodes, edges };
 };
 var normalizeCircuitryGraph = (graph) => {
-  if (graph.resources && Object.keys(graph.resources).length > 0) {
-    const { nodes: nodes2, edges } = expandResources(graph.resources);
-    return { ...graph, nodes: nodes2, edges };
-  }
-  if (graph.nodes && graph.nodes.length > 0) {
-    const nodeIds = new Set(graph.nodes.map((n) => n.id));
-    const agents = graph.agents || {};
-    const inputs = graph.inputs || {};
-    const nodes2 = [...graph.nodes];
-    for (const [id, agent] of Object.entries(agents)) {
-      if (!nodeIds.has(id)) {
-        nodes2.push({
-          ...agent,
-          id,
-          kind: "agent",
-          label: agent.label || agent.agent?.identity || id,
-          agent: {
-            identity: agent.agent?.identity || agent.label || id,
-            ...agent.agent
-          }
-        });
-      }
-    }
-    for (const [id, input] of Object.entries(inputs)) {
-      if (!nodeIds.has(id)) {
-        nodes2.push({
-          id,
-          kind: "input",
-          label: input.label || id,
-          input
-        });
-      }
-    }
-    return { ...graph, nodes: nodes2 };
-  }
-  const nodes = [];
-  for (const [id, agent] of Object.entries(graph.agents || {})) {
-    nodes.push({
-      ...agent,
-      id,
-      kind: "agent",
-      label: agent.label || agent.agent?.identity || id,
-      agent: {
-        identity: agent.agent?.identity || agent.label || id,
-        ...agent.agent
-      }
-    });
-  }
-  for (const [id, input] of Object.entries(graph.inputs || {})) {
-    nodes.push({
-      id,
-      kind: "input",
-      label: input.label || id,
-      input
-    });
-  }
-  return {
-    ...graph,
-    nodes
-  };
+  if (!graph.resources || Object.keys(graph.resources).length === 0) return { ...graph };
+  const { nodes, edges } = expandResources(graph.resources);
+  return { ...graph, nodes, edges };
 };
 var VALID_SPEC_VERSIONS = /* @__PURE__ */ new Set([CIRCUITRY_SPEC_VERSION]);
-var validateCircuitryGraphWithStandard = (graph, standard = {}) => {
+var validateCircuitryGraphInternal = (graph, standard = {}, options) => {
   const resolvedStandard = createCircuitryValidationStandard(
     standard,
     graph && typeof graph === "object" && !Array.isArray(graph) ? graph : void 0
@@ -211,15 +139,21 @@ var validateCircuitryGraphWithStandard = (graph, standard = {}) => {
       ["circuitry"]
     );
   }
-  if (graphObject.circuitry === CIRCUITRY_SPEC_VERSION && graphObject.resources && Object.keys(graphObject.resources).length > 0) {
+  if (options.sourceFormat) {
+    if (!graphObject.resources || Object.keys(graphObject.resources).length === 0) {
+      addError("missing_resources", "Circuitry v0.2 graphs must use a resources: section", ["resources"]);
+    }
     if (graphObject.agents && Object.keys(graphObject.agents).length > 0) {
-      addError("v02_mixed_format", "v0.2 graphs with resources: must not use legacy agents: section", ["agents"]);
+      addError("legacy_agents", "Circuitry v0.2 graphs must not use legacy agents: section", ["agents"]);
     }
     if (graphObject.inputs && Object.keys(graphObject.inputs).length > 0) {
-      addError("v02_mixed_format", "v0.2 graphs with resources: must not use legacy inputs: section", ["inputs"]);
+      addError("legacy_inputs", "Circuitry v0.2 graphs must not use legacy inputs: section", ["inputs"]);
     }
-    if (graphObject.edges && graphObject.edges.length > 0 && !(graphObject.nodes && graphObject.nodes.length > 0)) {
-      addError("v02_mixed_format", "v0.2 graphs with resources: must not use legacy edges: section", ["edges"]);
+    if (graphObject.nodes && graphObject.nodes.length > 0) {
+      addError("legacy_nodes", "Circuitry v0.2 graph files must not use nodes:; use resources:", ["nodes"]);
+    }
+    if (graphObject.edges && graphObject.edges.length > 0) {
+      addError("legacy_edges", "Circuitry v0.2 graph files must not use edges:; use resource inputs:", ["edges"]);
     }
   }
   const normalized = normalizeCircuitryGraph(graphObject);
@@ -364,6 +298,8 @@ var validateCircuitryGraphWithStandard = (graph, standard = {}) => {
   }
   return { ok: errors.length === 0, errors, standard: resolvedStandard };
 };
+var validateCircuitryGraphWithStandard = (graph, standard = {}) => validateCircuitryGraphInternal(graph, standard, { sourceFormat: true });
+var validateCircuitryExecutionGraphWithStandard = (graph, standard = {}) => validateCircuitryGraphInternal(graph, standard, { sourceFormat: false });
 var validateCircuitryGraph = (graph, standard = {}) => validateCircuitryGraphWithStandard(graph, standard).errors.map(
   (error) => error.message
 );
@@ -376,12 +312,11 @@ var parseCircuitryJson = (text, standard = {}, options = {}) => {
     throw new Error(`Could not parse Circuitry JSON. Check commas, quotes, and braces.
 ${message}`);
   }
-  if (options.validate !== false) {
-    const errors = validateCircuitryGraph(graph, standard);
-    if (errors.length) {
-      throw new Error(`Invalid Circuitry graph:
+  if (options.validate === false) return graph;
+  const errors = validateCircuitryGraph(graph, standard);
+  if (errors.length) {
+    throw new Error(`Invalid Circuitry graph:
 ${errors.join("\n")}`);
-    }
   }
   return normalizeCircuitryGraph(graph);
 };
@@ -403,12 +338,11 @@ ${message}`);
   if (!graph || typeof graph !== "object" || Array.isArray(graph)) {
     throw new Error("Could not parse Circuitry YAML. Expected a graph object.");
   }
-  if (options.validate !== false) {
-    const errors = validateCircuitryGraph(graph, standard);
-    if (errors.length) {
-      throw new Error(`Invalid Circuitry graph:
+  if (options.validate === false) return graph;
+  const errors = validateCircuitryGraph(graph, standard);
+  if (errors.length) {
+    throw new Error(`Invalid Circuitry graph:
 ${errors.join("\n")}`);
-    }
   }
   return normalizeCircuitryGraph(graph);
 };
@@ -615,15 +549,15 @@ var runCircuitryGraphExecution = async ({
   const ready = [];
   for (const nodeId of nodeIds) {
     const node = executionGraph.nodes.get(nodeId);
-    if (node.completed) {
-      completed.add(nodeId);
-      if (node.output) {
-        outputs.set(nodeId, node.output);
-      }
-      continue;
-    }
+    if (!node.completed) continue;
+    completed.add(nodeId);
+    outputs.set(nodeId, node.output || "");
+  }
+  for (const nodeId of nodeIds) {
+    if (completed.has(nodeId)) continue;
+    const node = executionGraph.nodes.get(nodeId);
     const count = node.inputNodeIds.filter(
-      (sourceId) => executionGraph.nodes.has(sourceId)
+      (sourceId) => executionGraph.nodes.has(sourceId) && !completed.has(sourceId)
     ).length;
     remainingDependencies.set(nodeId, count);
     if (count === 0) {
@@ -869,10 +803,10 @@ ${validation.errors.map((e) => e.message).join("\n")}`
       throw new Error(`Invalid Circuitry graph:
 ${parsed.error?.message}`);
     const runnableGraph = applyCircuitryRuntimeInputs(parsed.graph, input.inputs);
-    const validation = await this.validateGraph({
-      graph: runnableGraph,
-      standard: input.standard
-    });
+    const validation = validateCircuitryExecutionGraphWithStandard(
+      runnableGraph,
+      input.standard
+    );
     if (validation.errors.length)
       throw new Error(
         `Invalid Circuitry graph:

package/package.json

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