@perstack/runtime 0.0.22 → 0.0.24

package/dist/index.js

@@ -17,118 +17,107 @@ import { z as z2 } from "zod";
 import { anthropic } from "@ai-sdk/anthropic";
 import { google } from "@ai-sdk/google";
 import { openai } from "@ai-sdk/openai";
-var DefaultModel = "claude-4-sonnet-20250514";
-var AnthropicModels = [
-  "claude-4-opus-20250514",
-  "claude-4-sonnet-20250514",
-  "claude-3-7-sonnet-20250219",
-  "claude-3-5-sonnet-latest",
-  "claude-3-5-sonnet-20241022",
-  "claude-3-5-sonnet-20240620",
-  "claude-3-5-haiku-latest",
-  "claude-3-5-haiku-20241022"
-  // "claude-3-opus-latest", - No pdf support
-  // "claude-3-opus-20240229", - No pdf support
-  // "claude-3-sonnet-20240229", - No pdf support
-  // "claude-3-haiku-20240307", - No pdf support
+var anthropicModelConfigs = [
+  {
+    modelId: "claude-opus-4-20250514",
+    default: true,
+    contextWindow: 2e5
+  },
+  {
+    modelId: "claude-sonnet-4-20250514",
+    default: false,
+    contextWindow: 2e5
+  },
+  {
+    modelId: "claude-3-7-sonnet-20250219",
+    default: false,
+    contextWindow: 2e5
+  },
+  {
+    modelId: "claude-3-5-sonnet-latest",
+    default: false,
+    contextWindow: 2e5
+  },
+  {
+    modelId: "claude-3-5-haiku-latest",
+    default: false,
+    contextWindow: 2e5
+  }
 ];
-var GoogleModels = [
-  "gemini-1.5-flash",
-  "gemini-1.5-flash-latest",
-  "gemini-1.5-flash-001",
-  "gemini-1.5-flash-002",
-  "gemini-1.5-flash-8b",
-  "gemini-1.5-flash-8b-latest",
-  "gemini-1.5-flash-8b-001",
-  "gemini-1.5-pro",
-  "gemini-1.5-pro-latest",
-  "gemini-1.5-pro-001",
-  "gemini-1.5-pro-002",
-  "gemini-2.0-flash",
-  "gemini-2.0-flash-001",
-  "gemini-2.0-flash-live-001",
-  "gemini-2.0-flash-lite",
-  "gemini-2.0-pro-exp-02-05",
-  "gemini-2.0-flash-thinking-exp-01-21",
-  "gemini-2.0-flash-exp",
-  "gemini-2.5-pro",
-  "gemini-2.5-flash",
-  "gemini-2.5-flash-lite",
-  "gemini-2.5-pro-exp-03-25",
-  "gemini-2.5-flash-preview-04-17"
+var googleModelConfigs = [
+  {
+    modelId: "gemini-2.5-pro",
+    default: false,
+    contextWindow: 1e6
+  },
+  {
+    modelId: "gemini-2.5-flash",
+    default: false,
+    contextWindow: 1e6
+  },
+  {
+    modelId: "gemini-2.5-flash-lite",
+    default: false,
+    contextWindow: 1e6
+  }
 ];
-var OpenAIModels = [
-  "o4-mini",
-  "o4-mini-2025-04-16",
-  "o3",
-  "o3-2025-04-16",
-  "o3-mini",
-  "o3-mini-2025-01-31",
-  "o1",
-  "o1-2024-12-17",
-  "o1-mini",
-  "o1-mini-2024-09-12",
-  // "o1-preview", - No tool support
-  // "o1-preview-2024-09-12", - No tool support
-  "gpt-4.5-preview",
-  "gpt-4.5-preview-2025-02-27",
-  "gpt-4.1",
-  "gpt-4.1-2025-04-14",
-  "gpt-4.1-mini",
-  "gpt-4.1-mini-2025-04-14",
-  "gpt-4.1-nano",
-  "gpt-4.1-nano-2025-04-14",
-  "gpt-4o",
-  "gpt-4o-2024-05-13",
-  "gpt-4o-2024-08-06",
-  "gpt-4o-2024-11-20",
-  "gpt-4o-audio-preview",
-  "gpt-4o-audio-preview-2024-10-01",
-  "gpt-4o-audio-preview-2024-12-17",
-  "gpt-4o-search-preview",
-  "gpt-4o-search-preview-2025-03-11",
-  "gpt-4o-mini-search-preview",
-  "gpt-4o-mini-search-preview-2025-03-11",
-  "gpt-4o-mini",
-  "gpt-4o-mini-2024-07-18"
-  // "gpt-4-turbo", - Legacy model
-  // "gpt-4-turbo-2024-04-09", - Legacy model
-  // "gpt-4-turbo-preview", - Legacy model
-  // "gpt-4-0125-preview", - No image input support
-  // "gpt-4-1106-preview", - No image input support
-  // "gpt-4", - No image input support
-  // "gpt-4-0613", - No image input support
-  // "gpt-3.5-turbo-0125", - Legacy model
-  // "gpt-3.5-turbo", - Legacy model
-  // "gpt-3.5-turbo-1106", - Legacy model
-  // "chatgpt-4o-latest", - No tool support
+var openAIModelConfigs = [
+  {
+    modelId: "o4-mini",
+    default: false,
+    contextWindow: 2e5
+  },
+  {
+    modelId: "o3",
+    default: false,
+    contextWindow: 2e5
+  },
+  {
+    modelId: "o3-mini",
+    default: false,
+    contextWindow: 2e5
+  },
+  {
+    modelId: "gpt-4.1",
+    default: false,
+    contextWindow: 1e6
+  }
 ];
-var SupportedModels = Object.fromEntries(
-  [...AnthropicModels, ...GoogleModels, ...OpenAIModels].map((model) => [
-    model,
-    { default: model === DefaultModel, model }
-  ])
+var modelConfigs = Object.fromEntries(
+  Array.from(/* @__PURE__ */ new Set([...anthropicModelConfigs, ...googleModelConfigs, ...openAIModelConfigs])).map(
+    (model) => [model.modelId, model]
+  )
 );
 function getDefaultModelName() {
-  const model = Object.values(SupportedModels).find((model2) => model2.default);
+  const model = Object.values(modelConfigs).find((model2) => model2.default);
   if (!model) {
     throw new Error("No default model found");
   }
-  return model.model;
+  return model.modelId;
 }
 function getModel(modelId) {
   const unwrappedModelId = modelId ?? getDefaultModelName();
-  if (AnthropicModels.includes(unwrappedModelId)) {
+  if (anthropicModelConfigs.some((model) => model.modelId === unwrappedModelId)) {
     return anthropic(unwrappedModelId);
   }
-  if (GoogleModels.includes(unwrappedModelId)) {
+  if (googleModelConfigs.some((model) => model.modelId === unwrappedModelId)) {
     return google(unwrappedModelId);
   }
-  if (OpenAIModels.includes(unwrappedModelId)) {
+  if (openAIModelConfigs.some((model) => model.modelId === unwrappedModelId)) {
     return openai(unwrappedModelId);
   }
   throw new Error(`Unsupported model: ${unwrappedModelId}`);
 }
+function getModelConfig(modelId) {
+  const modelConfig = modelConfigs[modelId];
+  if (!modelConfig) {
+    throw new Error(`Unsupported model: ${modelId}`);
+  }
+  return modelConfig;
+}
+function calculateWindowUsage(usage, contextWindow) {
+  return (usage.inputTokens + usage.cachedInputTokens + usage.outputTokens) / contextWindow;
+}
 
 // src/schemas/messages.ts
 import { z } from "zod";
@@ -223,6 +212,10 @@ var MessageSchema = z.union([
 ]);
 
 // src/schemas/runtime.ts
+var defaultTemperature = 0;
+var defaultMaxSteps = void 0;
+var defaultMaxRetries = 5;
+var defaultTimeout = 5 * 1e3 * 60;
 var expertNameRegex = /^(@[a-z0-9][a-z0-9_-]*\/)?[a-z0-9][a-z0-9_-]*$/;
 var versionRegex = /^(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-[\w.-]+)?(?:\+[\w.-]+)?$/;
 var tagNameRegex = /^[a-z0-9][a-z0-9_-]*$/;
@@ -321,11 +314,11 @@ var ExpertSchema = z2.object({
   tags: z2.array(z2.string().regex(tagNameRegex).min(1)).optional().default([])
 });
 var UsageSchema = z2.object({
-  promptTokens: z2.number(),
-  completionTokens: z2.number(),
+  inputTokens: z2.number(),
+  outputTokens: z2.number(),
+  reasoningTokens: z2.number(),
   totalTokens: z2.number(),
-  cacheCreationInputTokens: z2.number(),
-  cacheReadInputTokens: z2.number()
+  cachedInputTokens: z2.number()
 });
 var CheckpointStatusSchema = z2.enum([
   "init",
@@ -367,7 +360,9 @@ var CheckpointSchema = z2.object({
     toolName: z2.string(),
     checkpointId: z2.string()
   }).optional(),
-  usage: UsageSchema
+  usage: UsageSchema,
+  contextWindow: z2.number(),
+  contextWindowUsage: z2.number()
 });
 var RunParamsSchema = z2.object({
   setting: z2.object({
@@ -393,10 +388,10 @@ var RunParamsSchema = z2.object({
       )
     ),
     model: z2.string().optional().default(getDefaultModelName()),
-    temperature: z2.number().min(0).max(1).optional().default(0.3),
-    maxSteps: z2.number().min(1).optional(),
-    maxRetries: z2.number().min(0).optional().default(5),
-    timeout: z2.number().min(0).optional().default(1e3 * 60),
+    temperature: z2.number().min(0).max(1).optional().default(defaultTemperature),
+    maxSteps: z2.number().min(1).optional().default(defaultMaxSteps),
+    maxRetries: z2.number().min(0).optional().default(defaultMaxRetries),
+    timeout: z2.number().min(0).optional().default(defaultTimeout),
     workspace: z2.string().optional(),
     startedAt: z2.number().optional().default(Date.now()),
     updatedAt: z2.number().optional().default(Date.now())
@@ -466,7 +461,7 @@ async function defaultStoreEvent(event) {
 // package.json
 var package_default = {
   name: "@perstack/runtime",
-  version: "0.0.22",
+  version: "0.0.24",
   description: "PerStack Runtime",
   author: "Wintermute Technologies, Inc.",
   license: "Apache-2.0",
@@ -527,14 +522,6 @@ async function defaultEventListener(e) {
   switch (e.type) {
     case "startRun": {
       log(`${header(e)} Perstack@${package_default.version} started`);
-      const { inputMessages } = e;
-      for (const message of inputMessages) {
-        if (message.type === "userMessage") {
-          logUserMessage(message);
-        } else if (message.type === "toolMessage") {
-          logToolMessage(message);
-        }
-      }
       break;
     }
     case "startGeneration": {
@@ -542,12 +529,11 @@ async function defaultEventListener(e) {
       break;
     }
     case "retry": {
-      logUsage(e);
       log(`${header(e)} Retrying tool call generation`);
+      debug(e.reason);
       break;
     }
     case "callTool": {
-      logUsage(e);
       log(`${header(e)} Calling tool`);
       if (e.toolCall.skillName === "@perstack/base") {
         switch (e.toolCall.toolName) {
@@ -580,14 +566,12 @@ async function defaultEventListener(e) {
       break;
     }
     case "callInteractiveTool": {
-      logUsage(e);
       log(`${header(e)} Calling interactive tool`);
       log(`${header(e)} Tool: ${e.toolCall.skillName}/${e.toolCall.toolName}`);
       debug(`${header(e)} Args: ${JSON.stringify(e.toolCall.args, null, 2)}`);
       break;
     }
     case "callDelegate": {
-      logUsage(e);
       log(`${header(e)} Calling delegate`);
       log(`${header(e)} Tool: ${e.toolCall.toolName}`);
       debug(`${header(e)} Args: ${JSON.stringify(e.toolCall.args, null, 2)}`);
@@ -641,77 +625,46 @@ async function defaultEventListener(e) {
       break;
     }
     case "stopRunByInteractiveTool": {
+      logUsage(e);
       log(`${header(e)} Stopping run by interactive tool`);
       break;
     }
     case "stopRunByDelegate": {
+      logUsage(e);
       log(`${header(e)} Stopping run by delegate`);
       break;
     }
     case "stopRunByExceededMaxSteps": {
+      logUsage(e);
       log(`${header(e)} Stopping run by exceeded max steps`);
       break;
     }
     case "continueToNextStep": {
+      const contextWindowUsage = e.checkpoint.contextWindowUsage * 100;
+      logUsage(e);
       log(`${header(e)} Continuing to next step`);
+      log(`${header(e)} Context window usage: ${contextWindowUsage.toFixed(2)}%`);
       break;
     }
   }
 }
-function logUserMessage(message) {
-  const t = (/* @__PURE__ */ new Date()).toISOString();
-  const contents = message.contents;
-  for (const content of contents) {
-    if (content.type === "textPart") {
-      log(`${t} User: ${content.text}`);
-    } else if (content.type === "imageUrlPart") {
-      log(`${t} User: ${content.url}`);
-    } else if (content.type === "imageInlinePart") {
-      log(`${t} User: Inline image`);
-    } else if (content.type === "imageBinaryPart") {
-      log(`${t} User: Binary image`);
-    } else if (content.type === "fileUrlPart") {
-      log(`${t} User: ${content.url}`);
-    } else if (content.type === "fileInlinePart") {
-      log(`${t} User: Inline file`);
-    } else if (content.type === "fileBinaryPart") {
-      log(`${t} User: Binary file`);
-    }
-  }
-}
-function logToolMessage(message) {
-  const t = (/* @__PURE__ */ new Date()).toISOString();
-  const contents = message.contents;
-  for (const content of contents) {
-    if (content.type === "toolResultPart") {
-      const { contents: contents2 } = content;
-      for (const content2 of contents2) {
-        if (content2.type === "textPart") {
-          log(`${t} Tool Result: ${content2.text}`);
-        } else if (content2.type === "imageInlinePart") {
-          log(`${t} Tool Result: Inline image`);
-        }
-      }
-    }
-  }
-}
 function logUsage(e) {
-  const usageByGeneration = [
-    `In: ${e.usage.promptTokens.toLocaleString()}`,
-    `Out: ${e.usage.completionTokens.toLocaleString()}`,
-    `Total: ${e.usage.totalTokens.toLocaleString()}`,
-    `Cache-read: ${e.usage.cacheReadInputTokens.toLocaleString()}`,
-    `Cache-write: ${e.usage.cacheCreationInputTokens.toLocaleString()}`
+  const usageByStep = [
+    `In: ${e.step.usage.inputTokens.toLocaleString()}`,
+    `Reasoning: ${e.step.usage.reasoningTokens.toLocaleString()}`,
+    `Out: ${e.step.usage.outputTokens.toLocaleString()}`,
+    `Total: ${e.step.usage.totalTokens.toLocaleString()}`,
+    `Cache-read: ${e.step.usage.cachedInputTokens.toLocaleString()}`
   ].join(", ");
-  log(`${header(e)} Tokens usage: ${usageByGeneration}`);
   const usageByRun = [
-    `In: ${e.usage.promptTokens.toLocaleString()}`,
-    `Out: ${e.usage.completionTokens.toLocaleString()}`,
-    `Total: ${e.usage.totalTokens.toLocaleString()}`,
-    `Cache-read: ${e.usage.cacheReadInputTokens.toLocaleString()}`,
-    `Cache-write: ${e.usage.cacheCreationInputTokens.toLocaleString()}`
+    `In: ${e.checkpoint.usage.inputTokens.toLocaleString()}`,
+    `Reasoning: ${e.checkpoint.usage.reasoningTokens.toLocaleString()}`,
+    `Out: ${e.checkpoint.usage.outputTokens.toLocaleString()}`,
+    `Total: ${e.checkpoint.usage.totalTokens.toLocaleString()}`,
+    `Cache-read: ${e.checkpoint.usage.cachedInputTokens.toLocaleString()}`
   ].join(", ");
-  log(`${header(e)} Total usage: ${usageByRun}`);
+  log(`${header(e)} Tokens usage by step: ${usageByStep}`);
+  log(`${header(e)} Tokens usage by run: ${usageByRun}`);
 }
 
 // src/events/event-emitter.ts
@@ -1152,7 +1105,7 @@ async function callingDelegateLogic({
   step,
   skillManagers
 }) {
-  if (!step?.toolCall) {
+  if (!step.toolCall) {
     throw new Error("No tool call found");
   }
   const { id, toolName, args } = step.toolCall;
@@ -1210,7 +1163,7 @@ async function callingToolLogic({
   step,
   skillManagers
 }) {
-  if (!step?.toolCall) {
+  if (!step.toolCall) {
     throw new Error("No tool call found");
   }
   const { id, skillName, toolName, args } = step.toolCall;
@@ -1476,36 +1429,29 @@ function toolResultPartToCoreToolResultPart(part) {
 // src/usage.ts
 function createEmptyUsage() {
   return {
-    promptTokens: 0,
-    completionTokens: 0,
+    inputTokens: 0,
+    outputTokens: 0,
+    reasoningTokens: 0,
     totalTokens: 0,
-    cacheCreationInputTokens: 0,
-    cacheReadInputTokens: 0
+    cachedInputTokens: 0
   };
 }
 function usageFromGenerateTextResult(result) {
-  let cacheCreationInputTokens = 0;
-  let cacheReadInputTokens = 0;
-  if (result.providerMetadata?.anthropic) {
-    const anthropicMetadata = result.providerMetadata.anthropic;
-    cacheCreationInputTokens = anthropicMetadata.cacheCreationInputTokens || 0;
-    cacheReadInputTokens = anthropicMetadata.cacheReadInputTokens || 0;
-  }
   return {
-    promptTokens: result.usage.inputTokens || 0,
-    completionTokens: result.usage.outputTokens || 0,
+    inputTokens: result.usage.inputTokens || 0,
+    outputTokens: result.usage.outputTokens || 0,
+    reasoningTokens: result.usage.reasoningTokens || 0,
     totalTokens: result.usage.totalTokens || 0,
-    cacheCreationInputTokens,
-    cacheReadInputTokens
+    cachedInputTokens: result.usage.cachedInputTokens || 0
   };
 }
 function sumUsage(a, b) {
   return {
-    promptTokens: a.promptTokens + b.promptTokens,
-    completionTokens: a.completionTokens + b.completionTokens,
+    inputTokens: a.inputTokens + b.inputTokens,
+    outputTokens: a.outputTokens + b.outputTokens,
+    reasoningTokens: a.reasoningTokens + b.reasoningTokens,
     totalTokens: a.totalTokens + b.totalTokens,
-    cacheCreationInputTokens: a.cacheCreationInputTokens + b.cacheCreationInputTokens,
-    cacheReadInputTokens: a.cacheReadInputTokens + b.cacheReadInputTokens
+    cachedInputTokens: a.cachedInputTokens + b.cachedInputTokens
   };
 }
 
@@ -1515,7 +1461,7 @@ async function generatingRunResultLogic({
   checkpoint,
   step
 }) {
-  if (!step?.toolCall || !step?.toolResult) {
+  if (!step.toolCall || !step.toolResult) {
     throw new Error("No tool call or tool result found");
   }
   const { id, toolName } = step.toolCall;
@@ -1543,17 +1489,11 @@ async function generatingRunResultLogic({
     });
   } catch (error) {
     if (error instanceof Error) {
+      const reason = JSON.stringify({ error: error.name, message: error.message });
       return retry(setting, checkpoint, {
-        newMessages: [
-          toolMessage,
-          createUserMessage([
-            {
-              type: "textPart",
-              text: JSON.stringify({ error: error.name, message: error.message })
-            }
-          ])
-        ],
-        usage: checkpoint.usage
+        reason,
+        newMessages: [toolMessage, createUserMessage([{ type: "textPart", text: reason }])],
+        usage: createEmptyUsage()
       });
     }
     throw error;
@@ -1566,6 +1506,7 @@ async function generatingRunResultLogic({
       ...checkpoint,
       messages: [...messages, ...newMessages],
       usage: sumUsage(checkpoint.usage, usage),
+      contextWindowUsage: calculateWindowUsage(usage, checkpoint.contextWindow),
       status: "completed"
     },
     step: {
@@ -1602,16 +1543,12 @@ async function generatingToolCallLogic({
     });
   } catch (error) {
     if (error instanceof Error) {
+      console.error(error);
+      const reason = JSON.stringify({ error: error.name, message: error.message });
       return retry(setting, checkpoint, {
-        newMessages: [
-          createUserMessage([
-            {
-              type: "textPart",
-              text: JSON.stringify({ error: error.name, message: error.message })
-            }
-          ])
-        ],
-        usage: checkpoint.usage
+        reason,
+        newMessages: [createUserMessage([{ type: "textPart", text: reason }])],
+        usage: createEmptyUsage()
       });
     }
     throw error;
@@ -1620,18 +1557,13 @@ async function generatingToolCallLogic({
   const { text, toolCalls, finishReason } = result;
   const toolCall = toolCalls[0];
   if (!toolCall) {
+    const reason = JSON.stringify({
+      error: "Error: No tool call generated",
+      message: "You must generate a tool call. Try again."
+    });
     return retry(setting, checkpoint, {
-      newMessages: [
-        createUserMessage([
-          {
-            type: "textPart",
-            text: JSON.stringify({
-              error: "No tool call generated",
-              message: "You must generate a tool call. Try again."
-            })
-          }
-        ])
-      ],
+      reason,
+      newMessages: [createUserMessage([{ type: "textPart", text: reason }])],
       usage
     });
   }
@@ -1671,7 +1603,12 @@ async function generatingToolCallLogic({
     }
   }
   if (finishReason === "length") {
+    const reason = JSON.stringify({
+      error: "Error: Tool call generation failed",
+      message: "Generation length exceeded. Try again."
+    });
     return retry(setting, checkpoint, {
+      reason,
       newMessages: [
         createExpertMessage([
           {
@@ -1686,7 +1623,7 @@ async function generatingToolCallLogic({
             type: "toolResultPart",
             toolCallId: toolCall.toolCallId,
             toolName: toolCall.toolName,
-            contents: [{ type: "textPart", text: "Error: Generation length exceeded" }]
+            contents: [{ type: "textPart", text: reason }]
           }
         ])
       ],
@@ -1695,7 +1632,7 @@ async function generatingToolCallLogic({
         id: toolCall.toolCallId,
         skillName: skillManager.name,
         toolName: toolCall.toolName,
-        result: [{ type: "textPart", id: createId6(), text: "Error: Generation length exceeded" }]
+        result: [{ type: "textPart", id: createId6(), text: reason }]
       },
       usage
     });
@@ -1835,28 +1772,7 @@ async function initLogic({
         ]
       });
     }
-    case "proceeding": {
-      if (!setting.input.text) {
-        throw new Error("Input message is undefined");
-      }
-      return startRun(setting, checkpoint, {
-        initialCheckpoint: checkpoint,
-        inputMessages: [createUserMessage([{ type: "textPart", text: setting.input.text }])]
-      });
-    }
-    case "stoppedByDelegate": {
-      if (!setting.input.interactiveToolCallResult) {
-        throw new Error("Interactive tool call result is undefined");
-      }
-      return startRun(setting, checkpoint, {
-        initialCheckpoint: checkpoint,
-        inputMessages: [
-          createUserMessage([
-            { type: "textPart", text: setting.input.interactiveToolCallResult.text }
-          ])
-        ]
-      });
-    }
+    case "stoppedByDelegate":
     case "stoppedByInteractiveTool": {
       if (!setting.input.interactiveToolCallResult) {
         throw new Error("Interactive tool call result is undefined");
@@ -1876,7 +1792,13 @@ async function initLogic({
       });
     }
     default:
-      throw new Error(`Unexpected checkpoint status: ${checkpoint.status}`);
+      if (!setting.input.text) {
+        throw new Error("Input message is undefined");
+      }
+      return startRun(setting, checkpoint, {
+        initialCheckpoint: checkpoint,
+        inputMessages: [createUserMessage([{ type: "textPart", text: setting.input.text }])]
+      });
   }
 }
 
@@ -1897,7 +1819,7 @@ async function resolvingImageFileLogic({
   checkpoint,
   step
 }) {
-  if (!step?.toolCall || !step?.toolResult) {
+  if (!step.toolCall || !step.toolResult) {
     throw new Error("No tool call or tool result found");
   }
   const { id, toolName } = step.toolCall;
@@ -1948,7 +1870,7 @@ async function resolvingPdfFileLogic({
   checkpoint,
   step
 }) {
-  if (!step?.toolCall || !step?.toolResult) {
+  if (!step.toolCall || !step.toolResult) {
     throw new Error("No tool call or tool result found");
   }
   const { id, toolName } = step.toolCall;
@@ -2004,7 +1926,7 @@ async function resolvingToolResultLogic({
   checkpoint,
   step
 }) {
-  if (!step?.toolCall || !step?.toolResult) {
+  if (!step.toolCall || !step.toolResult) {
     throw new Error("No tool call or tool result found");
   }
   const { id, toolName } = step.toolCall;
@@ -2060,17 +1982,14 @@ var runtimeStateMachine = setup({
         startRun: {
           target: "PreparingForStep",
           actions: assign({
-            checkpoint: ({ event }) => ({
-              ...event.initialCheckpoint,
-              messages: [...event.initialCheckpoint.messages, ...event.inputMessages],
-              status: "proceeding"
+            checkpoint: ({ context, event }) => ({
+              ...context.checkpoint,
+              status: "proceeding",
+              messages: [...context.checkpoint.messages, ...event.inputMessages]
             }),
-            step: ({ event }) => ({
-              stepNumber: event.initialCheckpoint.stepNumber,
-              inputMessages: event.inputMessages,
-              newMessages: [],
-              usage: createEmptyUsage(),
-              startedAt: event.timestamp
+            step: ({ context, event }) => ({
+              ...context.step,
+              inputMessages: event.inputMessages
             })
           })
         }
@@ -2083,7 +2002,7 @@ var runtimeStateMachine = setup({
           actions: assign({
             step: ({ context, event }) => ({
               stepNumber: context.checkpoint.stepNumber,
-              inputMessages: context.step.inputMessages,
+              inputMessages: context.step.inputMessages ?? [],
               newMessages: [],
               usage: createEmptyUsage(),
               startedAt: event.timestamp
@@ -2117,7 +2036,11 @@ var runtimeStateMachine = setup({
             checkpoint: ({ context, event }) => ({
               ...context.checkpoint,
               messages: [...context.checkpoint.messages, event.newMessage],
-              usage: sumUsage(context.checkpoint.usage, event.usage)
+              usage: sumUsage(context.checkpoint.usage, event.usage),
+              contextWindowUsage: calculateWindowUsage(
+                event.usage,
+                context.checkpoint.contextWindow
+              )
             }),
             step: ({ context, event }) => ({
               ...context.step,
@@ -2133,7 +2056,11 @@ var runtimeStateMachine = setup({
             checkpoint: ({ context, event }) => ({
               ...context.checkpoint,
               messages: [...context.checkpoint.messages, event.newMessage],
-              usage: sumUsage(context.checkpoint.usage, event.usage)
+              usage: sumUsage(context.checkpoint.usage, event.usage),
+              contextWindowUsage: calculateWindowUsage(
+                event.usage,
+                context.checkpoint.contextWindow
+              )
             }),
             step: ({ context, event }) => ({
               ...context.step,
@@ -2149,7 +2076,11 @@ var runtimeStateMachine = setup({
             checkpoint: ({ context, event }) => ({
               ...context.checkpoint,
               messages: [...context.checkpoint.messages, event.newMessage],
-              usage: sumUsage(context.checkpoint.usage, event.usage)
+              usage: sumUsage(context.checkpoint.usage, event.usage),
+              contextWindowUsage: calculateWindowUsage(
+                event.usage,
+                context.checkpoint.contextWindow
+              )
             }),
             step: ({ context, event }) => ({
               ...context.step,
@@ -2301,7 +2232,10 @@ var runtimeStateMachine = setup({
           target: "Stopped",
           actions: assign({
             checkpoint: ({ event }) => event.checkpoint,
-            step: ({ event }) => event.step
+            step: ({ event }) => ({
+              ...event.step,
+              inputMessages: void 0
+            })
           })
         }
       }
@@ -2312,7 +2246,10 @@ var runtimeStateMachine = setup({
           target: "Stopped",
           actions: assign({
             checkpoint: ({ event }) => event.checkpoint,
-            step: ({ event }) => event.step
+            step: ({ event }) => ({
+              ...event.step,
+              inputMessages: void 0
+            })
           })
         }
       }
@@ -2323,7 +2260,10 @@ var runtimeStateMachine = setup({
           target: "Stopped",
           actions: assign({
             checkpoint: ({ event }) => event.checkpoint,
-            step: ({ event }) => event.step
+            step: ({ event }) => ({
+              ...event.step,
+              inputMessages: void 0
+            })
           })
         }
       }
@@ -2438,9 +2378,7 @@ async function run(runInput, options) {
   const eventEmitter = new RunEventEmitter();
   eventEmitter.subscribe(eventListener);
   let { setting, checkpoint } = runParams;
-  if (checkpoint) {
-    checkpoint.status = "proceeding";
-  }
+  const modelConfig = getModelConfig(setting.model);
   if (setting.workspace) {
     if (!path.isAbsolute(setting.workspace)) {
       throw new Error(`Workspace path must be absolute: ${setting.workspace}`);
@@ -2473,7 +2411,9 @@ async function run(runInput, options) {
           stepNumber: 1,
           status: "init",
           messages: [],
-          usage: createEmptyUsage()
+          usage: createEmptyUsage(),
+          contextWindow: modelConfig.contextWindow,
+          contextWindowUsage: 0
         },
         eventListener,
         skillManagers
@@ -2740,6 +2680,10 @@ export {
   continueToNextStep,
   createEvent,
   defaultEventListener,
+  defaultMaxRetries,
+  defaultMaxSteps,
+  defaultTemperature,
+  defaultTimeout,
   expertKeyRegex,
   expertNameRegex,
   finishToolCall,