@everworker/oneringai 0.1.4 → 0.2.0

package/dist/index.cjs

@@ -2034,7 +2034,14 @@ var init_Connector = __esm({
         }
         const startTime = Date.now();
         this.requestCount++;
-        const url2 = endpoint.startsWith("http") ? endpoint : `${this.baseURL}${endpoint}`;
+        let url2;
+        if (endpoint.startsWith("http")) {
+          url2 = endpoint;
+        } else {
+          const base = (this.baseURL ?? "").replace(/\/+$/, "");
+          const path6 = endpoint.startsWith("/") ? endpoint : `/${endpoint}`;
+          url2 = `${base}${path6}`;
+        }
         const timeout = options?.timeout ?? this.config.timeout ?? exports.DEFAULT_CONNECTOR_TIMEOUT;
         if (this.config.logging?.enabled) {
           this.logRequest(url2, options);
@@ -18437,6 +18444,9 @@ var BasePluginNextGen = class {
   }
 };
 
+// src/core/context-nextgen/AgentContextNextGen.ts
+init_Connector();
+
 // src/domain/entities/Memory.ts
 function isTaskAwareScope(scope) {
   return typeof scope === "object" && scope !== null && "type" in scope;
@@ -19375,13 +19385,18 @@ Values are immediately visible - no retrieval needed.
 - \`high\`: Keep longer. Important state.
 - \`critical\`: Never auto-evicted.
 
+**UI Display:** Set \`showInUI: true\` in context_set to display the entry in the user's side panel.
+Values shown in the UI support the same rich markdown formatting as the chat window
+(see formatting instructions above). Use this for dashboards, progress displays, and results the user should see.
+
 **Tools:** context_set, context_delete, context_list`;
 var contextSetDefinition = {
   type: "function",
   function: {
     name: "context_set",
     description: `Store or update a key-value pair in live context.
-Value appears directly in context - no retrieval needed.`,
+Value appears directly in context - no retrieval needed.
+Set showInUI to true to also display the entry in the user's side panel.`,
     parameters: {
       type: "object",
       properties: {
@@ -19392,6 +19407,10 @@ Value appears directly in context - no retrieval needed.`,
           type: "string",
           enum: ["low", "normal", "high", "critical"],
           description: 'Eviction priority. Default: "normal"'
+        },
+        showInUI: {
+          type: "boolean",
+          description: "If true, display this entry in the user's side panel with full rich markdown rendering \u2014 same capabilities as the chat window (code blocks, tables, LaTeX, Mermaid diagrams, Vega-Lite charts, mindmaps, etc. \u2014 see formatting instructions in system prompt). Use this for dashboards, status displays, and structured results the user should see. Default: false"
         }
       },
       required: ["key", "description", "value"]
@@ -19432,6 +19451,7 @@ var InContextMemoryPluginNextGen = class {
   _destroyed = false;
   _tokenCache = null;
   _instructionsTokenCache = null;
+  _notifyTimer = null;
   constructor(config = {}) {
     this.config = { ...DEFAULT_CONFIG, ...config };
   }
@@ -19472,15 +19492,18 @@ var InContextMemoryPluginNextGen = class {
       return a.updatedAt - b.updatedAt;
     });
     let freed = 0;
+    let evicted = false;
     for (const entry of evictable) {
       if (freed >= targetTokensToFree) break;
       const entryTokens = this.estimator.estimateTokens(this.formatEntry(entry));
       this.entries.delete(entry.key);
       freed += entryTokens;
+      evicted = true;
     }
     this._tokenCache = null;
     const content = await this.getContent();
     const after = content ? this.estimator.estimateTokens(content) : 0;
+    if (evicted) this.notifyEntriesChanged();
     return Math.max(0, before - after);
   }
   getTools() {
@@ -19492,6 +19515,7 @@ var InContextMemoryPluginNextGen = class {
   }
   destroy() {
     if (this._destroyed) return;
+    if (this._notifyTimer) clearTimeout(this._notifyTimer);
     this.entries.clear();
     this._destroyed = true;
     this._tokenCache = null;
@@ -19509,6 +19533,7 @@ var InContextMemoryPluginNextGen = class {
       this.entries.set(entry.key, entry);
     }
     this._tokenCache = null;
+    this.notifyEntriesChanged();
   }
   // ============================================================================
   // Entry Management
@@ -19516,19 +19541,21 @@ var InContextMemoryPluginNextGen = class {
   /**
    * Store or update a key-value pair
    */
-  set(key, description, value, priority) {
+  set(key, description, value, priority, showInUI) {
     this.assertNotDestroyed();
     const entry = {
       key,
       description,
       value,
       updatedAt: Date.now(),
-      priority: priority ?? this.config.defaultPriority
+      priority: priority ?? this.config.defaultPriority,
+      showInUI: showInUI ?? false
     };
     this.entries.set(key, entry);
     this.enforceMaxEntries();
     this.enforceTokenLimit();
     this._tokenCache = null;
+    this.notifyEntriesChanged();
   }
   /**
    * Get a value by key
@@ -19550,7 +19577,10 @@ var InContextMemoryPluginNextGen = class {
   delete(key) {
     this.assertNotDestroyed();
     const deleted = this.entries.delete(key);
-    if (deleted) this._tokenCache = null;
+    if (deleted) {
+      this._tokenCache = null;
+      this.notifyEntriesChanged();
+    }
     return deleted;
   }
   /**
@@ -19562,7 +19592,8 @@ var InContextMemoryPluginNextGen = class {
       key: e.key,
       description: e.description,
       priority: e.priority,
-      updatedAt: e.updatedAt
+      updatedAt: e.updatedAt,
+      showInUI: e.showInUI ?? false
     }));
   }
   /**
@@ -19572,6 +19603,7 @@ var InContextMemoryPluginNextGen = class {
     this.assertNotDestroyed();
     this.entries.clear();
     this._tokenCache = null;
+    this.notifyEntriesChanged();
   }
   // ============================================================================
   // Private Helpers
@@ -19635,6 +19667,20 @@ ${valueStr}
       return a.updatedAt - b.updatedAt;
     });
   }
+  /**
+   * Debounced notification when entries change.
+   * Calls config.onEntriesChanged with all current entries.
+   */
+  notifyEntriesChanged() {
+    if (!this.config.onEntriesChanged) return;
+    if (this._notifyTimer) clearTimeout(this._notifyTimer);
+    this._notifyTimer = setTimeout(() => {
+      this._notifyTimer = null;
+      if (!this._destroyed && this.config.onEntriesChanged) {
+        this.config.onEntriesChanged(Array.from(this.entries.values()));
+      }
+    }, 100);
+  }
   assertNotDestroyed() {
     if (this._destroyed) {
       throw new Error("InContextMemoryPluginNextGen is destroyed");
@@ -19651,16 +19697,18 @@ ${valueStr}
           args.key,
           args.description,
           args.value,
-          args.priority
+          args.priority,
+          args.showInUI
         );
         return {
           success: true,
           key: args.key,
-          message: `Stored "${args.key}" in live context`
+          showInUI: args.showInUI ?? false,
+          message: `Stored "${args.key}" in live context${args.showInUI ? " (visible in UI)" : ""}`
         };
       },
       permission: { scope: "always", riskLevel: "low" },
-      describeCall: (args) => `set ${args.key}`
+      describeCall: (args) => `set ${args.key}${args.showInUI ? " [UI]" : ""}`
     };
   }
   createContextDeleteTool() {
@@ -20972,6 +21020,10 @@ var AgentContextNextGen = class _AgentContextNextGen extends eventemitter3.Event
   _sessionId = null;
   /** Agent ID */
   _agentId;
+  /** User ID for multi-user scenarios */
+  _userId;
+  /** Allowed connector names (when agent is restricted to a subset) */
+  _allowedConnectors;
   /** Storage backend */
   _storage;
   /** Destroyed flag */
@@ -21008,6 +21060,8 @@ var AgentContextNextGen = class _AgentContextNextGen extends eventemitter3.Event
     };
     this._systemPrompt = config.systemPrompt;
     this._agentId = this._config.agentId;
+    this._userId = config.userId;
+    this._allowedConnectors = config.connectors;
     this._storage = config.storage;
     this._compactionStrategy = config.compactionStrategy ?? StrategyRegistry.create(this._config.strategy);
     this._tools = new ToolManager(
@@ -21019,6 +21073,7 @@ var AgentContextNextGen = class _AgentContextNextGen extends eventemitter3.Event
       }
     }
     this.initializePlugins(config.plugins);
+    this.syncToolContext();
   }
   /**
    * Initialize plugins based on feature flags.
@@ -21063,6 +21118,62 @@ var AgentContextNextGen = class _AgentContextNextGen extends eventemitter3.Event
       );
     }
   }
+  /**
+   * Sync identity fields and connector registry to ToolContext.
+   * Merges with existing ToolContext to preserve other fields (memory, signal, taskId).
+   *
+   * Connector registry resolution order:
+   * 1. If `connectors` (allowed names) is set → filtered view of global registry
+   * 2. If access policy + userId → scoped view via Connector.scoped()
+   * 3. Otherwise → full global registry
+   */
+  syncToolContext() {
+    const existing = this._tools.getToolContext();
+    this._tools.setToolContext({
+      ...existing,
+      agentId: this._agentId,
+      userId: this._userId,
+      connectorRegistry: this.buildConnectorRegistry()
+    });
+  }
+  /**
+   * Build the connector registry appropriate for this agent's config.
+   */
+  buildConnectorRegistry() {
+    if (this._allowedConnectors?.length) {
+      const allowedSet = new Set(this._allowedConnectors);
+      const base = this._userId && exports.Connector.getAccessPolicy() ? exports.Connector.scoped({ userId: this._userId }) : exports.Connector.asRegistry();
+      return {
+        get: (name) => {
+          if (!allowedSet.has(name)) {
+            const available = this._allowedConnectors.filter((n) => base.has(n)).join(", ") || "none";
+            throw new Error(`Connector '${name}' not found. Available: ${available}`);
+          }
+          return base.get(name);
+        },
+        has: (name) => allowedSet.has(name) && base.has(name),
+        list: () => base.list().filter((n) => allowedSet.has(n)),
+        listAll: () => base.listAll().filter((c) => allowedSet.has(c.name)),
+        size: () => base.listAll().filter((c) => allowedSet.has(c.name)).length,
+        getDescriptionsForTools: () => {
+          const connectors = base.listAll().filter((c) => allowedSet.has(c.name));
+          if (connectors.length === 0) return "No connectors registered yet.";
+          return connectors.map((c) => `  - "${c.name}": ${c.displayName} - ${c.config.description || "No description"}`).join("\n");
+        },
+        getInfo: () => {
+          const info = {};
+          for (const c of base.listAll().filter((c2) => allowedSet.has(c2.name))) {
+            info[c.name] = { displayName: c.displayName, description: c.config.description || "", baseURL: c.baseURL };
+          }
+          return info;
+        }
+      };
+    }
+    if (this._userId && exports.Connector.getAccessPolicy()) {
+      return exports.Connector.scoped({ userId: this._userId });
+    }
+    return exports.Connector.asRegistry();
+  }
   // ============================================================================
   // Public Properties
   // ============================================================================
@@ -21078,6 +21189,24 @@ var AgentContextNextGen = class _AgentContextNextGen extends eventemitter3.Event
   get agentId() {
     return this._agentId;
   }
+  /** Get the current user ID */
+  get userId() {
+    return this._userId;
+  }
+  /** Set user ID. Automatically updates ToolContext for all tool executions. */
+  set userId(value) {
+    this._userId = value;
+    this.syncToolContext();
+  }
+  /** Get the allowed connector names (undefined = all visible connectors) */
+  get connectors() {
+    return this._allowedConnectors;
+  }
+  /** Set allowed connector names. Updates ToolContext.connectorRegistry. */
+  set connectors(value) {
+    this._allowedConnectors = value;
+    this.syncToolContext();
+  }
   /** Get/set system prompt */
   get systemPrompt() {
     return this._systemPrompt;
@@ -21991,6 +22120,7 @@ ${content}`);
       metadata: {
         savedAt: Date.now(),
         agentId: this._agentId,
+        userId: this._userId,
         model: this._config.model
       }
     };
@@ -24953,6 +25083,8 @@ var BaseAgent = class extends eventemitter3.EventEmitter {
     const contextConfig = {
       model: config.model,
       agentId: config.name,
+      userId: config.userId,
+      connectors: config.connectors,
       // Include storage and sessionId if session config is provided
       storage: config.session?.storage,
       // Thread tool execution timeout to ToolManager
@@ -25109,6 +25241,30 @@ var BaseAgent = class extends eventemitter3.EventEmitter {
   get context() {
     return this._agentContext;
   }
+  /**
+   * Get the current user ID. Delegates to AgentContextNextGen.
+   */
+  get userId() {
+    return this._agentContext.userId;
+  }
+  /**
+   * Set user ID at runtime. Automatically updates ToolContext for all tool executions.
+   */
+  set userId(value) {
+    this._agentContext.userId = value;
+  }
+  /**
+   * Get the allowed connector names (undefined = all visible connectors).
+   */
+  get connectors() {
+    return this._agentContext.connectors;
+  }
+  /**
+   * Restrict this agent to a subset of connectors. Updates ToolContext.connectorRegistry.
+   */
+  set connectors(value) {
+    this._agentContext.connectors = value;
+  }
   /**
    * Permission management. Returns ToolPermissionManager for approval control.
    */
@@ -25160,9 +25316,10 @@ var BaseAgent = class extends eventemitter3.EventEmitter {
    * always sees up-to-date tool descriptions.
    */
   getEnabledToolDefinitions() {
+    const toolContext = this._agentContext.tools.getToolContext();
     return this._agentContext.tools.getEnabled().map((tool) => {
       if (tool.descriptionFactory) {
-        const dynamicDescription = tool.descriptionFactory();
+        const dynamicDescription = tool.descriptionFactory(toolContext);
         return {
           ...tool.definition,
           function: {
@@ -26208,6 +26365,7 @@ var Agent = class _Agent extends BaseAgent {
    * const agent = Agent.create({
    *   connector: 'openai',  // or Connector instance
    *   model: 'gpt-4',
+   *   userId: 'user-123',   // flows to all tool executions automatically
    *   instructions: 'You are a helpful assistant',
    *   tools: [myTool]
    * });
@@ -41785,6 +41943,32 @@ function filterProtectedHeaders(headers) {
   }
   return filtered;
 }
+function normalizeBody(body) {
+  if (typeof body === "string") {
+    try {
+      return JSON.parse(body);
+    } catch {
+      return body;
+    }
+  }
+  return body;
+}
+function detectAPIError(data) {
+  if (!data || typeof data !== "object") return null;
+  const obj = data;
+  if (obj.ok === false && typeof obj.error === "string") {
+    return obj.error;
+  }
+  if (obj.success === false) {
+    if (typeof obj.error === "string") return obj.error;
+    if (typeof obj.message === "string") return obj.message;
+  }
+  if (obj.error && typeof obj.error === "object") {
+    const err = obj.error;
+    if (typeof err.message === "string") return err.message;
+  }
+  return null;
+}
 var ConnectorTools = class {
   /** Registry of service-specific tool factories */
   static factories = /* @__PURE__ */ new Map();
@@ -42038,7 +42222,7 @@ var ConnectorTools = class {
               },
               body: {
                 type: "object",
-                description: 'JSON request body for POST/PUT/PATCH requests. ALWAYS use this for sending data (e.g., {"channel": "C123", "text": "hello"}) instead of query string parameters.'
+                description: 'JSON request body for POST/PUT/PATCH requests. MUST be a JSON object (NOT a string). Example: {"channel": "C123", "text": "hello"}. Do NOT stringify this \u2014 pass it as a raw JSON object. Do NOT use query string parameters for POST data.'
               },
               queryParams: {
                 type: "object",
@@ -42053,7 +42237,8 @@ var ConnectorTools = class {
           }
         }
       },
-      execute: async (args) => {
+      execute: async (args, context) => {
+        const effectiveUserId = context?.userId ?? userId;
         let url2 = args.endpoint;
         if (args.queryParams && Object.keys(args.queryParams).length > 0) {
           const params = new URLSearchParams();
@@ -42066,7 +42251,8 @@ var ConnectorTools = class {
         let bodyStr;
         if (args.body) {
           try {
-            bodyStr = safeStringify2(args.body);
+            const normalized = normalizeBody(args.body);
+            bodyStr = safeStringify2(normalized);
           } catch (e) {
             return {
               success: false,
@@ -42085,7 +42271,7 @@ var ConnectorTools = class {
               },
               body: bodyStr
             },
-            userId
+            effectiveUserId
           );
           const text = await response.text();
           let data;
@@ -42094,11 +42280,12 @@ var ConnectorTools = class {
           } catch {
             data = text;
           }
+          const apiError = detectAPIError(data);
           return {
-            success: response.ok,
+            success: response.ok && !apiError,
             status: response.status,
-            data: response.ok ? data : void 0,
-            error: response.ok ? void 0 : typeof data === "string" ? data : safeStringify2(data)
+            data: response.ok && !apiError ? data : void 0,
+            error: apiError ? apiError : response.ok ? void 0 : typeof data === "string" ? data : safeStringify2(data)
           };
         } catch (error) {
           return {
@@ -45321,6 +45508,8 @@ __export(tools_exports, {
   createSpeechToTextTool: () => createSpeechToTextTool,
   createTextToSpeechTool: () => createTextToSpeechTool,
   createVideoTools: () => createVideoTools,
+  createWebScrapeTool: () => createWebScrapeTool,
+  createWebSearchTool: () => createWebSearchTool,
   createWriteFileTool: () => createWriteFileTool,
   developerTools: () => developerTools,
   editFile: () => editFile,
@@ -45350,9 +45539,6 @@ __export(tools_exports, {
   toolRegistry: () => toolRegistry,
   validatePath: () => validatePath,
   webFetch: () => webFetch,
-  webFetchJS: () => webFetchJS,
-  webScrape: () => webScrape,
-  webSearch: () => webSearch,
   writeFile: () => writeFile5
 });
 var DEFAULT_FILESYSTEM_CONFIG = {
@@ -47075,6 +47261,111 @@ The tool returns a result object with:
   }
 };
 
+// src/tools/web/createWebSearchTool.ts
+init_Logger();
+var searchLogger = exports.logger.child({ component: "webSearch" });
+function createWebSearchTool(connector) {
+  return {
+    definition: {
+      type: "function",
+      function: {
+        name: "web_search",
+        description: `Search the web and get relevant results with snippets.
+
+RETURNS:
+An array of search results, each containing:
+- title: Page title
+- url: Direct URL to the page
+- snippet: Short description/excerpt from the page
+- position: Search ranking position (1, 2, 3...)
+
+USE CASES:
+- Find current information on any topic
+- Research multiple sources
+- Discover relevant websites
+- Find URLs to fetch with web_fetch tool
+
+WORKFLOW PATTERN:
+1. Use web_search to find relevant URLs
+2. Use web_fetch to get full content from top results
+3. Process and summarize the information
+
+EXAMPLE:
+{
+  "query": "latest AI developments 2026",
+  "numResults": 5
+}`,
+        parameters: {
+          type: "object",
+          properties: {
+            query: {
+              type: "string",
+              description: "The search query string. Be specific for better results."
+            },
+            numResults: {
+              type: "number",
+              description: "Number of results to return (default: 10, max: 100)."
+            },
+            country: {
+              type: "string",
+              description: 'Country/region code for localized results (e.g., "us", "gb", "de")'
+            },
+            language: {
+              type: "string",
+              description: 'Language code for results (e.g., "en", "fr", "de")'
+            }
+          },
+          required: ["query"]
+        }
+      },
+      blocking: true,
+      timeout: 15e3
+    },
+    execute: async (args) => {
+      const numResults = args.numResults || 10;
+      searchLogger.debug({ connectorName: connector.name }, "Executing search with connector");
+      try {
+        const searchProvider = SearchProvider.create({ connector: connector.name });
+        const response = await searchProvider.search(args.query, {
+          numResults,
+          country: args.country,
+          language: args.language
+        });
+        if (response.success) {
+          searchLogger.debug({
+            provider: response.provider,
+            count: response.count
+          }, "Search completed successfully");
+        } else {
+          searchLogger.warn({
+            provider: response.provider,
+            error: response.error
+          }, "Search failed");
+        }
+        return {
+          success: response.success,
+          query: response.query,
+          provider: response.provider,
+          results: response.results,
+          count: response.count,
+          error: response.error
+        };
+      } catch (error) {
+        searchLogger.error({ error: error.message, connectorName: connector.name }, "Search threw exception");
+        return {
+          success: false,
+          query: args.query,
+          provider: connector.name,
+          results: [],
+          count: 0,
+          error: error.message || "Unknown error"
+        };
+      }
+    },
+    describeCall: (args) => `"${args.query}"${args.numResults ? ` (${args.numResults} results)` : ""}`
+  };
+}
+
 // src/tools/web/contentDetector.ts
 function detectContentQuality(html, text, $) {
   const issues = [];
@@ -47149,7 +47440,7 @@ function detectContentQuality(html, text, $) {
   }
   let suggestion;
   if (requiresJS && score < 50) {
-    suggestion = "Content quality is low. This appears to be a JavaScript-rendered site. Use the web_fetch_js tool for better results.";
+    suggestion = "Content quality is low. This appears to be a JavaScript-rendered site. Use a scraping service connector for better results.";
   } else if (score < 30) {
     suggestion = "Content extraction failed or page has errors. Check the URL and try again.";
   }
@@ -47258,7 +47549,7 @@ The tool analyzes the fetched content and returns a quality score (0-100):
 - 50-79: Moderate quality, some content extracted
 - 0-49: Low quality, likely needs JavaScript or has errors
 
-If the quality score is low or requiresJS is true, the tool will suggest using 'web_fetch_js' instead.
+If the quality score is low or requiresJS is true, consider using a scraping service connector for better results.
 
 RETURNS:
 {
@@ -47422,460 +47713,109 @@ With custom user agent:
   }
 };
 
-// src/tools/web/webFetchJS.ts
-var puppeteerModule = null;
-var browserInstance = null;
-async function loadPuppeteer() {
-  if (!puppeteerModule) {
-    try {
-      puppeteerModule = await import('puppeteer');
-    } catch (error) {
-      throw new Error("Puppeteer not installed");
-    }
-  }
-  return puppeteerModule;
-}
-async function getBrowser() {
-  if (!browserInstance) {
-    const puppeteer = await loadPuppeteer();
-    browserInstance = await puppeteer.launch({
-      headless: true,
-      args: ["--no-sandbox", "--disable-setuid-sandbox", "--disable-dev-shm-usage"]
-    });
-    process.on("exit", async () => {
-      if (browserInstance) {
-        await browserInstance.close();
-      }
-    });
-  }
-  return browserInstance;
-}
-var webFetchJS = {
-  definition: {
-    type: "function",
-    function: {
-      name: "web_fetch_js",
-      description: `Fetch and extract content from JavaScript-rendered websites using a headless browser (Puppeteer).
-
-USE THIS TOOL WHEN:
-- The web_fetch tool returned a low quality score (<50)
-- The web_fetch tool suggested using JavaScript rendering
-- You know the website is built with React/Vue/Angular/Next.js
-- Content loads dynamically via JavaScript
-- The page requires interaction (though this tool doesn't support interaction yet)
-
-HOW IT WORKS:
-- Launches a headless Chrome browser
-- Navigates to the URL
-- Waits for JavaScript to execute and content to load
-- Extracts the rendered HTML and text content
-- Optionally captures a screenshot
-
-CAPABILITIES:
-- Executes all JavaScript on the page
-- Waits for network to be idle (all resources loaded)
-- Can wait for specific CSS selectors to appear
-- Handles React, Vue, Angular, Next.js, and other SPAs
-- Returns content after full JavaScript execution
-
-LIMITATIONS:
-- Slower than web_fetch (typically 3-10 seconds vs <1 second)
-- Uses more system resources (runs a full browser)
-- May still fail on sites with aggressive bot detection
-- Requires puppeteer to be installed (npm install puppeteer)
-
-PERFORMANCE:
-- First call: Slower (launches browser ~1-2s)
-- Subsequent calls: Faster (reuses browser instance)
-
-RETURNS:
-{
-  success: boolean,
-  url: string,
-  title: string,
-  content: string,         // Clean markdown (converted via Readability + Turndown)
-  screenshot: string,      // Base64 PNG screenshot (if requested)
-  loadTime: number,        // Time taken in milliseconds
-  excerpt: string,         // Short summary excerpt (if extracted)
-  byline: string,          // Author info (if extracted)
-  wasTruncated: boolean,   // True if content was truncated
-  error: string           // Error message if failed
-}
-
-EXAMPLES:
-Basic usage:
-{
-  url: "https://react-app.com/page"
-}
-
-Wait for specific content:
-{
-  url: "https://app.com/dashboard",
-  waitForSelector: "#main-content",  // Wait for this element
-  timeout: 20000
+// src/tools/web/createWebScrapeTool.ts
+init_Logger();
+var scrapeLogger = exports.logger.child({ component: "webScrape" });
+var DEFAULT_MIN_QUALITY = 50;
+function stripBase64DataUris(content) {
+  if (!content) return content;
+  let cleaned = content.replace(/!\[[^\]]*\]\(data:[^)]+\)/g, "[image removed]");
+  cleaned = cleaned.replace(/url\(['"]?data:[^)]+['"]?\)/gi, "url([data-uri-removed])");
+  cleaned = cleaned.replace(/data:(?:image|font|application)\/[^;]+;base64,[A-Za-z0-9+/=]{100,}/g, "[base64-data-removed]");
+  return cleaned;
 }
-
-With screenshot:
-{
-  url: "https://site.com",
-  takeScreenshot: true
-}`,
-      parameters: {
-        type: "object",
-        properties: {
-          url: {
-            type: "string",
-            description: "The URL to fetch. Must start with http:// or https://"
-          },
-          waitForSelector: {
-            type: "string",
-            description: 'Optional CSS selector to wait for before extracting content. Example: "#main-content" or ".article-body"'
-          },
-          timeout: {
-            type: "number",
-            description: "Max wait time in milliseconds (default: 15000)"
-          },
-          takeScreenshot: {
-            type: "boolean",
-            description: "Whether to capture a screenshot of the page (default: false). Screenshot returned as base64 PNG."
-          }
-        },
-        required: ["url"]
-      }
-    },
-    blocking: true,
-    timeout: 3e4
-    // Allow extra time for browser operations
-  },
-  execute: async (args) => {
-    let page = null;
+function createWebScrapeTool(connector) {
+  async function tryNative(args, startTime, attemptedMethods) {
+    attemptedMethods.push("native");
+    scrapeLogger.debug({ url: args.url }, "Trying native fetch");
     try {
-      const browser = await getBrowser();
-      page = await browser.newPage();
-      await page.setViewport({ width: 1280, height: 800 });
-      await page.setUserAgent(
-        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
-      );
-      const startTime = Date.now();
-      await page.goto(args.url, {
-        waitUntil: "networkidle2",
-        // Wait until network is mostly idle
-        timeout: args.timeout || 15e3
+      const result = await webFetch.execute({
+        url: args.url,
+        timeout: args.timeout || 1e4
       });
-      if (args.waitForSelector) {
-        await page.waitForSelector(args.waitForSelector, {
-          timeout: args.timeout || 15e3
-        });
-      }
-      const html = await page.content();
-      const browserTitle = await page.title();
-      const loadTime = Date.now() - startTime;
-      let screenshot;
-      if (args.takeScreenshot) {
-        const buffer = await page.screenshot({
-          type: "png",
-          fullPage: false
-          // Just viewport
-        });
-        screenshot = buffer.toString("base64");
-      }
-      await page.close();
-      const mdResult = await htmlToMarkdown(html, args.url);
-      const title = browserTitle || mdResult.title || "Untitled";
+      const cleanContent = stripBase64DataUris(result.content);
       return {
-        success: true,
+        success: result.success,
         url: args.url,
-        title,
-        content: mdResult.markdown,
-        screenshot,
-        loadTime,
-        excerpt: mdResult.excerpt,
-        byline: mdResult.byline,
-        wasReadabilityUsed: mdResult.wasReadabilityUsed,
-        wasTruncated: mdResult.wasTruncated
+        finalUrl: args.url,
+        method: "native",
+        title: result.title,
+        content: cleanContent,
+        qualityScore: result.qualityScore,
+        durationMs: Date.now() - startTime,
+        attemptedMethods,
+        error: result.error
       };
     } catch (error) {
-      if (page) {
-        try {
-          await page.close();
-        } catch {
-        }
-      }
-      if (error.message === "Puppeteer not installed") {
-        return {
-          success: false,
-          url: args.url,
-          title: "",
-          content: "",
-          loadTime: 0,
-          error: "Puppeteer is not installed",
-          suggestion: "Install Puppeteer with: npm install puppeteer (note: downloads ~50MB Chrome binary)"
-        };
-      }
       return {
         success: false,
         url: args.url,
+        method: "native",
         title: "",
         content: "",
-        loadTime: 0,
+        durationMs: Date.now() - startTime,
+        attemptedMethods,
         error: error.message
       };
     }
   }
-};
-
-// src/tools/web/webSearch.ts
-init_Logger();
-
-// src/tools/web/searchProviders/serper.ts
-async function searchWithSerper(query, numResults, apiKey) {
-  const response = await fetch("https://google.serper.dev/search", {
-    method: "POST",
-    headers: {
-      "X-API-KEY": apiKey,
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({
-      q: query,
-      num: numResults
-    })
-  });
-  if (!response.ok) {
-    throw new Error(`Serper API error: ${response.status} ${response.statusText}`);
-  }
-  const data = await response.json();
-  if (!data.organic || !Array.isArray(data.organic)) {
-    throw new Error("Invalid response from Serper API");
-  }
-  return data.organic.slice(0, numResults).map((result, index) => ({
-    title: result.title || "Untitled",
-    url: result.link || "",
-    snippet: result.snippet || "",
-    position: index + 1
-  }));
-}
-
-// src/tools/web/searchProviders/brave.ts
-async function searchWithBrave(query, numResults, apiKey) {
-  const url2 = `https://api.search.brave.com/res/v1/web/search?q=${encodeURIComponent(query)}&count=${numResults}`;
-  const response = await fetch(url2, {
-    headers: {
-      "X-Subscription-Token": apiKey,
-      Accept: "application/json"
-    }
-  });
-  if (!response.ok) {
-    throw new Error(`Brave API error: ${response.status} ${response.statusText}`);
-  }
-  const data = await response.json();
-  if (!data.web?.results || !Array.isArray(data.web.results)) {
-    throw new Error("Invalid response from Brave API");
-  }
-  return data.web.results.slice(0, numResults).map((result, index) => ({
-    title: result.title || "Untitled",
-    url: result.url || "",
-    snippet: result.description || "",
-    position: index + 1
-  }));
-}
-
-// src/tools/web/searchProviders/tavily.ts
-async function searchWithTavily(query, numResults, apiKey) {
-  const response = await fetch("https://api.tavily.com/search", {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({
-      api_key: apiKey,
-      query,
-      max_results: numResults,
-      search_depth: "basic",
-      // 'basic' or 'advanced'
-      include_answer: false,
-      include_raw_content: false
-    })
-  });
-  if (!response.ok) {
-    throw new Error(`Tavily API error: ${response.status} ${response.statusText}`);
-  }
-  const data = await response.json();
-  if (!data.results || !Array.isArray(data.results)) {
-    throw new Error("Invalid response from Tavily API");
-  }
-  return data.results.slice(0, numResults).map((result, index) => ({
-    title: result.title || "Untitled",
-    url: result.url || "",
-    snippet: result.content || "",
-    position: index + 1
-  }));
-}
-
-// src/tools/web/webSearch.ts
-var searchLogger = exports.logger.child({ component: "webSearch" });
-var SEARCH_SERVICE_TYPES = ["serper", "brave-search", "tavily", "rapidapi-search"];
-var webSearch = {
-  definition: {
-    type: "function",
-    function: {
-      name: "web_search",
-      description: `Search the web and get relevant results with snippets.
-
-RETURNS:
-An array of search results, each containing:
-- title: Page title
-- url: Direct URL to the page
-- snippet: Short description/excerpt from the page
-- position: Search ranking position (1, 2, 3...)
-
-USE CASES:
-- Find current information on any topic
-- Research multiple sources
-- Discover relevant websites
-- Find URLs to fetch with web_fetch tool
-
-WORKFLOW PATTERN:
-1. Use web_search to find relevant URLs
-2. Use web_fetch to get full content from top results
-3. Process and summarize the information
-
-EXAMPLE:
-{
-  "query": "latest AI developments 2026",
-  "numResults": 5
-}`,
-      parameters: {
-        type: "object",
-        properties: {
-          query: {
-            type: "string",
-            description: "The search query string. Be specific for better results."
-          },
-          numResults: {
-            type: "number",
-            description: "Number of results to return (default: 10, max: 100)."
-          },
-          country: {
-            type: "string",
-            description: 'Country/region code for localized results (e.g., "us", "gb", "de")'
-          },
-          language: {
-            type: "string",
-            description: 'Language code for results (e.g., "en", "fr", "de")'
-          }
-        },
-        required: ["query"]
-      }
-    },
-    blocking: true,
-    timeout: 15e3
-  },
-  execute: async (args) => {
-    const numResults = args.numResults || 10;
-    const connector = findConnectorByServiceTypes(SEARCH_SERVICE_TYPES);
-    if (connector) {
-      return await executeWithConnector(connector.name, args, numResults);
-    }
-    return await executeWithEnvVar(args, numResults);
-  },
-  describeCall: (args) => `"${args.query}"${args.numResults ? ` (${args.numResults} results)` : ""}`
-};
-async function executeWithConnector(connectorName, args, numResults) {
-  searchLogger.debug({ connectorName }, "Executing search with connector");
-  try {
-    const searchProvider = SearchProvider.create({ connector: connectorName });
-    const response = await searchProvider.search(args.query, {
-      numResults,
-      country: args.country,
-      language: args.language
-    });
-    if (response.success) {
-      searchLogger.debug({
-        provider: response.provider,
-        count: response.count
-      }, "Search completed successfully");
-    } else {
-      searchLogger.warn({
-        provider: response.provider,
-        error: response.error
-      }, "Search failed");
-    }
-    return {
-      success: response.success,
-      query: response.query,
-      provider: response.provider,
-      results: response.results,
-      count: response.count,
-      error: response.error
-    };
-  } catch (error) {
-    searchLogger.error({ error: error.message, connectorName }, "Search threw exception");
-    return {
-      success: false,
-      query: args.query,
-      provider: connectorName,
-      results: [],
-      count: 0,
-      error: error.message || "Unknown error"
-    };
-  }
-}
-async function executeWithEnvVar(args, numResults) {
-  const providers = [
-    { name: "serper", key: process.env.SERPER_API_KEY, fn: searchWithSerper },
-    { name: "brave", key: process.env.BRAVE_API_KEY, fn: searchWithBrave },
-    { name: "tavily", key: process.env.TAVILY_API_KEY, fn: searchWithTavily }
-  ];
-  for (const provider of providers) {
-    if (provider.key) {
-      searchLogger.debug({ provider: provider.name }, "Using environment variable fallback");
-      try {
-        const results = await provider.fn(args.query, numResults, provider.key);
-        return {
-          success: true,
-          query: args.query,
-          provider: provider.name,
-          results,
-          count: results.length
-        };
-      } catch (error) {
-        searchLogger.warn({ provider: provider.name, error: error.message }, "Provider failed, trying next");
-      }
+  async function tryAPI(args, startTime, attemptedMethods) {
+    attemptedMethods.push(`api:${connector.name}`);
+    scrapeLogger.debug({ url: args.url, connectorName: connector.name }, "Trying external API");
+    try {
+      const provider = ScrapeProvider.create({ connector: connector.name });
+      const options = {
+        timeout: args.timeout,
+        waitForSelector: args.waitForSelector,
+        includeHtml: args.includeHtml,
+        includeMarkdown: args.includeMarkdown,
+        includeLinks: args.includeLinks
+      };
+      const result = await provider.scrape(args.url, options);
+      const rawContent = result.result?.content || "";
+      const rawMarkdown = result.result?.markdown;
+      const cleanContent = stripBase64DataUris(rawContent);
+      const cleanMarkdown = rawMarkdown ? stripBase64DataUris(rawMarkdown) : void 0;
+      const isDuplicate = !!cleanMarkdown && cleanContent === cleanMarkdown;
+      return {
+        success: result.success,
+        url: args.url,
+        finalUrl: result.finalUrl,
+        method: result.provider,
+        title: result.result?.title || "",
+        content: cleanContent,
+        html: result.result?.html,
+        markdown: isDuplicate ? void 0 : cleanMarkdown,
+        metadata: result.result?.metadata,
+        links: result.result?.links,
+        qualityScore: result.success ? 90 : 0,
+        durationMs: Date.now() - startTime,
+        attemptedMethods,
+        error: result.error
+      };
+    } catch (error) {
+      return {
+        success: false,
+        url: args.url,
+        method: "api",
+        title: "",
+        content: "",
+        durationMs: Date.now() - startTime,
+        attemptedMethods,
+        error: error.message
+      };
     }
   }
   return {
-    success: false,
-    query: args.query,
-    provider: "none",
-    results: [],
-    count: 0,
-    error: "No search provider configured. Set up a search connector (serper, brave-search, tavily) or set SERPER_API_KEY, BRAVE_API_KEY, or TAVILY_API_KEY environment variable."
-  };
-}
-
-// src/tools/web/webScrape.ts
-init_Logger();
-var scrapeLogger = exports.logger.child({ component: "webScrape" });
-function stripBase64DataUris(content) {
-  if (!content) return content;
-  let cleaned = content.replace(/!\[[^\]]*\]\(data:[^)]+\)/g, "[image removed]");
-  cleaned = cleaned.replace(/url\(['"]?data:[^)]+['"]?\)/gi, "url([data-uri-removed])");
-  cleaned = cleaned.replace(/data:(?:image|font|application)\/[^;]+;base64,[A-Za-z0-9+/=]{100,}/g, "[base64-data-removed]");
-  return cleaned;
-}
-var SCRAPE_SERVICE_TYPES = ["zenrows", "jina-reader", "firecrawl", "scrapingbee"];
-var DEFAULT_MIN_QUALITY = 50;
-var webScrape = {
-  definition: {
-    type: "function",
-    function: {
-      name: "web_scrape",
-      description: `Scrape any URL with automatic fallback - guaranteed to work on most sites.
+    definition: {
+      type: "function",
+      function: {
+        name: "web_scrape",
+        description: `Scrape any URL with automatic fallback - guaranteed to work on most sites.
 
 Automatically tries multiple methods in sequence:
 1. Native fetch - Fast (~1s), works for blogs/docs/articles
-2. JS rendering - Handles React/Vue/Angular SPAs
-3. External API - Handles bot protection, CAPTCHAs (if configured)
+2. External API - Handles bot protection, CAPTCHAs, SPAs (if configured)
 
 RETURNS:
 {
@@ -47910,46 +47850,64 @@ For JS-heavy sites:
   "url": "https://spa-app.com",
   "waitForSelector": ".main-content"
 }`,
-      parameters: {
-        type: "object",
-        properties: {
-          url: {
-            type: "string",
-            description: "URL to scrape. Must start with http:// or https://"
-          },
-          timeout: {
-            type: "number",
-            description: "Timeout in milliseconds (default: 30000)"
-          },
-          includeHtml: {
-            type: "boolean",
-            description: "Include raw HTML in response (default: false)"
-          },
-          includeMarkdown: {
-            type: "boolean",
-            description: "Include markdown conversion (default: false)"
-          },
-          includeLinks: {
-            type: "boolean",
-            description: "Extract and include links (default: false)"
+        parameters: {
+          type: "object",
+          properties: {
+            url: {
+              type: "string",
+              description: "URL to scrape. Must start with http:// or https://"
+            },
+            timeout: {
+              type: "number",
+              description: "Timeout in milliseconds (default: 30000)"
+            },
+            includeHtml: {
+              type: "boolean",
+              description: "Include raw HTML in response (default: false)"
+            },
+            includeMarkdown: {
+              type: "boolean",
+              description: "Include markdown conversion (default: false)"
+            },
+            includeLinks: {
+              type: "boolean",
+              description: "Extract and include links (default: false)"
+            },
+            waitForSelector: {
+              type: "string",
+              description: "CSS selector to wait for before scraping (for JS-heavy sites)"
+            }
           },
-          waitForSelector: {
-            type: "string",
-            description: "CSS selector to wait for before scraping (for JS-heavy sites)"
-          }
-        },
-        required: ["url"]
-      }
+          required: ["url"]
+        }
+      },
+      blocking: true,
+      timeout: 6e4
     },
-    blocking: true,
-    timeout: 6e4
-  },
-  execute: async (args) => {
-    const startTime = Date.now();
-    const attemptedMethods = [];
-    try {
-      new URL(args.url);
-    } catch {
+    execute: async (args) => {
+      const startTime = Date.now();
+      const attemptedMethods = [];
+      try {
+        new URL(args.url);
+      } catch {
+        return {
+          success: false,
+          url: args.url,
+          method: "none",
+          title: "",
+          content: "",
+          durationMs: Date.now() - startTime,
+          attemptedMethods: [],
+          error: "Invalid URL format"
+        };
+      }
+      const native = await tryNative(args, startTime, attemptedMethods);
+      if (native.success && (native.qualityScore ?? 0) >= DEFAULT_MIN_QUALITY) {
+        return native;
+      }
+      const api = await tryAPI(args, startTime, attemptedMethods);
+      if (api.success) return api;
+      if (native.success) return native;
       return {
         success: false,
         url: args.url,
@@ -47957,232 +47915,119 @@ For JS-heavy sites:
         title: "",
         content: "",
         durationMs: Date.now() - startTime,
-        attemptedMethods: [],
-        error: "Invalid URL format"
+        attemptedMethods,
+        error: "All scraping methods failed. Site may have bot protection."
       };
-    }
-    const native = await tryNative(args, startTime, attemptedMethods);
-    if (native.success && (native.qualityScore ?? 0) >= DEFAULT_MIN_QUALITY) {
-      return native;
-    }
-    const js = await tryJS(args, startTime, attemptedMethods);
-    if (js.success && (js.qualityScore ?? 0) >= DEFAULT_MIN_QUALITY) {
-      return js;
-    }
-    const connector = findConnectorByServiceTypes(SCRAPE_SERVICE_TYPES);
-    if (connector) {
-      const api = await tryAPI(connector.name, args, startTime, attemptedMethods);
-      if (api.success) return api;
-    }
-    if (js.success) return js;
-    if (native.success) return native;
-    return {
-      success: false,
-      url: args.url,
-      method: "none",
-      title: "",
-      content: "",
-      durationMs: Date.now() - startTime,
-      attemptedMethods,
-      error: "All scraping methods failed. Site may have bot protection."
-    };
-  },
-  describeCall: (args) => args.url
-};
-async function tryNative(args, startTime, attemptedMethods) {
-  attemptedMethods.push("native");
-  scrapeLogger.debug({ url: args.url }, "Trying native fetch");
-  try {
-    const result = await webFetch.execute({
-      url: args.url,
-      timeout: args.timeout || 1e4
-    });
-    const cleanContent = stripBase64DataUris(result.content);
-    return {
-      success: result.success,
-      url: args.url,
-      finalUrl: args.url,
-      method: "native",
-      title: result.title,
-      content: cleanContent,
-      // Native method already returns markdown-like content — no separate markdown field needed
-      // (would just duplicate content and waste tokens)
-      qualityScore: result.qualityScore,
-      durationMs: Date.now() - startTime,
-      attemptedMethods,
-      error: result.error
-    };
-  } catch (error) {
-    return {
-      success: false,
-      url: args.url,
-      method: "native",
-      title: "",
-      content: "",
-      durationMs: Date.now() - startTime,
-      attemptedMethods,
-      error: error.message
-    };
-  }
+    },
+    describeCall: (args) => args.url
+  };
 }
-async function tryJS(args, startTime, attemptedMethods) {
-  attemptedMethods.push("js");
-  scrapeLogger.debug({ url: args.url }, "Trying JS rendering");
-  try {
-    const result = await webFetchJS.execute({
-      url: args.url,
-      timeout: args.timeout || 15e3,
-      waitForSelector: args.waitForSelector
-    });
-    const cleanContent = stripBase64DataUris(result.content);
-    return {
-      success: result.success,
-      url: args.url,
-      finalUrl: args.url,
-      method: "js",
-      title: result.title,
-      content: cleanContent,
-      // JS method already returns markdown-like content — no separate markdown field needed
-      qualityScore: result.success ? 80 : 0,
-      durationMs: Date.now() - startTime,
-      attemptedMethods,
-      error: result.error
-    };
-  } catch (error) {
-    return {
-      success: false,
-      url: args.url,
-      method: "js",
-      title: "",
-      content: "",
-      durationMs: Date.now() - startTime,
-      attemptedMethods,
-      error: error.message
-    };
+
+// src/tools/web/register.ts
+var SEARCH_SERVICE_TYPES = ["serper", "brave-search", "tavily", "rapidapi-search"];
+var SCRAPE_SERVICE_TYPES = ["zenrows", "jina-reader", "firecrawl", "scrapingbee"];
+function registerWebTools() {
+  for (const st of SEARCH_SERVICE_TYPES) {
+    ConnectorTools.registerService(st, (connector) => [
+      createWebSearchTool(connector)
+    ]);
   }
-}
-async function tryAPI(connectorName, args, startTime, attemptedMethods) {
-  attemptedMethods.push(`api:${connectorName}`);
-  scrapeLogger.debug({ url: args.url, connectorName }, "Trying external API");
-  try {
-    const provider = ScrapeProvider.create({ connector: connectorName });
-    const options = {
-      timeout: args.timeout,
-      waitForSelector: args.waitForSelector,
-      includeHtml: args.includeHtml,
-      includeMarkdown: args.includeMarkdown,
-      includeLinks: args.includeLinks
-    };
-    const result = await provider.scrape(args.url, options);
-    const rawContent = result.result?.content || "";
-    const rawMarkdown = result.result?.markdown;
-    const cleanContent = stripBase64DataUris(rawContent);
-    const cleanMarkdown = rawMarkdown ? stripBase64DataUris(rawMarkdown) : void 0;
-    const isDuplicate = !!cleanMarkdown && cleanContent === cleanMarkdown;
-    return {
-      success: result.success,
-      url: args.url,
-      finalUrl: result.finalUrl,
-      method: result.provider,
-      title: result.result?.title || "",
-      content: cleanContent,
-      html: result.result?.html,
-      // Keep raw HTML as-is (only used if explicitly requested)
-      markdown: isDuplicate ? void 0 : cleanMarkdown,
-      metadata: result.result?.metadata,
-      links: result.result?.links,
-      qualityScore: result.success ? 90 : 0,
-      durationMs: Date.now() - startTime,
-      attemptedMethods,
-      error: result.error
-    };
-  } catch (error) {
-    return {
-      success: false,
-      url: args.url,
-      method: "api",
-      title: "",
-      content: "",
-      durationMs: Date.now() - startTime,
-      attemptedMethods,
-      error: error.message
-    };
+  for (const st of SCRAPE_SERVICE_TYPES) {
+    ConnectorTools.registerService(st, (connector) => [
+      createWebScrapeTool(connector)
+    ]);
   }
 }
 
+// src/tools/web/index.ts
+registerWebTools();
+
 // src/tools/code/executeJavaScript.ts
 init_Connector();
-function generateDescription() {
-  const connectors = exports.Connector.listAll();
-  const connectorList = connectors.length > 0 ? connectors.map((c) => {
-    const authType = c.config.auth?.type || "none";
-    return `   \u2022 "${c.name}": ${c.displayName}
-     ${c.config.description || "No description"}
-     Base URL: ${c.baseURL}
-     Auth: ${authType}`;
-  }).join("\n\n") : "   No connectors registered.";
-  return `Execute JavaScript code in a secure sandbox with authenticated API access.
-
-AVAILABLE APIS:
-
-1. authenticatedFetch(url, options, connectorName, userId?)
-   Makes authenticated API calls using the connector's configured auth scheme.
-   Auth headers are added automatically - DO NOT set Authorization header.
+var DEFAULT_TIMEOUT = 1e4;
+var DEFAULT_MAX_TIMEOUT = 3e4;
+function formatConnectorEntry(c) {
+  const parts = [];
+  const serviceOrVendor = c.serviceType ?? c.vendor ?? void 0;
+  if (serviceOrVendor) parts.push(`Service: ${serviceOrVendor}`);
+  if (c.config.description) parts.push(c.config.description);
+  if (c.baseURL) parts.push(`URL: ${c.baseURL}`);
+  const details = parts.map((p) => `     ${p}`).join("\n");
+  return `   \u2022 "${c.name}" (${c.displayName})
+${details}`;
+}
+function generateDescription(context, maxTimeout) {
+  const registry = context?.connectorRegistry ?? exports.Connector.asRegistry();
+  const connectors = registry.listAll();
+  const connectorList = connectors.length > 0 ? connectors.map(formatConnectorEntry).join("\n\n") : "   No connectors registered.";
+  const timeoutSec = Math.round(maxTimeout / 1e3);
+  return `Execute JavaScript code in a secure sandbox with authenticated API access to external services.
+
+Use this tool when you need to:
+- Call external APIs (GitHub, Slack, Stripe, etc.) using registered connectors
+- Process, transform, or compute data that requires programmatic logic
+- Chain multiple API calls or perform complex data manipulation
+- Do anything that plain text generation cannot accomplish
+
+SANDBOX API:
+
+1. authenticatedFetch(url, options, connectorName)
+   Makes authenticated HTTP requests using the connector's credentials.
+   The current user's identity (userId) is automatically included \u2014 no need to pass it.
+   Auth headers are added automatically \u2014 DO NOT set Authorization header manually.
 
    Parameters:
-     \u2022 url: Full URL or relative path (uses connector's baseURL)
+     \u2022 url: Full URL or path relative to the connector's base URL
        - Full: "https://api.github.com/user/repos"
-       - Relative: "/user/repos" (appended to connector's baseURL)
-     \u2022 options: Standard fetch options { method, body, headers }
-     \u2022 connectorName: One of the registered connectors below
-     \u2022 userId: (optional) For multi-tenant apps with per-user tokens
+       - Relative: "/user/repos" (resolved against connector's base URL)
+     \u2022 options: Standard fetch options { method, headers, body }
+       - For POST/PUT: set body to JSON.stringify(data) and headers to { 'Content-Type': 'application/json' }
+     \u2022 connectorName: Name of a registered connector (see list below)
 
    Returns: Promise<Response>
-     \u2022 response.ok - true if status 200-299
-     \u2022 response.status - HTTP status code
-     \u2022 response.json() - parse JSON body
-     \u2022 response.text() - get text body
+     \u2022 response.ok \u2014 true if status 200-299
+     \u2022 response.status \u2014 HTTP status code
+     \u2022 await response.json() \u2014 parse JSON body
+     \u2022 await response.text() \u2014 get text body
 
-   Auth Schemes (handled automatically per connector):
-     \u2022 Bearer tokens (GitHub, Slack, Stripe)
-     \u2022 Bot tokens (Discord)
-     \u2022 Basic auth (Twilio, Zendesk)
-     \u2022 Custom headers (Shopify uses X-Shopify-Access-Token)
+2. fetch(url, options) \u2014 Standard fetch without authentication
 
-2. connectors.list() - List available connector names
-3. connectors.get(name) - Get connector info { displayName, description, baseURL }
-4. fetch(url, options) - Standard fetch (no auth)
+3. connectors.list() \u2014 Array of available connector names
+4. connectors.get(name) \u2014 Connector info: { displayName, description, baseURL, serviceType }
 
-INPUT/OUTPUT:
-   \u2022 input - data passed to your code via the "input" parameter
-   \u2022 output - SET THIS variable to return your result
+VARIABLES:
+   \u2022 input \u2014 data passed via the "input" parameter (default: {})
+   \u2022 output \u2014 SET THIS to return your result to the caller
 
-UTILITIES: console.log/error/warn, Buffer, JSON, Math, Date, Promise
+GLOBALS: console.log/error/warn, JSON, Math, Date, Buffer, Promise, Array, Object, String, Number, Boolean, setTimeout, setInterval, URL, URLSearchParams, RegExp, Map, Set, Error, TextEncoder, TextDecoder
 
 REGISTERED CONNECTORS:
 ${connectorList}
 
-EXAMPLE:
-(async () => {
-  const response = await authenticatedFetch(
-    '/user/repos',
-    { method: 'GET' },
-    'github'
-  );
+EXAMPLES:
 
-  if (!response.ok) {
-    throw new Error(\`API error: \${response.status}\`);
-  }
+// GET request
+const resp = await authenticatedFetch('/user/repos', { method: 'GET' }, 'github');
+const repos = await resp.json();
+output = repos.map(r => r.full_name);
 
-  const repos = await response.json();
-  console.log(\`Found \${repos.length} repositories\`);
+// POST request with JSON body
+const resp = await authenticatedFetch('/chat.postMessage', {
+  method: 'POST',
+  headers: { 'Content-Type': 'application/json' },
+  body: JSON.stringify({ channel: '#general', text: 'Hello!' })
+}, 'slack');
+output = await resp.json();
 
-  output = repos;
-})();
+// Data processing (no API needed)
+const items = input.data;
+output = items.filter(i => i.score > 0.8).sort((a, b) => b.score - a.score);
 
-SECURITY: 10s timeout, no file system, no require/import.`;
+LIMITS: ${timeoutSec}s max timeout, no file system access, no require/import.`;
 }
-function createExecuteJavaScriptTool() {
+function createExecuteJavaScriptTool(options) {
+  const maxTimeout = options?.maxTimeout ?? DEFAULT_MAX_TIMEOUT;
+  const defaultTimeout = options?.defaultTimeout ?? DEFAULT_TIMEOUT;
   return {
     definition: {
       type: "function",
@@ -48195,32 +48040,40 @@ function createExecuteJavaScriptTool() {
           properties: {
             code: {
               type: "string",
-              description: 'JavaScript code to execute. MUST set the "output" variable. Wrap in async IIFE for async operations.'
+              description: 'JavaScript code to execute. Set the "output" variable with your result. Code is auto-wrapped in async IIFE \u2014 you can use await directly. For explicit async control, wrap in (async () => { ... })().'
             },
             input: {
-              description: 'Optional input data available as "input" variable in your code'
+              description: 'Optional data available as the "input" variable in your code. Can be any JSON value.'
             },
             timeout: {
               type: "number",
-              description: "Execution timeout in milliseconds (default: 10000, max: 30000)"
+              description: `Execution timeout in milliseconds. Default: ${defaultTimeout}ms, max: ${maxTimeout}ms. Increase for slow API calls or multiple sequential requests.`
             }
           },
           required: ["code"]
         }
       },
       blocking: true,
-      timeout: 35e3
-      // Tool timeout (slightly more than max code timeout)
+      timeout: maxTimeout + 5e3
+      // Tool-level timeout slightly above max code timeout
     },
-    // Dynamic description - evaluated each time tool definitions are sent to LLM
-    // This ensures the connector list is always current
-    descriptionFactory: generateDescription,
-    execute: async (args) => {
+    // Dynamic description — regenerated each time tool definitions are sent to LLM.
+    // Receives ToolContext so connector list is scoped to current userId.
+    descriptionFactory: (context) => generateDescription(context, maxTimeout),
+    execute: async (args, context) => {
       const logs = [];
       const startTime = Date.now();
       try {
-        const timeout = Math.min(args.timeout || 1e4, 3e4);
-        const result = await executeInVM(args.code, args.input, timeout, logs);
+        const timeout = Math.min(Math.max(args.timeout || defaultTimeout, 0), maxTimeout);
+        const registry = context?.connectorRegistry ?? exports.Connector.asRegistry();
+        const result = await executeInVM(
+          args.code,
+          args.input,
+          timeout,
+          logs,
+          context?.userId,
+          registry
+        );
         return {
           success: true,
           result,
@@ -48240,31 +48093,36 @@ function createExecuteJavaScriptTool() {
   };
 }
 var executeJavaScript = createExecuteJavaScriptTool();
-async function executeInVM(code, input, timeout, logs) {
+async function executeInVM(code, input, timeout, logs, userId, registry) {
   const sandbox = {
     // Input/output
-    input: input || {},
+    input: input ?? {},
     output: null,
-    // Console (captured)
+    // Console (captured) — stringify objects for readable logs
     console: {
-      log: (...args) => logs.push(args.map((a) => String(a)).join(" ")),
-      error: (...args) => logs.push("ERROR: " + args.map((a) => String(a)).join(" ")),
-      warn: (...args) => logs.push("WARN: " + args.map((a) => String(a)).join(" "))
+      log: (...args) => logs.push(args.map((a) => typeof a === "object" ? JSON.stringify(a) : String(a)).join(" ")),
+      error: (...args) => logs.push("ERROR: " + args.map((a) => typeof a === "object" ? JSON.stringify(a) : String(a)).join(" ")),
+      warn: (...args) => logs.push("WARN: " + args.map((a) => typeof a === "object" ? JSON.stringify(a) : String(a)).join(" "))
     },
-    // Authenticated fetch
-    authenticatedFetch,
-    // Standard fetch
+    // Authenticated fetch — userId auto-injected from ToolContext.
+    // Only connectors visible in the scoped registry are accessible.
+    authenticatedFetch: (url2, options, connectorName) => {
+      registry.get(connectorName);
+      return authenticatedFetch(url2, options, connectorName, userId);
+    },
+    // Standard fetch (no auth)
     fetch: globalThis.fetch,
-    // Connector info
+    // Connector info (userId-scoped)
     connectors: {
-      list: () => exports.Connector.list(),
+      list: () => registry.list(),
       get: (name) => {
         try {
-          const connector = exports.Connector.get(name);
+          const connector = registry.get(name);
           return {
             displayName: connector.displayName,
             description: connector.config.description || "",
-            baseURL: connector.baseURL
+            baseURL: connector.baseURL,
+            serviceType: connector.serviceType
           };
         } catch {
           return null;
@@ -48281,14 +48139,22 @@ async function executeInVM(code, input, timeout, logs) {
     clearTimeout,
     clearInterval,
     Promise,
-    // Array/Object
+    // Built-in types
     Array,
     Object,
     String,
     Number,
-    Boolean
+    Boolean,
+    RegExp,
+    Map,
+    Set,
+    Error,
+    URL,
+    URLSearchParams,
+    TextEncoder,
+    TextDecoder
   };
-  const context = vm__namespace.createContext(sandbox);
+  const vmContext = vm__namespace.createContext(sandbox);
   const wrappedCode = code.trim().startsWith("(async") ? code : `
     (async () => {
       ${code}
@@ -48296,7 +48162,7 @@ async function executeInVM(code, input, timeout, logs) {
     })()
   `;
   const script = new vm__namespace.Script(wrappedCode);
-  const resultPromise = script.runInContext(context, {
+  const resultPromise = script.runInContext(vmContext, {
     timeout,
     displayErrors: true
   });
@@ -48752,7 +48618,7 @@ function createTextToSpeechTool(connector, storage, userId) {
 }
 
 // src/tools/multimedia/speechToText.ts
-function createSpeechToTextTool(connector, storage, _userId) {
+function createSpeechToTextTool(connector, storage) {
   const vendor = connector.vendor;
   const handler = storage ?? getMediaStorage();
   const vendorModels = vendor ? getSTTModelsByVendor(vendor) : [];
@@ -49013,7 +48879,8 @@ EXAMPLES:
       riskLevel: "low",
       approvalMessage: `Search files in a GitHub repository via ${connector.displayName}`
     },
-    execute: async (args) => {
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
       const resolved = resolveRepository(args.repository, connector);
       if (!resolved.success) {
         return { success: false, error: resolved.error };
@@ -49025,14 +48892,14 @@ EXAMPLES:
           const repoInfo = await githubFetch(
             connector,
             `/repos/${owner}/${repo}`,
-            { userId }
+            { userId: effectiveUserId }
           );
           ref = repoInfo.default_branch;
         }
         const tree = await githubFetch(
           connector,
           `/repos/${owner}/${repo}/git/trees/${ref}?recursive=1`,
-          { userId }
+          { userId: effectiveUserId }
         );
         const matching = tree.tree.filter(
           (entry) => entry.type === "blob" && matchGlobPattern2(args.pattern, entry.path)
@@ -49123,7 +48990,8 @@ EXAMPLES:
       riskLevel: "low",
       approvalMessage: `Search code in a GitHub repository via ${connector.displayName}`
     },
-    execute: async (args) => {
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
       const resolved = resolveRepository(args.repository, connector);
       if (!resolved.success) {
         return { success: false, error: resolved.error };
@@ -49140,7 +49008,7 @@ EXAMPLES:
           connector,
           `/search/code`,
           {
-            userId,
+            userId: effectiveUserId,
             // Request text-match fragments
             accept: "application/vnd.github.text-match+json",
             queryParams: { q, per_page: perPage }
@@ -49227,7 +49095,8 @@ NOTE: Files larger than 1MB are fetched via the Git Blob API. Very large files (
       riskLevel: "low",
       approvalMessage: `Read a file from a GitHub repository via ${connector.displayName}`
     },
-    execute: async (args) => {
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
       const resolved = resolveRepository(args.repository, connector);
       if (!resolved.success) {
         return { success: false, error: resolved.error };
@@ -49241,7 +49110,7 @@ NOTE: Files larger than 1MB are fetched via the Git Blob API. Very large files (
         const contentResp = await githubFetch(
           connector,
           `/repos/${owner}/${repo}/contents/${args.path}${refParam}`,
-          { userId }
+          { userId: effectiveUserId }
         );
         if (contentResp.type !== "file") {
           return {
@@ -49258,7 +49127,7 @@ NOTE: Files larger than 1MB are fetched via the Git Blob API. Very large files (
           const blob = await githubFetch(
             connector,
             contentResp.git_url,
-            { userId }
+            { userId: effectiveUserId }
           );
           fileContent = Buffer.from(blob.content, "base64").toString("utf-8");
           fileSize = blob.size;
@@ -49345,7 +49214,8 @@ EXAMPLES:
       riskLevel: "low",
       approvalMessage: `Get pull request details from GitHub via ${connector.displayName}`
     },
-    execute: async (args) => {
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
       const resolved = resolveRepository(args.repository, connector);
       if (!resolved.success) {
         return { success: false, error: resolved.error };
@@ -49355,7 +49225,7 @@ EXAMPLES:
         const pr = await githubFetch(
           connector,
           `/repos/${owner}/${repo}/pulls/${args.pull_number}`,
-          { userId }
+          { userId: effectiveUserId }
         );
         return {
           success: true,
@@ -49431,7 +49301,8 @@ NOTE: Very large diffs may be truncated by GitHub. Patch content may be absent f
       riskLevel: "low",
       approvalMessage: `Get PR changed files from GitHub via ${connector.displayName}`
     },
-    execute: async (args) => {
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
       const resolved = resolveRepository(args.repository, connector);
       if (!resolved.success) {
         return { success: false, error: resolved.error };
@@ -49442,7 +49313,7 @@ NOTE: Very large diffs may be truncated by GitHub. Patch content may be absent f
           connector,
           `/repos/${owner}/${repo}/pulls/${args.pull_number}/files`,
           {
-            userId,
+            userId: effectiveUserId,
             queryParams: { per_page: 100 }
           }
         );
@@ -49513,7 +49384,8 @@ EXAMPLES:
       riskLevel: "low",
       approvalMessage: `Get PR comments and reviews from GitHub via ${connector.displayName}`
     },
-    execute: async (args) => {
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
       const resolved = resolveRepository(args.repository, connector);
       if (!resolved.success) {
         return { success: false, error: resolved.error };
@@ -49521,7 +49393,7 @@ EXAMPLES:
       const { owner, repo } = resolved.repo;
       try {
         const basePath = `/repos/${owner}/${repo}`;
-        const queryOpts = { userId, queryParams: { per_page: 100 } };
+        const queryOpts = { userId: effectiveUserId, queryParams: { per_page: 100 } };
         const [reviewComments, reviews, issueComments] = await Promise.all([
           githubFetch(
             connector,
@@ -49648,7 +49520,8 @@ EXAMPLES:
       riskLevel: "medium",
       approvalMessage: `Create a pull request on GitHub via ${connector.displayName}`
     },
-    execute: async (args) => {
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
       const resolved = resolveRepository(args.repository, connector);
       if (!resolved.success) {
         return { success: false, error: resolved.error };
@@ -49660,7 +49533,7 @@ EXAMPLES:
           `/repos/${owner}/${repo}/pulls`,
           {
             method: "POST",
-            userId,
+            userId: effectiveUserId,
             body: {
               title: args.title,
               body: args.body,
@@ -49798,37 +49671,6 @@ var toolRegistry = [
     description: "Fetch and extract text content from a web page URL.",
     tool: webFetch,
     safeByDefault: true
-  },
-  {
-    name: "web_fetch_js",
-    exportName: "webFetchJS",
-    displayName: "Web Fetch Js",
-    category: "web",
-    description: "Fetch and extract content from JavaScript-rendered websites using a headless browser (Puppeteer).",
-    tool: webFetchJS,
-    safeByDefault: true
-  },
-  {
-    name: "web_scrape",
-    exportName: "webScrape",
-    displayName: "Web Scrape",
-    category: "web",
-    description: "Scrape any URL with automatic fallback - guaranteed to work on most sites.",
-    tool: webScrape,
-    safeByDefault: true,
-    requiresConnector: true,
-    connectorServiceTypes: ["zenrows"]
-  },
-  {
-    name: "web_search",
-    exportName: "webSearch",
-    displayName: "Web Search",
-    category: "web",
-    description: "Search the web and get relevant results with snippets.",
-    tool: webSearch,
-    safeByDefault: true,
-    requiresConnector: true,
-    connectorServiceTypes: ["serper", "brave-search", "tavily", "rapidapi-websearch"]
   }
 ];
 function getAllBuiltInTools() {