agency-lang 0.0.13 → 0.0.15

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

@@ -18,6 +18,7 @@ export declare class GraphGenerator extends TypeScriptGenerator {
     protected processFunctionCall(node: FunctionCall): string;
     protected generateNodeCallExpression(node: FunctionCall): string;
     protected generateImports(): string;
+    protected preprocess(): string;
     protected postprocess(): string;
 }
 export declare function generateGraph(program: AgencyProgram): string;

package/dist/lib/backends/graphGenerator.js

@@ -282,6 +282,9 @@ export class GraphGenerator extends TypeScriptGenerator {
         arr.push(builtinTools.default({}));
         return arr.join("\n");
     }
+    preprocess() {
+        return "// @ts-nocheck\n";
+    }
     postprocess() {
         const lines = [];
         Object.keys(this.adjacentNodes).forEach((node) => {

package/dist/lib/backends/typescriptGenerator.js

@@ -161,14 +161,17 @@ export class TypeScriptGenerator extends BaseGenerator {
                 type: "primitiveType",
                 value: "string",
             };
-            const tsType = variableTypeToString(typeHint, this.typeAliases);
-            properties[param] = { type: tsType, description: "" };
+            const tsType = mapTypeToZodSchema(typeHint, this.typeAliases);
+            properties[param] = tsType;
         });
+        let schema = "";
+        for (const [key, value] of Object.entries(properties)) {
+            schema += `"${key}": ${value}, `;
+        }
         return renderTool.default({
             name: functionName,
             description: node.docString?.value || "No description provided.",
-            properties: Object.keys(properties).length > 0 ? JSON.stringify(properties) : "{}",
-            requiredParameters: parameters.map((p) => `"${p}"`).join(","),
+            schema: Object.keys(properties).length > 0 ? `{${schema}}` : "{}",
         });
     }
     processUsesTool(node) {

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

@@ -1,4 +1,4 @@
-export declare const template = "function add({a, b}: {a:number, b:number}):number {\n  return a + b;\n}\n\n// Define the function tool for OpenAI\nconst addTool = {\n    type: \"function\" as const,\n    function: {\n      name: \"add\",\n      description:\n        \"Adds two numbers together and returns the result.\",\n      parameters: {\n        type: \"object\",\n        properties: {\n          a: {\n            type: \"number\",\n            description: \"The first number to add\",\n          },\n          b: {\n            type: \"number\",\n            description: \"The second number to add\",\n          },\n        },\n        required: [\"a\", \"b\"],\n        additionalProperties: false,\n      },\n    },\n  };";
+export declare const template = "function add({a, b}: {a:number, b:number}):number {\n  return a + b;\n}\n\nconst addTool = {\n  name: \"add\",\n  description: \"Adds two numbers together and returns the result.\",\n  schema: z.object({\n    a: z.number().describe(\"The first number to add\"),\n    b: z.number().describe(\"The second number to add\"),\n  }),\n};\n";
 export type TemplateType = {};
 declare const render: (args: TemplateType) => string;
 export default render;

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

@@ -6,30 +6,15 @@ export const template = `function add({a, b}: {a:number, b:number}):number {
   return a + b;
 }
 
-// Define the function tool for OpenAI
 const addTool = {
-    type: "function" as const,
-    function: {
-      name: "add",
-      description:
-        "Adds two numbers together and returns the result.",
-      parameters: {
-        type: "object",
-        properties: {
-          a: {
-            type: "number",
-            description: "The first number to add",
-          },
-          b: {
-            type: "number",
-            description: "The second number to add",
-          },
-        },
-        required: ["a", "b"],
-        additionalProperties: false,
-      },
-    },
-  };`;
+  name: "add",
+  description: "Adds two numbers together and returns the result.",
+  schema: z.object({
+    a: z.number().describe("The first number to add"),
+    b: z.number().describe("The second number to add"),
+  }),
+};
+`;
 const render = (args) => {
     return apply(template, args);
 };

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

@@ -1,4 +1,4 @@
-export declare const template = "// @ts-nocheck\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: ModelName = \"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: __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 declare const template = "import { 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, toolMessage } 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: ModelName = \"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: __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

@@ -2,14 +2,13 @@
 // Source: lib/templates/backends/graphGenerator/imports.mustache
 // Any manual changes will be lost.
 import { apply } from "typestache";
-export const template = `// @ts-nocheck
-import { z } from "zod";
+export const template = `import { z } from "zod";
 import * as readline from "readline";
 import fs from "fs";
 import { PieMachine, goToNode } from "piemachine";
 import { StatelogClient } from "statelog-client";
 import { nanoid } from "nanoid";
-import { assistantMessage, getClient, userMessage } from "smoltalk";
+import { assistantMessage, getClient, userMessage, toolMessage } from "smoltalk";
 
 const statelogHost = "https://statelog.adit.io";
 const traceId = nanoid();

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: 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: __messages,\n    tools: __tools,\n    responseFormat: __responseFormat,\n  });\n\n  const endTime = performance.now();\n  statelogClient.promptCompletion({\n    messages: __messages,\n    completion: __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: __messages,\n      tools: __tools,\n      responseFormat: __responseFormat,\n    });\n\n    const nextEndTime = performance.now();\n\n    statelogClient.promptCompletion({\n      messages: __messages,\n      completion: __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  {{#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 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: __messages,\n    tools: __tools,\n    responseFormat: __responseFormat,\n  });\n\n  const endTime = performance.now();\n  statelogClient.promptCompletion({\n    messages: __messages,\n    completion: __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, { toolCalls: responseMessage.toolCalls }));\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: __messages,\n      tools: __tools,\n      responseFormat: __responseFormat,\n    });\n\n    const nextEndTime = performance.now();\n\n    statelogClient.promptCompletion({\n      messages: __messages,\n      completion: __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, { toolCalls: responseMessage.toolCalls }));\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;

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

@@ -44,7 +44,7 @@ async function _{{{variableName:string}}}({{{argsStr:string}}}): Promise<{{{type
   // Handle function calls
   while (responseMessage.toolCalls.length > 0) {
     // Add assistant's response with tool calls to message history
-    __messages.push(assistantMessage(responseMessage.output));
+    __messages.push(assistantMessage(responseMessage.output, { toolCalls: responseMessage.toolCalls }));
     let toolCallStartTime, toolCallEndTime;
 
     // Process each tool call
@@ -77,7 +77,7 @@ async function _{{{variableName:string}}}({{{argsStr:string}}}): Promise<{{{type
   }
 
   // Add final assistant response to history
-  __messages.push(assistantMessage(responseMessage.output));
+  __messages.push(assistantMessage(responseMessage.output, { toolCalls: responseMessage.toolCalls }));
   {{#hasResponseFormat}}
   try {
   const result = JSON.parse(responseMessage.output || "");

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

@@ -1,9 +1,8 @@
-export declare const template = "const {{{name:string}}}Tool: OpenAI.Chat.Completions.ChatCompletionTool = {\n    type: \"function\",\n    function: {\n      name: \"{{{name:string}}}\",\n      description:\n        \"{{{description:string}}}\",\n      parameters: {\n        type: \"object\",\n        properties: {{{properties:string}}},\n        required: [{{{requiredParameters:string}}}],\n        additionalProperties: false,\n      },\n    },\n  };\n";
+export declare const template = "const {{{name:string}}}Tool = {\n  name: \"{{{name:string}}}\",\n  description: \"{{{description:string}}}\",\n  schema: z.object({{{schema:string}}})\n};\n";
 export type TemplateType = {
     name: string;
     description: string;
-    properties: string;
-    requiredParameters: string;
+    schema: string;
 };
 declare const render: (args: TemplateType) => string;
 export default render;

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

@@ -2,20 +2,11 @@
 // Source: lib/templates/backends/typescriptGenerator/tool.mustache
 // Any manual changes will be lost.
 import { apply } from "typestache";
-export const template = `const {{{name:string}}}Tool: OpenAI.Chat.Completions.ChatCompletionTool = {
-    type: "function",
-    function: {
-      name: "{{{name:string}}}",
-      description:
-        "{{{description:string}}}",
-      parameters: {
-        type: "object",
-        properties: {{{properties:string}}},
-        required: [{{{requiredParameters:string}}}],
-        additionalProperties: false,
-      },
-    },
-  };
+export const template = `const {{{name:string}}}Tool = {
+  name: "{{{name:string}}}",
+  description: "{{{description:string}}}",
+  schema: z.object({{{schema:string}}})
+};
 `;
 const render = (args) => {
     return apply(template, args);

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

@@ -1,4 +1,4 @@
-export declare const template = "if (toolCall.type === \"function\" &&\n  toolCall.function.name === \"{{{name:string}}}\"\n) {\n  const args = JSON.parse(toolCall.function.arguments);\n\n  toolCallStartTime = performance.now();\n  const result = await {{{name}}}(args);\n  toolCallEndTime = performance.now();\n\n  console.log(\"Tool '{{{name:string}}}' called with arguments:\", args);\n  console.log(\"Tool '{{{name:string}}}' returned result:\", result);\n\nstatelogClient.toolCall({\n    toolName: \"{{{name:string}}}\",\n    args,\n    output: result,\n    model: __client.getModel(),\n    timeTaken: toolCallEndTime - toolCallStartTime,\n  });\n\n  // Add function result to messages\n  __messages.push({\n    role: \"tool\",\n    tool_call_id: toolCall.id,\n    content: JSON.stringify(result),\n  });\n}";
+export declare const template = "if (\n  toolCall.name === \"{{{name:string}}}\"\n) {\n  const args = toolCall.arguments;\n\n  toolCallStartTime = performance.now();\n  const result = await {{{name}}}(args);\n  toolCallEndTime = performance.now();\n\n  console.log(\"Tool '{{{name:string}}}' called with arguments:\", args);\n  console.log(\"Tool '{{{name:string}}}' returned result:\", result);\n\nstatelogClient.toolCall({\n    toolName: \"{{{name:string}}}\",\n    args,\n    output: result,\n    model: __client.getModel(),\n    timeTaken: toolCallEndTime - toolCallStartTime,\n  });\n\n  // Add function result to messages\n  __messages.push(toolMessage(result, {\n            tool_call_id: toolCall.id,\n            name: toolCall.name,\n      }));\n}";
 export type TemplateType = {
     name: string;
 };

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

@@ -2,10 +2,10 @@
 // Source: lib/templates/backends/typescriptGenerator/toolCall.mustache
 // Any manual changes will be lost.
 import { apply } from "typestache";
-export const template = `if (toolCall.type === "function" &&
-  toolCall.function.name === "{{{name:string}}}"
+export const template = `if (
+  toolCall.name === "{{{name:string}}}"
 ) {
-  const args = JSON.parse(toolCall.function.arguments);
+  const args = toolCall.arguments;
 
   toolCallStartTime = performance.now();
   const result = await {{{name}}}(args);
@@ -23,11 +23,10 @@ statelogClient.toolCall({
   });
 
   // Add function result to messages
-  __messages.push({
-    role: "tool",
-    tool_call_id: toolCall.id,
-    content: JSON.stringify(result),
-  });
+  __messages.push(toolMessage(result, {
+            tool_call_id: toolCall.id,
+            name: toolCall.name,
+      }));
 }`;
 const render = (args) => {
     return apply(template, args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agency-lang",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "The Agency language",
   "main": "lib/index.js",
   "scripts": {
@@ -41,6 +41,7 @@
   "homepage": "https://github.com/egonSchiele/agency-lang#readme",
   "dependencies": {
     "egonlog": "^0.0.2",
+    "smoltalk": "^0.0.11",
     "tarsec": "^0.1.1",
     "typestache": "^0.4.4",
     "zod": "^4.3.5"
@@ -49,7 +50,6 @@
     "@types/node": "^25.0.3",
     "nanoid": "^5.1.6",
     "piemachine": "^0.0.2",
-    "smoltalk": "^0.0.11",
     "statelog-client": "^0.0.31",
     "tsc-alias": "^1.8.16",
     "typescript": "^5.9.3",