agency-lang 0.0.43 → 0.0.45

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

@@ -71,6 +71,7 @@ export declare class BaseGenerator {
     protected postprocess(): string;
     protected startScope(scope: Scope): void;
     protected endScope(): void;
+    protected getCurrentScope(): Scope;
     protected getScopeVar(): string;
 }
 export {};

package/dist/lib/backends/baseGenerator.js

@@ -261,6 +261,9 @@ export class BaseGenerator {
     endScope() {
         this.currentScope.pop();
     }
+    getCurrentScope() {
+        return this.currentScope[this.currentScope.length - 1];
+    }
     getScopeVar() {
         const currentScope = this.currentScope[this.currentScope.length - 1];
         switch (currentScope) {

package/dist/lib/backends/typescriptGenerator.js

@@ -115,8 +115,13 @@ export class TypeScriptGenerator extends BaseGenerator {
     }
     processAssignment(node) {
         const { variableName, typeHint, value } = node;
-        // Track this variable as in scope
-        this.functionScopedVariables.push(variableName);
+        const _currentScope = this.getCurrentScope();
+        if (_currentScope === "global") {
+            this.globalScopedVariables.push(variableName);
+        }
+        else {
+            this.functionScopedVariables.push(variableName);
+        }
         const typeAnnotation = typeHint
             ? `: ${variableTypeToString(typeHint, this.typeAliases)}`
             : "";

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

@@ -1,4 +1,4 @@
-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, messageFromJSON } from \"smoltalk\";\nimport type { Message } 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\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: false,\n  },\n  statelog: statelogConfig,\n};\n\nconst graph = new PieMachine<State>(graphConfig);\n\n// builtins\n\nconst not = (val: any): boolean => !val;\nconst eq = (a: any, b: any): boolean => a === b;\nconst neq = (a: any, b: any): boolean => a !== b;\nconst lt = (a: any, b: any): boolean => a < b;\nconst lte = (a: any, b: any): boolean => a <= b;\nconst gt = (a: any, b: any): boolean => a > b;\nconst gte = (a: any, b: any): boolean => a >= b;\nconst and = (a: any, b: any): boolean => a && b;\nconst or = (a: any, b: any): boolean => a || b;\nconst head = <T>(arr: T[]): T | undefined => arr[0];\nconst tail = <T>(arr: T[]): T[] => arr.slice(1);\nconst empty = <T>(arr: T[]): boolean => arr.length === 0;\n\n// interrupts\n\nexport type Interrupt<T> = {\n  type: \"interrupt\";\n  data: T;\n  __state?: PackagedState;\n};\n\nexport function interrupt<T>(data: T): Interrupt<T> {\n  return {\n    type: \"interrupt\",\n    data,\n  };\n}\n\nexport function isInterrupt<T>(obj: any): obj is Interrupt<T> {\n  return obj && obj.type === \"interrupt\";\n}\n\nfunction printJSON(obj: any) {\n  console.log(JSON.stringify(obj, null, 2));\n}\n\nexport type InterruptResponseType = InterruptResponseApprove | InterruptResponseReject | InterruptResponseModify;\nexport type InterruptResponseApprove = {\n  type: \"approve\";\n};\nexport type InterruptResponseReject = {\n  type: \"reject\";\n};\nexport type InterruptResponseModify = {\n  type: \"modify\";\n  newArguments: Record<string, any>;\n};\n\n\nexport async function respondToInterrupt(_interrupt: Interrupt, _interruptResponse: InterruptResponseType) {\n  const interrupt = structuredClone(_interrupt);\n  const interruptResponse = structuredClone(_interruptResponse);\n  __stateStack = StateStack.fromJSON(interrupt.__state || {});\n  __stateStack.setMode(\"deserialize\");\n  const messages = (__stateStack.other.messages || []).map((json: any) => {\n    return messageFromJSON(json);\n  });\n\n  const nodesTraversed = __stateStack.other.nodesTraversed || [];\n  const nodeName = nodesTraversed[nodesTraversed.length - 1];\n  const result = await graph.run(nodeName, {\n    messages: messages,\n    __metadata: {\n      graph: graph,\n      statelogClient: __statelogClient,\n      interruptResponse: interruptResponse,\n      state: interrupt.__state,\n      __stateStack: __stateStack,\n    },\n    data: \"<from-stack>\"\n  });\n  //console.log(`Result of graph.run(\"${nodeName}\"):`, JSON.stringify(result, null, 2));\n  return result.data;\n}\n\n\nclass PackagedState {\n  public messages?: Message[];\n  public nodesTraversed?: string[];\n  public toolCall?: Record<string, any>;\n  public step?: number;\n  public self?: Record<string, any>;\n  public global?: Record<string, any>;\n  public args?: any;\n  constructor(_state: Record<string, any>, args?: any) {\n    const state = structuredClone(_state);\n    this.messages = state.messages;\n    this.nodesTraversed = state.graph?.getNodesTraversed();\n    this.toolCall = state.toolCall;\n    this.step = state.part;\n    this.self = state.self;\n    this.global = state.global;\n    this.args = state.args;\n  }\n\n  toJSON() {\n    return {\n      messages: this.messages,\n      nodesTraversed: this.nodesTraversed,\n      toolCall: this.toolCall,\n      step: this.step,\n      self: this.self,\n      global: this.global,\n      args: this.args,\n    };\n  }\n\n  nextStep() {\n    this.step ||= 0;\n    this.step += 1;\n  }\n}\n\n\nclass StateStack {\n  public stack: StateItem[] = [];\n  public mode: \"serialize\" | \"deserialize\" = \"serialize\";\n  public globals: Record<string, any> = {};\n  public other: Record<string, any> = {};\n\n  constructor(stack: StateItem[] = [], mode: \"serialize\" | \"deserialize\" = \"serialize\") {\n    this.stack = stack;\n    this.mode = mode;\n  }\n\n  getNewState(): StateItem | null {\n    if (this.stack.length === 0 && this.mode !== \"serialize\") {\n      console.log(\"Forcing mode to serialize, nothing left to deserialize\");\n      this.mode = \"serialize\";\n    }\n    if (this.mode === \"serialize\") {\n      const newState: StateItem = {\n        args: {},\n        locals: {},\n        step: 0,\n      };\n      this.stack.push(newState);\n      return newState;\n    } else if (this.mode === \"deserialize\") {\n      const item = this.stack.shift();\n      this.stack.push(item);\n      return item;\n    }\n    return null;\n  }\n\n  setMode(mode: \"serialize\" | \"deserialize\") {\n    this.mode = mode;\n  }\n\n  pop(): StateItem | undefined {\n    return this.stack.pop();\n  }\n\n  toJSON() {\n    return structuredClone({\n      stack: this.stack,\n      globals: this.globals,\n      other: this.other,\n      mode: this.mode,\n    });\n  }\n\n  static fromJSON(json: any): StateStack {\n    const stateStack = new StateStack([], \"serialize\");\n    stateStack.stack = json.stack || [];\n    stateStack.globals = json.globals || {};\n    stateStack.other = json.other || {};\n    stateStack.mode = json.mode || \"serialize\";\n    return stateStack;\n  }\n}\n\nlet __stateStack = new StateStack();";
+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, messageFromJSON } from \"smoltalk\";\nimport type { Message } 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\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: false,\n  },\n  statelog: statelogConfig,\n};\n\nconst graph = new PieMachine<State>(graphConfig);\n\n// builtins\n\nconst not = (val: any): boolean => !val;\nconst eq = (a: any, b: any): boolean => a === b;\nconst neq = (a: any, b: any): boolean => a !== b;\nconst lt = (a: any, b: any): boolean => a < b;\nconst lte = (a: any, b: any): boolean => a <= b;\nconst gt = (a: any, b: any): boolean => a > b;\nconst gte = (a: any, b: any): boolean => a >= b;\nconst and = (a: any, b: any): boolean => a && b;\nconst or = (a: any, b: any): boolean => a || b;\nconst head = <T>(arr: T[]): T | undefined => arr[0];\nconst tail = <T>(arr: T[]): T[] => arr.slice(1);\nconst empty = <T>(arr: T[]): boolean => arr.length === 0;\n\n// interrupts\n\nexport type Interrupt<T> = {\n  type: \"interrupt\";\n  data: T;\n  __state?: PackagedState;\n};\n\nexport function interrupt<T>(data: T): Interrupt<T> {\n  return {\n    type: \"interrupt\",\n    data,\n  };\n}\n\nexport function isInterrupt<T>(obj: any): obj is Interrupt<T> {\n  return obj && obj.type === \"interrupt\";\n}\n\nfunction printJSON(obj: any) {\n  console.log(JSON.stringify(obj, null, 2));\n}\n\nexport type InterruptResponseType = InterruptResponseApprove | InterruptResponseReject | InterruptResponseModify;\nexport type InterruptResponseApprove = {\n  type: \"approve\";\n};\nexport type InterruptResponseReject = {\n  type: \"reject\";\n};\nexport type InterruptResponseModify = {\n  type: \"modify\";\n  newArguments: Record<string, any>;\n};\n\n\nexport async function respondToInterrupt(_interrupt: Interrupt, _interruptResponse: InterruptResponseType) {\n  const interrupt = structuredClone(_interrupt);\n  const interruptResponse = structuredClone(_interruptResponse);\n  __stateStack = StateStack.fromJSON(interrupt.__state || {});\n  __stateStack.deserializeMode();\n  const messages = (__stateStack.other.messages || []).map((json: any) => {\n    return messageFromJSON(json);\n  });\n\n  const nodesTraversed = __stateStack.other.nodesTraversed || [];\n  const nodeName = nodesTraversed[nodesTraversed.length - 1];\n  const result = await graph.run(nodeName, {\n    messages: messages,\n    __metadata: {\n      graph: graph,\n      statelogClient: __statelogClient,\n      interruptResponse: interruptResponse,\n      state: interrupt.__state,\n      __stateStack: __stateStack,\n    },\n    data: \"<from-stack>\"\n  });\n  //console.log(`Result of graph.run(\"${nodeName}\"):`, JSON.stringify(result, null, 2));\n  return result.data;\n}\n\n\nclass PackagedState {\n  public messages?: Message[];\n  public nodesTraversed?: string[];\n  public toolCall?: Record<string, any>;\n  public step?: number;\n  public self?: Record<string, any>;\n  public global?: Record<string, any>;\n  public args?: any;\n  constructor(_state: Record<string, any>, args?: any) {\n    const state = structuredClone(_state);\n    this.messages = state.messages;\n    this.nodesTraversed = state.graph?.getNodesTraversed();\n    this.toolCall = state.toolCall;\n    this.step = state.part;\n    this.self = state.self;\n    this.global = state.global;\n    this.args = state.args;\n  }\n\n  toJSON() {\n    return {\n      messages: this.messages,\n      nodesTraversed: this.nodesTraversed,\n      toolCall: this.toolCall,\n      step: this.step,\n      self: this.self,\n      global: this.global,\n      args: this.args,\n    };\n  }\n\n  nextStep() {\n    this.step ||= 0;\n    this.step += 1;\n  }\n}\n\n\nclass StateStack {\n  public stack: StateItem[] = [];\n  private mode: \"serialize\" | \"deserialize\" = \"serialize\";\n  public globals: Record<string, any> = {};\n  public other: Record<string, any> = {};\n\n  private deserializeStackLength = 0;\n\n  constructor(stack: StateItem[] = [], mode: \"serialize\" | \"deserialize\" = \"serialize\") {\n    this.stack = stack;\n    this.mode = mode;\n  }\n\n  getNewState(): StateItem | null {\n    if (this.mode === \"deserialize\" && this.deserializeStackLength <= 0) {\n      console.log(\"Forcing mode to serialize, nothing left to deserialize\");\n      this.mode = \"serialize\";\n    }\n    if (this.mode === \"serialize\") {\n      const newState: StateItem = {\n        args: {},\n        locals: {},\n        step: 0,\n      };\n      this.stack.push(newState);\n      return newState;\n    } else if (this.mode === \"deserialize\") {\n      this.deserializeStackLength -= 1;\n      const item = this.stack.shift();\n      this.stack.push(item);\n      return item;\n    }\n    return null;\n  }\n\n  deserializeMode() {\n    this.mode = \"deserialize\";\n    this.deserializeStackLength = this.stack.length;\n  }\n\n  pop(): StateItem | undefined {\n    return this.stack.pop();\n  }\n\n  toJSON() {\n    return structuredClone({\n      stack: this.stack,\n      globals: this.globals,\n      other: this.other,\n      mode: this.mode,\n      deserializeStackLength: this.deserializeStackLength,\n    });\n  }\n\n  static fromJSON(json: any): StateStack {\n    const stateStack = new StateStack([], \"serialize\");\n    stateStack.stack = json.stack || [];\n    stateStack.globals = json.globals || {};\n    stateStack.other = json.other || {};\n    stateStack.mode = json.mode || \"serialize\";\n    stateStack.deserializeStackLength = json.deserializeStackLength || 0;\n    return stateStack;\n  }\n}\n\nlet __stateStack = new StateStack();";
 export type TemplateType = {};
 declare const render: (args: TemplateType) => string;
 export default render;

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

@@ -107,7 +107,7 @@ export async function respondToInterrupt(_interrupt: Interrupt, _interruptRespon
   const interrupt = structuredClone(_interrupt);
   const interruptResponse = structuredClone(_interruptResponse);
   __stateStack = StateStack.fromJSON(interrupt.__state || {});
-  __stateStack.setMode("deserialize");
+  __stateStack.deserializeMode();
   const messages = (__stateStack.other.messages || []).map((json: any) => {
     return messageFromJSON(json);
   });
@@ -170,17 +170,19 @@ class PackagedState {
 
 class StateStack {
   public stack: StateItem[] = [];
-  public mode: "serialize" | "deserialize" = "serialize";
+  private mode: "serialize" | "deserialize" = "serialize";
   public globals: Record<string, any> = {};
   public other: Record<string, any> = {};
 
+  private deserializeStackLength = 0;
+
   constructor(stack: StateItem[] = [], mode: "serialize" | "deserialize" = "serialize") {
     this.stack = stack;
     this.mode = mode;
   }
 
   getNewState(): StateItem | null {
-    if (this.stack.length === 0 && this.mode !== "serialize") {
+    if (this.mode === "deserialize" && this.deserializeStackLength <= 0) {
       console.log("Forcing mode to serialize, nothing left to deserialize");
       this.mode = "serialize";
     }
@@ -193,6 +195,7 @@ class StateStack {
       this.stack.push(newState);
       return newState;
     } else if (this.mode === "deserialize") {
+      this.deserializeStackLength -= 1;
       const item = this.stack.shift();
       this.stack.push(item);
       return item;
@@ -200,8 +203,9 @@ class StateStack {
     return null;
   }
 
-  setMode(mode: "serialize" | "deserialize") {
-    this.mode = mode;
+  deserializeMode() {
+    this.mode = "deserialize";
+    this.deserializeStackLength = this.stack.length;
   }
 
   pop(): StateItem | undefined {
@@ -214,6 +218,7 @@ class StateStack {
       globals: this.globals,
       other: this.other,
       mode: this.mode,
+      deserializeStackLength: this.deserializeStackLength,
     });
   }
 
@@ -223,6 +228,7 @@ class StateStack {
     stateStack.globals = json.globals || {};
     stateStack.other = json.other || {};
     stateStack.mode = json.mode || "serialize";
+    stateStack.deserializeStackLength = json.deserializeStackLength || 0;
     return stateStack;
   }
 }

package/dist/scripts/agency.js

@@ -77,11 +77,11 @@ function getImports(program) {
         .filter((node) => node.type === "importNodeStatement" ||
         node.type === "importToolStatement")
         .map((node) => node.agencyFile.trim());
-    /* const importStatements = program.nodes
-      .filter((node) => node.type === "importStatement")
-      .map((node) => (node as ImportStatement).modulePath.trim());
-   */
-    return [...toolAndNodeImports]; //, ...importStatements];
+    // this makes compile() try to parse non-agency files
+    const importStatements = program.nodes
+        .filter((node) => node.type === "importStatement" && node.modulePath.endsWith(".agency"))
+        .map((node) => node.modulePath.trim());
+    return [...toolAndNodeImports, ...importStatements];
 }
 const compiledFiles = new Set();
 const dirSearched = new Set();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agency-lang",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "description": "The Agency language",
   "main": "lib/index.js",
   "scripts": {
@@ -56,4 +56,4 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.16"
   }
-}
+}