@probelabs/probe 0.6.0-rc241 → 0.6.0-rc245

package/cjs/agent/ProbeAgent.cjs

@@ -5978,6 +5978,8 @@ var init_EventStreamSerde = __esm({
             } else {
               serializer.write(eventSchema, event[unionMember]);
             }
+          } else if (eventSchema.isUnitSchema()) {
+            serializer.write(eventSchema, {});
           } else {
             throw new Error("@smithy/core/event-streams - non-struct member not supported in event stream union.");
           }
@@ -6314,7 +6316,9 @@ var init_HttpBindingProtocol = __esm({
           if (bytes.byteLength > 0) {
             const dataFromBody = await deserializer.read(ns, bytes);
             for (const member2 of nonHttpBindingMembers) {
-              dataObject[member2] = dataFromBody[member2];
+              if (dataFromBody[member2] != null) {
+                dataObject[member2] = dataFromBody[member2];
+              }
             }
           }
         } else if (nonHttpBindingMembers.discardResponseBody) {
@@ -17502,7 +17506,7 @@ var require_package2 = __commonJS({
     module2.exports = {
       name: "@aws-sdk/client-bedrock-runtime",
       description: "AWS SDK for JavaScript Bedrock Runtime Client for Node.js, Browser and React Native",
-      version: "3.991.0",
+      version: "3.992.0",
       scripts: {
         build: "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
         "build:cjs": "node ../../scripts/compilation/inline client-bedrock-runtime",
@@ -17532,9 +17536,9 @@ var require_package2 = __commonJS({
         "@aws-sdk/middleware-user-agent": "^3.972.10",
         "@aws-sdk/middleware-websocket": "^3.972.6",
         "@aws-sdk/region-config-resolver": "^3.972.3",
-        "@aws-sdk/token-providers": "3.991.0",
+        "@aws-sdk/token-providers": "3.992.0",
         "@aws-sdk/types": "^3.973.1",
-        "@aws-sdk/util-endpoints": "3.991.0",
+        "@aws-sdk/util-endpoints": "3.992.0",
         "@aws-sdk/util-user-agent-browser": "^3.972.3",
         "@aws-sdk/util-user-agent-node": "^3.972.8",
         "@smithy/config-resolver": "^4.4.6",
@@ -24104,7 +24108,7 @@ var init_package2 = __esm({
   "node_modules/@aws-sdk/token-providers/node_modules/@aws-sdk/nested-clients/package.json"() {
     package_default2 = {
       name: "@aws-sdk/nested-clients",
-      version: "3.991.0",
+      version: "3.992.0",
       description: "Nested clients for AWS SDK packages.",
       main: "./dist-cjs/index.js",
       module: "./dist-es/index.js",
@@ -24140,7 +24144,7 @@ var init_package2 = __esm({
         "@aws-sdk/middleware-user-agent": "^3.972.10",
         "@aws-sdk/region-config-resolver": "^3.972.3",
         "@aws-sdk/types": "^3.973.1",
-        "@aws-sdk/util-endpoints": "3.991.0",
+        "@aws-sdk/util-endpoints": "3.992.0",
         "@aws-sdk/util-user-agent-browser": "^3.972.3",
         "@aws-sdk/util-user-agent-node": "^3.972.8",
         "@smithy/config-resolver": "^4.4.6",
@@ -51352,7 +51356,16 @@ function generateSandboxGlobals(options) {
   }
   if (llmCall) {
     const rawLLM = async (instruction, data3, opts = {}) => {
-      return llmCall(instruction, data3, opts);
+      const result = await llmCall(instruction, data3, opts);
+      if (opts.schema && typeof result === "string") {
+        try {
+          return JSON.parse(result);
+        } catch (e5) {
+          logFn?.("[LLM] Warning: schema provided but result is not valid JSON");
+          return result;
+        }
+      }
+      return result;
     };
     globals.LLM = traceToolCall("LLM", rawLLM, tracer, logFn);
   }
@@ -51409,6 +51422,54 @@ function generateSandboxGlobals(options) {
     }
     return chunks;
   };
+  globals.chunkByKey = (data3, keyFn, maxTokens = 2e4) => {
+    const CHARS_PER_TOKEN3 = 4;
+    const maxChars = maxTokens * CHARS_PER_TOKEN3;
+    const text = typeof data3 === "string" ? data3 : JSON.stringify(data3);
+    const blockRegex = /^File: ([^\n]+)/gm;
+    const markers = [];
+    let match2;
+    while ((match2 = blockRegex.exec(text)) !== null) {
+      markers.push({ index: match2.index, file: match2[1].trim() });
+    }
+    if (markers.length === 0) {
+      return globals.chunk(data3, maxTokens);
+    }
+    const chunks = [];
+    let currentChunk = "";
+    let currentSize = 0;
+    let keysInChunk = /* @__PURE__ */ new Set();
+    for (let i5 = 0; i5 < markers.length; i5++) {
+      const start = markers[i5].index;
+      const end = i5 + 1 < markers.length ? markers[i5 + 1].index : text.length;
+      const block = text.slice(start, end).trim();
+      const file = markers[i5].file;
+      const key = typeof keyFn === "function" ? keyFn(file) : file;
+      const blockSize = block.length + 2;
+      const wouldOverflow = currentSize + blockSize > maxChars;
+      const keyAlreadyInChunk = keysInChunk.has(key);
+      if (!keyAlreadyInChunk && wouldOverflow && currentChunk) {
+        chunks.push(currentChunk.trim());
+        currentChunk = "";
+        currentSize = 0;
+        keysInChunk = /* @__PURE__ */ new Set();
+      }
+      if (currentChunk) currentChunk += "\n\n";
+      currentChunk += block;
+      currentSize += blockSize;
+      keysInChunk.add(key);
+    }
+    if (currentChunk.trim()) {
+      chunks.push(currentChunk.trim());
+    }
+    return chunks.length > 0 ? chunks : [""];
+  };
+  globals.extractPaths = (searchResults) => {
+    const text = typeof searchResults === "string" ? searchResults : JSON.stringify(searchResults);
+    const matches = text.match(/^File: ([^\n]+)/gm) || [];
+    const paths = matches.map((m5) => m5.replace("File: ", "").trim());
+    return [...new Set(paths)];
+  };
   globals.log = (message) => {
     if (globals._logs) globals._logs.push(String(message));
   };
@@ -58653,6 +58714,26 @@ Last error: ${lastError}`;
     }
   });
 }
+function extractRawOutputBlocks(content, outputBuffer = null) {
+  if (typeof content !== "string") {
+    return { cleanedContent: content, extractedBlocks: [] };
+  }
+  const extractedBlocks = [];
+  const regex = new RegExp(`${RAW_OUTPUT_START}\\n([\\s\\S]*?)\\n${RAW_OUTPUT_END}`, "g");
+  let cleanedContent = content;
+  let match2;
+  while ((match2 = regex.exec(content)) !== null) {
+    extractedBlocks.push(match2[1]);
+  }
+  cleanedContent = content.replace(new RegExp(`${RAW_OUTPUT_START}\\n[\\s\\S]*?\\n${RAW_OUTPUT_END}`, "g"), "").replace(/\n\n\[The above raw output \(\d+ chars\) will be passed directly to the final response\. Do NOT repeat, summarize, or modify it\.\]/g, "").trim();
+  if (outputBuffer && extractedBlocks.length > 0) {
+    for (const block of extractedBlocks) {
+      outputBuffer.items = outputBuffer.items || [];
+      outputBuffer.items.push(block);
+    }
+  }
+  return { cleanedContent, extractedBlocks };
+}
 function formatSuccess(result, description, attempt, outputBuffer) {
   let output = "";
   if (description) {
@@ -58689,10 +58770,15 @@ ${JSON.stringify(resultValue, null, 2)}`;
     }
   }
   if (outputBuffer && outputBuffer.items && outputBuffer.items.length > 0) {
-    const totalChars = outputBuffer.items.reduce((sum, item) => sum + item.length, 0);
+    const rawContent = outputBuffer.items.join("\n");
+    output += `
+
+${RAW_OUTPUT_START}
+${rawContent}
+${RAW_OUTPUT_END}`;
     output += `
 
-[Output buffer: ${totalChars} chars written via output(). This content will be appended directly to your response. Do NOT repeat or summarize it.]`;
+[The above raw output (${rawContent.length} chars) will be passed directly to the final response. Do NOT repeat, summarize, or modify it.]`;
   }
   return output;
 }
@@ -59141,7 +59227,7 @@ Example:
 <clearOutputBuffer>true</clearOutputBuffer>
 </cleanup_execute_plan>`;
 }
-var import_ai4;
+var import_ai4, RAW_OUTPUT_START, RAW_OUTPUT_END;
 var init_executePlan = __esm({
   "src/tools/executePlan.js"() {
     "use strict";
@@ -59153,6 +59239,8 @@ var init_executePlan = __esm({
     init_extract();
     init_delegate();
     init_esm5();
+    RAW_OUTPUT_START = "<<<RAW_OUTPUT>>>";
+    RAW_OUTPUT_END = "<<<END_RAW_OUTPUT>>>";
   }
 });
 
@@ -110163,6 +110251,7 @@ var init_ProbeAgent = __esm({
     init_path_validation();
     init_outputTruncator();
     init_delegate();
+    init_executePlan();
     init_tasks();
     import_dotenv2.default.config();
     ENGINE_ACTIVITY_TIMEOUT_DEFAULT = 18e4;
@@ -112894,6 +112983,15 @@ You are working with a workspace. Available paths: ${workspaceDesc}
                     }
                     const executionResult = await this.mcpBridge.mcpTools[toolName].execute(params);
                     let toolResultContent = typeof executionResult === "string" ? executionResult : JSON.stringify(executionResult, null, 2);
+                    if (this._outputBuffer) {
+                      const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent, this._outputBuffer);
+                      if (extractedBlocks.length > 0) {
+                        toolResultContent = cleanedContent;
+                        if (this.debug) {
+                          console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b5) => sum + b5.length, 0)} chars) to output buffer`);
+                        }
+                      }
+                    }
                     try {
                       const truncateResult = await truncateIfNeeded(toolResultContent, this.tokenCounter, this.sessionId, this.maxOutputTokens);
                       if (truncateResult.truncated) {
@@ -113100,6 +113198,15 @@ ${errorXml}
                       const wsPrefix = this.workspaceRoot.endsWith(import_path17.sep) ? this.workspaceRoot : this.workspaceRoot + import_path17.sep;
                       toolResultContent = toolResultContent.split(wsPrefix).join("");
                     }
+                    if (this._outputBuffer) {
+                      const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent, this._outputBuffer);
+                      if (extractedBlocks.length > 0) {
+                        toolResultContent = cleanedContent;
+                        if (this.debug) {
+                          console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b5) => sum + b5.length, 0)} chars) to output buffer`);
+                        }
+                      }
+                    }
                     try {
                       const truncateResult = await truncateIfNeeded(toolResultContent, this.tokenCounter, this.sessionId, this.maxOutputTokens);
                       if (truncateResult.truncated) {
@@ -113785,12 +113892,16 @@ Convert your previous response content into actual JSON data that follows this s
           }
           if (this._outputBuffer && this._outputBuffer.items.length > 0 && !options._schemaFormatted) {
             const outputContent = this._outputBuffer.items.join("\n\n");
-            finalResult = (finalResult || "") + "\n\n" + outputContent;
+            if (options.schema) {
+              finalResult = (finalResult || "") + "\n<<<RAW_OUTPUT>>>\n" + outputContent + "\n<<<END_RAW_OUTPUT>>>";
+            } else {
+              finalResult = (finalResult || "") + "\n\n" + outputContent;
+            }
             if (options.onStream) {
               options.onStream("\n\n" + outputContent);
             }
             if (this.debug) {
-              console.log(`[DEBUG] Appended ${this._outputBuffer.items.length} output buffer items (${outputContent.length} chars) to final result`);
+              console.log(`[DEBUG] Appended ${this._outputBuffer.items.length} output buffer items (${outputContent.length} chars) to final result${options.schema ? " (with RAW_OUTPUT delimiters)" : ""}`);
             }
             this._outputBuffer.items = [];
           }