@acmecloud/core 1.0.8 → 1.0.10

package/dist/agent/index.js

@@ -281,6 +281,21 @@ export async function* runAgent(provider, modelName, messages, systemPrompt, abo
                 return [];
             }
             else {
+                // Check if this is a content safety error (should not retry)
+                const errorMessage = err.message?.toLowerCase() || "";
+                const isContentSafetyError = errorMessage.includes("sensitive_words_detected") ||
+                    errorMessage.includes("content_policy") ||
+                    errorMessage.includes("safety") ||
+                    errorMessage.includes("content_filter");
+                if (isContentSafetyError) {
+                    // Content safety errors should not be retried - they won't succeed by retrying
+                    yield {
+                        type: "text",
+                        text: `\n[Content Safety Error: ${err.message}]\n\nThis request triggered the content safety filter. Please modify your request to avoid sensitive topics and try again.\n`,
+                    };
+                    yield { type: "messages", messages: currentMessages };
+                    return [];
+                }
                 yield {
                     type: "text",
                     text: `\n[Error: ${err.message}]\n[Auto-recovering from stream drop...]\n`,

package/dist/llm/vision.d.ts

@@ -1,7 +1,7 @@
-import { ModelConfig } from '../config/index.js';
+import { ModelConfig } from "../config/index.js";
 /**
  * Analyzes an image using a specialized vision model and returns a textual description.
  * This allows non-vision primary models to "see" via delegation.
  */
 export declare function analyzeImage(imageData: string, // base64
-config: ModelConfig): Promise<string>;
+config: ModelConfig, abortSignal?: AbortSignal): Promise<string>;

package/dist/llm/vision.js

@@ -1,11 +1,11 @@
-import { generateText } from 'ai';
-import { getModel } from './provider.js';
+import { generateText } from "ai";
+import { getModel } from "./provider.js";
 /**
  * Analyzes an image using a specialized vision model and returns a textual description.
  * This allows non-vision primary models to "see" via delegation.
  */
 export async function analyzeImage(imageData, // base64
-config) {
+config, abortSignal) {
     if (!config.visionProvider || !config.visionModel) {
         return "Error: Vision model not configured. Please set visionProvider and visionModel in config.";
     }
@@ -13,24 +13,27 @@ config) {
     try {
         const { text } = await generateText({
             model,
-            abortSignal: AbortSignal.timeout(60000), // 60 seconds timeout
-            maxRetries: 3,
+            abortSignal: abortSignal || AbortSignal.timeout(90000), // 90 seconds timeout
+            maxRetries: 2,
             messages: [
                 {
-                    role: 'user',
+                    role: "user",
                     content: [
-                        { type: 'text', text: "Please describe this screenshot in detail. Focus on the layout, visible text, interactive elements (buttons, inputs), and any apparent errors or status messages. This description will be used by another AI to understand the state of the web application." },
-                        { type: 'image', image: imageData }
-                    ]
-                }
-            ]
+                        {
+                            type: "text",
+                            text: "Please describe this screenshot in detail. Focus on the layout, visible text, interactive elements (buttons, inputs), and any apparent errors or status messages. This description will be used by another AI to understand the state of the web application.",
+                        },
+                        { type: "image", image: imageData },
+                    ],
+                },
+            ],
         });
         return `[Vision Model Analysis (${config.visionModel})]:\n${text}`;
     }
     catch (err) {
         let msg = err.message;
-        if (err.name === 'TimeoutError' || err.message.includes('timeout')) {
-            msg = `Analysis timed out after 60s. The image might be too complex or the provider is slow.`;
+        if (err.name === "AbortError" || err.message.includes("timeout")) {
+            msg = `Analysis timed out after 90s. The image might be too complex or the provider is slow.`;
         }
         return `Error during vision analysis: ${msg}`;
     }

package/dist/tools/browser.d.ts

@@ -3,5 +3,5 @@ export declare function executeBrowserAction(args: {
     url?: string;
     selector?: string;
     text?: string;
-}): Promise<string>;
+}, abortSignal?: AbortSignal): Promise<string>;
 export declare function closeBrowser(): Promise<void>;

package/dist/tools/browser.js

@@ -1,9 +1,9 @@
-import { chromium } from 'playwright';
-import { analyzeImage } from '../llm/vision.js';
-import { loadModelConfig } from '../config/index.js';
-import * as fs from 'fs/promises';
-import { existsSync, mkdirSync } from 'fs';
-import path from 'path';
+import { chromium } from "playwright";
+import { analyzeImage } from "../llm/vision.js";
+import { loadModelConfig } from "../config/index.js";
+import * as fs from "fs/promises";
+import { existsSync, mkdirSync } from "fs";
+import path from "path";
 let browser = null;
 let page = null;
 async function getBrowser() {
@@ -13,61 +13,62 @@ async function getBrowser() {
         }
         if (!page) {
             const context = await browser.newContext({
-                viewport: { width: 1280, height: 720 }
+                viewport: { width: 1280, height: 720 },
             });
             page = await context.newPage();
         }
         return { browser, page };
     }
     catch (err) {
-        if (err.message.includes('executable') || err.message.includes('not found')) {
+        if (err.message.includes("executable") ||
+            err.message.includes("not found")) {
             throw new Error(`Browser not found. Please run: npx playwright install chromium`);
         }
         throw err;
     }
 }
-export async function executeBrowserAction(args) {
+export async function executeBrowserAction(args, abortSignal) {
     const { page } = await getBrowser();
     const config = loadModelConfig();
     try {
         switch (args.action) {
-            case 'navigate':
+            case "navigate":
                 if (!args.url)
-                    return 'Error: URL is required for navigate action.';
-                await page.goto(args.url, { waitUntil: 'networkidle' });
+                    return "Error: URL is required for navigate action.";
+                await page.goto(args.url, { waitUntil: "networkidle" });
                 const title = await page.title();
                 return `Successfully navigated to ${args.url}. Page title: ${title}`;
-            case 'screenshot':
+            case "screenshot":
                 const screenshot = await page.screenshot({ fullPage: false });
-                const base64 = screenshot.toString('base64');
+                const base64 = screenshot.toString("base64");
                 // Save to disk
-                const screenshotDir = path.resolve(process.cwd(), '.acmecode', 'screenshots');
+                const screenshotDir = path.resolve(process.cwd(), ".acmecode", "screenshots");
                 if (!existsSync(screenshotDir)) {
                     mkdirSync(screenshotDir, { recursive: true });
                 }
-                const filename = `screenshot_${new Date().toISOString().replace(/[:.]/g, '-')}.png`;
+                const filename = `screenshot_${new Date().toISOString().replace(/[:.]/g, "-")}.png`;
                 const filePath = path.join(screenshotDir, filename);
                 await fs.writeFile(filePath, screenshot);
                 const stats = `Screenshot saved to: ${path.relative(process.cwd(), filePath)}`;
                 // Delegate to vision model if configured
                 if (config.visionModel) {
-                    const analysis = await analyzeImage(base64, config);
+                    const analysis = await analyzeImage(base64, config, abortSignal);
                     return `${stats}\n\n${analysis}`;
                 }
                 return stats;
-            case 'click':
+            case "click":
                 if (!args.selector)
-                    return 'Error: Selector is required for click action.';
+                    return "Error: Selector is required for click action.";
                 await page.click(args.selector);
                 return `Clicked element: ${args.selector}`;
-            case 'type':
+            case "type":
                 if (!args.selector || !args.text)
-                    return 'Error: Selector and text are required for type action.';
+                    return "Error: Selector and text are required for type action.";
                 await page.fill(args.selector, args.text);
                 return `Typed "${args.text}" into ${args.selector}`;
-            case 'scroll':
+            case "scroll":
                 await page.mouse.wheel(0, 500);
-                return 'Scrolled down.';
+                return "Scrolled down.";
             default:
                 return `Error: Unknown action "${args.action}"`;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acmecloud/core",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/agent/index.ts

@@ -363,6 +363,24 @@ export async function* runAgent(
         yield { type: "messages", messages: currentMessages };
         return [];
       } else {
+        // Check if this is a content safety error (should not retry)
+        const errorMessage = err.message?.toLowerCase() || "";
+        const isContentSafetyError =
+          errorMessage.includes("sensitive_words_detected") ||
+          errorMessage.includes("content_policy") ||
+          errorMessage.includes("safety") ||
+          errorMessage.includes("content_filter");
+
+        if (isContentSafetyError) {
+          // Content safety errors should not be retried - they won't succeed by retrying
+          yield {
+            type: "text",
+            text: `\n[Content Safety Error: ${err.message}]\n\nThis request triggered the content safety filter. Please modify your request to avoid sensitive topics and try again.\n`,
+          };
+          yield { type: "messages", messages: currentMessages };
+          return [];
+        }
+
         yield {
           type: "text",
           text: `\n[Error: ${err.message}]\n[Auto-recovering from stream drop...]\n`,

package/src/llm/vision.ts

@@ -1,43 +1,47 @@
-import { generateText } from 'ai';
-import { getModel } from './provider.js';
-import { ModelConfig } from '../config/index.js';
-
-/**
- * Analyzes an image using a specialized vision model and returns a textual description.
- * This allows non-vision primary models to "see" via delegation.
- */
-export async function analyzeImage(
-    imageData: string, // base64
-    config: ModelConfig
-): Promise<string> {
-    if (!config.visionProvider || !config.visionModel) {
-        return "Error: Vision model not configured. Please set visionProvider and visionModel in config.";
-    }
-
-    const model = getModel(config.visionProvider as any, config.visionModel);
-
-    try {
-        const { text } = await generateText({
-            model,
-            abortSignal: AbortSignal.timeout(60000), // 60 seconds timeout
-            maxRetries: 3,
-            messages: [
-                {
-                    role: 'user',
-                    content: [
-                        { type: 'text', text: "Please describe this screenshot in detail. Focus on the layout, visible text, interactive elements (buttons, inputs), and any apparent errors or status messages. This description will be used by another AI to understand the state of the web application." },
-                        { type: 'image', image: imageData }
-                    ]
-                }
-            ]
-        });
-
-        return `[Vision Model Analysis (${config.visionModel})]:\n${text}`;
-    } catch (err: any) {
-        let msg = err.message;
-        if (err.name === 'TimeoutError' || err.message.includes('timeout')) {
-            msg = `Analysis timed out after 60s. The image might be too complex or the provider is slow.`;
-        }
-        return `Error during vision analysis: ${msg}`;
-    }
-}
+import { generateText } from "ai";
+import { getModel } from "./provider.js";
+import { ModelConfig } from "../config/index.js";
+
+/**
+ * Analyzes an image using a specialized vision model and returns a textual description.
+ * This allows non-vision primary models to "see" via delegation.
+ */
+export async function analyzeImage(
+  imageData: string, // base64
+  config: ModelConfig,
+  abortSignal?: AbortSignal,
+): Promise<string> {
+  if (!config.visionProvider || !config.visionModel) {
+    return "Error: Vision model not configured. Please set visionProvider and visionModel in config.";
+  }
+
+  const model = getModel(config.visionProvider as any, config.visionModel);
+
+  try {
+    const { text } = await generateText({
+      model,
+      abortSignal: abortSignal || AbortSignal.timeout(90000), // 90 seconds timeout
+      maxRetries: 2,
+      messages: [
+        {
+          role: "user",
+          content: [
+            {
+              type: "text",
+              text: "Please describe this screenshot in detail. Focus on the layout, visible text, interactive elements (buttons, inputs), and any apparent errors or status messages. This description will be used by another AI to understand the state of the web application.",
+            },
+            { type: "image", image: imageData },
+          ],
+        },
+      ],
+    });
+
+    return `[Vision Model Analysis (${config.visionModel})]:\n${text}`;
+  } catch (err: any) {
+    let msg = err.message;
+    if (err.name === "AbortError" || err.message.includes("timeout")) {
+      msg = `Analysis timed out after 90s. The image might be too complex or the provider is slow.`;
+    }
+    return `Error during vision analysis: ${msg}`;
+  }
+}

package/src/tools/browser.ts

@@ -1,95 +1,109 @@
-import { chromium, Browser, Page } from 'playwright';
-import { analyzeImage } from '../llm/vision.js';
-import { loadModelConfig } from '../config/index.js';
-import * as fs from 'fs/promises';
-import { existsSync, mkdirSync } from 'fs';
-import path from 'path';
-
-let browser: Browser | null = null;
-let page: Page | null = null;
-
-async function getBrowser() {
-    try {
-        if (!browser) {
-            browser = await chromium.launch({ headless: true });
-        }
-        if (!page) {
-            const context = await browser.newContext({
-                viewport: { width: 1280, height: 720 }
-            });
-            page = await context.newPage();
-        }
-        return { browser, page };
-    } catch (err: any) {
-        if (err.message.includes('executable') || err.message.includes('not found')) {
-            throw new Error(`Browser not found. Please run: npx playwright install chromium`);
-        }
-        throw err;
-    }
-}
-
-export async function executeBrowserAction(args: { action: string, url?: string, selector?: string, text?: string }): Promise<string> {
-    const { page } = await getBrowser();
-    const config = loadModelConfig();
-
-    try {
-        switch (args.action) {
-            case 'navigate':
-                if (!args.url) return 'Error: URL is required for navigate action.';
-                await page.goto(args.url, { waitUntil: 'networkidle' });
-                const title = await page.title();
-                return `Successfully navigated to ${args.url}. Page title: ${title}`;
-
-            case 'screenshot':
-                const screenshot = await page.screenshot({ fullPage: false });
-                const base64 = screenshot.toString('base64');
-
-                // Save to disk
-                const screenshotDir = path.resolve(process.cwd(), '.acmecode', 'screenshots');
-                if (!existsSync(screenshotDir)) {
-                    mkdirSync(screenshotDir, { recursive: true });
-                }
-                const filename = `screenshot_${new Date().toISOString().replace(/[:.]/g, '-')}.png`;
-                const filePath = path.join(screenshotDir, filename);
-                await fs.writeFile(filePath, screenshot);
-
-                const stats = `Screenshot saved to: ${path.relative(process.cwd(), filePath)}`;
-
-                // Delegate to vision model if configured
-                if (config.visionModel) {
-                    const analysis = await analyzeImage(base64, config);
-                    return `${stats}\n\n${analysis}`;
-                }
-
-                return stats;
-
-            case 'click':
-                if (!args.selector) return 'Error: Selector is required for click action.';
-                await page.click(args.selector);
-                return `Clicked element: ${args.selector}`;
-
-            case 'type':
-                if (!args.selector || !args.text) return 'Error: Selector and text are required for type action.';
-                await page.fill(args.selector, args.text);
-                return `Typed "${args.text}" into ${args.selector}`;
-
-            case 'scroll':
-                await page.mouse.wheel(0, 500);
-                return 'Scrolled down.';
-
-            default:
-                return `Error: Unknown action "${args.action}"`;
-        }
-    } catch (err: any) {
-        return `Browser error: ${err.message}`;
-    }
-}
-
-// Cleanup function to be called on process exit
-export async function closeBrowser() {
-    if (browser) {
-        await browser.close();
-        browser = null;
-        page = null;
-    }
-}
+import { chromium, Browser, Page } from "playwright";
+import { analyzeImage } from "../llm/vision.js";
+import { loadModelConfig } from "../config/index.js";
+import * as fs from "fs/promises";
+import { existsSync, mkdirSync } from "fs";
+import path from "path";
+
+let browser: Browser | null = null;
+let page: Page | null = null;
+
+async function getBrowser() {
+  try {
+    if (!browser) {
+      browser = await chromium.launch({ headless: true });
+    }
+    if (!page) {
+      const context = await browser.newContext({
+        viewport: { width: 1280, height: 720 },
+      });
+      page = await context.newPage();
+    }
+    return { browser, page };
+  } catch (err: any) {
+    if (
+      err.message.includes("executable") ||
+      err.message.includes("not found")
+    ) {
+      throw new Error(
+        `Browser not found. Please run: npx playwright install chromium`,
+      );
+    }
+    throw err;
+  }
+}
+
+export async function executeBrowserAction(
+  args: { action: string; url?: string; selector?: string; text?: string },
+  abortSignal?: AbortSignal,
+): Promise<string> {
+  const { page } = await getBrowser();
+  const config = loadModelConfig();
+
+  try {
+    switch (args.action) {
+      case "navigate":
+        if (!args.url) return "Error: URL is required for navigate action.";
+        await page.goto(args.url, { waitUntil: "networkidle" });
+        const title = await page.title();
+        return `Successfully navigated to ${args.url}. Page title: ${title}`;
+
+      case "screenshot":
+        const screenshot = await page.screenshot({ fullPage: false });
+        const base64 = screenshot.toString("base64");
+
+        // Save to disk
+        const screenshotDir = path.resolve(
+          process.cwd(),
+          ".acmecode",
+          "screenshots",
+        );
+        if (!existsSync(screenshotDir)) {
+          mkdirSync(screenshotDir, { recursive: true });
+        }
+        const filename = `screenshot_${new Date().toISOString().replace(/[:.]/g, "-")}.png`;
+        const filePath = path.join(screenshotDir, filename);
+        await fs.writeFile(filePath, screenshot);
+
+        const stats = `Screenshot saved to: ${path.relative(process.cwd(), filePath)}`;
+
+        // Delegate to vision model if configured
+        if (config.visionModel) {
+          const analysis = await analyzeImage(base64, config, abortSignal);
+          return `${stats}\n\n${analysis}`;
+        }
+
+        return stats;
+
+      case "click":
+        if (!args.selector)
+          return "Error: Selector is required for click action.";
+        await page.click(args.selector);
+        return `Clicked element: ${args.selector}`;
+
+      case "type":
+        if (!args.selector || !args.text)
+          return "Error: Selector and text are required for type action.";
+        await page.fill(args.selector, args.text);
+        return `Typed "${args.text}" into ${args.selector}`;
+
+      case "scroll":
+        await page.mouse.wheel(0, 500);
+        return "Scrolled down.";
+
+      default:
+        return `Error: Unknown action "${args.action}"`;
+    }
+  } catch (err: any) {
+    return `Browser error: ${err.message}`;
+  }
+}
+
+// Cleanup function to be called on process exit
+export async function closeBrowser() {
+  if (browser) {
+    await browser.close();
+    browser = null;
+    page = null;
+  }
+}