@corbat-tech/coco 2.5.2 → 2.5.3

package/dist/index.js

@@ -11790,6 +11790,20 @@ var AnthropicProvider = class {
         if (event.type === "content_block_start") {
           const contentBlock = event.content_block;
           if (contentBlock.type === "tool_use") {
+            if (currentToolCall) {
+              getLogger().warn(
+                `[Anthropic] content_block_stop missing for tool '${currentToolCall.name}' \u2014 finalizing early to prevent data bleed.`
+              );
+              try {
+                currentToolCall.input = currentToolInputJson ? JSON.parse(currentToolInputJson) : {};
+              } catch {
+                currentToolCall.input = {};
+              }
+              yield {
+                type: "tool_use_end",
+                toolCall: { ...currentToolCall }
+              };
+            }
             currentToolCall = {
               id: contentBlock.id,
               name: contentBlock.name
@@ -12383,6 +12397,30 @@ var OpenAIProvider = class {
         }
       };
       const timeoutInterval = setInterval(checkTimeout, 5e3);
+      const providerName = this.name;
+      const parseArguments = (builder) => {
+        let input = {};
+        try {
+          input = builder.arguments ? JSON.parse(builder.arguments) : {};
+        } catch (error) {
+          console.warn(
+            `[${providerName}] Failed to parse tool call arguments for ${builder.name}: ${builder.arguments?.slice(0, 300)}`
+          );
+          try {
+            if (builder.arguments) {
+              const repaired = jsonrepair(builder.arguments);
+              input = JSON.parse(repaired);
+              console.log(`[${providerName}] \u2713 Successfully repaired JSON for ${builder.name}`);
+            }
+          } catch {
+            console.error(
+              `[${providerName}] Cannot repair JSON for ${builder.name}, using empty object`
+            );
+            console.error(`[${providerName}] Original error:`, error);
+          }
+        }
+        return input;
+      };
       try {
         for await (const chunk of stream) {
           const delta = chunk.choices[0]?.delta;
@@ -12394,7 +12432,7 @@ var OpenAIProvider = class {
           }
           if (delta?.tool_calls) {
             for (const toolCallDelta of delta.tool_calls) {
-              const index = toolCallDelta.index;
+              const index = toolCallDelta.index ?? toolCallBuilders.size;
               if (!toolCallBuilders.has(index)) {
                 toolCallBuilders.set(index, {
                   id: toolCallDelta.id ?? "",
@@ -12429,34 +12467,28 @@ var OpenAIProvider = class {
               }
             }
           }
-        }
-        for (const [, builder] of toolCallBuilders) {
-          let input = {};
-          try {
-            input = builder.arguments ? JSON.parse(builder.arguments) : {};
-          } catch (error) {
-            console.warn(
-              `[${this.name}] Failed to parse tool call arguments for ${builder.name}: ${builder.arguments?.slice(0, 300)}`
-            );
-            try {
-              if (builder.arguments) {
-                const repaired = jsonrepair(builder.arguments);
-                input = JSON.parse(repaired);
-                console.log(`[${this.name}] \u2713 Successfully repaired JSON for ${builder.name}`);
-              }
-            } catch {
-              console.error(
-                `[${this.name}] Cannot repair JSON for ${builder.name}, using empty object`
-              );
-              console.error(`[${this.name}] Original error:`, error);
+          const finishReason = chunk.choices[0]?.finish_reason;
+          if (finishReason && toolCallBuilders.size > 0) {
+            for (const [, builder] of toolCallBuilders) {
+              yield {
+                type: "tool_use_end",
+                toolCall: {
+                  id: builder.id,
+                  name: builder.name,
+                  input: parseArguments(builder)
+                }
+              };
             }
+            toolCallBuilders.clear();
           }
+        }
+        for (const [, builder] of toolCallBuilders) {
           yield {
             type: "tool_use_end",
             toolCall: {
               id: builder.id,
               name: builder.name,
-              input
+              input: parseArguments(builder)
             }
           };
         }
@@ -12625,7 +12657,8 @@ var OpenAIProvider = class {
       if (msg.role === "system") {
         result.push({ role: "system", content: this.contentToString(msg.content) });
       } else if (msg.role === "user") {
-        if (Array.isArray(msg.content) && msg.content[0]?.type === "tool_result") {
+        if (Array.isArray(msg.content) && msg.content.some((b) => b.type === "tool_result")) {
+          const textParts = [];
           for (const block of msg.content) {
             if (block.type === "tool_result") {
               const toolResult = block;
@@ -12634,8 +12667,16 @@ var OpenAIProvider = class {
                 tool_call_id: toolResult.tool_use_id,
                 content: toolResult.content
               });
+            } else if (block.type === "text") {
+              textParts.push(block.text);
             }
           }
+          if (textParts.length > 0) {
+            console.warn(
+              `[${this.name}] User message has mixed tool_result and text blocks \u2014 text emitted as a separate user message.`
+            );
+            result.push({ role: "user", content: textParts.join("") });
+          }
         } else if (Array.isArray(msg.content) && msg.content.some((b) => b.type === "image")) {
           const parts = [];
           for (const block of msg.content) {
@@ -12680,6 +12721,10 @@ var OpenAIProvider = class {
                   arguments: JSON.stringify(block.input)
                 }
               });
+            } else {
+              console.warn(
+                `[${this.name}] Unexpected block type '${block.type}' in assistant message \u2014 dropping. This may indicate a message history corruption.`
+              );
             }
           }
           if (textParts.length > 0) {
@@ -15156,7 +15201,7 @@ function escapeRegex(str) {
 }
 var DEFAULT_TIMEOUT_MS = 12e4;
 var MAX_OUTPUT_SIZE = 1024 * 1024;
-var DANGEROUS_PATTERNS = [
+var DANGEROUS_PATTERNS_FULL = [
   /\brm\s+-rf\s+\/(?!\w)/,
   // rm -rf / (root)
   /\bsudo\s+rm\s+-rf/,
@@ -15169,14 +15214,6 @@ var DANGEROUS_PATTERNS = [
   // Format filesystem
   /\bformat\s+/,
   // Windows format
-  /`[^`]+`/,
-  // Backtick command substitution
-  /\$\([^)]+\)/,
-  // $() command substitution
-  /\beval\s+/,
-  // eval command
-  /\bsource\s+/,
-  // source command (can execute arbitrary scripts)
   />\s*\/etc\//,
   // Write to /etc
   />\s*\/root\//,
@@ -15190,6 +15227,25 @@ var DANGEROUS_PATTERNS = [
   /\bwget\s+.*\|\s*(ba)?sh/
   // wget | sh pattern
 ];
+var DANGEROUS_PATTERNS_SHELL_ONLY = [
+  /`[^`]+`/,
+  // Backtick command substitution
+  /\$\([^)]+\)/,
+  // $() command substitution
+  /\beval\s+/,
+  // eval command (shell eval, not JS eval())
+  /\bsource\s+/
+  // source command (can execute arbitrary scripts)
+];
+function getShellCommandPart(command) {
+  const firstNewline = command.indexOf("\n");
+  if (firstNewline === -1) return command;
+  const firstLine = command.slice(0, firstNewline);
+  if (/<<-?\s*['"]?\w/.test(firstLine)) {
+    return firstLine;
+  }
+  return command;
+}
 var SAFE_ENV_VARS = /* @__PURE__ */ new Set([
   // System info (non-sensitive)
   "PATH",
@@ -15256,13 +15312,21 @@ Examples:
     env: z.record(z.string(), z.string()).optional().describe("Environment variables")
   }),
   async execute({ command, cwd, timeout, env: env2 }) {
-    for (const pattern of DANGEROUS_PATTERNS) {
+    const shellPart = getShellCommandPart(command);
+    for (const pattern of DANGEROUS_PATTERNS_FULL) {
       if (pattern.test(command)) {
         throw new ToolError(`Potentially dangerous command blocked: ${command.slice(0, 100)}`, {
           tool: "bash_exec"
         });
       }
     }
+    for (const pattern of DANGEROUS_PATTERNS_SHELL_ONLY) {
+      if (pattern.test(shellPart)) {
+        throw new ToolError(`Potentially dangerous command blocked: ${command.slice(0, 100)}`, {
+          tool: "bash_exec"
+        });
+      }
+    }
     const startTime = performance.now();
     const timeoutMs = timeout ?? DEFAULT_TIMEOUT_MS;
     const { CommandHeartbeat: CommandHeartbeat2 } = await Promise.resolve().then(() => (init_heartbeat(), heartbeat_exports));
@@ -15344,13 +15408,21 @@ Examples:
     env: z.record(z.string(), z.string()).optional().describe("Environment variables")
   }),
   async execute({ command, cwd, env: env2 }) {
-    for (const pattern of DANGEROUS_PATTERNS) {
+    const shellPart = getShellCommandPart(command);
+    for (const pattern of DANGEROUS_PATTERNS_FULL) {
       if (pattern.test(command)) {
         throw new ToolError(`Potentially dangerous command blocked: ${command.slice(0, 100)}`, {
           tool: "bash_background"
         });
       }
     }
+    for (const pattern of DANGEROUS_PATTERNS_SHELL_ONLY) {
+      if (pattern.test(shellPart)) {
+        throw new ToolError(`Potentially dangerous command blocked: ${command.slice(0, 100)}`, {
+          tool: "bash_background"
+        });
+      }
+    }
     try {
       const filteredEnv = {};
       for (const [key, value] of Object.entries(process.env)) {
@@ -20932,7 +21004,7 @@ Examples:
 });
 var imageTools = [readImageTool];
 var path31 = await import('path');
-var DANGEROUS_PATTERNS2 = [
+var DANGEROUS_PATTERNS = [
   /\bDROP\s+(?:TABLE|DATABASE|INDEX|VIEW)\b/i,
   /\bTRUNCATE\b/i,
   /\bALTER\s+TABLE\b/i,
@@ -20942,7 +21014,7 @@ var DANGEROUS_PATTERNS2 = [
   /\bCREATE\s+(?:TABLE|DATABASE|INDEX)\b/i
 ];
 function isDangerousSql(sql2) {
-  return DANGEROUS_PATTERNS2.some((pattern) => pattern.test(sql2));
+  return DANGEROUS_PATTERNS.some((pattern) => pattern.test(sql2));
 }
 var sqlQueryTool = defineTool({
   name: "sql_query",