@darkhorseprojects/circuitry 0.4.1 → 0.4.3

package/dist/resolve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"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"}

package/dist/yaml.d.ts

@@ -1,11 +1,2 @@
-import { type CircuitryGraph, type CircuitryValidationStandard } from "./graph";
-export declare const parseYamlData: (text: string) => unknown;
-export declare const stringifyYamlData: (value: unknown) => string;
-export declare const parseCircuitryYaml: (text: string, standard?: CircuitryValidationStandard, options?: {
-    validate?: boolean;
-}) => CircuitryGraph;
-export declare const stringifyCircuitryYaml: (graph: CircuitryGraph) => string;
-export declare const parseCircuitryText: (text: string, standard?: CircuitryValidationStandard, options?: {
-    validate?: boolean;
-}) => CircuitryGraph;
-export declare const stringifyCircuitryText: (graph: CircuitryGraph) => string;
+export declare function parseYamlData(text: string): unknown;
+export declare function stringifyYamlData(value: unknown): string;

package/dist/yaml.js

@@ -0,0 +1,8 @@
+import { parse, stringify } from "yaml";
+export function parseYamlData(text) {
+    return parse(text);
+}
+export function stringifyYamlData(value) {
+    return stringify(value);
+}
+//# sourceMappingURL=yaml.js.map

package/dist/yaml.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../src/yaml.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAExC,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC9C,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC;AAC1B,CAAC"}

package/examples/agent.circuitry.yaml

@@ -1,24 +1,27 @@
 circuitry: "0.4"
-title: Agent with prompt input
+title: Research assistant
 inputs:
-  user_turn:
+  question:
     type: text
     required: true
 entry: assistant
 resources:
-  user_turn:
+  question:
     type: input
-    from: user_turn
-  guide:
+    from: question
+  system:
     type: text
-    value: Be direct, accurate, and natural.
+    value: |
+      You are a careful research assistant.
   assistant:
     type: agent
-    inputs: [guide, user_turn]
-    tools: [read, write, bash, run_graph]
-    instructions: Use the guide and answer the user.
+    identity: Researcher
+    inputs: [system, question]
+    tools: [read, search]
+    instructions: |
+      Answer with the smallest sufficient explanation.
     expect:
-      response: str
+      answer: str
 outputs:
-  response:
-    from: assistant.response
+  answer:
+    from: assistant.answer

package/examples/context.circuitry.yaml

@@ -0,0 +1,22 @@
+circuitry: "0.4"
+title: Context recovery
+inputs:
+  question:
+    type: text
+    required: true
+entry: recover
+resources:
+  question:
+    type: input
+    from: question
+  recover:
+    type: agent
+    identity: Context recovery
+    inputs: [question]
+    instructions: |
+      Return only context relevant to the question.
+    expect:
+      context: str
+outputs:
+  context:
+    from: recover.context

package/examples/imports.circuitry.yaml

@@ -1,13 +1,10 @@
 circuitry: "0.4"
-title: Imports and entries
+title: Imports
 imports:
-  - path: ./agent.circuitry.yaml
+  - path: ./shared.circuitry.yaml
     resources: "*"
-    prefix: imported_
-entry: imported_assistant
-entries:
-  default: imported_assistant
-resources:
-  local_note:
-    type: text
-    value: Local resource.
+entry: system
+resources: {}
+outputs:
+  system:
+    from: system

package/examples/minimal.circuitry.yaml

@@ -1,20 +1,10 @@
 circuitry: "0.4"
 title: Minimal
-inputs:
-  user_turn:
-    type: text
-    required: true
-entry: assistant
+entry: message
 resources:
-  user_turn:
-    type: input
-    from: user_turn
-  assistant:
-    type: agent
-    inputs: [user_turn]
-    instructions: Answer the user.
-    expect:
-      response: str
+  message:
+    type: text
+    value: Hello from Circuitry.
 outputs:
-  response:
-    from: assistant.response
+  message:
+    from: message

package/examples/run.circuitry.yaml

@@ -0,0 +1,26 @@
+circuitry: "0.4"
+title: Assistant with graph run
+inputs:
+  question:
+    type: text
+    required: true
+entry: assistant
+resources:
+  question:
+    type: input
+    from: question
+  recovered_context:
+    type: run
+    graph: ./context.circuitry.yaml
+    entry: recover
+    inputs:
+      question: question
+  assistant:
+    type: agent
+    identity: Researcher
+    inputs: [question, recovered_context]
+    expect:
+      answer: str
+outputs:
+  answer:
+    from: assistant.answer

package/examples/shared.circuitry.yaml

@@ -0,0 +1,6 @@
+circuitry: "0.4"
+title: Shared resources
+resources:
+  system:
+    type: text
+    value: You are concise and careful.

package/package.json

@@ -1,46 +1,43 @@
 {
   "name": "@darkhorseprojects/circuitry",
-  "version": "0.4.1",
+  "version": "0.4.3",
+  "description": "A tiny file format and CLI for executable resource graphs.",
   "type": "module",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "bin": {
+    "circuitry": "./dist/cli.js"
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
-    },
-    "./resolve": {
-      "types": "./dist/resolve.d.ts",
-      "import": "./dist/resolve.js"
     }
   },
-  "bin": {
-    "circuitry": "./dist/cli.js"
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/darkhorseprojects/circuitry"
   },
-  "license": "MPL-2.0",
   "files": [
     "dist",
+    "README.md",
     "SPEC.md",
     "schema.json",
-    "examples",
-    "LICENSE"
+    "examples"
   ],
   "scripts": {
-    "build": "node build.mjs",
-    "prepublishOnly": "npm run build"
-  },
-  "publishConfig": {
-    "access": "public"
+    "build": "tsc -p tsconfig.json",
+    "test": "vitest run",
+    "check": "tsc -p tsconfig.json --noEmit && vitest run"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/darkhorseprojects/circuitry.git"
+  "dependencies": {
+    "yaml": "^2.9.0"
   },
-  "dependencies": {},
   "devDependencies": {
-    "@types/node": "^20.11.0",
-    "typescript": "^5.3.3",
-    "yaml": "^2.8.4",
-    "zod": "^3.25.76"
-  }
+    "@types/node": "^22.15.30",
+    "typescript": "^5.8.3",
+    "vitest": "^3.1.4"
+  },
+  "engines": {
+    "node": ">=20"
+  },
+  "license": "MPL-2.0"
 }

package/schema.json

@@ -1,31 +1,54 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://darkhorseprojects.github.io/circuitry/schema/0.4/schema.json",
+  "$id": "https://darkhorseprojects.github.io/circuitry/schema.json",
   "title": "Circuitry 0.4",
   "type": "object",
   "required": ["circuitry", "resources"],
+  "additionalProperties": true,
   "properties": {
     "circuitry": { "const": "0.4" },
     "title": { "type": "string" },
     "description": { "type": "string" },
-    "imports": { "type": "array" },
-    "inputs": { "type": "object" },
+    "imports": { "type": "array", "items": { "$ref": "#/$defs/import" } },
+    "inputs": { "type": "object", "additionalProperties": { "$ref": "#/$defs/input" } },
     "entry": { "type": "string" },
     "entries": { "type": "object", "additionalProperties": { "type": "string" } },
-    "resources": {
+    "resources": { "type": "object", "additionalProperties": { "$ref": "#/$defs/resource" } },
+    "outputs": { "type": "object", "additionalProperties": { "$ref": "#/$defs/output" } }
+  },
+  "$defs": {
+    "import": {
       "type": "object",
-      "additionalProperties": { "$ref": "#/$defs/resource" }
+      "required": ["path"],
+      "additionalProperties": false,
+      "properties": {
+        "path": { "type": "string" },
+        "resources": {
+          "oneOf": [
+            { "const": "*" },
+            { "type": "array", "items": { "type": "string" } },
+            { "type": "object", "additionalProperties": { "type": "string" } }
+          ]
+        },
+        "prefix": { "type": "string" }
+      }
     },
-    "outputs": {
+    "input": {
       "type": "object",
-      "additionalProperties": { "$ref": "#/$defs/output" }
-    }
-  },
-  "additionalProperties": true,
-  "$defs": {
+      "additionalProperties": true,
+      "properties": {
+        "type": { "type": "string" },
+        "required": { "type": "boolean" },
+        "default": {},
+        "label": { "type": "string" },
+        "description": { "type": "string" },
+        "mime": { "type": "string" }
+      }
+    },
     "resource": {
       "type": "object",
       "required": ["type"],
+      "additionalProperties": true,
       "properties": {
         "type": { "type": "string" },
         "label": { "type": "string" },
@@ -37,7 +60,7 @@
           ]
         },
         "from": { "type": "string" },
-        "value": true,
+        "value": {},
         "path": { "type": "string" },
         "uri": { "type": "string" },
         "mime": { "type": "string" },
@@ -46,20 +69,19 @@
         "tools": { "type": "array", "items": { "type": "string" } },
         "graph": { "type": "string" },
         "entry": { "type": "string" },
-        "expect": true
-      },
-      "additionalProperties": true
+        "expect": {}
+      }
     },
     "output": {
       "type": "object",
       "required": ["from"],
+      "additionalProperties": true,
       "properties": {
         "from": { "type": "string" },
+        "schema": {},
         "type": { "type": "string" },
-        "mime": { "type": "string" },
-        "schema": true
-      },
-      "additionalProperties": true
+        "mime": { "type": "string" }
+      }
     }
   }
 }

package/examples/run-resource.circuitry.yaml

@@ -1,24 +0,0 @@
-circuitry: "0.4"
-title: Run resource
-inputs:
-  user_turn:
-    type: text
-    required: true
-entry: assistant
-resources:
-  user_turn:
-    type: input
-    from: user_turn
-  recovered_context:
-    type: run
-    graph: ./context-recovery.circuitry.yaml
-    entry: recovery
-    inputs:
-      user_turn: user_turn
-  assistant:
-    type: agent
-    inputs: [user_turn, recovered_context]
-    instructions: Answer with recovered context when useful.
-outputs:
-  response:
-    from: assistant