agency-lang 0.0.8 → 0.0.10

package/dist/lib/backends/agencyGenerator.d.ts

@@ -1,3 +1,4 @@
+import { SpecialVar } from "../types/specialVar.js";
 import { AgencyComment, AgencyProgram, Assignment, Literal, PromptLiteral, TypeAlias, TypeHint, VariableType } from "../types.js";
 import { AccessExpression, DotFunctionCall, DotProperty, IndexAccess } from "../types/access.js";
 import { AgencyArray, AgencyObject } from "../types/dataStructures.js";
@@ -44,6 +45,7 @@ export declare class AgencyGenerator extends BaseGenerator {
     protected processGraphNode(node: GraphNodeDefinition): string;
     protected processTool(node: FunctionDefinition): string;
     protected processUsesTool(node: UsesTool): string;
+    protected processSpecialVar(node: SpecialVar): string;
     private indentStr;
 }
 export declare function generateAgency(program: AgencyProgram): string;

package/dist/lib/backends/agencyGenerator.js

@@ -58,7 +58,7 @@ export class AgencyGenerator extends BaseGenerator {
     // Assignment and literals
     processAssignment(node) {
         const valueCode = this.processNode(node.value).trim();
-        return this.indentStr(`${node.variableName} = ${valueCode}\n\n`);
+        return this.indentStr(`${node.variableName} = ${valueCode}\n`);
     }
     generateLiteral(literal) {
         switch (literal.type) {
@@ -106,9 +106,12 @@ export class AgencyGenerator extends BaseGenerator {
         // Process body with increased indentation
         this.increaseIndent();
         this.functionScopedVariables = [...parameters];
+        const lines = [];
         for (const stmt of body) {
-            result += this.processNode(stmt);
+            lines.push(this.processNode(stmt));
         }
+        const bodyCode = lines.join("").trimEnd() + "\n";
+        result += bodyCode;
         this.functionScopedVariables = [];
         this.decreaseIndent();
         // Close function
@@ -204,10 +207,10 @@ export class AgencyGenerator extends BaseGenerator {
     }
     // Utility methods
     processComment(node) {
-        return this.indentStr(`// ${node.content}\n`);
+        return this.indentStr(`//${node.content}\n`);
     }
     processImportStatement(node) {
-        return this.indentStr(`import {${node.importedNames}} from "${node.modulePath}"\n`);
+        return this.indentStr(`import ${node.importedNames}from ${node.modulePath}`);
     }
     processGraphNode(node) {
         // Graph nodes use similar syntax to functions
@@ -216,9 +219,12 @@ export class AgencyGenerator extends BaseGenerator {
         let result = this.indentStr(`node ${nodeName}(${params}) {\n`);
         this.increaseIndent();
         this.functionScopedVariables = [...parameters];
+        const lines = [];
         for (const stmt of body) {
-            result += this.processNode(stmt);
+            lines.push(this.processNode(stmt));
         }
+        const bodyCode = lines.join("").trimEnd() + "\n";
+        result += bodyCode;
         this.functionScopedVariables = [];
         this.decreaseIndent();
         result += this.indentStr(`}\n`);
@@ -234,6 +240,9 @@ export class AgencyGenerator extends BaseGenerator {
         this.toolsUsed.push(node.toolName);
         return this.indentStr(`+${node.toolName}\n`);
     }
+    processSpecialVar(node) {
+        return this.indentStr(`@${node.name} = ${this.processNode(node.value).trim()}\n`);
+    }
     indentStr(str) {
         return `${this.indent()}${str}`;
     }

package/dist/lib/backends/baseGenerator.d.ts

@@ -1,3 +1,4 @@
+import { SpecialVar } from "../types/specialVar.js";
 import { AgencyComment, AgencyNode, AgencyProgram, Assignment, Literal, PromptLiteral, TypeAlias, TypeHint, TypeHintMap, VariableType } from "../types.js";
 import { AccessExpression, DotFunctionCall, DotProperty, IndexAccess } from "../types/access.js";
 import { AgencyArray, AgencyObject } from "../types/dataStructures.js";
@@ -5,6 +6,7 @@ import { FunctionCall, FunctionDefinition } from "../types/function.js";
 import { GraphNodeDefinition } from "../types/graphNode.js";
 import { ImportStatement } from "../types/importStatement.js";
 import { MatchBlock } from "../types/matchBlock.js";
+import { ReturnStatement } from "../types/returnStatement.js";
 import { UsesTool } from "../types/tools.js";
 import { WhileLoop } from "../types/whileLoop.js";
 export declare class BaseGenerator {
@@ -28,6 +30,7 @@ export declare class BaseGenerator {
     protected collectFunctionSignature(node: FunctionDefinition): void;
     protected processGraphNodeName(node: GraphNodeDefinition): void;
     protected processNode(node: AgencyNode): string;
+    protected processSpecialVar(node: SpecialVar): string;
     protected processWhileLoop(node: WhileLoop): string;
     protected processImportStatement(node: ImportStatement): string;
     protected processTool(node: FunctionDefinition): string;
@@ -36,7 +39,7 @@ export declare class BaseGenerator {
     protected processAgencyObject(node: AgencyObject): string;
     protected processAgencyArray(node: AgencyArray): string;
     protected processComment(node: AgencyComment): string;
-    protected processReturnStatement(node: AgencyNode): string;
+    protected processReturnStatement(node: ReturnStatement): string;
     protected processAccessExpression(node: AccessExpression): string;
     protected processMatchBlock(node: MatchBlock): string;
     protected processDotProperty(node: DotProperty): string;

package/dist/lib/backends/baseGenerator.js

@@ -54,7 +54,7 @@ export class BaseGenerator {
         output.push(this.generatedStatements.join(""));
         output.push(this.postprocess() + "\n");
         return {
-            output: output.filter(Boolean).join("\n"),
+            output: output.filter((line) => line.trim() !== "").join("\n"),
         };
     }
     generateBuiltins() {
@@ -111,10 +111,15 @@ export class BaseGenerator {
                 return "";
             case "whileLoop":
                 return this.processWhileLoop(node);
+            case "specialVar":
+                return this.processSpecialVar(node);
             default:
                 throw new Error(`Unhandled Agency node type: ${node.type}`);
         }
     }
+    processSpecialVar(node) {
+        return "processSpecialVar not implemented";
+    }
     processWhileLoop(node) {
         return "processWhileLoop not implemented";
     }

package/dist/lib/backends/graphGenerator.d.ts

@@ -1,7 +1,7 @@
 import { AgencyProgram, FunctionCall, TypeHintMap, VariableType } from "../types.js";
-import { TypeScriptGenerator } from "./typescriptGenerator.js";
 import { GraphNodeDefinition } from "../types/graphNode.js";
 import { ReturnStatement } from "../types/returnStatement.js";
+import { TypeScriptGenerator } from "./typescriptGenerator.js";
 export declare class GraphGenerator extends TypeScriptGenerator {
     protected typeHints: TypeHintMap;
     protected generatedStatements: string[];

package/dist/lib/backends/graphGenerator.js

@@ -1,9 +1,10 @@
+import * as builtinTools from "../templates/backends/graphGenerator/builtinTools.js";
 import * as renderConditionalEdge from "../templates/backends/graphGenerator/conditionalEdge.js";
+import * as goToNode from "../templates/backends/graphGenerator/goToNode.js";
+import * as graphNode from "../templates/backends/graphGenerator/graphNode.js";
 import * as renderImports from "../templates/backends/graphGenerator/imports.js";
 import * as renderStartNode from "../templates/backends/graphGenerator/startNode.js";
-import * as graphNode from "../templates/backends/graphGenerator/graphNode.js";
-import * as builtinTools from "../templates/backends/graphGenerator/builtinTools.js";
-import * as goToNode from "../templates/backends/graphGenerator/goToNode.js";
+import * as renderRunNodeFunction from "../templates/backends/graphGenerator/runNodeFunction.js";
 import { TypeScriptGenerator } from "./typescriptGenerator.js";
 import { mapFunctionName } from "./typescriptGenerator/builtins.js";
 export class GraphGenerator extends TypeScriptGenerator {
@@ -293,12 +294,17 @@ export class GraphGenerator extends TypeScriptGenerator {
                 toNodes: JSON.stringify(adjacent),
             }));
         });
-        if (!this.graphNodes.includes("main")) {
-            throw new Error("No entrypoint found for agent: missing 'main' node. Please create a node named 'main'.");
+        if (this.graphNodes.includes("main")) {
+            lines.push(renderStartNode.default({
+                startNode: "main",
+            }));
+        }
+        for (const node of this.graphNodes) {
+            lines.push(renderRunNodeFunction.default({
+                nodeName: node,
+            }));
         }
-        lines.push(renderStartNode.default({
-            startNode: "main",
-        }));
+        lines.push("export default graph;");
         return lines.join("\n");
     }
 }

package/dist/lib/backends/typescriptGenerator/builtins.js

@@ -1,5 +1,6 @@
 import * as builtinFunctionsInput from "../../templates/backends/typescriptGenerator/builtinFunctions/input.js";
 import * as builtinFunctionsRead from "../../templates/backends/typescriptGenerator/builtinFunctions/read.js";
+import * as builtinFunctionsReadImage from "../../templates/backends/typescriptGenerator/builtinFunctions/readImage.js";
 import * as builtinFunctionsFetchJSON from "../../templates/backends/typescriptGenerator/builtinFunctions/fetchJSON.js";
 import * as builtinFunctionsFetch from "../../templates/backends/typescriptGenerator/builtinFunctions/fetch.js";
 /**
@@ -9,6 +10,7 @@ export const BUILTIN_FUNCTIONS = {
     print: "console.log",
     input: "_builtinInput",
     read: "_builtinRead",
+    readImage: "_builtinReadImage",
     write: "fs.writeFileSync",
     fetch: "_builtinFetch",
     fetchJSON: "_builtinFetchJSON",
@@ -42,5 +44,9 @@ export function generateBuiltinHelpers(functionsUsed) {
         const fetchFunc = builtinFunctionsFetch.default({});
         helpers.push(fetchFunc);
     }
+    if (functionsUsed.has("readImage")) {
+        const readImageFunc = builtinFunctionsReadImage.default({});
+        helpers.push(readImageFunc);
+    }
     return helpers.join("\n\n");
 }

package/dist/lib/backends/typescriptGenerator/typeToZodSchema.d.ts

@@ -1,4 +1,5 @@
 import { VariableType } from "../../types.js";
+export declare const DEFAULT_SCHEMA = "z.string()";
 /**
  * Maps Agency types to Zod schema strings
  */

package/dist/lib/backends/typescriptGenerator/typeToZodSchema.js

@@ -1,4 +1,5 @@
 import { escape } from "../../utils.js";
+export const DEFAULT_SCHEMA = "z.string()";
 /**
  * Maps Agency types to Zod schema strings
  */
@@ -8,12 +9,12 @@ export function mapTypeToZodSchema(variableType, typeAliases) {
             case "number":
                 return "z.number()";
             case "string":
-                return "z.string()";
+                return DEFAULT_SCHEMA;
             case "boolean":
                 return "z.boolean()";
             default:
                 // Default to string for unknown types
-                return "z.string()";
+                return DEFAULT_SCHEMA;
         }
     }
     else if (variableType.type === "arrayType") {

package/dist/lib/backends/typescriptGenerator.d.ts

@@ -8,6 +8,7 @@ import { ReturnStatement } from "../types/returnStatement.js";
 import { UsesTool } from "../types/tools.js";
 import { ImportStatement } from "../types/importStatement.js";
 import { WhileLoop } from "../types/whileLoop.js";
+import { SpecialVar } from "../types/specialVar.js";
 export declare class TypeScriptGenerator extends BaseGenerator {
     constructor();
     protected generateBuiltins(): string;
@@ -52,5 +53,6 @@ export declare class TypeScriptGenerator extends BaseGenerator {
     }): string;
     protected processImportStatement(node: ImportStatement): string;
     protected processWhileLoop(node: WhileLoop): string;
+    protected processSpecialVar(node: SpecialVar): string;
 }
 export declare function generateTypeScript(program: AgencyProgram): string;

package/dist/lib/backends/typescriptGenerator.js

@@ -3,11 +3,12 @@ import * as promptFunction from "../templates/backends/typescriptGenerator/promp
 import * as renderTool from "../templates/backends/typescriptGenerator/tool.js";
 import * as renderToolCall from "../templates/backends/typescriptGenerator/toolCall.js";
 import * as renderFunctionDefinition from "../templates/backends/typescriptGenerator/functionDefinition.js";
+import * as renderSpecialVar from "../templates/backends/graphGenerator/specialVar.js";
 import { escape, zip } from "../utils.js";
 import { BaseGenerator } from "./baseGenerator.js";
 import { generateBuiltinHelpers, mapFunctionName, } from "./typescriptGenerator/builtins.js";
 import { variableTypeToString } from "./typescriptGenerator/typeToString.js";
-import { mapTypeToZodSchema } from "./typescriptGenerator/typeToZodSchema.js";
+import { DEFAULT_SCHEMA, mapTypeToZodSchema, } from "./typescriptGenerator/typeToZodSchema.js";
 import * as builtinTools from "../templates/backends/typescriptGenerator/builtinTools.js";
 export class TypeScriptGenerator extends BaseGenerator {
     constructor() {
@@ -318,6 +319,7 @@ export class TypeScriptGenerator extends BaseGenerator {
             argsStr,
             typeString,
             promptCode,
+            hasResponseFormat: zodSchema !== DEFAULT_SCHEMA,
             zodSchema,
             tools,
             functionCalls,
@@ -335,6 +337,18 @@ export class TypeScriptGenerator extends BaseGenerator {
         const bodyCodeStr = bodyCodes.join("\n");
         return `while (${conditionCode}) {\n${bodyCodeStr}\n}\n`;
     }
+    processSpecialVar(node) {
+        const value = this.processNode(node.value);
+        switch (node.name) {
+            case "model":
+                return renderSpecialVar.default({
+                    name: "model",
+                    value,
+                });
+            default:
+                throw new Error(`Unhandled SpecialVar name: ${node.name}`);
+        }
+    }
 }
 export function generateTypeScript(program) {
     const generator = new TypeScriptGenerator();

package/dist/lib/parser.js

@@ -10,8 +10,9 @@ import { matchBlockParser } from "./parsers/matchBlock.js";
 import { returnStatementParser } from "./parsers/returnStatement.js";
 import { usesToolParser } from "./parsers/tools.js";
 import { EgonLog } from "egonlog";
+import { specialVarParser } from "./parsers/specialVar.js";
 export const agencyNode = (input) => {
-    const parser = sepBy(spaces, trace("agencyParser", or(usesToolParser, importStatmentParser, graphNodeParser, typeAliasParser, whileLoopParser, typeHintParser, matchBlockParser, functionParser, returnStatementParser, accessExpressionParser, assignmentParser, functionCallParser, commentParser)));
+    const parser = sepBy(spaces, trace("agencyParser", or(usesToolParser, importStatmentParser, graphNodeParser, typeAliasParser, whileLoopParser, typeHintParser, matchBlockParser, functionParser, returnStatementParser, specialVarParser, accessExpressionParser, assignmentParser, functionCallParser, commentParser)));
     return parser(input);
 };
 export const agencyParser = seqC(set("type", "agencyProgram"), capture(agencyNode, "nodes"), eof);

package/dist/lib/parsers/function.js

@@ -10,10 +10,11 @@ import { typeAliasParser, typeHintParser } from "./typeHints.js";
 import { comma, optionalSpaces, varNameChar } from "./utils.js";
 import { returnStatementParser } from "./returnStatement.js";
 import { usesToolParser } from "./tools.js";
+import { specialVarParser } from "./specialVar.js";
 const trim = (s) => s.trim();
 export const docStringParser = trace("docStringParser", seqC(set("type", "docString"), str('"""'), capture(map(many1Till(str('"""')), trim), "value"), str('"""')));
 export const bodyParser = trace("functionBodyParser", (input) => {
-    const parser = sepBy(spaces, or(usesToolParser, debug(typeAliasParser, "error in typeAliasParser"), debug(typeHintParser, "error in typeHintParser"), returnStatementParser, whileLoopParser, matchBlockParser, functionParser, accessExpressionParser, assignmentParser, functionCallParser, literalParser, commentParser));
+    const parser = sepBy(spaces, or(usesToolParser, debug(typeAliasParser, "error in typeAliasParser"), debug(typeHintParser, "error in typeHintParser"), specialVarParser, returnStatementParser, whileLoopParser, matchBlockParser, functionParser, accessExpressionParser, assignmentParser, functionCallParser, literalParser, commentParser));
     const result = parser(input);
     return result;
 });

package/dist/lib/parsers/specialVar.d.ts

@@ -0,0 +1,4 @@
+import { SpecialVar, SpecialVarName } from "../types/specialVar.js";
+import { Parser } from "tarsec";
+export declare const specialVarNameParser: Parser<SpecialVarName>;
+export declare const specialVarParser: Parser<SpecialVar>;

package/dist/lib/parsers/specialVar.js

@@ -0,0 +1,8 @@
+import { specialVarNames, } from "../types/specialVar.js";
+import { capture, char, or, seqC, set, str } from "tarsec";
+import { optionalSpaces } from "./utils.js";
+import { literalParser } from "./literals.js";
+import { agencyArrayParser, agencyObjectParser } from "./dataStructures.js";
+import { optionalSemicolon } from "./parserUtils.js";
+export const specialVarNameParser = or(...specialVarNames.map((name) => str(name)));
+export const specialVarParser = seqC(set("type", "specialVar"), char("@"), capture(specialVarNameParser, "name"), optionalSpaces, char("="), optionalSpaces, capture(or(agencyObjectParser, agencyArrayParser, literalParser), "value"), optionalSemicolon);

package/dist/lib/templates/backends/graphGenerator/imports.d.ts

@@ -1,4 +1,4 @@
-export declare const template = "import OpenAI from \"openai\";\nimport { zodResponseFormat } from \"openai/helpers/zod\";\nimport { z } from \"zod\";\nimport * as readline from \"readline\";\nimport fs from \"fs\";\nimport { Graph, goToNode } from \"simplemachine\";\nimport { StatelogClient } from \"statelog-client\";\nimport { nanoid } from \"nanoid\";\nimport { assistantMessage, getClient, Message, userMessage } from \"smoltalk\";\n\nconst statelogHost = \"http://localhost:1065\";\nconst traceId = nanoid();\nconst statelogClient = new StatelogClient({host: statelogHost, tid: traceId});\nconst model = \"gpt-4o-mini\";\n\nconst client = getClient({\n  apiKey: process.env.OPENAI_API_KEY || \"\",\n  model,\n});\n\ntype State = {\n  messages: string[];\n  data: any;\n}\n\n// enable debug logging\nconst graphConfig = {\n  debug: {\n    log: true,\n    logData: true,\n  },\n  statelogHost,\n  traceId\n};\n\n// Define the names of the nodes in the graph\n// Useful for type safety\nconst nodes = {{{nodes:string}}} as const;\ntype Node = (typeof nodes)[number];\n\nconst graph = new Graph<State, Node>(nodes, graphConfig);";
+export declare const template = "import OpenAI from \"openai\";\nimport { zodResponseFormat } from \"openai/helpers/zod\";\nimport { z } from \"zod\";\nimport * as readline from \"readline\";\nimport fs from \"fs\";\nimport { PieMachine, goToNode } from \"piemachine\";\nimport { StatelogClient } from \"statelog-client\";\nimport { nanoid } from \"nanoid\";\nimport { assistantMessage, getClient, userMessage } from \"smoltalk\";\n\nconst statelogHost = \"https://statelog.adit.io\";\nconst traceId = nanoid();\nconst statelogConfig = {\n    host: statelogHost,\n    traceId: traceId,\n    apiKey: process.env.STATELOG_API_KEY || \"\",\n    projectId: \"agency-lang\",\n    debugMode: false,\n  };\nconst statelogClient = new StatelogClient(statelogConfig);\nconst model = \"gpt-4o-mini\";\n\n\nconst getClientWithConfig = (config = {}) => {\n  const defaultConfig = {\n    openAiApiKey: process.env.OPENAI_API_KEY || \"\",\n    googleApiKey: process.env.GEMINI_API_KEY || \"\",\n    model,\n    logLevel: \"warn\",\n  };\n\n  return getClient({ ...defaultConfig, ...config });\n};\n\nlet client = getClientWithConfig();\n\ntype State = {\n  messages: string[];\n  data: any;\n}\n\n// enable debug logging\nconst graphConfig = {\n  debug: {\n    log: true,\n    logData: true,\n  },\n  statelog: statelogConfig,\n};\n\n// Define the names of the nodes in the graph\n// Useful for type safety\nconst nodes = {{{nodes:string}}} as const;\ntype Node = (typeof nodes)[number];\n\nconst graph = new PieMachine<State, Node>(nodes, graphConfig);";
 export type TemplateType = {
     nodes: string;
 };

package/dist/lib/templates/backends/graphGenerator/imports.js

@@ -7,20 +7,36 @@ import { zodResponseFormat } from "openai/helpers/zod";
 import { z } from "zod";
 import * as readline from "readline";
 import fs from "fs";
-import { Graph, goToNode } from "simplemachine";
+import { PieMachine, goToNode } from "piemachine";
 import { StatelogClient } from "statelog-client";
 import { nanoid } from "nanoid";
-import { assistantMessage, getClient, Message, userMessage } from "smoltalk";
+import { assistantMessage, getClient, userMessage } from "smoltalk";
 
-const statelogHost = "http://localhost:1065";
+const statelogHost = "https://statelog.adit.io";
 const traceId = nanoid();
-const statelogClient = new StatelogClient({host: statelogHost, tid: traceId});
+const statelogConfig = {
+    host: statelogHost,
+    traceId: traceId,
+    apiKey: process.env.STATELOG_API_KEY || "",
+    projectId: "agency-lang",
+    debugMode: false,
+  };
+const statelogClient = new StatelogClient(statelogConfig);
 const model = "gpt-4o-mini";
 
-const client = getClient({
-  apiKey: process.env.OPENAI_API_KEY || "",
-  model,
-});
+
+const getClientWithConfig = (config = {}) => {
+  const defaultConfig = {
+    openAiApiKey: process.env.OPENAI_API_KEY || "",
+    googleApiKey: process.env.GEMINI_API_KEY || "",
+    model,
+    logLevel: "warn",
+  };
+
+  return getClient({ ...defaultConfig, ...config });
+};
+
+let client = getClientWithConfig();
 
 type State = {
   messages: string[];
@@ -33,8 +49,7 @@ const graphConfig = {
     log: true,
     logData: true,
   },
-  statelogHost,
-  traceId
+  statelog: statelogConfig,
 };
 
 // Define the names of the nodes in the graph
@@ -42,7 +57,7 @@ const graphConfig = {
 const nodes = {{{nodes:string}}} as const;
 type Node = (typeof nodes)[number];
 
-const graph = new Graph<State, Node>(nodes, graphConfig);`;
+const graph = new PieMachine<State, Node>(nodes, graphConfig);`;
 const render = (args) => {
     return apply(template, args);
 };

package/dist/lib/templates/backends/graphGenerator/runNodeFunction.d.ts

@@ -0,0 +1,6 @@
+export declare const template = "export async function {{{nodeName:string}}}(data) {\n  const result = await graph.run(\"{{{nodeName:string}}}\", { messages: [], data });\n  return result.data;\n}\n";
+export type TemplateType = {
+    nodeName: string;
+};
+declare const render: (args: TemplateType) => string;
+export default render;

package/dist/lib/templates/backends/graphGenerator/runNodeFunction.js

@@ -0,0 +1,13 @@
+// THIS FILE WAS AUTO-GENERATED
+// Source: lib/templates/backends/graphGenerator/runNodeFunction.mustache
+// Any manual changes will be lost.
+import { apply } from "typestache";
+export const template = `export async function {{{nodeName:string}}}(data) {
+  const result = await graph.run("{{{nodeName:string}}}", { messages: [], data });
+  return result.data;
+}
+`;
+const render = (args) => {
+    return apply(template, args);
+};
+export default render;

package/dist/lib/templates/backends/graphGenerator/specialVar.d.ts

@@ -0,0 +1,7 @@
+export declare const template = "client = getClientWithConfig({ {{{name}}}: {{{value}}} });";
+export type TemplateType = {
+    name: string | boolean | number;
+    value: string | boolean | number;
+};
+declare const render: (args: TemplateType) => string;
+export default render;

package/dist/lib/templates/backends/graphGenerator/specialVar.js

@@ -0,0 +1,9 @@
+// THIS FILE WAS AUTO-GENERATED
+// Source: lib/templates/backends/graphGenerator/specialVar.mustache
+// Any manual changes will be lost.
+import { apply } from "typestache";
+export const template = `client = getClientWithConfig({ {{{name}}}: {{{value}}} });`;
+const render = (args) => {
+    return apply(template, args);
+};
+export default render;

package/dist/lib/templates/backends/typescriptGenerator/builtinFunctions/readImage.d.ts

@@ -0,0 +1,4 @@
+export declare const template = "/*\n * @param filePath The absolute or relative path to the image file.\n * @returns The Base64 string, or null if an error occurs.\n */\nfunction _builtinReadImage(filePath: string): string {\n    const data = fs.readFileSync(filePath); // Synchronous file reading\n    const base64String = data.toString('base64');\n    return base64String;\n}";
+export type TemplateType = {};
+declare const render: (args: TemplateType) => string;
+export default render;

package/dist/lib/templates/backends/typescriptGenerator/builtinFunctions/readImage.js

@@ -0,0 +1,17 @@
+// THIS FILE WAS AUTO-GENERATED
+// Source: lib/templates/backends/typescriptGenerator/builtinFunctions/readImage.mustache
+// Any manual changes will be lost.
+import { apply } from "typestache";
+export const template = `/*
+ * @param filePath The absolute or relative path to the image file.
+ * @returns The Base64 string, or null if an error occurs.
+ */
+function _builtinReadImage(filePath: string): string {
+    const data = fs.readFileSync(filePath); // Synchronous file reading
+    const base64String = data.toString('base64');
+    return base64String;
+}`;
+const render = (args) => {
+    return apply(template, args);
+};
+export default render;

package/dist/lib/templates/backends/typescriptGenerator/imports.d.ts

@@ -1,4 +1,4 @@
-export declare const template = "import OpenAI from \"openai\";\nimport { zodResponseFormat } from \"openai/helpers/zod\";\nimport { z } from \"zod\";\nimport * as readline from \"readline\";\nimport fs from \"fs\";\nimport { StatelogClient } from \"statelog-client\";\nimport { nanoid } from \"nanoid\";\n\nconst statelogHost = \"http://localhost:1065\";\nconst traceId = nanoid();\nconst statelogClient = new StatelogClient({host: statelogHost, tid: traceId});\n\nconst model = \"gpt-5-nano-2025-08-07\";\n\nconst openai = new OpenAI({\n  apiKey: process.env.OPENAI_API_KEY,\n});";
+export declare const template = "import OpenAI from \"openai\";\nimport { zodResponseFormat } from \"openai/helpers/zod\";\nimport { z } from \"zod\";\nimport * as readline from \"readline\";\nimport fs from \"fs\";\nimport { StatelogClient } from \"statelog-client\";\nimport { nanoid } from \"nanoid\";\n\nconst statelogHost = \"http://localhost:1065\";\nconst traceId = nanoid();\nconst statelogClient = new StatelogClient({\n    host: statelogHost,\n    traceId: traceId,\n    apiKey: process.env.STATELOG_API_KEY || \"\",\n    projectId: \"agency-lang\",\n    debugMode: true,\n  });\n\nconst model = \"gpt-5-nano-2025-08-07\";\n\nconst openai = new OpenAI({\n  apiKey: process.env.OPENAI_API_KEY,\n});";
 export type TemplateType = {};
 declare const render: (args: TemplateType) => string;
 export default render;

package/dist/lib/templates/backends/typescriptGenerator/imports.js

@@ -12,7 +12,13 @@ import { nanoid } from "nanoid";
 
 const statelogHost = "http://localhost:1065";
 const traceId = nanoid();
-const statelogClient = new StatelogClient({host: statelogHost, tid: traceId});
+const statelogClient = new StatelogClient({
+    host: statelogHost,
+    traceId: traceId,
+    apiKey: process.env.STATELOG_API_KEY || "",
+    projectId: "agency-lang",
+    debugMode: true,
+  });
 
 const model = "gpt-5-nano-2025-08-07";
 

package/dist/lib/templates/backends/typescriptGenerator/promptFunction.d.ts

@@ -1,10 +1,11 @@
-export declare const template = "\nasync function _{{{variableName:string}}}({{{argsStr:string}}}): Promise<{{{typeString:string}}}> {\n  const prompt = {{{promptCode:string}}};\n  const startTime = performance.now();\n  const messages: Message[] = [userMessage(prompt)];\n  const tools = {{{tools}}};\n\n  const responseFormat = {{{zodSchema:string}}};\n\n  let completion = await client.text({\n    messages,\n    tools,\n    responseFormat,\n  });\n\n  const endTime = performance.now();\n  statelogClient.promptCompletion({\n    messages,\n    completion,\n    model,\n    timeTaken: endTime - startTime,\n  });\n\n  if (!completion.success) {\n    throw new Error(\n      `Error getting response from ${model}: ${completion.error}`\n    );\n  }\n\n  let responseMessage = completion.value;\n\n  // Handle function calls\n  while (responseMessage.toolCalls.length > 0) {\n    // Add assistant's response with tool calls to message history\n    messages.push(assistantMessage(responseMessage.output));\n    let toolCallStartTime, toolCallEndTime;\n\n    // Process each tool call\n    for (const toolCall of responseMessage.toolCalls) {\n      {{{functionCalls:string}}}\n    }\n\n    const nextStartTime = performance.now();\n    let completion = await client.text({\n      messages,\n      tools,\n      responseFormat,\n    });\n\n    const nextEndTime = performance.now();\n\n    statelogClient.promptCompletion({\n      messages,\n      completion,\n      model,\n      timeTaken: nextEndTime - nextStartTime,\n    });\n\n    if (!completion.success) {\n      throw new Error(\n        `Error getting response from ${model}: ${completion.error}`\n      );\n    }\n    responseMessage = completion.value;\n  }\n\n  // Add final assistant response to history\n  messages.push(assistantMessage(responseMessage.output));\n\n  try {\n  const result = JSON.parse(responseMessage.output || \"\");\n  return result.value;\n  } catch (e) {\n    return responseMessage.output;\n    // console.error(\"Error parsing response for variable '{{{variableName:string}}}':\", e);\n    // console.error(\"Full completion response:\", JSON.stringify(completion, null, 2));\n    // throw e;\n  }\n}\n";
+export declare const template = "\nasync function _{{{variableName:string}}}({{{argsStr:string}}}): Promise<{{{typeString:string}}}> {\n  const prompt = {{{promptCode:string}}};\n  const startTime = performance.now();\n  const messages: Message[] = [userMessage(prompt)];\n  const tools = {{{tools}}};\n\n  {{#hasResponseFormat}}\n  // Need to make sure this is always an object\n  const responseFormat = z.object({\n     response: {{{zodSchema:string}}}\n  });\n  {{/hasResponseFormat}}\n  {{^hasResponseFormat}}\n  const responseFormat = undefined;\n  {{/hasResponseFormat}}\n\n  let completion = await client.text({\n    messages,\n    tools,\n    responseFormat,\n  });\n\n  const endTime = performance.now();\n  statelogClient.promptCompletion({\n    messages,\n    completion,\n    model: client.getModel(),\n    timeTaken: endTime - startTime,\n  });\n\n  if (!completion.success) {\n    throw new Error(\n      `Error getting response from ${model}: ${completion.error}`\n    );\n  }\n\n  let responseMessage = completion.value;\n\n  // Handle function calls\n  while (responseMessage.toolCalls.length > 0) {\n    // Add assistant's response with tool calls to message history\n    messages.push(assistantMessage(responseMessage.output));\n    let toolCallStartTime, toolCallEndTime;\n\n    // Process each tool call\n    for (const toolCall of responseMessage.toolCalls) {\n      {{{functionCalls:string}}}\n    }\n\n    const nextStartTime = performance.now();\n    let completion = await client.text({\n      messages,\n      tools,\n      responseFormat,\n    });\n\n    const nextEndTime = performance.now();\n\n    statelogClient.promptCompletion({\n      messages,\n      completion,\n      model: client.getModel(),\n      timeTaken: nextEndTime - nextStartTime,\n    });\n\n    if (!completion.success) {\n      throw new Error(\n        `Error getting response from ${model}: ${completion.error}`\n      );\n    }\n    responseMessage = completion.value;\n  }\n\n  // Add final assistant response to history\n  messages.push(assistantMessage(responseMessage.output));\n\n  {{#hasResponseFormat}}\n  try {\n  const result = JSON.parse(responseMessage.output || \"\");\n  return result.response;\n  } catch (e) {\n    return responseMessage.output;\n    // console.error(\"Error parsing response for variable '{{{variableName:string}}}':\", e);\n    // console.error(\"Full completion response:\", JSON.stringify(completion, null, 2));\n    // throw e;\n  }\n  {{/hasResponseFormat}}\n\n  {{^hasResponseFormat}}\n  return responseMessage.output;\n  {{/hasResponseFormat}}\n}\n";
 export type TemplateType = {
     variableName: string;
     argsStr: string;
     typeString: string;
     promptCode: string;
     tools: string | boolean | number;
+    hasResponseFormat: boolean;
     zodSchema: string;
     functionCalls: string;
 };

package/dist/lib/templates/backends/typescriptGenerator/promptFunction.js

@@ -9,7 +9,15 @@ async function _{{{variableName:string}}}({{{argsStr:string}}}): Promise<{{{type
   const messages: Message[] = [userMessage(prompt)];
   const tools = {{{tools}}};
 
-  const responseFormat = {{{zodSchema:string}}};
+  {{#hasResponseFormat}}
+  // Need to make sure this is always an object
+  const responseFormat = z.object({
+     response: {{{zodSchema:string}}}
+  });
+  {{/hasResponseFormat}}
+  {{^hasResponseFormat}}
+  const responseFormat = undefined;
+  {{/hasResponseFormat}}
 
   let completion = await client.text({
     messages,
@@ -21,7 +29,7 @@ async function _{{{variableName:string}}}({{{argsStr:string}}}): Promise<{{{type
   statelogClient.promptCompletion({
     messages,
     completion,
-    model,
+    model: client.getModel(),
     timeTaken: endTime - startTime,
   });
 
@@ -56,7 +64,7 @@ async function _{{{variableName:string}}}({{{argsStr:string}}}): Promise<{{{type
     statelogClient.promptCompletion({
       messages,
       completion,
-      model,
+      model: client.getModel(),
       timeTaken: nextEndTime - nextStartTime,
     });
 
@@ -71,15 +79,21 @@ async function _{{{variableName:string}}}({{{argsStr:string}}}): Promise<{{{type
   // Add final assistant response to history
   messages.push(assistantMessage(responseMessage.output));
 
+  {{#hasResponseFormat}}
   try {
   const result = JSON.parse(responseMessage.output || "");
-  return result.value;
+  return result.response;
   } catch (e) {
     return responseMessage.output;
     // console.error("Error parsing response for variable '{{{variableName:string}}}':", e);
     // console.error("Full completion response:", JSON.stringify(completion, null, 2));
     // throw e;
   }
+  {{/hasResponseFormat}}
+
+  {{^hasResponseFormat}}
+  return responseMessage.output;
+  {{/hasResponseFormat}}
 }
 `;
 const render = (args) => {

package/dist/lib/types/specialVar.d.ts

@@ -0,0 +1,9 @@
+import { AgencyArray, AgencyObject } from "./dataStructures.js";
+import { Literal } from "./literals.js";
+export declare const specialVarNames: readonly ["model"];
+export type SpecialVarName = (typeof specialVarNames)[number];
+export type SpecialVar = {
+    type: "specialVar";
+    name: SpecialVarName;
+    value: Literal | AgencyObject | AgencyArray;
+};

package/dist/lib/types/specialVar.js

@@ -0,0 +1 @@
+export const specialVarNames = ["model"];

package/dist/lib/types.d.ts

@@ -9,6 +9,7 @@ import { ReturnStatement } from "./types/returnStatement.js";
 import { UsesTool } from "./types/tools.js";
 import { ImportStatement } from "./types/importStatement.js";
 import { WhileLoop } from "./types/whileLoop.js";
+import { SpecialVar } from "./types/specialVar.js";
 export * from "./types/access.js";
 export * from "./types/dataStructures.js";
 export * from "./types/function.js";
@@ -29,7 +30,7 @@ export type AgencyComment = {
     type: "comment";
     content: string;
 };
-export type AgencyNode = TypeHint | TypeAlias | UsesTool | GraphNodeDefinition | FunctionDefinition | Assignment | Literal | FunctionCall | MatchBlock | ReturnStatement | AccessExpression | AgencyComment | AgencyObject | AgencyArray | ImportStatement | WhileLoop;
+export type AgencyNode = TypeHint | TypeAlias | UsesTool | GraphNodeDefinition | FunctionDefinition | Assignment | Literal | FunctionCall | MatchBlock | ReturnStatement | AccessExpression | AgencyComment | AgencyObject | AgencyArray | ImportStatement | WhileLoop | SpecialVar;
 export type AgencyProgram = {
     type: "agencyProgram";
     nodes: AgencyNode[];

package/dist/scripts/agency.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { spawn } from "child_process";
 import * as fs from "fs";
+import * as path from "path";
 import { parseAgency } from "../lib/parser.js";
 import { generateGraph } from "../lib/index.js";
 import { generateAgency } from "../lib/backends/agencyGenerator.js";
@@ -70,17 +71,43 @@ function readFile(inputFile) {
     const contents = fs.readFileSync(inputFile, "utf-8");
     return contents;
 }
-function compile(inputFile, outputFile, verbose = false) {
-    // Determine output file name
-    const output = outputFile || inputFile.replace(".agency", ".ts");
+function getImports(program) {
+    return program.nodes
+        .filter((node) => node.type === "importStatement")
+        .filter((importNode) => {
+        const modulePath = importNode.modulePath.trim().replace(/['"]/g, "");
+        return modulePath.includes(".agency");
+    })
+        .map((node) => node.modulePath.trim().replace(/['"]/g, ""));
+}
+const compiledFiles = new Set();
+function compile(inputFile, _outputFile, verbose = false) {
+    // Resolve the absolute path of the input file to avoid duplicates
+    const absoluteInputFile = path.resolve(inputFile);
+    const outputFile = _outputFile || inputFile.replace(".agency", ".ts");
+    // Skip if already compiled
+    if (compiledFiles.has(absoluteInputFile)) {
+        return outputFile;
+    }
+    compiledFiles.add(absoluteInputFile);
     const contents = readFile(inputFile);
     const parsedProgram = parse(contents, verbose);
-    // Generate TypeScript code
+    const imports = getImports(parsedProgram);
+    const inputDir = path.dirname(absoluteInputFile);
+    for (const importPath of imports) {
+        const absPath = path.resolve(inputDir, importPath);
+        compile(absPath, undefined, verbose);
+    }
+    // Update the import path in the AST to reference the new .ts file
+    parsedProgram.nodes.forEach((node) => {
+        if (node.type === "importStatement") {
+            node.modulePath = node.modulePath.replace(".agency", ".ts");
+        }
+    });
     const generatedCode = generateGraph(parsedProgram);
-    // Write to output file
-    fs.writeFileSync(output, generatedCode, "utf-8");
-    console.log(`Generated ${output} from ${inputFile}`);
-    return output;
+    fs.writeFileSync(outputFile, generatedCode, "utf-8");
+    console.log(`Generated ${outputFile} from ${inputFile}`);
+    return outputFile;
 }
 function run(inputFile, outputFile, verbose = false) {
     // Compile the file

package/dist/scripts/regenerate-fixtures.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/scripts/regenerate-fixtures.js

@@ -0,0 +1,36 @@
+#!/usr/bin/env node
+import path, { dirname } from "path";
+import fs from "fs";
+import { generateTypeScript } from "../lib/backends/typescriptGenerator.js";
+import { parseAgency } from "../lib/parser.js";
+import { fileURLToPath } from "url";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const fixturesDir = path.join(__dirname, "../../tests/typescriptGenerator");
+function regenerateFixtures(dir, relativePath = "") {
+    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+        const fullPath = path.join(dir, entry.name);
+        if (entry.isDirectory()) {
+            regenerateFixtures(fullPath, path.join(relativePath, entry.name));
+        }
+        else if (entry.isFile() && entry.name.endsWith(".agency")) {
+            const baseName = entry.name.replace(".agency", "");
+            const mtsPath = path.join(dir, `${baseName}.mts`);
+            const agencyContent = fs.readFileSync(fullPath, "utf-8");
+            const parseResult = parseAgency(agencyContent);
+            if (parseResult.success) {
+                const tsCode = generateTypeScript(parseResult.result);
+                fs.writeFileSync(mtsPath, tsCode, "utf-8");
+                const fixtureRelPath = path.join(relativePath, baseName) || baseName;
+                console.log(`✓ Updated ${fixtureRelPath}.mts`);
+            }
+            else {
+                console.error(`✗ Failed to parse ${fullPath}: ${parseResult.message}`);
+            }
+        }
+    }
+}
+console.log("Regenerating fixture files...\n");
+regenerateFixtures(fixturesDir);
+console.log("\nDone!");

package/dist/scripts/regenerate-graph-fixtures.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/scripts/regenerate-graph-fixtures.js

@@ -0,0 +1,36 @@
+#!/usr/bin/env node
+import path, { dirname } from "path";
+import fs from "fs";
+import { generateGraph } from "../lib/backends/graphGenerator.js";
+import { parseAgency } from "../lib/parser.js";
+import { fileURLToPath } from "url";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const fixturesDir = path.join(__dirname, "../../tests/graphGenerator");
+function regenerateFixtures(dir, relativePath = "") {
+    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+        const fullPath = path.join(dir, entry.name);
+        if (entry.isDirectory()) {
+            regenerateFixtures(fullPath, path.join(relativePath, entry.name));
+        }
+        else if (entry.isFile() && entry.name.endsWith(".agency")) {
+            const baseName = entry.name.replace(".agency", "");
+            const mtsPath = path.join(dir, `${baseName}.mts`);
+            const agencyContent = fs.readFileSync(fullPath, "utf-8");
+            const parseResult = parseAgency(agencyContent);
+            if (parseResult.success) {
+                const graphCode = generateGraph(parseResult.result);
+                fs.writeFileSync(mtsPath, graphCode, "utf-8");
+                const fixtureRelPath = path.join(relativePath, baseName) || baseName;
+                console.log(`✓ Updated ${fixtureRelPath}.mts`);
+            }
+            else {
+                console.error(`✗ Failed to parse ${fullPath}: ${parseResult.message}`);
+            }
+        }
+    }
+}
+console.log("Regenerating graph generator fixture files...\n");
+regenerateFixtures(fixturesDir);
+console.log("\nDone!");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agency-lang",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "The Agency language",
   "main": "lib/index.js",
   "scripts": {
@@ -10,7 +10,8 @@
     "start": "node dist/lib/index.js",
     "templates": "typestache ./lib/templates",
     "typecheck": "tsc --noEmit",
-    "agency": "node ./dist/scripts/agency.js"
+    "agency": "node ./dist/scripts/agency.js",
+    "compile": "node ./dist/scripts/agency.js compile"
   },
   "bin": {
     "agency": "./dist/scripts/agency.js"
@@ -24,9 +25,9 @@
   ],
   "exports": {
     ".": {
+      "types": "./dist/lib/index.d.ts",
       "import": "./dist/lib/index.js",
-      "require": "./dist/lib/index.js",
-      "types": "./dist/lib/index.d.ts"
+      "require": "./dist/lib/index.js"
     }
   },
   "type": "module",
@@ -42,9 +43,9 @@
     "egonlog": "^0.0.2",
     "nanoid": "^5.1.6",
     "openai": "^6.15.0",
-    "simplemachine": "github:egonSchiele/simplemachine",
-    "smoltalk": "^0.0.4",
-    "statelog-client": "^0.0.28",
+    "piemachine": "^0.0.2",
+    "smoltalk": "^0.0.11",
+    "statelog-client": "^0.0.31",
     "tarsec": "^0.1.1",
     "typestache": "^0.4.4",
     "zod": "^4.2.1"