agency-lang 0.0.64 → 0.0.66

package/README.md

@@ -1,6 +1,13 @@
 # Agency
 Agent Definition Language
 
+```ts
+node main() {
+  result = llm("Say hello to world")
+  return result
+}
+```
+
 ## Usage
 
 Add agency to a project:

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

@@ -16,6 +16,7 @@ import { BaseGenerator } from "./baseGenerator.js";
 import { AgencyConfig } from "../config.js";
 import { MessageThread } from "../types/messageThread.js";
 import { Skill } from "../types/skill.js";
+import { BinOpExpression } from "../types/binop.js";
 export declare class AgencyGenerator extends BaseGenerator {
     private indentLevel;
     private indentSize;
@@ -68,5 +69,6 @@ export declare class AgencyGenerator extends BaseGenerator {
     protected processNewLine(_node: NewLine): string;
     protected processMessageThread(node: MessageThread): string;
     protected processSkill(node: Skill): string;
+    protected processBinOpExpression(node: BinOpExpression): string;
 }
 export declare function generateAgency(program: AgencyProgram): string;

package/dist/lib/backends/agencyGenerator.js

@@ -90,6 +90,8 @@ export class AgencyGenerator extends BaseGenerator {
                 return this.generateMultiLineStringLiteral(literal);
             case "prompt":
                 return this.indentStr(this.generatePromptLiteral(literal));
+            case "boolean":
+                return literal.value ? "true" : "false";
             default:
                 return "";
         }
@@ -430,6 +432,9 @@ export class AgencyGenerator extends BaseGenerator {
     processSkill(node) {
         return this.indentStr(`skill "${node.filepath}"`);
     }
+    processBinOpExpression(node) {
+        return `${this.processNode(node.left).trim()} ${node.operator} ${this.processNode(node.right).trim()}`;
+    }
 }
 export function generateAgency(program) {
     const generator = new AgencyGenerator();

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

@@ -15,6 +15,7 @@ import { WhileLoop } from "../types/whileLoop.js";
 import { AgencyConfig } from "../config.js";
 import { MessageThread } from "../types/messageThread.js";
 import { Skill } from "../types/skill.js";
+import { BinOpExpression } from "../types/binop.js";
 export declare class BaseGenerator {
     protected typeHints: TypeHintMap;
     protected graphNodes: GraphNodeDefinition[];
@@ -44,6 +45,7 @@ export declare class BaseGenerator {
     protected collectFunctionSignature(node: FunctionDefinition): void;
     protected processGraphNodeName(node: GraphNodeDefinition): void;
     protected processNode(node: AgencyNode): string;
+    protected processBinOpExpression(node: BinOpExpression): string;
     protected processSkill(node: Skill): string;
     protected processMessageThread(node: MessageThread): string;
     protected processNewLine(_node: NewLine): string;

package/dist/lib/backends/baseGenerator.js

@@ -130,6 +130,7 @@ export class BaseGenerator {
             case "string":
             case "variableName":
             case "prompt":
+            case "boolean":
                 // Standalone literals at top level
                 return this.generateLiteral(node);
             case "returnStatement":
@@ -169,10 +170,15 @@ export class BaseGenerator {
                 return this.processMessageThread(node);
             case "skill":
                 return this.processSkill(node);
+            case "binOpExpression":
+                return this.processBinOpExpression(node);
             default:
                 throw new Error(`Unhandled Agency node type: ${node.type}`);
         }
     }
+    processBinOpExpression(node) {
+        return "processBinOpExpression not implemented";
+    }
     processSkill(node) {
         return "processSkill not implemented";
     }

package/dist/lib/backends/graphGenerator.js

@@ -22,6 +22,9 @@ export class GraphGenerator extends TypeScriptGenerator {
     }
     configDefaults() {
         return {
+            log: {
+                host: "https://agency-lang.com",
+            },
             client: {
                 logLevel: "warn",
                 defaultModel: "gpt-4o-mini",
@@ -133,6 +136,9 @@ export class GraphGenerator extends TypeScriptGenerator {
       return "generateLiteral not implemented";
     } */
     generateImports() {
+        /* if (this.agencyConfig.verbose) {
+          console.log("Generating imports with config:", this.agencyConfig);
+        } */
         const args = {
             logHost: this.agencyConfig.log?.host || "",
             logProjectId: this.agencyConfig.log?.projectId || "",
@@ -141,6 +147,10 @@ export class GraphGenerator extends TypeScriptGenerator {
             logDebugMode: this.agencyConfig.log?.debugMode || false,
             clientLogLevel: this.agencyConfig.client?.logLevel || "warn",
             clientDefaultModel: this.agencyConfig.client?.defaultModel || "gpt-4o-mini",
+            hasOpenAiApiKey: !!this.agencyConfig.client?.openAiApiKey,
+            clientOpenAiApiKey: this.agencyConfig.client?.openAiApiKey || undefined,
+            hasGoogleApiKey: !!this.agencyConfig.client?.googleApiKey,
+            clientGoogleApiKey: this.agencyConfig.client?.googleApiKey || undefined,
         };
         const arr = [renderImports.default(args)];
         arr.push(builtinTools.default({}));
@@ -173,11 +183,6 @@ export class GraphGenerator extends TypeScriptGenerator {
             const defaultImportName = this.agencyFileToDefaultImportName(importNode.agencyFile);
             lines.push(`graph.merge(${defaultImportName});`);
         });
-        if (this.graphNodes.map((n) => n.nodeName).includes("main")) {
-            lines.push(renderStartNode.default({
-                startNode: "main",
-            }));
-        }
         for (const node of this.graphNodes) {
             const args = node.parameters;
             const argsStr = args.map((arg) => arg.name).join(", ");
@@ -187,6 +192,11 @@ export class GraphGenerator extends TypeScriptGenerator {
                 argsStr,
             }));
         }
+        if (this.graphNodes.map((n) => n.nodeName).includes("main")) {
+            lines.push(renderStartNode.default({
+                startNode: "main",
+            }));
+        }
         lines.push("export default graph;");
         return lines.join("\n");
     }

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

@@ -15,6 +15,7 @@ import { BaseGenerator } from "./baseGenerator.js";
 import { AgencyConfig } from "../config.js";
 import { MessageThread } from "../types/messageThread.js";
 import { Skill } from "../types/skill.js";
+import { BinOpExpression } from "../types/binop.js";
 export declare class TypeScriptGenerator extends BaseGenerator {
     protected currentMessageThreadNodeId: string[];
     constructor(args?: {
@@ -78,6 +79,7 @@ export declare class TypeScriptGenerator extends BaseGenerator {
     protected processAwaitStatement(node: AwaitStatement): string;
     protected processMessageThread(node: MessageThread, varName?: string): string;
     protected processSkill(node: Skill): string;
+    protected processBinOpExpression(node: BinOpExpression): string;
     protected processBodyAsParts(body: AgencyNode[]): string[];
 }
 export declare function generateTypeScript(program: AgencyProgram, config?: AgencyConfig): string;

package/dist/lib/backends/typescriptGenerator.js

@@ -93,7 +93,7 @@ export class TypeScriptGenerator extends BaseGenerator {
         }
     }
     processMatchBlock(node) {
-        let lines = [`switch (${this.generateLiteral(node.expression)}) {`];
+        let lines = [`switch (${this.processNode(node.expression)}) {`];
         for (const caseItem of node.cases) {
             if (caseItem.type === "comment") {
                 lines.push(`  // ${caseItem.content}`);
@@ -310,6 +310,8 @@ export class TypeScriptGenerator extends BaseGenerator {
                 return `${this.scopetoString(literal.scope)}.${literal.value}`;
             case "prompt":
                 return this.processPromptLiteral(DEFAULT_PROMPT_NAME, this.getScopeReturnType(), literal);
+            case "boolean":
+                return literal.value ? "true" : "false";
         }
     }
     getScopeReturnType() {
@@ -452,7 +454,7 @@ export class TypeScriptGenerator extends BaseGenerator {
             .join("\n");
         const clientConfig = prompt.config ? this.processNode(prompt.config) : "{}";
         const metadataObj = `{
-      messages: __self.messages_${this.currentMessageThreadNodeId.at(-1)}.getMessages(),
+      messages: __self.messages_${this.currentMessageThreadNodeId.at(-1)}?.getMessages(),
     }`;
         const scopedFunctionArgs = functionArgs.map((arg) => {
             // Find the scope for this interpolated variable from the prompt segments
@@ -582,6 +584,9 @@ export class TypeScriptGenerator extends BaseGenerator {
     processSkill(node) {
         return "";
     }
+    processBinOpExpression(node) {
+        return `${this.processNode(node.left).trim()} ${node.operator} ${this.processNode(node.right).trim()}`;
+    }
     /* This generates the body of a node or function separated into multiple parts.
     You can think of a part as roughly corresponding to a single statement
     (although some statements don't need their own parts, such as a newlines or type definitions).

package/dist/lib/cli/evaluate.js

@@ -3,6 +3,9 @@ import { getNodesOfType } from "../utils/node.js";
 import fs from "fs";
 import { nanoid } from "nanoid";
 import prompts from "prompts";
+const onCancel = () => {
+    process.exit(0);
+};
 import { executeNode, formatTypeHint, parseTarget, pickANode, promptForTarget, } from "./util.js";
 function readFile(filename) {
     const data = fs.readFileSync(filename);
@@ -48,7 +51,7 @@ async function createArgsFileInteractively(filename, selectedNode) {
             type: "text",
             name: "name",
             message: "Case name (optional, press enter to skip):",
-        });
+        }, { onCancel });
         const args = {};
         for (const param of selectedNode.parameters) {
             const typeLabel = param.typeHint
@@ -58,7 +61,7 @@ async function createArgsFileInteractively(filename, selectedNode) {
                 type: "text",
                 name: "value",
                 message: `Value for ${param.name}${typeLabel}:`,
-            });
+            }, { onCancel });
             if (argResponse.value === undefined)
                 break;
             args[param.name] = parseArgValue(argResponse.value);
@@ -73,7 +76,7 @@ async function createArgsFileInteractively(filename, selectedNode) {
             name: "more",
             message: "Add another case?",
             initial: true,
-        });
+        }, { onCancel });
         addMore = moreResponse.more === true;
     }
     const argsFile = { cases };
@@ -120,7 +123,7 @@ export async function evaluate(config, target, argsFilePath, resultsFilePath) {
             name: "filename",
             message: "Args file name:",
             initial: defaultFilename,
-        });
+        }, { onCancel });
         if (!filenameResponse.filename)
             return;
         if (fs.existsSync(filenameResponse.filename)) {
@@ -176,7 +179,7 @@ export async function evaluate(config, target, argsFilePath, resultsFilePath) {
             name: "rating",
             message: "Rate this output (1-5):",
             validate: (v) => v >= 1 && v <= 5 ? true : "Rating must be between 1 and 5",
-        });
+        }, { onCancel });
         if (ratingResponse.rating === undefined) {
             console.log("\nEvaluation cancelled.");
             break;

package/dist/lib/cli/remoteRun.js

@@ -1,6 +1,8 @@
 import { getStatelogClient } from "../statelogClient.js";
 import { getImportsRecursively } from "./util.js";
 import fs from "fs";
+import { parseAgency } from "../parser.js";
+import { exit } from "process";
 export async function remoteRun(config, filename) {
     const client = getStatelogClient({
         host: config.log?.host || "http://localhost:1065",
@@ -13,6 +15,16 @@ export async function remoteRun(config, filename) {
         name: file,
         contents: fs.readFileSync(file, "utf-8"),
     }));
+    const parsed = files.map((file) => {
+        return parseAgency(file.contents, config);
+    });
+    const errors = parsed
+        .filter((p) => p.success === false)
+        .map((p) => p.message);
+    if (errors.length > 0) {
+        console.error("Errors parsing agency files:", errors);
+        exit(1);
+    }
     const result = await client.remoteRun({
         files,
         entrypoint: filename,

package/dist/lib/cli/test.js

@@ -33,6 +33,9 @@ function writeTestCase(agencyFilename, nodeName, input, expectedOutput, evaluati
     fs.writeFileSync(testFilePath, JSON.stringify(tests, null, 2));
     return testFilePath;
 }
+const onCancel = () => {
+    process.exit(0);
+};
 export async function fixtures(config, target) {
     let { filename, nodeName } = target
         ? parseTarget(target)
@@ -79,7 +82,7 @@ export async function fixtures(config, target) {
                 { title: "Reject", value: "reject" },
                 { title: "Modify arguments", value: "modify" },
             ],
-        });
+        }, { onCancel });
         if (!actionResponse.action) {
             console.log("Interrupt handling cancelled.");
             return;
@@ -95,7 +98,7 @@ export async function fixtures(config, target) {
                     type: "text",
                     name: "args",
                     message: "Enter modified arguments as JSON object:",
-                });
+                }, { onCancel });
                 if (!modifyResponse.args) {
                     console.log("Interrupt handling cancelled.");
                     return;
@@ -128,7 +131,7 @@ export async function fixtures(config, target) {
         name: "correct",
         message: "Does this output look correct?",
         initial: true,
-    });
+    }, { onCancel });
     let expectedOutput;
     if (correctResponse.correct) {
         expectedOutput = JSON.stringify(json.data);
@@ -138,7 +141,7 @@ export async function fixtures(config, target) {
             type: "text",
             name: "expected",
             message: "What should the correct output look like?",
-        });
+        }, { onCancel });
         expectedOutput = expectedResponse.expected;
     }
     const criteriaResponse = await prompts({
@@ -149,7 +152,7 @@ export async function fixtures(config, target) {
             { title: "Exact match", value: "exact" },
             { title: "LLM Judge", value: "llmJudge" },
         ],
-    });
+    }, { onCancel });
     let criteria;
     if (criteriaResponse.criteria === "exact") {
         criteria = [{ type: "exact" }];
@@ -167,7 +170,7 @@ export async function fixtures(config, target) {
                 message: "Desired accuracy (0-100):",
                 initial: 80,
             },
-        ]);
+        ], { onCancel });
         criteria = [
             {
                 type: "llmJudge",

package/dist/lib/cli/util.js

@@ -1,4 +1,7 @@
 import prompts from "prompts";
+const onCancel = () => {
+    process.exit(0);
+};
 import fs, { readFileSync } from "fs";
 import path from "path";
 import { execSync } from "child_process";
@@ -35,7 +38,7 @@ export async function promptForTarget() {
         name: "filename",
         message: "Select an Agency file to read:",
         choices: choices,
-    });
+    }, { onCancel });
     filename = response.filename;
     // If user chose custom option, prompt for filename
     if (filename === "__custom__") {
@@ -43,7 +46,7 @@ export async function promptForTarget() {
             type: "text",
             name: "filename",
             message: "Enter the filename to read:",
-        });
+        }, { onCancel });
         filename = customResponse.filename;
     }
     return { filename, nodeName };
@@ -57,7 +60,7 @@ export async function pickANode(nodes) {
             title: node.nodeName,
             value: node.nodeName,
         })),
-    });
+    }, { onCancel });
     return response.node;
 }
 export async function promptForArgs(selectedNode) {
@@ -70,7 +73,7 @@ export async function promptForArgs(selectedNode) {
             name: "provideArgs",
             message: `This node has parameters (${paramNames}). Provide arguments?`,
             initial: true,
-        });
+        }, { onCancel });
         if (confirmArgs.provideArgs) {
             const argValues = [];
             for (const param of selectedNode.parameters) {
@@ -81,7 +84,7 @@ export async function promptForArgs(selectedNode) {
                     type: "text",
                     name: "value",
                     message: `Value for ${param.name}${typeLabel}:`,
-                });
+                }, { onCancel });
                 argValues.push(serializeArgValue(argResponse.value));
             }
             argsString = argValues.join(", ");

package/dist/lib/config.d.ts

@@ -47,9 +47,12 @@ export interface AgencyConfig {
         debugMode: boolean;
         apiKey: string;
     }>;
+    /** Smoltalk client config */
     client?: Partial<{
         logLevel: "error" | "warn" | "info" | "debug";
         defaultModel: string;
+        openAiApiKey: string;
+        googleApiKey: string;
     }>;
     /**
      * If true, untyped variables are errors.

package/dist/lib/parser.js

@@ -12,8 +12,9 @@ import { usesToolParser } from "./parsers/tools.js";
 import { typeAliasParser, typeHintParser } from "./parsers/typeHints.js";
 import { skillParser } from "./parsers/skill.js";
 import { nanoid } from "nanoid";
+import { binOpParser } from "./parsers/binop.js";
 export const agencyNode = (input) => {
-    const parser = many(trace("agencyParser", or(usesToolParser, importNodeStatmentParser, importToolStatmentParser, importStatmentParser, graphNodeParser, typeAliasParser, ifParser, whileLoopParser, typeHintParser, matchBlockParser, timeBlockParser, messageThreadParser, skillParser, streamingPromptLiteralParser, functionParser, returnStatementParser, specialVarParser, accessExpressionParser, assignmentParser, llmPromptFunctionCallParser, functionCallParser, commentParser, newLineParser)));
+    const parser = many(trace("agencyParser", or(usesToolParser, importNodeStatmentParser, importToolStatmentParser, importStatmentParser, graphNodeParser, typeAliasParser, ifParser, whileLoopParser, typeHintParser, matchBlockParser, timeBlockParser, messageThreadParser, skillParser, streamingPromptLiteralParser, functionParser, returnStatementParser, specialVarParser, assignmentParser, binOpParser, accessExpressionParser, llmPromptFunctionCallParser, functionCallParser, commentParser, newLineParser)));
     return parser(input);
 };
 export const agencyParser = seqC(set("type", "agencyProgram"), capture(agencyNode, "nodes"), eof);

package/dist/lib/parsers/assignment.test.js

@@ -107,7 +107,7 @@ describe("assignmentParser", () => {
                 result: {
                     type: "assignment",
                     variableName: "_privateVar",
-                    value: { type: "variableName", value: "true" },
+                    value: { type: "boolean", value: true },
                 },
             },
         },
@@ -312,7 +312,7 @@ describe("assignmentParser", () => {
                     type: "assignment",
                     variableName: "isActive",
                     typeHint: { type: "primitiveType", value: "boolean" },
-                    value: { type: "variableName", value: "true" },
+                    value: { type: "boolean", value: true },
                 },
             },
         },

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

@@ -0,0 +1,3 @@
+import { BinOpExpression } from "../types/binop.js";
+import { Parser } from "tarsec";
+export declare const binOpParser: Parser<BinOpExpression>;

package/dist/lib/parsers/binop.js

@@ -0,0 +1,8 @@
+import { capture, oneOf, or, seqC, set, str, trace } from "tarsec";
+import { simpleLiteralParser } from "./literals.js";
+import { optionalSemicolon } from "./parserUtils.js";
+import { optionalSpaces } from "./utils.js";
+export const binOpParser = (input) => {
+    const parser = trace("binOpParser", seqC(set("type", "binOpExpression"), capture(simpleLiteralParser, "left"), optionalSpaces, capture(or(str("=="), str("!="), str("<="), str(">="), oneOf("+-*/<>")), "operator"), optionalSpaces, capture(simpleLiteralParser, "right"), optionalSemicolon));
+    return parser(input);
+};

package/dist/lib/parsers/binop.test.d.ts

@@ -0,0 +1 @@
+export {};