@probelabs/probe 0.6.0-rc262 → 0.6.0-rc264

package/build/agent/index.js

@@ -12935,6 +12935,122 @@ var init_bashPermissions = __esm({
 import { spawn as spawn2 } from "child_process";
 import { resolve as resolve3, join } from "path";
 import { existsSync as existsSync2 } from "fs";
+function splitCommandComponents(command) {
+  const parts = [];
+  let current2 = "";
+  let inQuote = false;
+  let quoteChar = "";
+  for (let i = 0; i < command.length; i++) {
+    const c = command[i];
+    const next = command[i + 1] || "";
+    if (c === "\\" && !inQuote) {
+      current2 += c + next;
+      i++;
+      continue;
+    }
+    if (inQuote && quoteChar === '"' && c === "\\" && next) {
+      current2 += c + next;
+      i++;
+      continue;
+    }
+    if (!inQuote && (c === '"' || c === "'")) {
+      inQuote = true;
+      quoteChar = c;
+      current2 += c;
+      continue;
+    }
+    if (inQuote && c === quoteChar) {
+      inQuote = false;
+      current2 += c;
+      continue;
+    }
+    if (!inQuote) {
+      if (c === "&" && next === "&" || c === "|" && next === "|") {
+        if (current2.trim()) parts.push(current2.trim());
+        current2 = "";
+        i++;
+        continue;
+      }
+      if (c === "|" || c === ";") {
+        if (current2.trim()) parts.push(current2.trim());
+        current2 = "";
+        continue;
+      }
+    }
+    current2 += c;
+  }
+  if (current2.trim()) parts.push(current2.trim());
+  return parts;
+}
+function checkSingleCommandInteractive(command) {
+  let effective = command.trim();
+  while (/^\w+=\S*\s/.test(effective)) {
+    effective = effective.replace(/^\w+=\S*\s+/, "");
+  }
+  const parts = effective.split(/\s+/);
+  const base2 = parts[0];
+  const args = parts.slice(1);
+  if (["vi", "vim", "nvim", "nano", "emacs", "pico", "joe", "mcedit"].includes(base2)) {
+    return `'${base2}' is an interactive editor and cannot run without a terminal. Use non-interactive file manipulation commands instead.`;
+  }
+  if (["less", "more"].includes(base2)) {
+    return `'${base2}' is an interactive pager. Use 'cat', 'head', or 'tail' instead.`;
+  }
+  if (base2 === "git") {
+    const sub = args[0];
+    if (sub === "commit") {
+      const hasNonInteractiveFlag = args.some(
+        (a) => a === "-m" || a.startsWith("--message") || a === "-C" || a === "-c" || a.startsWith("--fixup") || a.startsWith("--squash") || a === "--allow-empty-message" || a === "--no-edit"
+      );
+      if (!hasNonInteractiveFlag) {
+        return `Interactive command: 'git commit' opens an editor for the commit message. Use 'git commit -m "your message"' instead.`;
+      }
+    }
+    if (sub === "rebase" && (args.includes("--continue") || args.includes("--skip"))) {
+      return "Interactive command: 'git rebase --continue' opens an editor. Set environment variable GIT_EDITOR=true to accept default messages, e.g. pass env: {GIT_EDITOR: 'true'} or prepend GIT_EDITOR=true to the command.";
+    }
+    if (sub === "rebase" && (args.includes("-i") || args.includes("--interactive"))) {
+      return "Interactive command: 'git rebase -i' requires an interactive editor. Interactive rebase cannot run without a terminal.";
+    }
+    if (sub === "merge" && !args.includes("--no-edit") && !args.includes("--no-commit") && !args.includes("--ff-only")) {
+      return "Interactive command: 'git merge' may open an editor for the merge commit message. Add '--no-edit' to accept the default message.";
+    }
+    if (sub === "cherry-pick" && !args.includes("--no-edit")) {
+      return "Interactive command: 'git cherry-pick' may open an editor. Add '--no-edit' to accept the default message.";
+    }
+    if (sub === "revert" && !args.includes("--no-edit")) {
+      return "Interactive command: 'git revert' opens an editor. Add '--no-edit' to accept the default message.";
+    }
+    if (sub === "tag" && args.includes("-a") && !args.some((a) => a === "-m" || a.startsWith("--message"))) {
+      return `Interactive command: 'git tag -a' opens an editor for the tag message. Use 'git tag -a <name> -m "message"' instead.`;
+    }
+    if (sub === "add" && (args.includes("-i") || args.includes("--interactive") || args.includes("-p") || args.includes("--patch"))) {
+      return "Interactive command: 'git add -i/-p' requires interactive input. Use 'git add <files>' to stage specific files instead.";
+    }
+  }
+  if (["python", "python3", "node", "irb", "ghci", "lua", "R", "ruby"].includes(base2) && args.length === 0) {
+    return `Interactive command: '${base2}' without arguments starts an interactive REPL. Provide a script file or use '-c'/'--eval' for inline code.`;
+  }
+  if (base2 === "mysql" && !args.some((a) => a === "-e" || a.startsWith("--execute"))) {
+    return `Interactive command: 'mysql' without -e flag starts an interactive session. Use 'mysql -e "SQL QUERY"' instead.`;
+  }
+  if (base2 === "psql" && !args.some((a) => a === "-c" || a.startsWith("--command") || a === "-f" || a.startsWith("--file"))) {
+    return `Interactive command: 'psql' without -c flag starts an interactive session. Use 'psql -c "SQL QUERY"' instead.`;
+  }
+  if (["top", "htop", "btop", "nmon"].includes(base2)) {
+    return `Interactive command: '${base2}' is an interactive TUI tool. Use 'ps aux' or 'top -b -n 1' for non-interactive process listing.`;
+  }
+  return null;
+}
+function checkInteractiveCommand(command) {
+  if (!command || typeof command !== "string") return null;
+  const components = splitCommandComponents(command.trim());
+  for (const component of components) {
+    const result = checkSingleCommandInteractive(component);
+    if (result) return result;
+  }
+  return null;
+}
 async function executeBashCommand(command, options = {}) {
   const {
     workingDirectory = process.cwd(),
@@ -12964,6 +13080,24 @@ async function executeBashCommand(command, options = {}) {
     };
   }
   const startTime = Date.now();
+  const interactiveError = checkInteractiveCommand(command);
+  if (interactiveError) {
+    if (debug) {
+      console.log(`[BashExecutor] Blocked interactive command: "${command}"`);
+      console.log(`[BashExecutor] Reason: ${interactiveError}`);
+    }
+    return {
+      success: false,
+      error: interactiveError,
+      stdout: "",
+      stderr: interactiveError,
+      exitCode: 1,
+      command,
+      workingDirectory: cwd,
+      duration: 0,
+      interactive: true
+    };
+  }
   if (debug) {
     console.log(`[BashExecutor] Executing command: "${command}"`);
     console.log(`[BashExecutor] Working directory: "${cwd}"`);
@@ -12974,6 +13108,8 @@ async function executeBashCommand(command, options = {}) {
       ...process.env,
       ...env
     };
+    if (!processEnv.GIT_EDITOR) processEnv.GIT_EDITOR = "true";
+    if (!processEnv.GIT_TERMINAL_PROMPT) processEnv.GIT_TERMINAL_PROMPT = "0";
     const isComplex = isComplexCommand(command);
     let cmd, cmdArgs, useShell;
     if (isComplex) {
@@ -13008,20 +13144,32 @@ async function executeBashCommand(command, options = {}) {
       // stdin ignored, capture stdout/stderr
       shell: useShell,
       // false for security
+      detached: true,
+      // new session — no controlling terminal
       windowsHide: true
     });
     let stdout = "";
     let stderr = "";
     let killed = false;
     let timeoutHandle;
+    const killProcessGroup = (signal) => {
+      try {
+        if (child.pid) process.kill(-child.pid, signal);
+      } catch {
+        try {
+          child.kill(signal);
+        } catch {
+        }
+      }
+    };
     if (timeout > 0) {
       timeoutHandle = setTimeout(() => {
         if (!killed) {
           killed = true;
-          child.kill("SIGTERM");
+          killProcessGroup("SIGTERM");
           setTimeout(() => {
             if (child.exitCode === null) {
-              child.kill("SIGKILL");
+              killProcessGroup("SIGKILL");
             }
           }, 5e3);
         }
@@ -13034,7 +13182,7 @@ async function executeBashCommand(command, options = {}) {
       } else {
         if (!killed) {
           killed = true;
-          child.kill("SIGTERM");
+          killProcessGroup("SIGTERM");
         }
       }
     });
@@ -13045,7 +13193,7 @@ async function executeBashCommand(command, options = {}) {
       } else {
         if (!killed) {
           killed = true;
-          child.kill("SIGTERM");
+          killProcessGroup("SIGTERM");
         }
       }
     });
@@ -39381,7 +39529,6 @@ var init_reg_exp = __esm({
 // node_modules/chevrotain/lib/src/scan/lexer.js
 function analyzeTokenTypes(tokenTypes, options) {
   options = defaults_default(options, {
-    useSticky: SUPPORT_STICKY,
     debug: false,
     safeMode: false,
     positionTracking: "full",
@@ -39430,7 +39577,7 @@ function analyzeTokenTypes(tokenTypes, options) {
         ], regExpSource[1])) {
           return regExpSource[1];
         } else {
-          return options.useSticky ? addStickyFlag(currPattern) : addStartOfInput(currPattern);
+          return addStickyFlag(currPattern);
         }
       } else if (isFunction_default(currPattern)) {
         hasCustom = true;
@@ -39444,7 +39591,7 @@ function analyzeTokenTypes(tokenTypes, options) {
         } else {
           const escapedRegExpString = currPattern.replace(/[\\^$.*+?()[\]{}|]/g, "\\$&");
           const wrappedRegExp = new RegExp(escapedRegExpString);
-          return options.useSticky ? addStickyFlag(wrappedRegExp) : addStartOfInput(wrappedRegExp);
+          return addStickyFlag(wrappedRegExp);
         }
       } else {
         throw Error("non exhaustive match");
@@ -39848,10 +39995,6 @@ function noMetaChar(regExp) {
 function usesLookAheadOrBehind(regExp) {
   return /(\(\?=)|(\(\?!)|(\(\?<=)|(\(\?<!)/.test(regExp.source);
 }
-function addStartOfInput(pattern) {
-  const flags = pattern.ignoreCase ? "i" : "";
-  return new RegExp(`^(?:${pattern.source})`, flags);
-}
 function addStickyFlag(pattern) {
   const flags = pattern.ignoreCase ? "iy" : "y";
   return new RegExp(`${pattern.source}`, flags);
@@ -40040,7 +40183,7 @@ function initCharCodeToOptimizedIndexMap() {
     }
   }
 }
-var PATTERN, DEFAULT_MODE, MODES, SUPPORT_STICKY, end_of_input, start_of_input, LineTerminatorOptimizedTester, minOptimizationVal, charCodeToOptimizedIdxMap;
+var PATTERN, DEFAULT_MODE, MODES, end_of_input, start_of_input, LineTerminatorOptimizedTester, minOptimizationVal, charCodeToOptimizedIdxMap;
 var init_lexer = __esm({
   "node_modules/chevrotain/lib/src/scan/lexer.js"() {
     init_api3();
@@ -40052,7 +40195,6 @@ var init_lexer = __esm({
     PATTERN = "PATTERN";
     DEFAULT_MODE = "defaultMode";
     MODES = "modes";
-    SUPPORT_STICKY = typeof new RegExp("(?:)").sticky === "boolean";
     end_of_input = /[^\\][$]/;
     start_of_input = /[^\\[][\^]|^\^/;
     LineTerminatorOptimizedTester = {
@@ -40368,13 +40510,6 @@ var init_lexer_public = __esm({
             PRINT_WARNING(warningDescriptor.message);
           });
           this.TRACE_INIT("Choosing sub-methods implementations", () => {
-            if (SUPPORT_STICKY) {
-              this.chopInput = identity_default;
-              this.match = this.matchWithTest;
-            } else {
-              this.updateLastIndex = noop_default;
-              this.match = this.matchWithExec;
-            }
             if (hasOnlySingleMode) {
               this.handleModes = noop_default;
             }
@@ -40437,7 +40572,7 @@ var init_lexer_public = __esm({
       // this method also used quite a bit of `!` none null assertions because it is too optimized
       // for `tsc` to always understand it is "safe"
       tokenizeInternal(text, initialMode) {
-        let i, j, k, matchAltImage, longerAlt, matchedImage, payload, altPayload, imageLength, group, tokType, newToken, errLength, droppedChar, msg, match2;
+        let i, j, k, matchAltImage, longerAlt, matchedImage, payload, altPayload, imageLength, group, tokType, newToken, errLength, msg, match2;
         const orgText = text;
         const orgLength = orgText.length;
         let offset2 = 0;
@@ -40456,19 +40591,7 @@ var init_lexer_public = __esm({
         const modeStack = [];
         const emptyArray = [];
         Object.freeze(emptyArray);
-        let getPossiblePatterns;
-        function getPossiblePatternsSlow() {
-          return patternIdxToConfig;
-        }
-        function getPossiblePatternsOptimized(charCode) {
-          const optimizedCharIdx = charCodeToOptimizedIndex(charCode);
-          const possiblePatterns = currCharCodeToPatternIdxToConfig[optimizedCharIdx];
-          if (possiblePatterns === void 0) {
-            return emptyArray;
-          } else {
-            return possiblePatterns;
-          }
-        }
+        let isOptimizedMode = false;
         const pop_mode = (popToken) => {
           if (modeStack.length === 1 && // if we have both a POP_MODE and a PUSH_MODE this is in-fact a "transition"
           // So no error should occur.
@@ -40489,9 +40612,9 @@ var init_lexer_public = __esm({
             currModePatternsLength = patternIdxToConfig.length;
             const modeCanBeOptimized = this.canModeBeOptimized[newMode] && this.config.safeMode === false;
             if (currCharCodeToPatternIdxToConfig && modeCanBeOptimized) {
-              getPossiblePatterns = getPossiblePatternsOptimized;
+              isOptimizedMode = true;
             } else {
-              getPossiblePatterns = getPossiblePatternsSlow;
+              isOptimizedMode = false;
             }
           }
         };
@@ -40503,9 +40626,9 @@ var init_lexer_public = __esm({
           currModePatternsLength = patternIdxToConfig.length;
           const modeCanBeOptimized = this.canModeBeOptimized[newMode] && this.config.safeMode === false;
           if (currCharCodeToPatternIdxToConfig && modeCanBeOptimized) {
-            getPossiblePatterns = getPossiblePatternsOptimized;
+            isOptimizedMode = true;
           } else {
-            getPossiblePatterns = getPossiblePatternsSlow;
+            isOptimizedMode = false;
           }
         }
         push_mode.call(this, initialMode);
@@ -40513,8 +40636,16 @@ var init_lexer_public = __esm({
         const recoveryEnabled = this.config.recoveryEnabled;
         while (offset2 < orgLength) {
           matchedImage = null;
+          imageLength = -1;
           const nextCharCode = orgText.charCodeAt(offset2);
-          const chosenPatternIdxToConfig = getPossiblePatterns(nextCharCode);
+          let chosenPatternIdxToConfig;
+          if (isOptimizedMode) {
+            const optimizedCharIdx = charCodeToOptimizedIndex(nextCharCode);
+            const possiblePatterns = currCharCodeToPatternIdxToConfig[optimizedCharIdx];
+            chosenPatternIdxToConfig = possiblePatterns !== void 0 ? possiblePatterns : emptyArray;
+          } else {
+            chosenPatternIdxToConfig = patternIdxToConfig;
+          }
           const chosenPatternsLength = chosenPatternIdxToConfig.length;
           for (i = 0; i < chosenPatternsLength; i++) {
             currConfig = chosenPatternIdxToConfig[i];
@@ -40523,12 +40654,14 @@ var init_lexer_public = __esm({
             const singleCharCode = currConfig.short;
             if (singleCharCode !== false) {
               if (nextCharCode === singleCharCode) {
+                imageLength = 1;
                 matchedImage = currPattern;
               }
             } else if (currConfig.isCustom === true) {
               match2 = currPattern.exec(orgText, offset2, matchedTokens, groups);
               if (match2 !== null) {
                 matchedImage = match2[0];
+                imageLength = matchedImage.length;
                 if (match2.payload !== void 0) {
                   payload = match2.payload;
                 }
@@ -40536,12 +40669,13 @@ var init_lexer_public = __esm({
                 matchedImage = null;
               }
             } else {
-              this.updateLastIndex(currPattern, offset2);
-              matchedImage = this.match(currPattern, text, offset2);
+              currPattern.lastIndex = offset2;
+              imageLength = this.matchLength(currPattern, text, offset2);
             }
-            if (matchedImage !== null) {
+            if (imageLength !== -1) {
               longerAlt = currConfig.longerAlt;
               if (longerAlt !== void 0) {
+                matchedImage = text.substring(offset2, offset2 + imageLength);
                 const longerAltLength = longerAlt.length;
                 for (k = 0; k < longerAltLength; k++) {
                   const longerAltConfig = patternIdxToConfig[longerAlt[k]];
@@ -40558,11 +40692,12 @@ var init_lexer_public = __esm({
                       matchAltImage = null;
                     }
                   } else {
-                    this.updateLastIndex(longerAltPattern, offset2);
+                    longerAltPattern.lastIndex = offset2;
                     matchAltImage = this.match(longerAltPattern, text, offset2);
                   }
                   if (matchAltImage && matchAltImage.length > matchedImage.length) {
                     matchedImage = matchAltImage;
+                    imageLength = matchAltImage.length;
                     payload = altPayload;
                     currConfig = longerAltConfig;
                     break;
@@ -40572,10 +40707,10 @@ var init_lexer_public = __esm({
               break;
             }
           }
-          if (matchedImage !== null) {
-            imageLength = matchedImage.length;
+          if (imageLength !== -1) {
             group = currConfig.group;
             if (group !== void 0) {
+              matchedImage = matchedImage !== null ? matchedImage : text.substring(offset2, offset2 + imageLength);
               tokType = currConfig.tokenTypeIdx;
               newToken = this.createTokenInstance(matchedImage, offset2, tokType, currConfig.tokenType, line, column, imageLength);
               this.handlePayload(newToken, payload);
@@ -40585,15 +40720,13 @@ var init_lexer_public = __esm({
                 groups[group].push(newToken);
               }
             }
-            text = this.chopInput(text, imageLength);
-            offset2 = offset2 + imageLength;
-            column = this.computeNewColumn(column, imageLength);
             if (trackLines === true && currConfig.canLineTerminator === true) {
               let numOfLTsInMatch = 0;
               let foundTerminator;
               let lastLTEndOffset;
               lineTerminatorPattern.lastIndex = 0;
               do {
+                matchedImage = matchedImage !== null ? matchedImage : text.substring(offset2, offset2 + imageLength);
                 foundTerminator = lineTerminatorPattern.test(matchedImage);
                 if (foundTerminator === true) {
                   lastLTEndOffset = lineTerminatorPattern.lastIndex - 1;
@@ -40604,8 +40737,13 @@ var init_lexer_public = __esm({
                 line = line + numOfLTsInMatch;
                 column = imageLength - lastLTEndOffset;
                 this.updateTokenEndLineColumnLocation(newToken, group, lastLTEndOffset, numOfLTsInMatch, line, column, imageLength);
+              } else {
+                column = this.computeNewColumn(column, imageLength);
               }
+            } else {
+              column = this.computeNewColumn(column, imageLength);
             }
+            offset2 = offset2 + imageLength;
             this.handleModes(currConfig, pop_mode, push_mode, newToken);
           } else {
             const errorStartOffset = offset2;
@@ -40613,7 +40751,6 @@ var init_lexer_public = __esm({
             const errorColumn = column;
             let foundResyncPoint = recoveryEnabled === false;
             while (foundResyncPoint === false && offset2 < orgLength) {
-              text = this.chopInput(text, 1);
               offset2++;
               for (j = 0; j < currModePatternsLength; j++) {
                 const currConfig2 = patternIdxToConfig[j];
@@ -40626,7 +40763,7 @@ var init_lexer_public = __esm({
                 } else if (currConfig2.isCustom === true) {
                   foundResyncPoint = currPattern.exec(orgText, offset2, matchedTokens, groups) !== null;
                 } else {
-                  this.updateLastIndex(currPattern, offset2);
+                  currPattern.lastIndex = offset2;
                   foundResyncPoint = currPattern.exec(text) !== null;
                 }
                 if (foundResyncPoint === true) {
@@ -40669,12 +40806,6 @@ var init_lexer_public = __esm({
           push_mode.call(this, config.push);
         }
       }
-      chopInput(text, length) {
-        return text.substring(length);
-      }
-      updateLastIndex(regExp, newLastIndex) {
-        regExp.lastIndex = newLastIndex;
-      }
       // TODO: decrease this under 600 characters? inspect stripping comments option in TSC compiler
       updateTokenEndLineColumnLocation(newToken, group, lastLTIdx, numOfLTsInMatch, line, column, imageLength) {
         let lastCharIsLT, fixForEndingInLT;
@@ -40737,16 +40868,19 @@ var init_lexer_public = __esm({
           token.payload = payload;
         }
       }
-      matchWithTest(pattern, text, offset2) {
+      match(pattern, text, offset2) {
         const found = pattern.test(text);
         if (found === true) {
           return text.substring(offset2, pattern.lastIndex);
         }
         return null;
       }
-      matchWithExec(pattern, text) {
-        const regExpArray = pattern.exec(text);
-        return regExpArray !== null ? regExpArray[0] : null;
+      matchLength(pattern, text, offset2) {
+        const found = pattern.test(text);
+        if (found === true) {
+          return pattern.lastIndex - offset2;
+        }
+        return -1;
       }
     };
     Lexer.SKIPPED = "This marks a skipped Token pattern, this means each token identified by it will be consumed and then thrown into oblivion, this can be used to for example to completely ignore whitespace.";
@@ -40938,12 +41072,20 @@ For Further details.`;
         return errMsg;
       },
       buildAlternationAmbiguityError(options) {
-        const pathMsg = map_default(options.prefixPath, (currtok) => tokenLabel2(currtok)).join(", ");
         const occurrence = options.alternation.idx === 0 ? "" : options.alternation.idx;
+        const isEmptyPath = options.prefixPath.length === 0;
         let currMessage = `Ambiguous Alternatives Detected: <${options.ambiguityIndices.join(" ,")}> in <OR${occurrence}> inside <${options.topLevelRule.name}> Rule,
-<${pathMsg}> may appears as a prefix path in all these alternatives.
 `;
-        currMessage = currMessage + `See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#AMBIGUOUS_ALTERNATIVES
+        if (isEmptyPath) {
+          currMessage += `These alternatives are all empty (match no tokens), making them indistinguishable.
+Only the last alternative may be empty.
+`;
+        } else {
+          const pathMsg = map_default(options.prefixPath, (currtok) => tokenLabel2(currtok)).join(", ");
+          currMessage += `<${pathMsg}> may appears as a prefix path in all these alternatives.
+`;
+        }
+        currMessage += `See: https://chevrotain.io/docs/guide/resolving_grammar_errors.html#AMBIGUOUS_ALTERNATIVES
 For Further details.`;
         return currMessage;
       },
@@ -70182,12 +70324,31 @@ function cleanSchemaResponse(response) {
     const closeChar = openChar === "{" ? "}" : "]";
     let bracketCount = 1;
     let endIndex = startIndex + 1;
+    let inString = false;
+    let escapeNext = false;
     while (endIndex < trimmed.length && bracketCount > 0) {
       const char = trimmed[endIndex];
-      if (char === openChar) {
-        bracketCount++;
-      } else if (char === closeChar) {
-        bracketCount--;
+      if (escapeNext) {
+        escapeNext = false;
+        endIndex++;
+        continue;
+      }
+      if (char === "\\" && inString) {
+        escapeNext = true;
+        endIndex++;
+        continue;
+      }
+      if (char === '"') {
+        inString = !inString;
+        endIndex++;
+        continue;
+      }
+      if (!inString) {
+        if (char === openChar) {
+          bracketCount++;
+        } else if (char === closeChar) {
+          bracketCount--;
+        }
       }
       endIndex++;
     }

package/build/agent/schemaUtils.js

@@ -387,18 +387,42 @@ export function cleanSchemaResponse(response) {
   if (codeBlockMatch && !isCodeBlockEmbeddedInDocument(trimmed, codeBlockMatch)) {
     const startIndex = codeBlockMatch.index + codeBlockMatch[0].length - 1; // Position of the bracket
 
-    // Find the matching closing bracket
+    // Find the matching closing bracket (string-aware to avoid miscounting
+    // brackets inside JSON string values)
     const openChar = codeBlockMatch[1];
     const closeChar = openChar === '{' ? '}' : ']';
     let bracketCount = 1;
     let endIndex = startIndex + 1;
+    let inString = false;
+    let escapeNext = false;
 
     while (endIndex < trimmed.length && bracketCount > 0) {
       const char = trimmed[endIndex];
-      if (char === openChar) {
-        bracketCount++;
-      } else if (char === closeChar) {
-        bracketCount--;
+
+      if (escapeNext) {
+        escapeNext = false;
+        endIndex++;
+        continue;
+      }
+
+      if (char === '\\' && inString) {
+        escapeNext = true;
+        endIndex++;
+        continue;
+      }
+
+      if (char === '"') {
+        inString = !inString;
+        endIndex++;
+        continue;
+      }
+
+      if (!inString) {
+        if (char === openChar) {
+          bracketCount++;
+        } else if (char === closeChar) {
+          bracketCount--;
+        }
       }
       endIndex++;
     }