@probelabs/probe 0.6.0-rc285 → 0.6.0-rc286

package/build/agent/ProbeAgent.js

@@ -93,7 +93,7 @@ import { formatAvailableSkillsXml as formatAvailableSkills } from './skills/form
 import { createSkillToolInstances } from './skills/tools.js';
 import { RetryManager, createRetryManagerFromEnv } from './RetryManager.js';
 import { FallbackManager, createFallbackManagerFromEnv, buildFallbackProvidersFromEnv } from './FallbackManager.js';
-import { handleContextLimitError } from './contextCompactor.js';
+import { handleContextLimitError, compactMessages, calculateCompactionStats } from './contextCompactor.js';
 import { formatErrorForAI, ParameterError } from '../utils/error-types.js';
 import { getCommonPrefix, toRelativePath, safeRealpath } from '../utils/path-validation.js';
 import { truncateIfNeeded, getMaxOutputTokens } from './outputTruncator.js';
@@ -3227,6 +3227,25 @@ Follow these instructions carefully:
         ];
       }
 
+      // Proactively compact for multi-turn conversations.
+      // On turn 2+, previous turns contain full tool call/result history which can
+      // be 50K+ tokens. This drowns out the new user message and causes the model to
+      // focus on prior context rather than the new question.
+      // compactMessages strips intermediate monologue from completed segments,
+      // keeping user messages + final answers from prior turns.
+      // Must run AFTER adding the new user message so the compactor sees 2+ segments
+      // (completed prior turns + the new incomplete turn), preserving the latest segment.
+      if (this.history.length > 0) {
+        const compacted = compactMessages(currentMessages, { keepLastSegment: true, minSegmentsToKeep: 1 });
+        if (compacted.length < currentMessages.length) {
+          const stats = calculateCompactionStats(currentMessages, compacted);
+          if (this.debug) {
+            console.log(`[DEBUG] Proactive history compaction: ${currentMessages.length} → ${compacted.length} messages (${stats.reductionPercent}% reduction, ~${stats.tokensSaved} tokens saved)`);
+          }
+          currentMessages = compacted;
+        }
+      }
+
       let currentIteration = 0;
       let finalResult = 'I was unable to complete your request due to reaching the maximum number of tool iterations.';
 
@@ -4141,8 +4160,6 @@ Double-check your response based on the criteria above. If everything looks good
    * @returns {Object} Compaction statistics
    */
   async compactHistory(options = {}) {
-    const { compactMessages, calculateCompactionStats } = await import('./contextCompactor.js');
-
     if (this.history.length === 0) {
       if (this.debug) {
         console.log(`[DEBUG] No history to compact for session ${this.sessionId}`);

package/build/agent/index.js

@@ -2755,7 +2755,11 @@ async function extractBinary(assetPath, outputDir) {
       if (process.env.DEBUG === "1" || process.env.VERBOSE === "1") {
         console.log(`Extracting zip to ${extractDir}...`);
       }
-      await exec(`unzip -q "${assetPath}" -d "${extractDir}"`);
+      if (isWindows) {
+        await exec(`powershell -NoProfile -Command "Expand-Archive -Path '${assetPath}' -DestinationPath '${extractDir}' -Force"`);
+      } else {
+        await exec(`unzip -q "${assetPath}" -d "${extractDir}"`);
+      }
     } else {
       if (process.env.DEBUG === "1" || process.env.VERBOSE === "1") {
         console.log(`Copying binary directly to ${binaryPath}`);
@@ -9651,14 +9655,15 @@ var init_vercel = __esm({
               const parsedTargets = parseTargets(targets);
               extractFiles = parsedTargets.map((target) => resolveTargetPath(target, effectiveCwd));
               if (options.allowedFolders && options.allowedFolders.length > 0) {
+                const { join: pathJoin, sep: pathSep } = await import("path");
                 extractFiles = extractFiles.map((target) => {
                   const { filePart, suffix } = splitTargetSuffix(target);
                   if (existsSync(filePart)) return target;
-                  const cwdPrefix = effectiveCwd.endsWith("/") ? effectiveCwd : effectiveCwd + "/";
+                  const cwdPrefix = effectiveCwd.endsWith(pathSep) ? effectiveCwd : effectiveCwd + pathSep;
                   const relativePart = filePart.startsWith(cwdPrefix) ? filePart.slice(cwdPrefix.length) : null;
                   if (relativePart) {
                     for (const folder of options.allowedFolders) {
-                      const candidate = folder + "/" + relativePart;
+                      const candidate = pathJoin(folder, relativePart);
                       if (existsSync(candidate)) {
                         if (debug) console.error(`[extract] Auto-fixed path: ${filePart} \u2192 ${candidate}`);
                         return candidate + suffix;
@@ -9666,11 +9671,12 @@ var init_vercel = __esm({
                     }
                   }
                   for (const folder of options.allowedFolders) {
-                    const folderPrefix = folder.endsWith("/") ? folder : folder + "/";
-                    const wsParent = folderPrefix.replace(/[^/]+\/$/, "");
+                    const folderPrefix = folder.endsWith(pathSep) ? folder : folder + pathSep;
+                    const sepEscaped = pathSep === "\\" ? "\\\\" : pathSep;
+                    const wsParent = folderPrefix.replace(new RegExp("[^" + sepEscaped + "]+" + sepEscaped + "$"), "");
                     if (filePart.startsWith(wsParent)) {
                       const tail = filePart.slice(wsParent.length);
-                      const candidate = folderPrefix + tail;
+                      const candidate = pathJoin(folderPrefix, tail);
                       if (candidate !== filePart && existsSync(candidate)) {
                         if (debug) console.error(`[extract] Auto-fixed path via workspace: ${filePart} \u2192 ${candidate}`);
                         return candidate + suffix;
@@ -79910,14 +79916,6 @@ var init_FallbackManager = __esm({
 });
 
 // src/agent/contextCompactor.js
-var contextCompactor_exports = {};
-__export(contextCompactor_exports, {
-  calculateCompactionStats: () => calculateCompactionStats,
-  compactMessages: () => compactMessages,
-  handleContextLimitError: () => handleContextLimitError,
-  identifyMessageSegments: () => identifyMessageSegments,
-  isContextLimitError: () => isContextLimitError
-});
 function isContextLimitError(error) {
   if (!error) return false;
   const errorMessage = (typeof error === "string" ? error : error?.message || "").toLowerCase();
@@ -84234,6 +84232,16 @@ You are working with a workspace. Available paths: ${workspaceDesc}
               userMessage
             ];
           }
+          if (this.history.length > 0) {
+            const compacted = compactMessages(currentMessages, { keepLastSegment: true, minSegmentsToKeep: 1 });
+            if (compacted.length < currentMessages.length) {
+              const stats = calculateCompactionStats(currentMessages, compacted);
+              if (this.debug) {
+                console.log(`[DEBUG] Proactive history compaction: ${currentMessages.length} \u2192 ${compacted.length} messages (${stats.reductionPercent}% reduction, ~${stats.tokensSaved} tokens saved)`);
+              }
+              currentMessages = compacted;
+            }
+          }
           let currentIteration = 0;
           let finalResult = "I was unable to complete your request due to reaching the maximum number of tool iterations.";
           const baseMaxIterations = options._maxIterationsOverride || this.maxIterations || MAX_TOOL_ITERATIONS;
@@ -84934,7 +84942,6 @@ Double-check your response based on the criteria above. If everything looks good
        * @returns {Object} Compaction statistics
        */
       async compactHistory(options = {}) {
-        const { compactMessages: compactMessages2, calculateCompactionStats: calculateCompactionStats2 } = await Promise.resolve().then(() => (init_contextCompactor(), contextCompactor_exports));
         if (this.history.length === 0) {
           if (this.debug) {
             console.log(`[DEBUG] No history to compact for session ${this.sessionId}`);
@@ -84949,8 +84956,8 @@ Double-check your response based on the criteria above. If everything looks good
             tokensSaved: 0
           };
         }
-        const compactedMessages = compactMessages2(this.history, options);
-        const stats = calculateCompactionStats2(this.history, compactedMessages);
+        const compactedMessages = compactMessages(this.history, options);
+        const stats = calculateCompactionStats(this.history, compactedMessages);
         this.history = compactedMessages;
         try {
           await this.storageAdapter.clearHistory(this.sessionId);

package/build/downloader.js

@@ -743,7 +743,11 @@ async function extractBinary(assetPath, outputDir) {
 			if (process.env.DEBUG === '1' || process.env.VERBOSE === '1') {
 				console.log(`Extracting zip to ${extractDir}...`);
 			}
-			await exec(`unzip -q "${assetPath}" -d "${extractDir}"`);
+			if (isWindows) {
+				await exec(`powershell -NoProfile -Command "Expand-Archive -Path '${assetPath}' -DestinationPath '${extractDir}' -Force"`);
+			} else {
+				await exec(`unzip -q "${assetPath}" -d "${extractDir}"`);
+			}
 		} else {
 			// Assume it's a direct binary
 			if (process.env.DEBUG === '1' || process.env.VERBOSE === '1') {

package/build/tools/vercel.js

@@ -691,19 +691,20 @@ export const extractTool = (options = {}) => {
 					// model constructs wrong absolute paths (e.g., /workspace/gateway/file.go
 					// instead of /workspace/tyk/gateway/file.go)
 					if (options.allowedFolders && options.allowedFolders.length > 0) {
+						const { join: pathJoin, sep: pathSep } = await import('path');
 						extractFiles = extractFiles.map(target => {
 							const { filePart, suffix } = splitTargetSuffix(target);
 							if (existsSync(filePart)) return target;
 
 							// Try resolving the relative tail against each allowedFolder
-							const cwdPrefix = (effectiveCwd.endsWith('/') ? effectiveCwd : effectiveCwd + '/');
+							const cwdPrefix = effectiveCwd.endsWith(pathSep) ? effectiveCwd : effectiveCwd + pathSep;
 							const relativePart = filePart.startsWith(cwdPrefix)
 								? filePart.slice(cwdPrefix.length)
 								: null;
 
 							if (relativePart) {
 								for (const folder of options.allowedFolders) {
-									const candidate = folder + '/' + relativePart;
+									const candidate = pathJoin(folder, relativePart);
 									if (existsSync(candidate)) {
 										if (debug) console.error(`[extract] Auto-fixed path: ${filePart} → ${candidate}`);
 										return candidate + suffix;
@@ -714,11 +715,12 @@ export const extractTool = (options = {}) => {
 							// Try stripping workspace prefix and resolving against allowedFolders
 							// e.g., /tmp/visor-workspaces/abc/gateway/file.go → try each folder + gateway/file.go
 							for (const folder of options.allowedFolders) {
-								const folderPrefix = folder.endsWith('/') ? folder : folder + '/';
-								const wsParent = folderPrefix.replace(/[^/]+\/$/, '');
+								const folderPrefix = folder.endsWith(pathSep) ? folder : folder + pathSep;
+								const sepEscaped = pathSep === '\\' ? '\\\\' : pathSep;
+								const wsParent = folderPrefix.replace(new RegExp('[^' + sepEscaped + ']+' + sepEscaped + '$'), '');
 								if (filePart.startsWith(wsParent)) {
 									const tail = filePart.slice(wsParent.length);
-									const candidate = folderPrefix + tail;
+									const candidate = pathJoin(folderPrefix, tail);
 									if (candidate !== filePart && existsSync(candidate)) {
 										if (debug) console.error(`[extract] Auto-fixed path via workspace: ${filePart} → ${candidate}`);
 										return candidate + suffix;

package/cjs/agent/ProbeAgent.cjs

@@ -24981,7 +24981,11 @@ async function extractBinary(assetPath, outputDir) {
       if (process.env.DEBUG === "1" || process.env.VERBOSE === "1") {
         console.log(`Extracting zip to ${extractDir}...`);
       }
-      await exec(`unzip -q "${assetPath}" -d "${extractDir}"`);
+      if (isWindows) {
+        await exec(`powershell -NoProfile -Command "Expand-Archive -Path '${assetPath}' -DestinationPath '${extractDir}' -Force"`);
+      } else {
+        await exec(`unzip -q "${assetPath}" -d "${extractDir}"`);
+      }
     } else {
       if (process.env.DEBUG === "1" || process.env.VERBOSE === "1") {
         console.log(`Copying binary directly to ${binaryPath}`);
@@ -27789,14 +27793,15 @@ var init_vercel = __esm({
               const parsedTargets = parseTargets(targets);
               extractFiles = parsedTargets.map((target) => resolveTargetPath(target, effectiveCwd));
               if (options.allowedFolders && options.allowedFolders.length > 0) {
+                const { join: pathJoin, sep: pathSep } = await import("path");
                 extractFiles = extractFiles.map((target) => {
                   const { filePart, suffix } = splitTargetSuffix(target);
                   if ((0, import_fs4.existsSync)(filePart)) return target;
-                  const cwdPrefix = effectiveCwd.endsWith("/") ? effectiveCwd : effectiveCwd + "/";
+                  const cwdPrefix = effectiveCwd.endsWith(pathSep) ? effectiveCwd : effectiveCwd + pathSep;
                   const relativePart = filePart.startsWith(cwdPrefix) ? filePart.slice(cwdPrefix.length) : null;
                   if (relativePart) {
                     for (const folder of options.allowedFolders) {
-                      const candidate = folder + "/" + relativePart;
+                      const candidate = pathJoin(folder, relativePart);
                       if ((0, import_fs4.existsSync)(candidate)) {
                         if (debug) console.error(`[extract] Auto-fixed path: ${filePart} \u2192 ${candidate}`);
                         return candidate + suffix;
@@ -27804,11 +27809,12 @@ var init_vercel = __esm({
                     }
                   }
                   for (const folder of options.allowedFolders) {
-                    const folderPrefix = folder.endsWith("/") ? folder : folder + "/";
-                    const wsParent = folderPrefix.replace(/[^/]+\/$/, "");
+                    const folderPrefix = folder.endsWith(pathSep) ? folder : folder + pathSep;
+                    const sepEscaped = pathSep === "\\" ? "\\\\" : pathSep;
+                    const wsParent = folderPrefix.replace(new RegExp("[^" + sepEscaped + "]+" + sepEscaped + "$"), "");
                     if (filePart.startsWith(wsParent)) {
                       const tail = filePart.slice(wsParent.length);
-                      const candidate = folderPrefix + tail;
+                      const candidate = pathJoin(folderPrefix, tail);
                       if (candidate !== filePart && (0, import_fs4.existsSync)(candidate)) {
                         if (debug) console.error(`[extract] Auto-fixed path via workspace: ${filePart} \u2192 ${candidate}`);
                         return candidate + suffix;
@@ -97556,14 +97562,6 @@ var init_FallbackManager = __esm({
 });
 
 // src/agent/contextCompactor.js
-var contextCompactor_exports = {};
-__export(contextCompactor_exports, {
-  calculateCompactionStats: () => calculateCompactionStats,
-  compactMessages: () => compactMessages,
-  handleContextLimitError: () => handleContextLimitError,
-  identifyMessageSegments: () => identifyMessageSegments,
-  isContextLimitError: () => isContextLimitError
-});
 function isContextLimitError(error40) {
   if (!error40) return false;
   const errorMessage = (typeof error40 === "string" ? error40 : error40?.message || "").toLowerCase();
@@ -101879,6 +101877,16 @@ You are working with a workspace. Available paths: ${workspaceDesc}
               userMessage
             ];
           }
+          if (this.history.length > 0) {
+            const compacted = compactMessages(currentMessages, { keepLastSegment: true, minSegmentsToKeep: 1 });
+            if (compacted.length < currentMessages.length) {
+              const stats = calculateCompactionStats(currentMessages, compacted);
+              if (this.debug) {
+                console.log(`[DEBUG] Proactive history compaction: ${currentMessages.length} \u2192 ${compacted.length} messages (${stats.reductionPercent}% reduction, ~${stats.tokensSaved} tokens saved)`);
+              }
+              currentMessages = compacted;
+            }
+          }
           let currentIteration = 0;
           let finalResult = "I was unable to complete your request due to reaching the maximum number of tool iterations.";
           const baseMaxIterations = options._maxIterationsOverride || this.maxIterations || MAX_TOOL_ITERATIONS;
@@ -102579,7 +102587,6 @@ Double-check your response based on the criteria above. If everything looks good
        * @returns {Object} Compaction statistics
        */
       async compactHistory(options = {}) {
-        const { compactMessages: compactMessages2, calculateCompactionStats: calculateCompactionStats2 } = await Promise.resolve().then(() => (init_contextCompactor(), contextCompactor_exports));
         if (this.history.length === 0) {
           if (this.debug) {
             console.log(`[DEBUG] No history to compact for session ${this.sessionId}`);
@@ -102594,8 +102601,8 @@ Double-check your response based on the criteria above. If everything looks good
             tokensSaved: 0
           };
         }
-        const compactedMessages = compactMessages2(this.history, options);
-        const stats = calculateCompactionStats2(this.history, compactedMessages);
+        const compactedMessages = compactMessages(this.history, options);
+        const stats = calculateCompactionStats(this.history, compactedMessages);
         this.history = compactedMessages;
         try {
           await this.storageAdapter.clearHistory(this.sessionId);

package/cjs/index.cjs

@@ -1098,7 +1098,11 @@ async function extractBinary(assetPath, outputDir) {
       if (process.env.DEBUG === "1" || process.env.VERBOSE === "1") {
         console.log(`Extracting zip to ${extractDir}...`);
       }
-      await exec(`unzip -q "${assetPath}" -d "${extractDir}"`);
+      if (isWindows) {
+        await exec(`powershell -NoProfile -Command "Expand-Archive -Path '${assetPath}' -DestinationPath '${extractDir}' -Force"`);
+      } else {
+        await exec(`unzip -q "${assetPath}" -d "${extractDir}"`);
+      }
     } else {
       if (process.env.DEBUG === "1" || process.env.VERBOSE === "1") {
         console.log(`Copying binary directly to ${binaryPath}`);
@@ -82266,14 +82270,6 @@ var init_FallbackManager = __esm({
 });
 
 // src/agent/contextCompactor.js
-var contextCompactor_exports = {};
-__export(contextCompactor_exports, {
-  calculateCompactionStats: () => calculateCompactionStats,
-  compactMessages: () => compactMessages,
-  handleContextLimitError: () => handleContextLimitError,
-  identifyMessageSegments: () => identifyMessageSegments,
-  isContextLimitError: () => isContextLimitError
-});
 function isContextLimitError(error40) {
   if (!error40) return false;
   const errorMessage = (typeof error40 === "string" ? error40 : error40?.message || "").toLowerCase();
@@ -98870,6 +98866,16 @@ You are working with a workspace. Available paths: ${workspaceDesc}
               userMessage
             ];
           }
+          if (this.history.length > 0) {
+            const compacted = compactMessages(currentMessages, { keepLastSegment: true, minSegmentsToKeep: 1 });
+            if (compacted.length < currentMessages.length) {
+              const stats = calculateCompactionStats(currentMessages, compacted);
+              if (this.debug) {
+                console.log(`[DEBUG] Proactive history compaction: ${currentMessages.length} \u2192 ${compacted.length} messages (${stats.reductionPercent}% reduction, ~${stats.tokensSaved} tokens saved)`);
+              }
+              currentMessages = compacted;
+            }
+          }
           let currentIteration = 0;
           let finalResult = "I was unable to complete your request due to reaching the maximum number of tool iterations.";
           const baseMaxIterations = options._maxIterationsOverride || this.maxIterations || MAX_TOOL_ITERATIONS;
@@ -99570,7 +99576,6 @@ Double-check your response based on the criteria above. If everything looks good
        * @returns {Object} Compaction statistics
        */
       async compactHistory(options = {}) {
-        const { compactMessages: compactMessages2, calculateCompactionStats: calculateCompactionStats2 } = await Promise.resolve().then(() => (init_contextCompactor(), contextCompactor_exports));
         if (this.history.length === 0) {
           if (this.debug) {
             console.log(`[DEBUG] No history to compact for session ${this.sessionId}`);
@@ -99585,8 +99590,8 @@ Double-check your response based on the criteria above. If everything looks good
             tokensSaved: 0
           };
         }
-        const compactedMessages = compactMessages2(this.history, options);
-        const stats = calculateCompactionStats2(this.history, compactedMessages);
+        const compactedMessages = compactMessages(this.history, options);
+        const stats = calculateCompactionStats(this.history, compactedMessages);
         this.history = compactedMessages;
         try {
           await this.storageAdapter.clearHistory(this.sessionId);
@@ -101405,14 +101410,15 @@ var init_vercel = __esm({
               const parsedTargets = parseTargets(targets);
               extractFiles = parsedTargets.map((target) => resolveTargetPath(target, effectiveCwd));
               if (options.allowedFolders && options.allowedFolders.length > 0) {
+                const { join: pathJoin, sep: pathSep } = await import("path");
                 extractFiles = extractFiles.map((target) => {
                   const { filePart, suffix } = splitTargetSuffix(target);
                   if ((0, import_fs11.existsSync)(filePart)) return target;
-                  const cwdPrefix = effectiveCwd.endsWith("/") ? effectiveCwd : effectiveCwd + "/";
+                  const cwdPrefix = effectiveCwd.endsWith(pathSep) ? effectiveCwd : effectiveCwd + pathSep;
                   const relativePart = filePart.startsWith(cwdPrefix) ? filePart.slice(cwdPrefix.length) : null;
                   if (relativePart) {
                     for (const folder of options.allowedFolders) {
-                      const candidate = folder + "/" + relativePart;
+                      const candidate = pathJoin(folder, relativePart);
                       if ((0, import_fs11.existsSync)(candidate)) {
                         if (debug) console.error(`[extract] Auto-fixed path: ${filePart} \u2192 ${candidate}`);
                         return candidate + suffix;
@@ -101420,11 +101426,12 @@ var init_vercel = __esm({
                     }
                   }
                   for (const folder of options.allowedFolders) {
-                    const folderPrefix = folder.endsWith("/") ? folder : folder + "/";
-                    const wsParent = folderPrefix.replace(/[^/]+\/$/, "");
+                    const folderPrefix = folder.endsWith(pathSep) ? folder : folder + pathSep;
+                    const sepEscaped = pathSep === "\\" ? "\\\\" : pathSep;
+                    const wsParent = folderPrefix.replace(new RegExp("[^" + sepEscaped + "]+" + sepEscaped + "$"), "");
                     if (filePart.startsWith(wsParent)) {
                       const tail = filePart.slice(wsParent.length);
-                      const candidate = folderPrefix + tail;
+                      const candidate = pathJoin(folderPrefix, tail);
                       if (candidate !== filePart && (0, import_fs11.existsSync)(candidate)) {
                         if (debug) console.error(`[extract] Auto-fixed path via workspace: ${filePart} \u2192 ${candidate}`);
                         return candidate + suffix;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@probelabs/probe",
-  "version": "0.6.0-rc285",
+  "version": "0.6.0-rc286",
   "description": "Node.js wrapper for the probe code search tool",
   "main": "src/index.js",
   "module": "src/index.js",

package/src/agent/ProbeAgent.js

@@ -93,7 +93,7 @@ import { formatAvailableSkillsXml as formatAvailableSkills } from './skills/form
 import { createSkillToolInstances } from './skills/tools.js';
 import { RetryManager, createRetryManagerFromEnv } from './RetryManager.js';
 import { FallbackManager, createFallbackManagerFromEnv, buildFallbackProvidersFromEnv } from './FallbackManager.js';
-import { handleContextLimitError } from './contextCompactor.js';
+import { handleContextLimitError, compactMessages, calculateCompactionStats } from './contextCompactor.js';
 import { formatErrorForAI, ParameterError } from '../utils/error-types.js';
 import { getCommonPrefix, toRelativePath, safeRealpath } from '../utils/path-validation.js';
 import { truncateIfNeeded, getMaxOutputTokens } from './outputTruncator.js';
@@ -3227,6 +3227,25 @@ Follow these instructions carefully:
         ];
       }
 
+      // Proactively compact for multi-turn conversations.
+      // On turn 2+, previous turns contain full tool call/result history which can
+      // be 50K+ tokens. This drowns out the new user message and causes the model to
+      // focus on prior context rather than the new question.
+      // compactMessages strips intermediate monologue from completed segments,
+      // keeping user messages + final answers from prior turns.
+      // Must run AFTER adding the new user message so the compactor sees 2+ segments
+      // (completed prior turns + the new incomplete turn), preserving the latest segment.
+      if (this.history.length > 0) {
+        const compacted = compactMessages(currentMessages, { keepLastSegment: true, minSegmentsToKeep: 1 });
+        if (compacted.length < currentMessages.length) {
+          const stats = calculateCompactionStats(currentMessages, compacted);
+          if (this.debug) {
+            console.log(`[DEBUG] Proactive history compaction: ${currentMessages.length} → ${compacted.length} messages (${stats.reductionPercent}% reduction, ~${stats.tokensSaved} tokens saved)`);
+          }
+          currentMessages = compacted;
+        }
+      }
+
       let currentIteration = 0;
       let finalResult = 'I was unable to complete your request due to reaching the maximum number of tool iterations.';
 
@@ -4141,8 +4160,6 @@ Double-check your response based on the criteria above. If everything looks good
    * @returns {Object} Compaction statistics
    */
   async compactHistory(options = {}) {
-    const { compactMessages, calculateCompactionStats } = await import('./contextCompactor.js');
-
     if (this.history.length === 0) {
       if (this.debug) {
         console.log(`[DEBUG] No history to compact for session ${this.sessionId}`);

package/src/downloader.js

@@ -743,7 +743,11 @@ async function extractBinary(assetPath, outputDir) {
 			if (process.env.DEBUG === '1' || process.env.VERBOSE === '1') {
 				console.log(`Extracting zip to ${extractDir}...`);
 			}
-			await exec(`unzip -q "${assetPath}" -d "${extractDir}"`);
+			if (isWindows) {
+				await exec(`powershell -NoProfile -Command "Expand-Archive -Path '${assetPath}' -DestinationPath '${extractDir}' -Force"`);
+			} else {
+				await exec(`unzip -q "${assetPath}" -d "${extractDir}"`);
+			}
 		} else {
 			// Assume it's a direct binary
 			if (process.env.DEBUG === '1' || process.env.VERBOSE === '1') {

package/src/tools/vercel.js

@@ -691,19 +691,20 @@ export const extractTool = (options = {}) => {
 					// model constructs wrong absolute paths (e.g., /workspace/gateway/file.go
 					// instead of /workspace/tyk/gateway/file.go)
 					if (options.allowedFolders && options.allowedFolders.length > 0) {
+						const { join: pathJoin, sep: pathSep } = await import('path');
 						extractFiles = extractFiles.map(target => {
 							const { filePart, suffix } = splitTargetSuffix(target);
 							if (existsSync(filePart)) return target;
 
 							// Try resolving the relative tail against each allowedFolder
-							const cwdPrefix = (effectiveCwd.endsWith('/') ? effectiveCwd : effectiveCwd + '/');
+							const cwdPrefix = effectiveCwd.endsWith(pathSep) ? effectiveCwd : effectiveCwd + pathSep;
 							const relativePart = filePart.startsWith(cwdPrefix)
 								? filePart.slice(cwdPrefix.length)
 								: null;
 
 							if (relativePart) {
 								for (const folder of options.allowedFolders) {
-									const candidate = folder + '/' + relativePart;
+									const candidate = pathJoin(folder, relativePart);
 									if (existsSync(candidate)) {
 										if (debug) console.error(`[extract] Auto-fixed path: ${filePart} → ${candidate}`);
 										return candidate + suffix;
@@ -714,11 +715,12 @@ export const extractTool = (options = {}) => {
 							// Try stripping workspace prefix and resolving against allowedFolders
 							// e.g., /tmp/visor-workspaces/abc/gateway/file.go → try each folder + gateway/file.go
 							for (const folder of options.allowedFolders) {
-								const folderPrefix = folder.endsWith('/') ? folder : folder + '/';
-								const wsParent = folderPrefix.replace(/[^/]+\/$/, '');
+								const folderPrefix = folder.endsWith(pathSep) ? folder : folder + pathSep;
+								const sepEscaped = pathSep === '\\' ? '\\\\' : pathSep;
+								const wsParent = folderPrefix.replace(new RegExp('[^' + sepEscaped + ']+' + sepEscaped + '$'), '');
 								if (filePart.startsWith(wsParent)) {
 									const tail = filePart.slice(wsParent.length);
-									const candidate = folderPrefix + tail;
+									const candidate = pathJoin(folderPrefix, tail);
 									if (candidate !== filePart && existsSync(candidate)) {
 										if (debug) console.error(`[extract] Auto-fixed path via workspace: ${filePart} → ${candidate}`);
 										return candidate + suffix;