WIP

Author: habedi

src/agent/context/contextWindow.ts

@@ -4,6 +4,7 @@ import type { ModelConfig } from "@/config.js";
 import logger from "@/logger.js";
 
 function getTokenCount(text: string): number {
+    if (text.length >= 12000) return Math.ceil(text.length * 0.4);
     return encode(text).length;
 }
 
@@ -31,22 +32,22 @@ function getMessageTokenCount(message: ModelMessage): number {
                 tokens += getTokenCount(part.text);
             } else if ("output" in part && part.output) {
                 if (typeof part.output === "object" && "value" in part.output) {
-                    tokens += getTokenCount(serializeContent(part.output.value));
+                    tokens += getTokenCount(serializeContent((part.output as any).value));
                 } else {
-                    tokens += getTokenCount(serializeContent(part.output));
+                    tokens += getTokenCount(serializeContent((part as any).output));
                 }
-            } else if ("toolName" in part && typeof part.toolName === "string") {
-                tokens += getTokenCount(part.toolName);
+            } else if ("toolName" in part && typeof (part as any).toolName === "string") {
+                tokens += getTokenCount((part as any).toolName as string);
                 tokens += 10;
-                if ("args" in part && part.args) {
-                    tokens += getTokenCount(serializeContent(part.args));
+                if ("args" in part && (part as any).args) {
+                    tokens += getTokenCount(serializeContent((part as any).args));
                 }
             } else {
-                tokens += getTokenCount(serializeContent(part));
+                tokens += getTokenCount(serializeContent(part as any));
             }
         }
     } else {
-        tokens += getTokenCount(serializeContent(message.content));
+        tokens += getTokenCount(serializeContent(message.content as any));
     }
 
     tokens += 4;

src/agent/tools/definitions/edit.ts

@@ -84,35 +84,17 @@ export const editTool = tool({
             switch (edit.type) {
                 case "replace": {
                     if (!originalContent.includes(edit.search)) {
-                        // Check if autofix is available and enabled
-                        const shouldAttemptAutofix =
-                            process.env.OPENAI_API_KEY &&
-                            process.env.ENABLE_EDIT_AUTOFIX !== "false";
-
-                        if (shouldAttemptAutofix) {
+                        try {
                             logger.warn(`Search string not found in file. Attempting autofix...`);
-                            try {
-                                const correctedSearch = await autofixEdit(
-                                    originalContent,
-                                    edit.search,
-                                );
-                                if (correctedSearch) {
-                                    logger.info(
-                                        "Autofix successful, using corrected search string",
-                                    );
-                                    newContent = originalContent.replace(
-                                        correctedSearch,
-                                        edit.replaceWith,
-                                    );
-                                    break;
-                                }
-                            } catch (autofixError) {
-                                logger.error("Autofix threw an error:", autofixError);
-                                // Fall through to the error below
+                            const correctedSearch = await autofixEdit(originalContent, edit.search);
+                            if (correctedSearch) {
+                                logger.info("Autofix successful, using corrected search string");
+                                newContent = originalContent.replace(correctedSearch, edit.replaceWith);
+                                break;
                             }
+                        } catch (autofixError) {
+                            logger.error("Autofix threw an error:", autofixError);
                         }
-
-                        // Autofix failed or disabled
                         throw new ToolError(
                             `The search string was not found in the file. ` +
                                 `Expected to find:\n"${edit.search.substring(0, 100)}${edit.search.length > 100 ? "..." : ""}"\n\n` +