@probelabs/probe 0.6.0-rc285 → 0.6.0-rc287

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}`);
@@ -27053,7 +27057,14 @@ function parseTargets(targets) {
 }
 function parseAndResolvePaths(pathStr, cwd) {
   if (!pathStr) return [];
-  const paths = pathStr.split(",").map((p) => p.trim()).filter((p) => p.length > 0);
+  let paths = pathStr.split(",").map((p) => p.trim()).filter((p) => p.length > 0);
+  paths = paths.flatMap((p) => {
+    if (!/\s/.test(p)) return [p];
+    const parts = p.split(/\s+/).filter(Boolean);
+    if (parts.length <= 1) return [p];
+    const allLookLikePaths = parts.every((part) => /[/\\]/.test(part) || /\.\w+/.test(part));
+    return allLookLikePaths ? parts : [p];
+  });
   return paths.map((p) => {
     if ((0, import_path5.isAbsolute)(p)) {
       return p;
@@ -46716,6 +46727,7 @@ var init_parser2 = __esm({
                     { ALT: () => this.CONSUME(Identifier) },
                     { ALT: () => this.CONSUME(Text) },
                     { ALT: () => this.CONSUME(NumberLiteral) },
+                    { ALT: () => this.CONSUME(ColorValue) },
                     // Note: RoundOpen and RoundClose (parentheses) are NOT allowed in unquoted labels
                     // to match Mermaid's behavior - use quoted labels like ["text (with parens)"] instead
                     // Allow HTML-like tags (e.g., <br/>) inside labels
@@ -46807,6 +46819,7 @@ var init_parser2 = __esm({
               { ALT: () => this.CONSUME(Identifier) },
               { ALT: () => this.CONSUME(Text) },
               { ALT: () => this.CONSUME(NumberLiteral) },
+              { ALT: () => this.CONSUME(ColorValue) },
               // Allow HTML-like angle brackets and slashes for <br/>, <i>, etc.
               { ALT: () => this.CONSUME(AngleLess) },
               { ALT: () => this.CONSUME(AngleOpen) },
@@ -47982,13 +47995,24 @@ function mapFlowchartParserError(err, text) {
       length: len
     };
   }
-  if (tokType === "QuotedString" || tokType === "SquareOpen" || tokType === "SquareClose") {
+  if (tokType === "QuotedString" || tokType === "SquareOpen" || tokType === "SquareClose" || tokType === "DiamondOpen" || tokType === "DiamondClose") {
     const context = err?.context;
     const inLinkRule = context?.ruleStack?.includes("linkTextInline") || context?.ruleStack?.includes("link") || false;
     const lineContent = allLines[Math.max(0, line - 1)] || "";
     const beforeQuote = lineContent.slice(0, Math.max(0, column - 1));
     const hasLinkBefore = beforeQuote.match(/--\s*$|==\s*$|-\.\s*$|-\.-\s*$|\[\s*$/);
     if (inLinkRule || hasLinkBefore) {
+      if (tokType === "DiamondOpen" || tokType === "DiamondClose") {
+        return {
+          line,
+          column,
+          severity: "error",
+          code: "FL-EDGE-LABEL-CURLY-IN-PIPES",
+          message: "Curly braces { } are not supported inside pipe-delimited edge labels.",
+          hint: "Use HTML entities &#123; and &#125; inside |...|, e.g., --|Resolve $&#123;VAR&#125;|-->",
+          length: len
+        };
+      }
       if (tokType === "SquareOpen" || tokType === "SquareClose") {
         return {
           line,
@@ -48050,6 +48074,17 @@ function mapFlowchartParserError(err, text) {
           length: len
         };
       }
+      if (tokType === "DiamondOpen" || tokType === "DiamondClose") {
+        return {
+          line,
+          column,
+          severity: "error",
+          code: "FL-LABEL-CURLY-IN-UNQUOTED",
+          message: "Curly braces are not supported inside unquoted node labels.",
+          hint: "Use &#123; and &#125; for literal braces, e.g., C[Substitute &#123;params&#125;].",
+          length: len
+        };
+      }
       {
         const caret0 = Math.max(0, column - 1);
         const openIdx = lineStr.lastIndexOf("[", caret0);
@@ -48091,9 +48126,20 @@ function mapFlowchartParserError(err, text) {
               length: len
             };
           }
+          if (seg.includes("{") || seg.includes("}")) {
+            return {
+              line,
+              column,
+              severity: "error",
+              code: "FL-LABEL-CURLY-IN-UNQUOTED",
+              message: "Curly braces are not supported inside unquoted node labels.",
+              hint: "Use &#123; and &#125; for literal braces, e.g., C[Substitute &#123;params&#125;].",
+              length: len
+            };
+          }
         }
       }
-      if (tokType === "QuotedString" || tokType === "SquareOpen" || tokType === "SquareClose") {
+      if (tokType === "QuotedString") {
         return {
           line,
           column,
@@ -48104,6 +48150,17 @@ function mapFlowchartParserError(err, text) {
           length: len
         };
       }
+      if (tokType === "SquareOpen" || tokType === "SquareClose") {
+        return {
+          line,
+          column,
+          severity: "error",
+          code: "FL-LABEL-BRACKET-IN-UNQUOTED",
+          message: "Square brackets are not supported inside unquoted node labels.",
+          hint: 'Use &#91; and &#93; for literal brackets or wrap the label in quotes, e.g., C["bind_paths[]"]',
+          length: len
+        };
+      }
       const q = findInnerQuoteIssue("[");
       if (q?.kind === "escaped") {
         return { line, column: q.column, severity: "error", code: "FL-LABEL-ESCAPED-QUOTE", message: 'Escaped quotes (\\") in node labels are not supported by Mermaid. Use &quot; instead.', hint: 'Prefer "He said &quot;Hi&quot;".', length: 2 };
@@ -48114,7 +48171,7 @@ function mapFlowchartParserError(err, text) {
       return { line, column, severity: "error", code: "FL-NODE-UNCLOSED-BRACKET", message: "Unclosed '['. Add a matching ']' before the arrow or newline.", hint: "Example: A[Label] --> B", length: 1 };
     }
     if (expecting(err, "RoundClose")) {
-      if (tokType === "QuotedString" || tokType === "SquareOpen" || tokType === "SquareClose") {
+      if (tokType === "QuotedString") {
         return {
           line,
           column,
@@ -48125,6 +48182,17 @@ function mapFlowchartParserError(err, text) {
           length: len
         };
       }
+      if (tokType === "SquareOpen" || tokType === "SquareClose") {
+        return {
+          line,
+          column,
+          severity: "error",
+          code: "FL-LABEL-BRACKET-IN-UNQUOTED",
+          message: "Square brackets are not supported inside unquoted node labels.",
+          hint: 'Use &#91; and &#93; for literal brackets or wrap the label in quotes, e.g., C["bind_paths[]"]',
+          length: len
+        };
+      }
       {
         const caret0 = Math.max(0, column - 1);
         const openIdx = lineStr.lastIndexOf("(", caret0);
@@ -48153,7 +48221,7 @@ function mapFlowchartParserError(err, text) {
       return { line, column, severity: "error", code: "FL-NODE-UNCLOSED-BRACKET", message: "Unclosed '('. Add a matching ')'.", hint: "Example: B(Label)", length: 1 };
     }
     if (expecting(err, "DiamondClose")) {
-      if (tokType === "QuotedString" || tokType === "SquareOpen" || tokType === "SquareClose") {
+      if (tokType === "QuotedString") {
         return {
           line,
           column,
@@ -48164,6 +48232,17 @@ function mapFlowchartParserError(err, text) {
           length: len
         };
       }
+      if (tokType === "SquareOpen" || tokType === "SquareClose") {
+        return {
+          line,
+          column,
+          severity: "error",
+          code: "FL-LABEL-BRACKET-IN-UNQUOTED",
+          message: "Square brackets are not supported inside unquoted node labels.",
+          hint: 'Use &#91; and &#93; for literal brackets or wrap the label in quotes, e.g., C["bind_paths[]"]',
+          length: len
+        };
+      }
       {
         const caret0 = Math.max(0, column - 1);
         const openIdx = lineStr.lastIndexOf("{", caret0);
@@ -49006,7 +49085,7 @@ function validateFlowchart(text, options = {}) {
         const byLine = /* @__PURE__ */ new Map();
         const collect = (arr) => {
           for (const e of arr || []) {
-            if (e && (e.code === "FL-LABEL-PARENS-UNQUOTED" || e.code === "FL-LABEL-AT-IN-UNQUOTED" || e.code === "FL-LABEL-QUOTE-IN-UNQUOTED" || e.code === "FL-LABEL-SLASH-UNQUOTED")) {
+            if (e && (e.code === "FL-LABEL-PARENS-UNQUOTED" || e.code === "FL-LABEL-AT-IN-UNQUOTED" || e.code === "FL-LABEL-QUOTE-IN-UNQUOTED" || e.code === "FL-LABEL-SLASH-UNQUOTED" || e.code === "FL-LABEL-CURLY-IN-UNQUOTED" || e.code === "FL-LABEL-BRACKET-IN-UNQUOTED")) {
               const ln = e.line ?? 0;
               const col = e.column ?? 1;
               const list = byLine.get(ln) || [];
@@ -49088,6 +49167,9 @@ function validateFlowchart(text, options = {}) {
                 const hasParens = seg.includes("(") || seg.includes(")");
                 const hasAt = seg.includes("@");
                 const hasQuote = seg.includes('"');
+                const hasCurly = seg.includes("{") || seg.includes("}");
+                const hasBracket = seg.includes("[") || seg.includes("]");
+                const isDoubleSquare = raw.slice(i, i + 2) === "[[" && raw.slice(j - 2, j) === "]]";
                 const isSingleQuoted = /^'[^]*'$/.test(trimmed);
                 const hasLeadingSlash = lsp === "/" || lsp === "\\";
                 if (!covered && !isQuoted && !isParenWrapped && hasParens) {
@@ -49105,6 +49187,16 @@ function validateFlowchart(text, options = {}) {
                   existing.push({ start: startCol, end: endCol });
                   byLine.set(ln, existing);
                 }
+                if (!covered && !isQuoted && !isSlashPair && hasCurly) {
+                  errs.push({ line: ln, column: startCol, severity: "error", code: "FL-LABEL-CURLY-IN-UNQUOTED", message: "Curly braces are not supported inside unquoted node labels.", hint: "Use &#123; and &#125; for literal braces, e.g., C[Substitute &#123;params&#125;]." });
+                  existing.push({ start: startCol, end: endCol });
+                  byLine.set(ln, existing);
+                }
+                if (!covered && !isQuoted && !isSlashPair && !isDoubleSquare && hasBracket) {
+                  errs.push({ line: ln, column: startCol, severity: "error", code: "FL-LABEL-BRACKET-IN-UNQUOTED", message: "Square brackets are not supported inside unquoted node labels.", hint: 'Use &#91; and &#93; for literal brackets or wrap the label in quotes, e.g., C["bind_paths[]"]' });
+                  existing.push({ start: startCol, end: endCol });
+                  byLine.set(ln, existing);
+                }
                 if (!covered && !isQuoted && !isSlashPair && hasQuote && !isSingleQuoted) {
                   errs.push({ line: ln, column: startCol, severity: "error", code: "FL-LABEL-QUOTE-IN-UNQUOTED", message: "Quotes are not allowed inside unquoted node labels. Use &quot; for quotes or wrap the entire label in quotes.", hint: 'Example: C["HTML Output: data-trigger-visibility=&quot;true&quot;"]' });
                   existing.push({ start: startCol, end: endCol });
@@ -51465,7 +51557,7 @@ function computeFixes(text, errors, level = "safe") {
       }
       continue;
     }
-    if (is("FL-EDGE-LABEL-BRACKET", e)) {
+    if (is("FL-EDGE-LABEL-BRACKET", e) || is("FL-EDGE-LABEL-CURLY-IN-PIPES", e)) {
       const lineText = lineTextAt(text, e.line);
       const firstBar = lineText.indexOf("|");
       const secondBar = firstBar >= 0 ? lineText.indexOf("|", firstBar + 1) : -1;
@@ -51473,7 +51565,8 @@ function computeFixes(text, errors, level = "safe") {
         const before = lineText.slice(0, firstBar + 1);
         const label = lineText.slice(firstBar + 1, secondBar);
         const after = lineText.slice(secondBar);
-        const fixedLabel = label.replace(/\[/g, "&#91;").replace(/\]/g, "&#93;");
+        let fixedLabel = label.replace(/\[/g, "&#91;").replace(/\]/g, "&#93;");
+        fixedLabel = fixedLabel.replace(/\{/g, "&#123;").replace(/\}/g, "&#125;");
         const fixedLine = before + fixedLabel + after;
         const finalLine = fixedLine.replace(/\[([^\]]*)\]/g, (m, seg) => "[" + String(seg).replace(/`/g, "") + "]");
         edits.push({ start: { line: e.line, column: 1 }, end: { line: e.line, column: lineText.length + 1 }, newText: finalLine });
@@ -52113,7 +52206,7 @@ function computeFixes(text, errors, level = "safe") {
       }
       continue;
     }
-    if (is("FL-LABEL-PARENS-UNQUOTED", e) || is("FL-LABEL-AT-IN-UNQUOTED", e) || is("FL-LABEL-SLASH-UNQUOTED", e)) {
+    if (is("FL-LABEL-PARENS-UNQUOTED", e) || is("FL-LABEL-AT-IN-UNQUOTED", e) || is("FL-LABEL-SLASH-UNQUOTED", e) || is("FL-LABEL-CURLY-IN-UNQUOTED", e) || is("FL-LABEL-BRACKET-IN-UNQUOTED", e)) {
       if (level === "safe" || level === "all") {
         if (patchedLines.has(e.line))
           continue;
@@ -52154,7 +52247,7 @@ function computeFixes(text, errors, level = "safe") {
             if (openIdx === -1)
               break;
             const contentStart = openIdx + shape.open.length;
-            const closeIdx = shape.open === "(" && shape.close === ")" ? findMatchingCloser(lineText, openIdx, shape.open, shape.close) : lineText.indexOf(shape.close, contentStart);
+            const closeIdx = shape.open === "(" && shape.close === ")" || shape.open === "[" && shape.close === "]" ? findMatchingCloser(lineText, openIdx, shape.open, shape.close) : lineText.indexOf(shape.close, contentStart);
             if (closeIdx === -1)
               break;
             if (openIdx <= caret0 && caret0 < closeIdx) {
@@ -52174,11 +52267,21 @@ function computeFixes(text, errors, level = "safe") {
               const isSlashPair = (l, r) => l === "/" && r === "/" || l === "\\" && r === "\\" || l === "/" && r === "\\" || l === "\\" && r === "/";
               const isParallelogramShape = core.length >= 2 && isSlashPair(left, right);
               let replaced;
-              if (!isParallelogramShape) {
-                const escaped = inner.replace(/`/g, "").replace(/\"/g, "&quot;").replace(/"/g, "&quot;");
+              if (is("FL-LABEL-BRACKET-IN-UNQUOTED", e) && !isParallelogramShape) {
+                const hasOtherHazards = /[(){}@]/.test(inner) || inner.includes('"') || inner.includes('\\"');
+                if (hasOtherHazards) {
+                  const escaped = inner.replace(/`/g, "").replace(/\\"/g, "&quot;").replace(/"/g, "&quot;");
+                  replaced = '"' + escaped + '"';
+                } else {
+                  replaced = inner.replace(/\[/g, "&#91;").replace(/\]/g, "&#93;");
+                }
+              } else if (is("FL-LABEL-CURLY-IN-UNQUOTED", e)) {
+                replaced = inner.replace(/\{/g, "&#123;").replace(/\}/g, "&#125;");
+              } else if (!isParallelogramShape) {
+                const escaped = inner.replace(/`/g, "").replace(/\\"/g, "&quot;").replace(/"/g, "&quot;");
                 replaced = '"' + escaped + '"';
               } else {
-                replaced = inner.replace(/`/g, "").replace(/\(/g, "&#40;").replace(/\)/g, "&#41;").replace(/\"/g, "&quot;").replace(/"/g, "&quot;");
+                replaced = inner.replace(/`/g, "").replace(/\(/g, "&#40;").replace(/\)/g, "&#41;").replace(/\[/g, "&#91;").replace(/\]/g, "&#93;").replace(/\\"/g, "&quot;").replace(/"/g, "&quot;");
               }
               if (replaced !== inner) {
                 edits.push({ start: { line: e.line, column: contentStart + 1 }, end: { line: e.line, column: closeIdx + 1 }, newText: replaced });
@@ -82266,14 +82369,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 +98965,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 +99675,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 +99689,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);
@@ -100915,11 +101019,24 @@ function normalizeTargets(targets) {
     if (typeof target !== "string") continue;
     const trimmed = target.trim();
     if (!trimmed || seen.has(trimmed)) continue;
-    seen.add(trimmed);
-    normalized.push(trimmed);
+    const subTargets = splitSpaceSeparatedPaths(trimmed);
+    for (const sub of subTargets) {
+      if (!seen.has(sub)) {
+        seen.add(sub);
+        normalized.push(sub);
+      }
+    }
   }
   return normalized;
 }
+function splitSpaceSeparatedPaths(target) {
+  if (!/\s/.test(target)) return [target];
+  const parts = target.split(/\s+/).filter(Boolean);
+  if (parts.length <= 1) return [target];
+  const allLookLikePaths = parts.every((p) => /[/\\]/.test(p) || /\.\w+/.test(p));
+  if (allLookLikePaths) return parts;
+  return [target];
+}
 function extractJsonSnippet(text) {
   const jsonBlockMatch = text.match(/```json\s*([\s\S]*?)```/i);
   if (jsonBlockMatch) {
@@ -101405,14 +101522,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 +101538,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-rc287",
   "description": "Node.js wrapper for the probe code search tool",
   "main": "src/index.js",
   "module": "src/index.js",
@@ -80,11 +80,11 @@
     "@anthropic-ai/claude-agent-sdk": "^0.1.46",
     "@modelcontextprotocol/sdk": "^1.0.0",
     "@nyariv/sandboxjs": "github:probelabs/SandboxJS",
-    "@probelabs/maid": "^0.0.26",
+    "@probelabs/maid": "^0.0.27",
     "acorn": "^8.15.0",
     "acorn-walk": "^8.3.4",
     "adm-zip": "^0.5.16",
-    "ai": "^6.0.121",
+    "ai": "^6.0.0",
     "ajv": "^8.17.1",
     "astring": "^1.9.0",
     "axios": "^1.8.3",

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/common.js

@@ -228,7 +228,17 @@ export function parseAndResolvePaths(pathStr, cwd) {
 	if (!pathStr) return [];
 
 	// Split on comma and trim whitespace
-	const paths = pathStr.split(',').map(p => p.trim()).filter(p => p.length > 0);
+	let paths = pathStr.split(',').map(p => p.trim()).filter(p => p.length > 0);
+
+	// Auto-fix: model sometimes passes space-separated file paths as one string
+	// e.g. "src/ranking.rs src/simd_ranking.rs" — split if each part looks like a path
+	paths = paths.flatMap(p => {
+		if (!/\s/.test(p)) return [p];
+		const parts = p.split(/\s+/).filter(Boolean);
+		if (parts.length <= 1) return [p];
+		const allLookLikePaths = parts.every(part => /[/\\]/.test(part) || /\.\w+/.test(part));
+		return allLookLikePaths ? parts : [p];
+	});
 
 	// Resolve relative paths against cwd
 	return paths.map(p => {

package/src/tools/vercel.js

@@ -105,13 +105,42 @@ function normalizeTargets(targets) {
 		if (typeof target !== 'string') continue;
 		const trimmed = target.trim();
 		if (!trimmed || seen.has(trimmed)) continue;
-		seen.add(trimmed);
-		normalized.push(trimmed);
+
+		// Auto-fix: model sometimes puts multiple space-separated file paths in one string
+		// e.g. "src/ranking.rs src/simd_ranking.rs" — split them apart
+		const subTargets = splitSpaceSeparatedPaths(trimmed);
+		for (const sub of subTargets) {
+			if (!seen.has(sub)) {
+				seen.add(sub);
+				normalized.push(sub);
+			}
+		}
 	}
 
 	return normalized;
 }
 
+/**
+ * Split a string that may contain multiple space-separated file paths.
+ * Detects patterns like "path/file.ext path2/file2.ext" and splits them.
+ * Preserves single paths and paths with suffixes like ":10-20" or "#Symbol".
+ */
+function splitSpaceSeparatedPaths(target) {
+	// If no spaces, it's a single target
+	if (!/\s/.test(target)) return [target];
+
+	// Split on whitespace and check if parts look like file paths
+	const parts = target.split(/\s+/).filter(Boolean);
+	if (parts.length <= 1) return [target];
+
+	// Check if each part looks like a file path (has a dot extension or path separator)
+	const allLookLikePaths = parts.every(p => /[/\\]/.test(p) || /\.\w+/.test(p));
+	if (allLookLikePaths) return parts;
+
+	// Not confident these are separate paths — return as-is
+	return [target];
+}
+
 function extractJsonSnippet(text) {
 	const jsonBlockMatch = text.match(/```json\s*([\s\S]*?)```/i);
 	if (jsonBlockMatch) {
@@ -691,19 +720,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 +744,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;