agency-lang 0.0.7 → 0.0.9

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

@@ -1,4 +1,4 @@
-import { AgencyComment, AgencyProgram, Assignment, Literal, PromptLiteral, TypeAlias, TypeHint } from "../types.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";
 import { FunctionCall, FunctionDefinition } from "../types/function.js";
@@ -20,6 +20,7 @@ export declare class AgencyGenerator extends BaseGenerator {
     protected generateImports(): string;
     protected preprocess(): string;
     protected postprocess(): string;
+    protected aliasedTypeToString(aliasedType: VariableType): string;
     protected processTypeAlias(node: TypeAlias): string;
     protected processTypeHint(node: TypeHint): string;
     protected processAssignment(node: Assignment): string;

package/dist/lib/backends/agencyGenerator.js

@@ -6,8 +6,8 @@ export class AgencyGenerator extends BaseGenerator {
     constructor() {
         super();
     }
-    indent() {
-        return " ".repeat(this.indentLevel * this.indentSize);
+    indent(level = this.indentLevel) {
+        return " ".repeat(level * this.indentSize);
     }
     increaseIndent() {
         this.indentLevel++;
@@ -28,10 +28,26 @@ export class AgencyGenerator extends BaseGenerator {
     postprocess() {
         return "";
     }
+    aliasedTypeToString(aliasedType) {
+        if (aliasedType.type === "objectType") {
+            const props = aliasedType.properties
+                .map((prop) => {
+                let str = `${this.indent(this.indentLevel + 1)}`;
+                str += `${prop.key}: ${this.aliasedTypeToString(prop.value)}`;
+                if (prop.description) {
+                    str += ` # ${prop.description}`;
+                }
+                return str;
+            })
+                .join(";\n");
+            return `{\n${props}\n}`;
+        }
+        return variableTypeToString(aliasedType, this.typeAliases);
+    }
     // Type system methods
     processTypeAlias(node) {
         this.typeAliases[node.aliasName] = node.aliasedType;
-        const aliasedTypeStr = variableTypeToString(node.aliasedType, this.typeAliases);
+        const aliasedTypeStr = this.aliasedTypeToString(node.aliasedType);
         return this.indentStr(`type ${node.aliasName} = ${aliasedTypeStr}\n`);
     }
     processTypeHint(node) {

package/dist/lib/backends/typescriptGenerator.js

@@ -19,7 +19,9 @@ export class TypeScriptGenerator extends BaseGenerator {
     processTypeAlias(node) {
         this.typeAliases[node.aliasName] = node.aliasedType;
         const typeAliasStr = this.typeAliasToString(node);
-        this.generatedTypeAliases.push(typeAliasStr);
+        if (!this.generatedTypeAliases.includes(typeAliasStr)) {
+            this.generatedTypeAliases.push(typeAliasStr);
+        }
         return "";
     }
     typeAliasToString(node) {

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\";\n\nconst statelogHost = \"http://localhost:1065\";\nconst traceId = nanoid();\nconst statelogClient = new StatelogClient({host: statelogHost, tid: traceId});\nconst model = \"gpt-4.1-nano-2025-04-14\";\n\nconst openai = new OpenAI({\n  apiKey: process.env.OPENAI_API_KEY,\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\nconst client = getClient({\n  openAiApiKey: process.env.OPENAI_API_KEY || \"\",\n  googleApiKey: process.env.GEMINI_API_KEY || \"\",\n  model,\n  logLevel: \"warn\",\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  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,17 +7,28 @@ 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, 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 model = "gpt-4.1-nano-2025-04-14";
+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 openai = new OpenAI({
-  apiKey: process.env.OPENAI_API_KEY,
+const client = getClient({
+  openAiApiKey: process.env.OPENAI_API_KEY || "",
+  googleApiKey: process.env.GEMINI_API_KEY || "",
+  model,
+  logLevel: "warn",
 });
 
 type State = {
@@ -31,8 +42,7 @@ const graphConfig = {
     log: true,
     logData: true,
   },
-  statelogHost,
-  traceId
+  statelog: statelogConfig,
 };
 
 // Define the names of the nodes in the graph
@@ -40,7 +50,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/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,4 +1,4 @@
-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:any[] = [{ role: \"user\", content: prompt }];\n  const tools = {{{tools}}};\n\n  let completion = await openai.chat.completions.create({\n    model,\n    messages,\n    tools,\n    response_format: zodResponseFormat(z.object({\n      value: {{{zodSchema:string}}}\n    }), \"{{{variableName:string}}}_response\"),\n  });\n  const endTime = performance.now();\n  statelogClient.promptCompletion({\n    messages,\n    completion,\n    model,\n    timeTaken: endTime - startTime,\n  });\n\n  let responseMessage = completion.choices[0].message;\n  // Handle function calls\n  while (responseMessage.tool_calls && responseMessage.tool_calls.length > 0) {\n    // Add assistant's response with tool calls to message history\n    messages.push(responseMessage);\n    let toolCallStartTime, toolCallEndTime;\n\n    // Process each tool call\n    for (const toolCall of responseMessage.tool_calls) {\n      {{{functionCalls:string}}}\n    }\n\n    const nextStartTime = performance.now();\n    // Get the next response from the model\n    completion = await openai.chat.completions.create({\n      model,\n      messages: messages,\n      tools: tools,\n    });\n    const nextEndTime = performance.now();\n\n    statelogClient.promptCompletion({\n      messages,\n      completion,\n      model,\n      timeTaken: nextEndTime - nextStartTime,\n    });\n\n    responseMessage = completion.choices[0].message;\n  }\n\n  // Add final assistant response to history\n  messages.push(responseMessage);\n\n  try {\n  const result = JSON.parse(completion.choices[0].message.content || \"\");\n  return result.value;\n  } catch (e) {\n    return completion.choices[0].message.content;\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  // Need to make sure this is always an object\n  const responseFormat = z.object({\n     response: {{{zodSchema:string}}}\n  });\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.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}\n";
 export type TemplateType = {
     variableName: string;
     argsStr: string;

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

@@ -6,17 +6,20 @@ export const template = `
 async function _{{{variableName:string}}}({{{argsStr:string}}}): Promise<{{{typeString:string}}}> {
   const prompt = {{{promptCode:string}}};
   const startTime = performance.now();
-  const messages:any[] = [{ role: "user", content: prompt }];
+  const messages: Message[] = [userMessage(prompt)];
   const tools = {{{tools}}};
 
-  let completion = await openai.chat.completions.create({
-    model,
+  // Need to make sure this is always an object
+  const responseFormat = z.object({
+     response: {{{zodSchema:string}}}
+  });
+
+  let completion = await client.text({
     messages,
     tools,
-    response_format: zodResponseFormat(z.object({
-      value: {{{zodSchema:string}}}
-    }), "{{{variableName:string}}}_response"),
+    responseFormat,
   });
+
   const endTime = performance.now();
   statelogClient.promptCompletion({
     messages,
@@ -25,25 +28,32 @@ async function _{{{variableName:string}}}({{{argsStr:string}}}): Promise<{{{type
     timeTaken: endTime - startTime,
   });
 
-  let responseMessage = completion.choices[0].message;
+  if (!completion.success) {
+    throw new Error(
+      \`Error getting response from $\{model\}: $\{completion.error\}\`
+    );
+  }
+
+  let responseMessage = completion.value;
+
   // Handle function calls
-  while (responseMessage.tool_calls && responseMessage.tool_calls.length > 0) {
+  while (responseMessage.toolCalls.length > 0) {
     // Add assistant's response with tool calls to message history
-    messages.push(responseMessage);
+    messages.push(assistantMessage(responseMessage.output));
     let toolCallStartTime, toolCallEndTime;
 
     // Process each tool call
-    for (const toolCall of responseMessage.tool_calls) {
+    for (const toolCall of responseMessage.toolCalls) {
       {{{functionCalls:string}}}
     }
 
     const nextStartTime = performance.now();
-    // Get the next response from the model
-    completion = await openai.chat.completions.create({
-      model,
-      messages: messages,
-      tools: tools,
+    let completion = await client.text({
+      messages,
+      tools,
+      responseFormat,
     });
+
     const nextEndTime = performance.now();
 
     statelogClient.promptCompletion({
@@ -53,17 +63,22 @@ async function _{{{variableName:string}}}({{{argsStr:string}}}): Promise<{{{type
       timeTaken: nextEndTime - nextStartTime,
     });
 
-    responseMessage = completion.choices[0].message;
+    if (!completion.success) {
+      throw new Error(
+        \`Error getting response from $\{model\}: $\{completion.error\}\`
+      );
+    }
+    responseMessage = completion.value;
   }
 
   // Add final assistant response to history
-  messages.push(responseMessage);
+  messages.push(assistantMessage(responseMessage.output));
 
   try {
-  const result = JSON.parse(completion.choices[0].message.content || "");
-  return result.value;
+  const result = JSON.parse(responseMessage.output || "");
+  return result.response;
   } catch (e) {
-    return completion.choices[0].message.content;
+    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;

package/dist/scripts/agency.js

@@ -155,6 +155,7 @@ async function main() {
             }
             format(fmtContents, verbose);
             break;
+        case "ast":
         case "parse":
             let contents;
             if (filteredArgs.length < 2) {

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.7",
+  "version": "0.0.9",
   "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,8 +43,9 @@
     "egonlog": "^0.0.2",
     "nanoid": "^5.1.6",
     "openai": "^6.15.0",
-    "simplemachine": "github:egonSchiele/simplemachine",
-    "statelog-client": "^0.0.28",
+    "piemachine": "^0.0.2",
+    "smoltalk": "^0.0.8",
+    "statelog-client": "^0.0.31",
     "tarsec": "^0.1.1",
     "typestache": "^0.4.4",
     "zod": "^4.2.1"