chore: refactor out ContextWindow and ChatLogs from the Chat class

apps/browser/src/pages/Dojo.tsx

@@ -172,9 +172,10 @@ function Dojo() {
 
       const userWorkspace = new EvoCore.InMemoryWorkspace();
       setUserWorkspace(userWorkspace);
+      const contextWindow = new EvoCore.ContextWindow(llm);
       const chat = new EvoCore.Chat(
-        llm,
         cl100k_base,
+        contextWindow,
         logger
       );
 

apps/cli/src/app.ts

@@ -11,6 +11,7 @@ import {
   Timeout,
   Workspace,
   LlmApi,
+  ContextWindow,
 } from "@evo-ninja/agent-utils";
 import dotenv from "dotenv";
 import readline from "readline";
@@ -90,7 +91,8 @@ export function createApp(config?: AppConfig): App {
     config?.userWorkspace ?? new FileSystemWorkspace(workspacePath);
 
   // Chat
-  const chat = new Chat(llm, cl100k_base, logger);
+  const contextWindow = new ContextWindow(llm);
+  const chat = new Chat(cl100k_base, contextWindow, logger);
 
   // Debug Logging
   let debugLog: DebugLog | undefined;

apps/cli/src/diagnostic/DebugLlmApi.ts

@@ -1,7 +1,7 @@
 import { DebugLog } from "./DebugLog";
 import { Timer } from "./Timer";
 
-import { Chat, LlmApi, LlmOptions, ChatMessage } from "@evo-ninja/agent-utils";
+import { LlmApi, LlmOptions, ChatLogs, ChatMessage } from "@evo-ninja/agent-utils";
 
 export class DebugLlmApi implements LlmApi {
   constructor(
@@ -18,7 +18,7 @@ export class DebugLlmApi implements LlmApi {
   }
 
   async getResponse(
-    chat: Chat,
+    chatLogs: ChatLogs,
     functionDefinitions: any[],
     options?: LlmOptions | undefined
   ): Promise<ChatMessage | undefined> {
@@ -28,15 +28,15 @@ export class DebugLlmApi implements LlmApi {
     time.start();
 
     const resp = await this.llm.getResponse(
-      chat,
+      chatLogs,
       functionDefinitions,
       options
     );
 
     time.end();
     this.debugLog.stepLlmReq(
       time,
-      chat.export(),
+      chatLogs.clone(),
       resp
     );
 

apps/cli/src/diagnostic/DebugLlmReq.ts

@@ -1,28 +1,32 @@
 import { Timer } from "./Timer";
 
-import { ChatMessageLog, ChatMessage } from "@evo-ninja/agent-utils";
+import { ChatLogs, ChatMessage } from "@evo-ninja/agent-utils";
 
 export class DebugLlmReq {
   constructor(
     public time: Timer,
-    public chat: ChatMessageLog,
+    public chatLogs: ChatLogs,
     public response?: ChatMessage
   ) { }
 
-  get tokens() {
-    return this.chat["persistent"].tokens +
-      this.chat["temporary"].tokens;
+  get tokens(): number {
+    return this.chatLogs.tokens;
   }
 
   toString(): string {
     return JSON.stringify(this.toJSON(), null, 2);
   }
 
-  toJSON() {
+  toJSON(): {
+    time: Timer;
+    tokens: number;
+    chat: ChatLogs;
+    response?: ChatMessage;
+  } {
     return {
       time: this.time,
       tokens: this.tokens,
-      chat: this.chat,
+      chat: this.chatLogs,
       response: this.response
     };
   }

apps/cli/src/diagnostic/DebugLog.ts

@@ -1,7 +1,7 @@
 import { Timer } from "./Timer";
 import { DebugLlmReq } from "./DebugLlmReq";
 
-import { ChatMessageLog, ChatMessage, Workspace } from "@evo-ninja/agent-utils";
+import { ChatLogs, ChatMessage, Workspace } from "@evo-ninja/agent-utils";
 
 interface DebugGoal {
   prompt: string;
@@ -77,8 +77,8 @@ export class DebugLog {
     this.save();
   }
 
-  stepLlmReq(time: Timer, chat: ChatMessageLog, response?: ChatMessage): void {
-    const req = new DebugLlmReq(time, chat, response);
+  stepLlmReq(time: Timer, chatLogs: ChatLogs, response?: ChatMessage): void {
+    const req = new DebugLlmReq(time, chatLogs, response);
     this.goal.llmReqs += 1;
     this.goal.tokens += req.tokens;
     this._latestStep.llmReqs.push(req);
@@ -89,7 +89,10 @@ export class DebugLog {
     return JSON.stringify(this.toJSON(), null, 2);
   }
 
-  toJSON() {
+  toJSON(): {
+    goal: DebugGoal;
+    steps: DebugStep[];
+  } {
     return {
       goal: this.goal,
       steps: this.steps,

apps/cli/src/diagnostic/Timer.ts

@@ -26,11 +26,11 @@ export class Timer {
     return `${this._pad(hours)}:${this._pad(minutes)}:${this._pad(seconds)}`;
   }
 
-  toString() {
+  toString(): string {
     return this.getHHMMSS();
   }
 
-  toJSON() {
+  toJSON(): string {
     return this.toString();
   }
 

packages/agent-utils/src/agent/basicFunctionCallLoop.ts

@@ -27,7 +27,7 @@ export async function* basicFunctionCallLoop<TContext extends { llm: LlmApi, cha
     await chat.fitToContextWindow();
 
     const functionDefinitions = agentFunctions.map(f => f.definition);
-    const response = await llm.getResponse(chat, functionDefinitions);
+    const response = await llm.getResponse(chat.chatLogs, functionDefinitions);
 
     if (!response) {
       return ResultErr("No response from LLM.");