@everworker/oneringai 0.1.3 → 0.2.0

package/dist/index.cjs

@@ -2,11 +2,11 @@
 
 var crypto2 = require('crypto');
 var jose = require('jose');
-var fs15 = require('fs');
+var fs16 = require('fs');
 var eventemitter3 = require('eventemitter3');
-var path3 = require('path');
-var os = require('os');
-var OpenAI2 = require('openai');
+var path2 = require('path');
+var os2 = require('os');
+var OpenAI3 = require('openai');
 var Anthropic = require('@anthropic-ai/sdk');
 var genai = require('@google/genai');
 require('zod/v3');
@@ -14,7 +14,7 @@ var z4mini = require('zod/v4-mini');
 var z = require('zod/v4');
 var process2 = require('process');
 var stream = require('stream');
-var fs14 = require('fs/promises');
+var fs15 = require('fs/promises');
 var simpleIcons = require('simple-icons');
 var child_process = require('child_process');
 var util = require('util');
@@ -44,15 +44,15 @@ function _interopNamespace(e) {
 }
 
 var crypto2__namespace = /*#__PURE__*/_interopNamespace(crypto2);
-var fs15__namespace = /*#__PURE__*/_interopNamespace(fs15);
-var path3__namespace = /*#__PURE__*/_interopNamespace(path3);
-var os__namespace = /*#__PURE__*/_interopNamespace(os);
-var OpenAI2__default = /*#__PURE__*/_interopDefault(OpenAI2);
+var fs16__namespace = /*#__PURE__*/_interopNamespace(fs16);
+var path2__namespace = /*#__PURE__*/_interopNamespace(path2);
+var os2__namespace = /*#__PURE__*/_interopNamespace(os2);
+var OpenAI3__default = /*#__PURE__*/_interopDefault(OpenAI3);
 var Anthropic__default = /*#__PURE__*/_interopDefault(Anthropic);
 var z4mini__namespace = /*#__PURE__*/_interopNamespace(z4mini);
 var z__namespace = /*#__PURE__*/_interopNamespace(z);
 var process2__default = /*#__PURE__*/_interopDefault(process2);
-var fs14__namespace = /*#__PURE__*/_interopNamespace(fs14);
+var fs15__namespace = /*#__PURE__*/_interopNamespace(fs15);
 var simpleIcons__namespace = /*#__PURE__*/_interopNamespace(simpleIcons);
 var TurndownService__default = /*#__PURE__*/_interopDefault(TurndownService);
 var vm__namespace = /*#__PURE__*/_interopNamespace(vm);
@@ -631,7 +631,7 @@ var init_JWTBearer = __esm({
           this.privateKey = config.privateKey;
         } else if (config.privateKeyPath) {
           try {
-            this.privateKey = fs15__namespace.readFileSync(config.privateKeyPath, "utf8");
+            this.privateKey = fs16__namespace.readFileSync(config.privateKeyPath, "utf8");
           } catch (error) {
             throw new Error(`Failed to read private key from ${config.privateKeyPath}: ${error.message}`);
           }
@@ -1281,11 +1281,11 @@ var init_Logger = __esm({
        */
       initFileStream(filePath) {
         try {
-          const dir = path3__namespace.dirname(filePath);
-          if (!fs15__namespace.existsSync(dir)) {
-            fs15__namespace.mkdirSync(dir, { recursive: true });
+          const dir = path2__namespace.dirname(filePath);
+          if (!fs16__namespace.existsSync(dir)) {
+            fs16__namespace.mkdirSync(dir, { recursive: true });
           }
-          this.fileStream = fs15__namespace.createWriteStream(filePath, {
+          this.fileStream = fs16__namespace.createWriteStream(filePath, {
             flags: "a",
             // append mode
             encoding: "utf8"
@@ -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);
@@ -14555,12 +14562,12 @@ var require_dist = __commonJS({
         throw new Error(`Unknown format "${name}"`);
       return f;
     };
-    function addFormats(ajv, list, fs18, exportName) {
+    function addFormats(ajv, list, fs17, exportName) {
       var _a;
       var _b;
       (_a = (_b = ajv.opts.code).formats) !== null && _a !== void 0 ? _a : _b.formats = (0, codegen_1._)`require("ajv-formats/dist/formats").${exportName}`;
       for (const f of list)
-        ajv.addFormat(f, fs18[f]);
+        ajv.addFormat(f, fs17[f]);
     }
     module.exports = exports$1 = formatsPlugin;
     Object.defineProperty(exports$1, "__esModule", { value: true });
@@ -14573,7 +14580,7 @@ var require_windows = __commonJS({
   "node_modules/isexe/windows.js"(exports$1, module) {
     module.exports = isexe;
     isexe.sync = sync;
-    var fs18 = __require("fs");
+    var fs17 = __require("fs");
     function checkPathExt(path6, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
@@ -14591,19 +14598,19 @@ var require_windows = __commonJS({
       }
       return false;
     }
-    function checkStat(stat5, path6, options) {
-      if (!stat5.isSymbolicLink() && !stat5.isFile()) {
+    function checkStat(stat6, path6, options) {
+      if (!stat6.isSymbolicLink() && !stat6.isFile()) {
         return false;
       }
       return checkPathExt(path6, options);
     }
     function isexe(path6, options, cb) {
-      fs18.stat(path6, function(er, stat5) {
-        cb(er, er ? false : checkStat(stat5, path6, options));
+      fs17.stat(path6, function(er, stat6) {
+        cb(er, er ? false : checkStat(stat6, path6, options));
       });
     }
     function sync(path6, options) {
-      return checkStat(fs18.statSync(path6), path6, options);
+      return checkStat(fs17.statSync(path6), path6, options);
     }
   }
 });
@@ -14613,22 +14620,22 @@ var require_mode = __commonJS({
   "node_modules/isexe/mode.js"(exports$1, module) {
     module.exports = isexe;
     isexe.sync = sync;
-    var fs18 = __require("fs");
+    var fs17 = __require("fs");
     function isexe(path6, options, cb) {
-      fs18.stat(path6, function(er, stat5) {
-        cb(er, er ? false : checkStat(stat5, options));
+      fs17.stat(path6, function(er, stat6) {
+        cb(er, er ? false : checkStat(stat6, options));
       });
     }
     function sync(path6, options) {
-      return checkStat(fs18.statSync(path6), options);
+      return checkStat(fs17.statSync(path6), options);
     }
-    function checkStat(stat5, options) {
-      return stat5.isFile() && checkMode(stat5, options);
+    function checkStat(stat6, options) {
+      return stat6.isFile() && checkMode(stat6, options);
     }
-    function checkMode(stat5, options) {
-      var mod = stat5.mode;
-      var uid = stat5.uid;
-      var gid = stat5.gid;
+    function checkMode(stat6, options) {
+      var mod = stat6.mode;
+      var uid = stat6.uid;
+      var gid = stat6.gid;
       var myUid = options.uid !== void 0 ? options.uid : process.getuid && process.getuid();
       var myGid = options.gid !== void 0 ? options.gid : process.getgid && process.getgid();
       var u = parseInt("100", 8);
@@ -14902,16 +14909,16 @@ var require_shebang_command = __commonJS({
 // node_modules/cross-spawn/lib/util/readShebang.js
 var require_readShebang = __commonJS({
   "node_modules/cross-spawn/lib/util/readShebang.js"(exports$1, module) {
-    var fs18 = __require("fs");
+    var fs17 = __require("fs");
     var shebangCommand = require_shebang_command();
     function readShebang(command) {
       const size = 150;
       const buffer = Buffer.alloc(size);
       let fd;
       try {
-        fd = fs18.openSync(command, "r");
-        fs18.readSync(fd, buffer, 0, size, 0);
-        fs18.closeSync(fd);
+        fd = fs17.openSync(command, "r");
+        fs17.readSync(fd, buffer, 0, size, 0);
+        fs17.closeSync(fd);
       } catch (e) {
       }
       return shebangCommand(buffer.toString());
@@ -16020,13 +16027,26 @@ var ToolManager = class extends eventemitter3.EventEmitter {
   pipeline;
   /** Optional tool context for execution (set by agent before runs) */
   _toolContext;
-  constructor() {
+  /** Hard timeout for tool execution (0 = disabled) */
+  _toolExecutionTimeout;
+  constructor(config) {
     super();
+    this._toolExecutionTimeout = config?.toolExecutionTimeout ?? 0;
     this.namespaceIndex.set("default", /* @__PURE__ */ new Set());
     this.toolLogger = exports.logger.child({ component: "ToolManager" });
     this.pipeline = new ToolExecutionPipeline();
     this.pipeline.use(new ResultNormalizerPlugin());
   }
+  /**
+   * Get or set the hard tool execution timeout in milliseconds.
+   * 0 = disabled (relies on tool's own timeout).
+   */
+  get toolExecutionTimeout() {
+    return this._toolExecutionTimeout;
+  }
+  set toolExecutionTimeout(value) {
+    this._toolExecutionTimeout = Math.max(0, value);
+  }
   /**
    * Access the execution pipeline for plugin management.
    *
@@ -16524,7 +16544,7 @@ var ToolManager = class extends eventemitter3.EventEmitter {
     const startTime = Date.now();
     exports.metrics.increment("tool.executed", 1, { tool: toolName });
     try {
-      const result = await breaker.execute(async () => {
+      const executionPromise = breaker.execute(async () => {
         const toolWithContext = {
           ...registration.tool,
           execute: async (pipelineArgs) => {
@@ -16533,6 +16553,7 @@ var ToolManager = class extends eventemitter3.EventEmitter {
         };
         return await this.pipeline.execute(toolWithContext, args);
       });
+      const result = this._toolExecutionTimeout > 0 ? await this.withHardTimeout(executionPromise, toolName, this._toolExecutionTimeout) : await executionPromise;
       const duration = Date.now() - startTime;
       this.recordExecution(toolName, duration, true);
       const resultSummary = this.summarizeResult(result);
@@ -16595,6 +16616,29 @@ var ToolManager = class extends eventemitter3.EventEmitter {
     return this.list();
   }
   // ==========================================================================
+  // Hard Timeout
+  // ==========================================================================
+  /**
+   * Wrap a promise with a hard timeout safety net.
+   * If the promise doesn't resolve within the timeout, throws ToolExecutionError.
+   */
+  async withHardTimeout(promise, toolName, timeoutMs) {
+    let timeoutId;
+    const timeoutPromise = new Promise((_, reject) => {
+      timeoutId = setTimeout(() => {
+        reject(new ToolExecutionError(
+          toolName,
+          `Tool execution hard timeout after ${timeoutMs}ms (safety net - tool's own timeout may have failed)`
+        ));
+      }, timeoutMs);
+    });
+    try {
+      return await Promise.race([promise, timeoutPromise]);
+    } finally {
+      clearTimeout(timeoutId);
+    }
+  }
+  // ==========================================================================
   // Circuit Breaker Management
   // ==========================================================================
   /**
@@ -18400,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;
@@ -19338,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: {
@@ -19355,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"]
@@ -19395,6 +19451,7 @@ var InContextMemoryPluginNextGen = class {
   _destroyed = false;
   _tokenCache = null;
   _instructionsTokenCache = null;
+  _notifyTimer = null;
   constructor(config = {}) {
     this.config = { ...DEFAULT_CONFIG, ...config };
   }
@@ -19435,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() {
@@ -19455,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;
@@ -19472,6 +19533,7 @@ var InContextMemoryPluginNextGen = class {
       this.entries.set(entry.key, entry);
     }
     this._tokenCache = null;
+    this.notifyEntriesChanged();
   }
   // ============================================================================
   // Entry Management
@@ -19479,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
@@ -19513,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;
   }
   /**
@@ -19525,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
     }));
   }
   /**
@@ -19535,6 +19603,7 @@ var InContextMemoryPluginNextGen = class {
     this.assertNotDestroyed();
     this.entries.clear();
     this._tokenCache = null;
+    this.notifyEntriesChanged();
   }
   // ============================================================================
   // Private Helpers
@@ -19598,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");
@@ -19614,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() {
@@ -19653,10 +19738,10 @@ function getDefaultBaseDirectory() {
   if (platform2 === "win32") {
     const appData = process.env.APPDATA || process.env.LOCALAPPDATA;
     if (appData) {
-      return path3.join(appData, "oneringai", "agents");
+      return path2.join(appData, "oneringai", "agents");
     }
   }
-  return path3.join(os.homedir(), ".oneringai", "agents");
+  return path2.join(os2.homedir(), ".oneringai", "agents");
 }
 function sanitizeAgentId(agentId) {
   return agentId.replace(/[^a-zA-Z0-9_-]/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "").toLowerCase() || "default";
@@ -19671,9 +19756,9 @@ var FilePersistentInstructionsStorage = class {
     const sanitizedId = sanitizeAgentId(config.agentId);
     const baseDir = config.baseDirectory ?? getDefaultBaseDirectory();
     const filename = config.filename ?? "custom_instructions.json";
-    this.directory = path3.join(baseDir, sanitizedId);
-    this.filePath = path3.join(this.directory, filename);
-    this.legacyFilePath = path3.join(this.directory, "custom_instructions.md");
+    this.directory = path2.join(baseDir, sanitizedId);
+    this.filePath = path2.join(this.directory, filename);
+    this.legacyFilePath = path2.join(this.directory, "custom_instructions.md");
   }
   /**
    * Load instruction entries from file.
@@ -19681,7 +19766,7 @@ var FilePersistentInstructionsStorage = class {
    */
   async load() {
     try {
-      const raw = await fs15.promises.readFile(this.filePath, "utf-8");
+      const raw = await fs16.promises.readFile(this.filePath, "utf-8");
       const data = JSON.parse(raw);
       if (data.version === 2 && Array.isArray(data.entries)) {
         return data.entries.length > 0 ? data.entries : null;
@@ -19693,7 +19778,7 @@ var FilePersistentInstructionsStorage = class {
       }
     }
     try {
-      const content = await fs15.promises.readFile(this.legacyFilePath, "utf-8");
+      const content = await fs16.promises.readFile(this.legacyFilePath, "utf-8");
       const trimmed = content.trim();
       if (!trimmed) return null;
       const now = Date.now();
@@ -19723,11 +19808,11 @@ var FilePersistentInstructionsStorage = class {
     };
     const tempPath = `${this.filePath}.tmp`;
     try {
-      await fs15.promises.writeFile(tempPath, JSON.stringify(data, null, 2), "utf-8");
-      await fs15.promises.rename(tempPath, this.filePath);
+      await fs16.promises.writeFile(tempPath, JSON.stringify(data, null, 2), "utf-8");
+      await fs16.promises.rename(tempPath, this.filePath);
     } catch (error) {
       try {
-        await fs15.promises.unlink(tempPath);
+        await fs16.promises.unlink(tempPath);
       } catch {
       }
       throw error;
@@ -19739,7 +19824,7 @@ var FilePersistentInstructionsStorage = class {
    */
   async delete() {
     try {
-      await fs15.promises.unlink(this.filePath);
+      await fs16.promises.unlink(this.filePath);
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code !== "ENOENT") {
         throw error;
@@ -19752,11 +19837,11 @@ var FilePersistentInstructionsStorage = class {
    */
   async exists() {
     try {
-      await fs15.promises.access(this.filePath);
+      await fs16.promises.access(this.filePath);
       return true;
     } catch {
       try {
-        await fs15.promises.access(this.legacyFilePath);
+        await fs16.promises.access(this.legacyFilePath);
         return true;
       } catch {
         return false;
@@ -19780,7 +19865,7 @@ var FilePersistentInstructionsStorage = class {
    */
   async ensureDirectory() {
     try {
-      await fs15.promises.mkdir(this.directory, { recursive: true });
+      await fs16.promises.mkdir(this.directory, { recursive: true });
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code !== "EEXIST") {
         throw error;
@@ -19792,7 +19877,7 @@ var FilePersistentInstructionsStorage = class {
    */
   async removeLegacyFile() {
     try {
-      await fs15.promises.unlink(this.legacyFilePath);
+      await fs16.promises.unlink(this.legacyFilePath);
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code !== "ENOENT") {
         console.warn(`Failed to remove legacy instructions file: ${this.legacyFilePath}`);
@@ -20935,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 */
@@ -20971,15 +21060,20 @@ 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();
+    this._tools = new ToolManager(
+      config.toolExecutionTimeout ? { toolExecutionTimeout: config.toolExecutionTimeout } : void 0
+    );
     if (config.tools) {
       for (const tool of config.tools) {
         this._tools.register(tool);
       }
     }
     this.initializePlugins(config.plugins);
+    this.syncToolContext();
   }
   /**
    * Initialize plugins based on feature flags.
@@ -21024,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
   // ============================================================================
@@ -21039,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;
@@ -21952,6 +22120,7 @@ ${content}`);
       metadata: {
         savedAt: Date.now(),
         agentId: this._agentId,
+        userId: this._userId,
         model: this._config.model
       }
     };
@@ -22709,7 +22878,7 @@ var OpenAITextProvider = class extends BaseTextProvider {
   streamConverter;
   constructor(config) {
     super(config);
-    this.client = new OpenAI2__default.default({
+    this.client = new OpenAI3__default.default({
       apiKey: this.getApiKey(),
       baseURL: this.getBaseURL(),
       organization: config.organization,
@@ -24439,7 +24608,9 @@ var GoogleTextProvider = class extends BaseTextProvider {
   constructor(config) {
     super(config);
     this.client = new genai.GoogleGenAI({
-      apiKey: this.getApiKey()
+      apiKey: this.getApiKey(),
+      // Pass custom baseURL for proxy support (e.g. when routing through EW proxy)
+      ...config.baseURL ? { httpOptions: { baseUrl: config.baseURL } } : {}
     });
     this.converter = new GoogleConverter();
     this.streamConverter = new GoogleStreamConverter();
@@ -24736,6 +24907,30 @@ var GenericOpenAIProvider = class extends OpenAITextProvider {
 };
 
 // src/core/createProvider.ts
+var VENDOR_DEFAULT_URLS = (() => {
+  const map = /* @__PURE__ */ new Map();
+  try {
+    map.set(Vendor.OpenAI, new OpenAI3__default.default({ apiKey: "_" }).baseURL);
+  } catch {
+  }
+  try {
+    map.set(Vendor.Anthropic, new Anthropic__default.default({ apiKey: "_" }).baseURL);
+  } catch {
+  }
+  map.set(Vendor.Google, "https://generativelanguage.googleapis.com");
+  map.set(Vendor.GoogleVertex, "https://us-central1-aiplatform.googleapis.com");
+  map.set(Vendor.Groq, "https://api.groq.com/openai/v1");
+  map.set(Vendor.Together, "https://api.together.xyz/v1");
+  map.set(Vendor.Perplexity, "https://api.perplexity.ai");
+  map.set(Vendor.Grok, "https://api.x.ai/v1");
+  map.set(Vendor.DeepSeek, "https://api.deepseek.com/v1");
+  map.set(Vendor.Mistral, "https://api.mistral.ai/v1");
+  map.set(Vendor.Ollama, "http://localhost:11434/v1");
+  return map;
+})();
+function getVendorDefaultBaseURL(vendor) {
+  return VENDOR_DEFAULT_URLS.get(vendor);
+}
 function createProvider(connector) {
   const injectedProvider = connector.getOptions().provider;
   if (injectedProvider && typeof injectedProvider.generate === "function") {
@@ -24770,39 +24965,15 @@ function createProvider(connector) {
       });
     // OpenAI-compatible providers (use connector.name for unique identification)
     case Vendor.Groq:
-      return new GenericOpenAIProvider(connector.name, {
-        ...config,
-        baseURL: config.baseURL || "https://api.groq.com/openai/v1"
-      });
     case Vendor.Together:
-      return new GenericOpenAIProvider(connector.name, {
-        ...config,
-        baseURL: config.baseURL || "https://api.together.xyz/v1"
-      });
     case Vendor.Perplexity:
-      return new GenericOpenAIProvider(connector.name, {
-        ...config,
-        baseURL: config.baseURL || "https://api.perplexity.ai"
-      });
     case Vendor.Grok:
-      return new GenericOpenAIProvider(connector.name, {
-        ...config,
-        baseURL: config.baseURL || "https://api.x.ai/v1"
-      });
     case Vendor.DeepSeek:
-      return new GenericOpenAIProvider(connector.name, {
-        ...config,
-        baseURL: config.baseURL || "https://api.deepseek.com/v1"
-      });
     case Vendor.Mistral:
-      return new GenericOpenAIProvider(connector.name, {
-        ...config,
-        baseURL: config.baseURL || "https://api.mistral.ai/v1"
-      });
     case Vendor.Ollama:
       return new GenericOpenAIProvider(connector.name, {
         ...config,
-        baseURL: config.baseURL || "http://localhost:11434/v1"
+        baseURL: config.baseURL || getVendorDefaultBaseURL(vendor)
       });
     case Vendor.Custom:
       if (!config.baseURL) {
@@ -24912,9 +25083,14 @@ 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
+      toolExecutionTimeout: config.toolExecutionTimeout,
       // Subclasses can add systemPrompt via their config
+      // Note: context-level toolExecutionTimeout overrides agent-level if both set
       ...typeof config.context === "object" && config.context !== null ? config.context : {}
     };
     return AgentContextNextGen.create(contextConfig);
@@ -25065,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.
    */
@@ -25116,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: {
@@ -26164,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]
    * });
@@ -27354,18 +27556,18 @@ var Agent = class _Agent extends BaseAgent {
 (class {
   static DEFAULT_PATHS = [
     "./oneringai.config.json",
-    path3.join(os.homedir(), ".oneringai", "config.json")
+    path2.join(os2.homedir(), ".oneringai", "config.json")
   ];
   /**
    * Load configuration from file
    */
   static async load(path6) {
-    const configPath = path6 ? path3.resolve(path6) : await this.findConfig();
+    const configPath = path6 ? path2.resolve(path6) : await this.findConfig();
     if (!configPath) {
       throw new Error("Configuration file not found. Searched: " + this.DEFAULT_PATHS.join(", "));
     }
     try {
-      const content = await fs15.promises.readFile(configPath, "utf-8");
+      const content = await fs16.promises.readFile(configPath, "utf-8");
       let config = JSON.parse(content);
       config = this.interpolateEnvVars(config);
       this.validate(config);
@@ -27381,13 +27583,13 @@ var Agent = class _Agent extends BaseAgent {
    * Load configuration synchronously
    */
   static loadSync(path6) {
-    const configPath = path6 ? path3.resolve(path6) : this.findConfigSync();
+    const configPath = path6 ? path2.resolve(path6) : this.findConfigSync();
     if (!configPath) {
       throw new Error("Configuration file not found. Searched: " + this.DEFAULT_PATHS.join(", "));
     }
     try {
-      const fs18 = __require("fs");
-      const content = fs18.readFileSync(configPath, "utf-8");
+      const fs17 = __require("fs");
+      const content = fs17.readFileSync(configPath, "utf-8");
       let config = JSON.parse(content);
       config = this.interpolateEnvVars(config);
       this.validate(config);
@@ -27405,8 +27607,8 @@ var Agent = class _Agent extends BaseAgent {
   static async findConfig() {
     for (const path6 of this.DEFAULT_PATHS) {
       try {
-        await fs15.promises.access(path3.resolve(path6));
-        return path3.resolve(path6);
+        await fs16.promises.access(path2.resolve(path6));
+        return path2.resolve(path6);
       } catch {
       }
     }
@@ -27416,11 +27618,11 @@ var Agent = class _Agent extends BaseAgent {
    * Find configuration file synchronously
    */
   static findConfigSync() {
-    const fs18 = __require("fs");
+    const fs17 = __require("fs");
     for (const path6 of this.DEFAULT_PATHS) {
       try {
-        fs18.accessSync(path3.resolve(path6));
-        return path3.resolve(path6);
+        fs17.accessSync(path2.resolve(path6));
+        return path2.resolve(path6);
       } catch {
       }
     }
@@ -32977,8 +33179,8 @@ var MCPRegistry = class {
    */
   static async loadFromConfigFile(path6) {
     try {
-      const configPath = path3.resolve(path6);
-      const content = await fs15.promises.readFile(configPath, "utf-8");
+      const configPath = path2.resolve(path6);
+      const content = await fs16.promises.readFile(configPath, "utf-8");
       const config = JSON.parse(content);
       if (!config.mcp) {
         throw new MCPError("Configuration file does not contain MCP section");
@@ -33366,7 +33568,7 @@ var OpenAITTSProvider = class extends BaseMediaProvider {
   client;
   constructor(config) {
     super({ apiKey: config.auth.apiKey, ...config });
-    this.client = new OpenAI2__default.default({
+    this.client = new OpenAI3__default.default({
       apiKey: config.auth.apiKey,
       baseURL: config.baseURL,
       organization: config.organization,
@@ -33449,7 +33651,7 @@ var OpenAITTSProvider = class extends BaseMediaProvider {
    * Handle OpenAI API errors
    */
   handleError(error) {
-    if (error instanceof OpenAI2__default.default.APIError) {
+    if (error instanceof OpenAI3__default.default.APIError) {
       const status = error.status;
       const message = error.message || "Unknown OpenAI API error";
       if (status === 401) {
@@ -33481,7 +33683,7 @@ var OpenAISTTProvider = class extends BaseMediaProvider {
   client;
   constructor(config) {
     super({ apiKey: config.auth.apiKey, ...config });
-    this.client = new OpenAI2__default.default({
+    this.client = new OpenAI3__default.default({
       apiKey: config.auth.apiKey,
       baseURL: config.baseURL,
       organization: config.organization,
@@ -33583,7 +33785,7 @@ var OpenAISTTProvider = class extends BaseMediaProvider {
     if (Buffer.isBuffer(audio)) {
       return new File([new Uint8Array(audio)], "audio.wav", { type: "audio/wav" });
     } else if (typeof audio === "string") {
-      return fs15__namespace.createReadStream(audio);
+      return fs16__namespace.createReadStream(audio);
     } else {
       throw new Error("Invalid audio input: must be Buffer or file path");
     }
@@ -33642,7 +33844,7 @@ var OpenAISTTProvider = class extends BaseMediaProvider {
    * Handle OpenAI API errors
    */
   handleError(error) {
-    if (error instanceof OpenAI2__default.default.APIError) {
+    if (error instanceof OpenAI3__default.default.APIError) {
       const status = error.status;
       const message = error.message || "Unknown OpenAI API error";
       if (status === 401) {
@@ -34136,7 +34338,7 @@ var TextToSpeech = class _TextToSpeech {
    */
   async toFile(text, filePath, options) {
     const response = await this.synthesize(text, options);
-    await fs14__namespace.writeFile(filePath, response.audio);
+    await fs15__namespace.writeFile(filePath, response.audio);
   }
   // ======================== Introspection Methods ========================
   /**
@@ -34484,7 +34686,7 @@ var SpeechToText = class _SpeechToText {
    * @param options - Optional transcription parameters
    */
   async transcribeFile(filePath, options) {
-    const audio = await fs14__namespace.readFile(filePath);
+    const audio = await fs15__namespace.readFile(filePath);
     return this.transcribe(audio, options);
   }
   /**
@@ -34648,7 +34850,7 @@ var OpenAIImageProvider = class extends BaseMediaProvider {
   client;
   constructor(config) {
     super({ apiKey: config.auth.apiKey, ...config });
-    this.client = new OpenAI2__default.default({
+    this.client = new OpenAI3__default.default({
       apiKey: config.auth.apiKey,
       baseURL: config.baseURL,
       organization: config.organization,
@@ -34810,7 +35012,7 @@ var OpenAIImageProvider = class extends BaseMediaProvider {
     if (Buffer.isBuffer(image)) {
       return new File([new Uint8Array(image)], "image.png", { type: "image/png" });
     }
-    return fs15__namespace.createReadStream(image);
+    return fs16__namespace.createReadStream(image);
   }
   /**
    * Handle OpenAI API errors
@@ -34957,8 +35159,8 @@ var GoogleImageProvider = class extends BaseMediaProvider {
     if (Buffer.isBuffer(image)) {
       imageBytes = image.toString("base64");
     } else {
-      const fs18 = await import('fs');
-      const buffer = fs18.readFileSync(image);
+      const fs17 = await import('fs');
+      const buffer = fs17.readFileSync(image);
       imageBytes = buffer.toString("base64");
     }
     return {
@@ -35008,7 +35210,7 @@ var GrokImageProvider = class extends BaseMediaProvider {
   client;
   constructor(config) {
     super({ apiKey: config.auth.apiKey, ...config });
-    this.client = new OpenAI2__default.default({
+    this.client = new OpenAI3__default.default({
       apiKey: config.auth.apiKey,
       baseURL: config.baseURL || GROK_API_BASE_URL,
       timeout: config.timeout,
@@ -35119,7 +35321,7 @@ var GrokImageProvider = class extends BaseMediaProvider {
     if (Buffer.isBuffer(image)) {
       return new File([new Uint8Array(image)], "image.png", { type: "image/png" });
     }
-    return fs15__namespace.createReadStream(image);
+    return fs16__namespace.createReadStream(image);
   }
   /**
    * Handle API errors
@@ -36321,7 +36523,7 @@ var OpenAISoraProvider = class extends BaseMediaProvider {
   client;
   constructor(config) {
     super({ apiKey: config.auth.apiKey, ...config });
-    this.client = new OpenAI2__default.default({
+    this.client = new OpenAI3__default.default({
       apiKey: config.auth.apiKey,
       baseURL: config.baseURL,
       organization: config.organization,
@@ -36569,8 +36771,8 @@ var OpenAISoraProvider = class extends BaseMediaProvider {
       return new File([new Uint8Array(image)], "input.png", { type: "image/png" });
     }
     if (!image.startsWith("http")) {
-      const fs18 = await import('fs');
-      const data = fs18.readFileSync(image);
+      const fs17 = await import('fs');
+      const data = fs17.readFileSync(image);
       return new File([new Uint8Array(data)], "input.png", { type: "image/png" });
     }
     const response = await fetch(image);
@@ -36748,7 +36950,7 @@ var GoogleVeoProvider = class extends BaseMediaProvider {
           if (video.videoBytes) {
             buffer = Buffer.from(video.videoBytes, "base64");
           } else if (video.uri) {
-            const fs18 = await import('fs/promises');
+            const fs17 = await import('fs/promises');
             const os3 = await import('os');
             const path6 = await import('path');
             const tempDir = os3.tmpdir();
@@ -36759,11 +36961,11 @@ var GoogleVeoProvider = class extends BaseMediaProvider {
                 // Pass as GeneratedVideo
                 downloadPath: tempFile
               });
-              buffer = await fs18.readFile(tempFile);
-              await fs18.unlink(tempFile).catch(() => {
+              buffer = await fs17.readFile(tempFile);
+              await fs17.unlink(tempFile).catch(() => {
               });
             } catch (downloadError) {
-              await fs18.unlink(tempFile).catch(() => {
+              await fs17.unlink(tempFile).catch(() => {
               });
               throw new ProviderError(
                 "google",
@@ -36885,8 +37087,8 @@ var GoogleVeoProvider = class extends BaseMediaProvider {
     if (image.startsWith("http://") || image.startsWith("https://")) {
       return { imageUri: image };
     }
-    const fs18 = await import('fs/promises');
-    const data = await fs18.readFile(image);
+    const fs17 = await import('fs/promises');
+    const data = await fs17.readFile(image);
     return {
       imageBytes: data.toString("base64")
     };
@@ -37193,8 +37395,8 @@ var GrokImagineProvider = class extends BaseMediaProvider {
     if (image.startsWith("http") || image.startsWith("data:")) {
       return image;
     }
-    const fs18 = await import('fs');
-    const data = fs18.readFileSync(image);
+    const fs17 = await import('fs');
+    const data = fs17.readFileSync(image);
     const base64 = data.toString("base64");
     const ext = image.split(".").pop()?.toLowerCase() || "png";
     const mimeType = ext === "jpg" || ext === "jpeg" ? "image/jpeg" : `image/${ext}`;
@@ -40399,10 +40601,10 @@ function getDefaultBaseDirectory2() {
   if (platform2 === "win32") {
     const appData = process.env.APPDATA || process.env.LOCALAPPDATA;
     if (appData) {
-      return path3.join(appData, "oneringai", "agents");
+      return path2.join(appData, "oneringai", "agents");
     }
   }
-  return path3.join(os.homedir(), ".oneringai", "agents");
+  return path2.join(os2.homedir(), ".oneringai", "agents");
 }
 function sanitizeId(id) {
   return id.replace(/[^a-zA-Z0-9_-]/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "").toLowerCase() || "default";
@@ -40419,8 +40621,8 @@ var FileContextStorage = class {
     const sanitizedAgentId = sanitizeId(config.agentId);
     const baseDir = config.baseDirectory ?? getDefaultBaseDirectory2();
     this.prettyPrint = config.prettyPrint ?? true;
-    this.sessionsDirectory = path3.join(baseDir, sanitizedAgentId, "sessions");
-    this.indexPath = path3.join(this.sessionsDirectory, "_index.json");
+    this.sessionsDirectory = path2.join(baseDir, sanitizedAgentId, "sessions");
+    this.indexPath = path2.join(this.sessionsDirectory, "_index.json");
   }
   /**
    * Save context state to a session file
@@ -40446,11 +40648,11 @@ var FileContextStorage = class {
     const data = this.prettyPrint ? JSON.stringify(storedSession, null, 2) : JSON.stringify(storedSession);
     const tempPath = `${filePath}.tmp`;
     try {
-      await fs15.promises.writeFile(tempPath, data, "utf-8");
-      await fs15.promises.rename(tempPath, filePath);
+      await fs16.promises.writeFile(tempPath, data, "utf-8");
+      await fs16.promises.rename(tempPath, filePath);
     } catch (error) {
       try {
-        await fs15.promises.unlink(tempPath);
+        await fs16.promises.unlink(tempPath);
       } catch {
       }
       throw error;
@@ -40471,7 +40673,7 @@ var FileContextStorage = class {
     const sanitizedSessionId = sanitizeId(sessionId);
     const filePath = this.getFilePath(sanitizedSessionId);
     try {
-      await fs15.promises.unlink(filePath);
+      await fs16.promises.unlink(filePath);
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code !== "ENOENT") {
         throw error;
@@ -40486,7 +40688,7 @@ var FileContextStorage = class {
     const sanitizedSessionId = sanitizeId(sessionId);
     const filePath = this.getFilePath(sanitizedSessionId);
     try {
-      await fs15.promises.access(filePath);
+      await fs16.promises.access(filePath);
       return true;
     } catch {
       return false;
@@ -40551,7 +40753,7 @@ var FileContextStorage = class {
     const sanitizedSessionId = sanitizeId(sessionId);
     const filePath = this.getFilePath(sanitizedSessionId);
     const data = this.prettyPrint ? JSON.stringify(stored, null, 2) : JSON.stringify(stored);
-    await fs15.promises.writeFile(filePath, data, "utf-8");
+    await fs16.promises.writeFile(filePath, data, "utf-8");
     await this.updateIndex(stored);
   }
   /**
@@ -40572,13 +40774,13 @@ var FileContextStorage = class {
    */
   async rebuildIndex() {
     await this.ensureDirectory();
-    const files = await fs15.promises.readdir(this.sessionsDirectory);
+    const files = await fs16.promises.readdir(this.sessionsDirectory);
     const sessionFiles = files.filter((f) => f.endsWith(".json") && !f.startsWith("_"));
     const entries = [];
     for (const file of sessionFiles) {
       try {
-        const filePath = path3.join(this.sessionsDirectory, file);
-        const data = await fs15.promises.readFile(filePath, "utf-8");
+        const filePath = path2.join(this.sessionsDirectory, file);
+        const data = await fs16.promises.readFile(filePath, "utf-8");
         const stored = JSON.parse(data);
         entries.push(this.storedToIndexEntry(stored));
       } catch {
@@ -40596,11 +40798,11 @@ var FileContextStorage = class {
   // Private Helpers
   // ==========================================================================
   getFilePath(sanitizedSessionId) {
-    return path3.join(this.sessionsDirectory, `${sanitizedSessionId}.json`);
+    return path2.join(this.sessionsDirectory, `${sanitizedSessionId}.json`);
   }
   async ensureDirectory() {
     try {
-      await fs15.promises.mkdir(this.sessionsDirectory, { recursive: true });
+      await fs16.promises.mkdir(this.sessionsDirectory, { recursive: true });
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code !== "EEXIST") {
         throw error;
@@ -40610,7 +40812,7 @@ var FileContextStorage = class {
   async loadRaw(sanitizedSessionId) {
     const filePath = this.getFilePath(sanitizedSessionId);
     try {
-      const data = await fs15.promises.readFile(filePath, "utf-8");
+      const data = await fs16.promises.readFile(filePath, "utf-8");
       return JSON.parse(data);
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code === "ENOENT") {
@@ -40628,7 +40830,7 @@ var FileContextStorage = class {
       return this.index;
     }
     try {
-      const data = await fs15.promises.readFile(this.indexPath, "utf-8");
+      const data = await fs16.promises.readFile(this.indexPath, "utf-8");
       this.index = JSON.parse(data);
       return this.index;
     } catch (error) {
@@ -40649,7 +40851,7 @@ var FileContextStorage = class {
     await this.ensureDirectory();
     this.index.lastUpdated = (/* @__PURE__ */ new Date()).toISOString();
     const data = this.prettyPrint ? JSON.stringify(this.index, null, 2) : JSON.stringify(this.index);
-    await fs15.promises.writeFile(this.indexPath, data, "utf-8");
+    await fs16.promises.writeFile(this.indexPath, data, "utf-8");
   }
   async updateIndex(stored) {
     const index = await this.loadIndex();
@@ -40687,10 +40889,10 @@ function getDefaultBaseDirectory3() {
   if (platform2 === "win32") {
     const appData = process.env.APPDATA || process.env.LOCALAPPDATA;
     if (appData) {
-      return path3.join(appData, "oneringai", "agents");
+      return path2.join(appData, "oneringai", "agents");
     }
   }
-  return path3.join(os.homedir(), ".oneringai", "agents");
+  return path2.join(os2.homedir(), ".oneringai", "agents");
 }
 function sanitizeAgentId2(agentId) {
   return agentId.replace(/[^a-zA-Z0-9_-]/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "").toLowerCase() || "default";
@@ -40703,15 +40905,15 @@ var FileAgentDefinitionStorage = class {
   constructor(config = {}) {
     this.baseDirectory = config.baseDirectory ?? getDefaultBaseDirectory3();
     this.prettyPrint = config.prettyPrint ?? true;
-    this.indexPath = path3.join(this.baseDirectory, "_agents_index.json");
+    this.indexPath = path2.join(this.baseDirectory, "_agents_index.json");
   }
   /**
    * Save an agent definition
    */
   async save(definition) {
     const sanitizedId = sanitizeAgentId2(definition.agentId);
-    const agentDir = path3.join(this.baseDirectory, sanitizedId);
-    const filePath = path3.join(agentDir, "definition.json");
+    const agentDir = path2.join(this.baseDirectory, sanitizedId);
+    const filePath = path2.join(agentDir, "definition.json");
     await this.ensureDirectory(agentDir);
     const now = (/* @__PURE__ */ new Date()).toISOString();
     if (!definition.createdAt) {
@@ -40723,11 +40925,11 @@ var FileAgentDefinitionStorage = class {
     const data = this.prettyPrint ? JSON.stringify(definition, null, 2) : JSON.stringify(definition);
     const tempPath = `${filePath}.tmp`;
     try {
-      await fs15.promises.writeFile(tempPath, data, "utf-8");
-      await fs15.promises.rename(tempPath, filePath);
+      await fs16.promises.writeFile(tempPath, data, "utf-8");
+      await fs16.promises.rename(tempPath, filePath);
     } catch (error) {
       try {
-        await fs15.promises.unlink(tempPath);
+        await fs16.promises.unlink(tempPath);
       } catch {
       }
       throw error;
@@ -40746,10 +40948,10 @@ var FileAgentDefinitionStorage = class {
    */
   async delete(agentId) {
     const sanitizedId = sanitizeAgentId2(agentId);
-    const agentDir = path3.join(this.baseDirectory, sanitizedId);
-    const filePath = path3.join(agentDir, "definition.json");
+    const agentDir = path2.join(this.baseDirectory, sanitizedId);
+    const filePath = path2.join(agentDir, "definition.json");
     try {
-      await fs15.promises.unlink(filePath);
+      await fs16.promises.unlink(filePath);
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code !== "ENOENT") {
         throw error;
@@ -40762,9 +40964,9 @@ var FileAgentDefinitionStorage = class {
    */
   async exists(agentId) {
     const sanitizedId = sanitizeAgentId2(agentId);
-    const filePath = path3.join(this.baseDirectory, sanitizedId, "definition.json");
+    const filePath = path2.join(this.baseDirectory, sanitizedId, "definition.json");
     try {
-      await fs15.promises.access(filePath);
+      await fs16.promises.access(filePath);
       return true;
     } catch {
       return false;
@@ -40826,13 +41028,13 @@ var FileAgentDefinitionStorage = class {
    */
   async rebuildIndex() {
     await this.ensureDirectory(this.baseDirectory);
-    const entries = await fs15.promises.readdir(this.baseDirectory, { withFileTypes: true });
+    const entries = await fs16.promises.readdir(this.baseDirectory, { withFileTypes: true });
     const agentDirs = entries.filter((e) => e.isDirectory() && !e.name.startsWith("_"));
     const indexEntries = [];
     for (const dir of agentDirs) {
       try {
-        const filePath = path3.join(this.baseDirectory, dir.name, "definition.json");
-        const data = await fs15.promises.readFile(filePath, "utf-8");
+        const filePath = path2.join(this.baseDirectory, dir.name, "definition.json");
+        const data = await fs16.promises.readFile(filePath, "utf-8");
         const definition = JSON.parse(data);
         indexEntries.push(this.definitionToIndexEntry(definition));
       } catch {
@@ -40850,7 +41052,7 @@ var FileAgentDefinitionStorage = class {
   // ==========================================================================
   async ensureDirectory(dir) {
     try {
-      await fs15.promises.mkdir(dir, { recursive: true });
+      await fs16.promises.mkdir(dir, { recursive: true });
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code !== "EEXIST") {
         throw error;
@@ -40858,9 +41060,9 @@ var FileAgentDefinitionStorage = class {
     }
   }
   async loadRaw(sanitizedId) {
-    const filePath = path3.join(this.baseDirectory, sanitizedId, "definition.json");
+    const filePath = path2.join(this.baseDirectory, sanitizedId, "definition.json");
     try {
-      const data = await fs15.promises.readFile(filePath, "utf-8");
+      const data = await fs16.promises.readFile(filePath, "utf-8");
       return JSON.parse(data);
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code === "ENOENT") {
@@ -40878,7 +41080,7 @@ var FileAgentDefinitionStorage = class {
       return this.index;
     }
     try {
-      const data = await fs15.promises.readFile(this.indexPath, "utf-8");
+      const data = await fs16.promises.readFile(this.indexPath, "utf-8");
       this.index = JSON.parse(data);
       return this.index;
     } catch (error) {
@@ -40898,7 +41100,7 @@ var FileAgentDefinitionStorage = class {
     await this.ensureDirectory(this.baseDirectory);
     this.index.lastUpdated = (/* @__PURE__ */ new Date()).toISOString();
     const data = this.prettyPrint ? JSON.stringify(this.index, null, 2) : JSON.stringify(this.index);
-    await fs15.promises.writeFile(this.indexPath, data, "utf-8");
+    await fs16.promises.writeFile(this.indexPath, data, "utf-8");
   }
   async updateIndex(definition) {
     const index = await this.loadIndex();
@@ -40931,6 +41133,126 @@ var FileAgentDefinitionStorage = class {
 function createFileAgentDefinitionStorage(config) {
   return new FileAgentDefinitionStorage(config);
 }
+var MIME_TYPES = {
+  png: "image/png",
+  jpeg: "image/jpeg",
+  jpg: "image/jpeg",
+  webp: "image/webp",
+  gif: "image/gif",
+  mp4: "video/mp4",
+  webm: "video/webm",
+  mp3: "audio/mpeg",
+  wav: "audio/wav",
+  opus: "audio/opus",
+  ogg: "audio/ogg",
+  aac: "audio/aac",
+  flac: "audio/flac",
+  pcm: "audio/pcm"
+};
+var MEDIA_TYPE_PREFIXES = ["image", "video", "audio"];
+var FileMediaStorage = class {
+  outputDir;
+  initialized = false;
+  constructor(config) {
+    this.outputDir = config?.outputDir ?? path2__namespace.join(os2__namespace.tmpdir(), "oneringai-media");
+  }
+  async save(data, metadata) {
+    const dir = metadata.userId ? path2__namespace.join(this.outputDir, metadata.userId) : this.outputDir;
+    await fs15__namespace.mkdir(dir, { recursive: true });
+    const filename = metadata.suggestedFilename ?? this.generateFilename(metadata);
+    const filePath = path2__namespace.join(dir, filename);
+    await fs15__namespace.writeFile(filePath, data);
+    const format = metadata.format.toLowerCase();
+    const mimeType = MIME_TYPES[format] ?? "application/octet-stream";
+    return {
+      location: filePath,
+      mimeType,
+      size: data.length
+    };
+  }
+  async read(location) {
+    try {
+      return await fs15__namespace.readFile(location);
+    } catch (err) {
+      if (err.code === "ENOENT") {
+        return null;
+      }
+      throw err;
+    }
+  }
+  async delete(location) {
+    try {
+      await fs15__namespace.unlink(location);
+    } catch (err) {
+      if (err.code === "ENOENT") {
+        return;
+      }
+      throw err;
+    }
+  }
+  async exists(location) {
+    try {
+      await fs15__namespace.access(location);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  async list(options) {
+    await this.ensureDir();
+    let entries = [];
+    const files = await fs15__namespace.readdir(this.outputDir);
+    for (const file of files) {
+      const filePath = path2__namespace.join(this.outputDir, file);
+      try {
+        const stat6 = await fs15__namespace.stat(filePath);
+        if (!stat6.isFile()) continue;
+        const ext = path2__namespace.extname(file).slice(1).toLowerCase();
+        const mimeType = MIME_TYPES[ext] ?? "application/octet-stream";
+        let type;
+        for (const prefix of MEDIA_TYPE_PREFIXES) {
+          if (file.startsWith(`${prefix}_`)) {
+            type = prefix;
+            break;
+          }
+        }
+        entries.push({
+          location: filePath,
+          mimeType,
+          size: stat6.size,
+          type,
+          createdAt: stat6.birthtime
+        });
+      } catch {
+      }
+    }
+    if (options?.type) {
+      entries = entries.filter((e) => e.type === options.type);
+    }
+    entries.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
+    const offset = options?.offset ?? 0;
+    const limit = options?.limit ?? entries.length;
+    return entries.slice(offset, offset + limit);
+  }
+  getPath() {
+    return this.outputDir;
+  }
+  generateFilename(metadata) {
+    const timestamp = Date.now();
+    const random2 = crypto2__namespace.randomBytes(4).toString("hex");
+    const indexSuffix = metadata.index != null ? `_${metadata.index}` : "";
+    return `${metadata.type}_${timestamp}_${random2}${indexSuffix}.${metadata.format}`;
+  }
+  async ensureDir() {
+    if (!this.initialized) {
+      await fs15__namespace.mkdir(this.outputDir, { recursive: true });
+      this.initialized = true;
+    }
+  }
+};
+function createFileMediaStorage(config) {
+  return new FileMediaStorage(config);
+}
 
 // src/capabilities/agents/StreamHelpers.ts
 var StreamHelpers = class {
@@ -41621,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();
@@ -41853,7 +42201,7 @@ var ConnectorTools = class {
   static createGenericAPITool(connector, options) {
     const toolName = options?.toolName ?? `${connector.name}_api`;
     const userId = options?.userId;
-    const description = options?.description ?? `Make an authenticated API call to ${connector.displayName}.` + (connector.baseURL ? ` Base URL: ${connector.baseURL}` : " Provide full URL in endpoint.");
+    const description = options?.description ?? `Make an authenticated API call to ${connector.displayName}.` + (connector.baseURL ? ` Base URL: ${connector.baseURL}.` : " Provide full URL in endpoint.") + ' IMPORTANT: For POST/PUT/PATCH requests, pass data in the "body" parameter as a JSON object, NOT as query string parameters in the endpoint URL. The body is sent as application/json.';
     return {
       definition: {
         type: "function",
@@ -41870,15 +42218,15 @@ var ConnectorTools = class {
               },
               endpoint: {
                 type: "string",
-                description: "API endpoint (relative to base URL) or full URL"
+                description: 'API endpoint path (relative to base URL) or full URL. Do NOT put request data as query parameters here for POST/PUT/PATCH \u2014 use the "body" parameter instead.'
               },
               body: {
                 type: "object",
-                description: "Request body (for POST/PUT/PATCH)"
+                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",
-                description: "URL query parameters"
+                description: 'URL query parameters (for filtering/pagination on GET requests). Do NOT use for POST/PUT/PATCH data \u2014 use "body" instead.'
               },
               headers: {
                 type: "object",
@@ -41889,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();
@@ -41902,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,
@@ -41921,7 +42271,7 @@ var ConnectorTools = class {
               },
               body: bodyStr
             },
-            userId
+            effectiveUserId
           );
           const text = await response.text();
           let data;
@@ -41930,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 {
@@ -41943,7 +42294,10 @@ var ConnectorTools = class {
           };
         }
       },
-      describeCall: (args) => `${args.method} ${args.endpoint}`,
+      describeCall: (args) => {
+        const bodyInfo = args.body ? ` body=${JSON.stringify(args.body).slice(0, 100)}` : "";
+        return `${args.method} ${args.endpoint}${bodyInfo}`;
+      },
       permission: options?.permission ?? {
         scope: "session",
         riskLevel: "medium",
@@ -41978,8 +42332,8 @@ var FileStorage = class {
   }
   async ensureDirectory() {
     try {
-      await fs14__namespace.mkdir(this.directory, { recursive: true });
-      await fs14__namespace.chmod(this.directory, 448);
+      await fs15__namespace.mkdir(this.directory, { recursive: true });
+      await fs15__namespace.chmod(this.directory, 448);
     } catch (error) {
     }
   }
@@ -41988,20 +42342,20 @@ var FileStorage = class {
    */
   getFilePath(key) {
     const hash = crypto2__namespace.createHash("sha256").update(key).digest("hex");
-    return path3__namespace.join(this.directory, `${hash}.token`);
+    return path2__namespace.join(this.directory, `${hash}.token`);
   }
   async storeToken(key, token) {
     await this.ensureDirectory();
     const filePath = this.getFilePath(key);
     const plaintext = JSON.stringify(token);
     const encrypted = encrypt(plaintext, this.encryptionKey);
-    await fs14__namespace.writeFile(filePath, encrypted, "utf8");
-    await fs14__namespace.chmod(filePath, 384);
+    await fs15__namespace.writeFile(filePath, encrypted, "utf8");
+    await fs15__namespace.chmod(filePath, 384);
   }
   async getToken(key) {
     const filePath = this.getFilePath(key);
     try {
-      const encrypted = await fs14__namespace.readFile(filePath, "utf8");
+      const encrypted = await fs15__namespace.readFile(filePath, "utf8");
       const decrypted = decrypt(encrypted, this.encryptionKey);
       return JSON.parse(decrypted);
     } catch (error) {
@@ -42010,7 +42364,7 @@ var FileStorage = class {
       }
       console.error("Failed to read/decrypt token file:", error);
       try {
-        await fs14__namespace.unlink(filePath);
+        await fs15__namespace.unlink(filePath);
       } catch {
       }
       return null;
@@ -42019,7 +42373,7 @@ var FileStorage = class {
   async deleteToken(key) {
     const filePath = this.getFilePath(key);
     try {
-      await fs14__namespace.unlink(filePath);
+      await fs15__namespace.unlink(filePath);
     } catch (error) {
       if (error.code !== "ENOENT") {
         throw error;
@@ -42029,7 +42383,7 @@ var FileStorage = class {
   async hasToken(key) {
     const filePath = this.getFilePath(key);
     try {
-      await fs14__namespace.access(filePath);
+      await fs15__namespace.access(filePath);
       return true;
     } catch {
       return false;
@@ -42040,7 +42394,7 @@ var FileStorage = class {
    */
   async listTokens() {
     try {
-      const files = await fs14__namespace.readdir(this.directory);
+      const files = await fs15__namespace.readdir(this.directory);
       return files.filter((f) => f.endsWith(".token")).map((f) => f.replace(".token", ""));
     } catch {
       return [];
@@ -42051,10 +42405,10 @@ var FileStorage = class {
    */
   async clearAll() {
     try {
-      const files = await fs14__namespace.readdir(this.directory);
+      const files = await fs15__namespace.readdir(this.directory);
       const tokenFiles = files.filter((f) => f.endsWith(".token"));
       await Promise.all(
-        tokenFiles.map((f) => fs14__namespace.unlink(path3__namespace.join(this.directory, f)).catch(() => {
+        tokenFiles.map((f) => fs15__namespace.unlink(path2__namespace.join(this.directory, f)).catch(() => {
         }))
       );
     } catch {
@@ -42322,22 +42676,26 @@ var ConnectorConfigStore = class {
    * Encrypt secrets in ConnectorAuth based on auth type
    */
   encryptAuthSecrets(auth2) {
+    const encryptedExtra = this.encryptExtra(auth2.extra);
     switch (auth2.type) {
       case "api_key":
         return {
           ...auth2,
-          apiKey: this.encryptValue(auth2.apiKey)
+          apiKey: this.encryptValue(auth2.apiKey),
+          ...encryptedExtra ? { extra: encryptedExtra } : {}
         };
       case "oauth":
         return {
           ...auth2,
           clientSecret: auth2.clientSecret ? this.encryptValue(auth2.clientSecret) : void 0,
-          privateKey: auth2.privateKey ? this.encryptValue(auth2.privateKey) : void 0
+          privateKey: auth2.privateKey ? this.encryptValue(auth2.privateKey) : void 0,
+          ...encryptedExtra ? { extra: encryptedExtra } : {}
         };
       case "jwt":
         return {
           ...auth2,
-          privateKey: this.encryptValue(auth2.privateKey)
+          privateKey: this.encryptValue(auth2.privateKey),
+          ...encryptedExtra ? { extra: encryptedExtra } : {}
         };
       default:
         return auth2;
@@ -42347,27 +42705,53 @@ var ConnectorConfigStore = class {
    * Decrypt secrets in ConnectorAuth based on auth type
    */
   decryptAuthSecrets(auth2) {
+    const decryptedExtra = this.decryptExtra(auth2.extra);
     switch (auth2.type) {
       case "api_key":
         return {
           ...auth2,
-          apiKey: this.decryptValue(auth2.apiKey)
+          apiKey: this.decryptValue(auth2.apiKey),
+          ...decryptedExtra ? { extra: decryptedExtra } : {}
         };
       case "oauth":
         return {
           ...auth2,
           clientSecret: auth2.clientSecret ? this.decryptValue(auth2.clientSecret) : void 0,
-          privateKey: auth2.privateKey ? this.decryptValue(auth2.privateKey) : void 0
+          privateKey: auth2.privateKey ? this.decryptValue(auth2.privateKey) : void 0,
+          ...decryptedExtra ? { extra: decryptedExtra } : {}
         };
       case "jwt":
         return {
           ...auth2,
-          privateKey: this.decryptValue(auth2.privateKey)
+          privateKey: this.decryptValue(auth2.privateKey),
+          ...decryptedExtra ? { extra: decryptedExtra } : {}
         };
       default:
         return auth2;
     }
   }
+  /**
+   * Encrypt all values in an extra Record (vendor-specific credentials)
+   */
+  encryptExtra(extra) {
+    if (!extra || Object.keys(extra).length === 0) return void 0;
+    const result = {};
+    for (const [key, value] of Object.entries(extra)) {
+      result[key] = this.encryptValue(value);
+    }
+    return result;
+  }
+  /**
+   * Decrypt all values in an extra Record (vendor-specific credentials)
+   */
+  decryptExtra(extra) {
+    if (!extra || Object.keys(extra).length === 0) return void 0;
+    const result = {};
+    for (const [key, value] of Object.entries(extra)) {
+      result[key] = this.decryptValue(value);
+    }
+    return result;
+  }
   /**
    * Encrypt a single value if not already encrypted
    */
@@ -42445,20 +42829,20 @@ var FileConnectorStorage = class {
       throw new Error("FileConnectorStorage requires a directory path");
     }
     this.directory = config.directory;
-    this.indexPath = path3__namespace.join(this.directory, "_index.json");
+    this.indexPath = path2__namespace.join(this.directory, "_index.json");
   }
   async save(name, stored) {
     await this.ensureDirectory();
     const filePath = this.getFilePath(name);
     const json = JSON.stringify(stored, null, 2);
-    await fs14__namespace.writeFile(filePath, json, "utf8");
-    await fs14__namespace.chmod(filePath, 384);
+    await fs15__namespace.writeFile(filePath, json, "utf8");
+    await fs15__namespace.chmod(filePath, 384);
     await this.updateIndex(name, "add");
   }
   async get(name) {
     const filePath = this.getFilePath(name);
     try {
-      const json = await fs14__namespace.readFile(filePath, "utf8");
+      const json = await fs15__namespace.readFile(filePath, "utf8");
       return JSON.parse(json);
     } catch (error) {
       const err = error;
@@ -42471,7 +42855,7 @@ var FileConnectorStorage = class {
   async delete(name) {
     const filePath = this.getFilePath(name);
     try {
-      await fs14__namespace.unlink(filePath);
+      await fs15__namespace.unlink(filePath);
       await this.updateIndex(name, "remove");
       return true;
     } catch (error) {
@@ -42485,7 +42869,7 @@ var FileConnectorStorage = class {
   async has(name) {
     const filePath = this.getFilePath(name);
     try {
-      await fs14__namespace.access(filePath);
+      await fs15__namespace.access(filePath);
       return true;
     } catch {
       return false;
@@ -42511,13 +42895,13 @@ var FileConnectorStorage = class {
    */
   async clear() {
     try {
-      const files = await fs14__namespace.readdir(this.directory);
+      const files = await fs15__namespace.readdir(this.directory);
       const connectorFiles = files.filter(
         (f) => f.endsWith(".connector.json") || f === "_index.json"
       );
       await Promise.all(
         connectorFiles.map(
-          (f) => fs14__namespace.unlink(path3__namespace.join(this.directory, f)).catch(() => {
+          (f) => fs15__namespace.unlink(path2__namespace.join(this.directory, f)).catch(() => {
           })
         )
       );
@@ -42530,7 +42914,7 @@ var FileConnectorStorage = class {
    */
   getFilePath(name) {
     const hash = this.hashName(name);
-    return path3__namespace.join(this.directory, `${hash}.connector.json`);
+    return path2__namespace.join(this.directory, `${hash}.connector.json`);
   }
   /**
    * Hash connector name to prevent enumeration
@@ -42544,8 +42928,8 @@ var FileConnectorStorage = class {
   async ensureDirectory() {
     if (this.initialized) return;
     try {
-      await fs14__namespace.mkdir(this.directory, { recursive: true });
-      await fs14__namespace.chmod(this.directory, 448);
+      await fs15__namespace.mkdir(this.directory, { recursive: true });
+      await fs15__namespace.chmod(this.directory, 448);
       this.initialized = true;
     } catch {
       this.initialized = true;
@@ -42556,7 +42940,7 @@ var FileConnectorStorage = class {
    */
   async loadIndex() {
     try {
-      const json = await fs14__namespace.readFile(this.indexPath, "utf8");
+      const json = await fs15__namespace.readFile(this.indexPath, "utf8");
       return JSON.parse(json);
     } catch {
       return { connectors: {} };
@@ -42574,8 +42958,8 @@ var FileConnectorStorage = class {
       delete index.connectors[hash];
     }
     const json = JSON.stringify(index, null, 2);
-    await fs14__namespace.writeFile(this.indexPath, json, "utf8");
-    await fs14__namespace.chmod(this.indexPath, 384);
+    await fs15__namespace.writeFile(this.indexPath, json, "utf8");
+    await fs15__namespace.chmod(this.indexPath, 384);
   }
 };
 
@@ -42620,11 +43004,19 @@ function buildAuthConfig(authTemplate, credentials) {
     if (!credentials.apiKey) {
       throw new Error("API key is required for api_key auth");
     }
+    const standardApiKeyFields = /* @__PURE__ */ new Set(["apiKey", "headerName", "headerPrefix"]);
+    const extra = {};
+    for (const field of authTemplate.optionalFields ?? []) {
+      if (!standardApiKeyFields.has(field) && credentials[field]) {
+        extra[field] = credentials[field];
+      }
+    }
     return {
       type: "api_key",
       apiKey: credentials.apiKey,
       headerName: defaults.headerName ?? "Authorization",
-      headerPrefix: defaults.headerPrefix ?? "Bearer"
+      headerPrefix: defaults.headerPrefix ?? "Bearer",
+      ...Object.keys(extra).length > 0 ? { extra } : {}
     };
   }
   if (!authTemplate.flow) {
@@ -42894,8 +43286,9 @@ var slackTemplate = {
       id: "bot-token",
       name: "Bot Token",
       type: "api_key",
-      description: "Internal workspace bot - get from OAuth & Permissions page of your Slack app",
+      description: "Internal workspace bot - get from OAuth & Permissions page of your Slack app. For Socket Mode bots, also provide appToken and signingSecret in extra fields.",
       requiredFields: ["apiKey"],
+      optionalFields: ["appToken", "signingSecret"],
       defaults: {
         type: "api_key",
         headerName: "Authorization",
@@ -44733,14 +45126,14 @@ function createMessageWithImages(text, imageUrls, role = "user" /* USER */) {
 var execAsync = util.promisify(child_process.exec);
 function cleanupTempFile(filePath) {
   try {
-    if (fs15__namespace.existsSync(filePath)) {
-      fs15__namespace.unlinkSync(filePath);
+    if (fs16__namespace.existsSync(filePath)) {
+      fs16__namespace.unlinkSync(filePath);
     }
   } catch {
   }
 }
 async function readClipboardImage() {
-  const platform2 = os__namespace.platform();
+  const platform2 = os2__namespace.platform();
   try {
     switch (platform2) {
       case "darwin":
@@ -44763,7 +45156,7 @@ async function readClipboardImage() {
   }
 }
 async function readClipboardImageMac() {
-  const tempFile = path3__namespace.join(os__namespace.tmpdir(), `clipboard-${Date.now()}.png`);
+  const tempFile = path2__namespace.join(os2__namespace.tmpdir(), `clipboard-${Date.now()}.png`);
   try {
     try {
       await execAsync(`pngpaste "${tempFile}"`);
@@ -44785,7 +45178,7 @@ async function readClipboardImageMac() {
         end try
       `;
       const { stdout } = await execAsync(`osascript -e '${script}'`);
-      if (stdout.includes("success") || fs15__namespace.existsSync(tempFile)) {
+      if (stdout.includes("success") || fs16__namespace.existsSync(tempFile)) {
         return await convertFileToDataUri(tempFile);
       }
       return {
@@ -44798,18 +45191,18 @@ async function readClipboardImageMac() {
   }
 }
 async function readClipboardImageLinux() {
-  const tempFile = path3__namespace.join(os__namespace.tmpdir(), `clipboard-${Date.now()}.png`);
+  const tempFile = path2__namespace.join(os2__namespace.tmpdir(), `clipboard-${Date.now()}.png`);
   try {
     try {
       await execAsync(`xclip -selection clipboard -t image/png -o > "${tempFile}"`);
-      if (fs15__namespace.existsSync(tempFile) && fs15__namespace.statSync(tempFile).size > 0) {
+      if (fs16__namespace.existsSync(tempFile) && fs16__namespace.statSync(tempFile).size > 0) {
         return await convertFileToDataUri(tempFile);
       }
     } catch {
     }
     try {
       await execAsync(`wl-paste -t image/png > "${tempFile}"`);
-      if (fs15__namespace.existsSync(tempFile) && fs15__namespace.statSync(tempFile).size > 0) {
+      if (fs16__namespace.existsSync(tempFile) && fs16__namespace.statSync(tempFile).size > 0) {
         return await convertFileToDataUri(tempFile);
       }
     } catch {
@@ -44823,7 +45216,7 @@ async function readClipboardImageLinux() {
   }
 }
 async function readClipboardImageWindows() {
-  const tempFile = path3__namespace.join(os__namespace.tmpdir(), `clipboard-${Date.now()}.png`);
+  const tempFile = path2__namespace.join(os2__namespace.tmpdir(), `clipboard-${Date.now()}.png`);
   try {
     const psScript = `
       Add-Type -AssemblyName System.Windows.Forms;
@@ -44836,7 +45229,7 @@ async function readClipboardImageWindows() {
       }
     `;
     await execAsync(`powershell -Command "${psScript}"`);
-    if (fs15__namespace.existsSync(tempFile) && fs15__namespace.statSync(tempFile).size > 0) {
+    if (fs16__namespace.existsSync(tempFile) && fs16__namespace.statSync(tempFile).size > 0) {
       return await convertFileToDataUri(tempFile);
     }
     return {
@@ -44849,7 +45242,7 @@ async function readClipboardImageWindows() {
 }
 async function convertFileToDataUri(filePath) {
   try {
-    const imageBuffer = fs15__namespace.readFileSync(filePath);
+    const imageBuffer = fs16__namespace.readFileSync(filePath);
     const base64Image = imageBuffer.toString("base64");
     const magic = imageBuffer.slice(0, 4).toString("hex");
     let mimeType = "image/png";
@@ -44876,7 +45269,7 @@ async function convertFileToDataUri(filePath) {
   }
 }
 async function hasClipboardImage() {
-  const platform2 = os__namespace.platform();
+  const platform2 = os2__namespace.platform();
   try {
     switch (platform2) {
       case "darwin":
@@ -45094,20 +45487,29 @@ __export(tools_exports, {
   ConnectorTools: () => ConnectorTools,
   DEFAULT_FILESYSTEM_CONFIG: () => DEFAULT_FILESYSTEM_CONFIG,
   DEFAULT_SHELL_CONFIG: () => DEFAULT_SHELL_CONFIG,
-  FileMediaOutputHandler: () => FileMediaOutputHandler,
+  FileMediaOutputHandler: () => FileMediaStorage,
   ToolRegistry: () => ToolRegistry,
   bash: () => bash,
   createBashTool: () => createBashTool,
+  createCreatePRTool: () => createCreatePRTool,
   createEditFileTool: () => createEditFileTool,
   createExecuteJavaScriptTool: () => createExecuteJavaScriptTool,
+  createGetPRTool: () => createGetPRTool,
+  createGitHubReadFileTool: () => createGitHubReadFileTool,
   createGlobTool: () => createGlobTool,
   createGrepTool: () => createGrepTool,
   createImageGenerationTool: () => createImageGenerationTool,
   createListDirectoryTool: () => createListDirectoryTool,
+  createPRCommentsTool: () => createPRCommentsTool,
+  createPRFilesTool: () => createPRFilesTool,
   createReadFileTool: () => createReadFileTool,
+  createSearchCodeTool: () => createSearchCodeTool,
+  createSearchFilesTool: () => createSearchFilesTool,
   createSpeechToTextTool: () => createSpeechToTextTool,
   createTextToSpeechTool: () => createTextToSpeechTool,
   createVideoTools: () => createVideoTools,
+  createWebScrapeTool: () => createWebScrapeTool,
+  createWebSearchTool: () => createWebSearchTool,
   createWriteFileTool: () => createWriteFileTool,
   developerTools: () => developerTools,
   editFile: () => editFile,
@@ -45116,6 +45518,7 @@ __export(tools_exports, {
   getAllBuiltInTools: () => getAllBuiltInTools,
   getBackgroundOutput: () => getBackgroundOutput,
   getMediaOutputHandler: () => getMediaOutputHandler,
+  getMediaStorage: () => getMediaStorage,
   getToolByName: () => getToolByName,
   getToolCategories: () => getToolCategories,
   getToolRegistry: () => getToolRegistry,
@@ -45128,15 +45531,15 @@ __export(tools_exports, {
   jsonManipulator: () => jsonManipulator,
   killBackgroundProcess: () => killBackgroundProcess,
   listDirectory: () => listDirectory,
-  readFile: () => readFile4,
+  parseRepository: () => parseRepository,
+  readFile: () => readFile5,
+  resolveRepository: () => resolveRepository,
   setMediaOutputHandler: () => setMediaOutputHandler,
+  setMediaStorage: () => setMediaStorage,
   toolRegistry: () => toolRegistry,
   validatePath: () => validatePath,
   webFetch: () => webFetch,
-  webFetchJS: () => webFetchJS,
-  webScrape: () => webScrape,
-  webSearch: () => webSearch,
-  writeFile: () => writeFile4
+  writeFile: () => writeFile5
 });
 var DEFAULT_FILESYSTEM_CONFIG = {
   workingDirectory: process.cwd(),
@@ -45195,15 +45598,15 @@ function validatePath(inputPath, config = {}) {
   const blockedDirs = config.blockedDirectories || DEFAULT_FILESYSTEM_CONFIG.blockedDirectories;
   let expandedPath = inputPath;
   if (inputPath.startsWith("~/")) {
-    expandedPath = path3.resolve(os.homedir(), inputPath.slice(2));
+    expandedPath = path2.resolve(os2.homedir(), inputPath.slice(2));
   } else if (inputPath === "~") {
-    expandedPath = os.homedir();
+    expandedPath = os2.homedir();
   }
   let resolvedPath;
-  if (path3.isAbsolute(expandedPath)) {
-    resolvedPath = path3.normalize(expandedPath);
+  if (path2.isAbsolute(expandedPath)) {
+    resolvedPath = path2.normalize(expandedPath);
   } else {
-    resolvedPath = path3.resolve(workingDir, expandedPath);
+    resolvedPath = path2.resolve(workingDir, expandedPath);
   }
   const pathSegments = resolvedPath.split("/").filter(Boolean);
   for (const blocked of blockedDirs) {
@@ -45216,7 +45619,7 @@ function validatePath(inputPath, config = {}) {
         };
       }
     } else {
-      const blockedPath = path3.isAbsolute(blocked) ? blocked : path3.resolve(workingDir, blocked);
+      const blockedPath = path2.isAbsolute(blocked) ? blocked : path2.resolve(workingDir, blocked);
       if (resolvedPath.startsWith(blockedPath + "/") || resolvedPath === blockedPath) {
         return {
           valid: false,
@@ -45229,7 +45632,7 @@ function validatePath(inputPath, config = {}) {
   if (allowedDirs.length > 0) {
     let isAllowed = false;
     for (const allowed of allowedDirs) {
-      const allowedPath = path3.isAbsolute(allowed) ? allowed : path3.resolve(workingDir, allowed);
+      const allowedPath = path2.isAbsolute(allowed) ? allowed : path2.resolve(workingDir, allowed);
       if (resolvedPath.startsWith(allowedPath + "/") || resolvedPath === allowedPath) {
         isAllowed = true;
         break;
@@ -45247,9 +45650,9 @@ function validatePath(inputPath, config = {}) {
 }
 function expandTilde(inputPath) {
   if (inputPath.startsWith("~/")) {
-    return path3.resolve(os.homedir(), inputPath.slice(2));
+    return path2.resolve(os2.homedir(), inputPath.slice(2));
   } else if (inputPath === "~") {
-    return os.homedir();
+    return os2.homedir();
   }
   return inputPath;
 }
@@ -45324,7 +45727,7 @@ EXAMPLES:
         };
       }
       const resolvedPath = validation.resolvedPath;
-      if (!fs15.existsSync(resolvedPath)) {
+      if (!fs16.existsSync(resolvedPath)) {
         return {
           success: false,
           error: `File not found: ${file_path}`,
@@ -45332,7 +45735,7 @@ EXAMPLES:
         };
       }
       try {
-        const stats = await fs14.stat(resolvedPath);
+        const stats = await fs15.stat(resolvedPath);
         if (!stats.isFile()) {
           return {
             success: false,
@@ -45348,7 +45751,7 @@ EXAMPLES:
             size: stats.size
           };
         }
-        const content = await fs14.readFile(resolvedPath, "utf-8");
+        const content = await fs15.readFile(resolvedPath, "utf-8");
         const allLines = content.split("\n");
         const totalLines = allLines.length;
         const startIndex = Math.max(0, offset - 1);
@@ -45389,7 +45792,7 @@ EXAMPLES:
     }
   };
 }
-var readFile4 = createReadFileTool();
+var readFile5 = createReadFileTool();
 function createWriteFileTool(config = {}) {
   const mergedConfig = { ...DEFAULT_FILESYSTEM_CONFIG, ...config };
   return {
@@ -45453,13 +45856,13 @@ EXAMPLES:
         };
       }
       const resolvedPath = validation.resolvedPath;
-      const fileExists = fs15.existsSync(resolvedPath);
+      const fileExists = fs16.existsSync(resolvedPath);
       try {
-        const parentDir = path3.dirname(resolvedPath);
-        if (!fs15.existsSync(parentDir)) {
-          await fs14.mkdir(parentDir, { recursive: true });
+        const parentDir = path2.dirname(resolvedPath);
+        if (!fs16.existsSync(parentDir)) {
+          await fs15.mkdir(parentDir, { recursive: true });
         }
-        await fs14.writeFile(resolvedPath, content, "utf-8");
+        await fs15.writeFile(resolvedPath, content, "utf-8");
         return {
           success: true,
           path: file_path,
@@ -45476,7 +45879,7 @@ EXAMPLES:
     }
   };
 }
-var writeFile4 = createWriteFileTool();
+var writeFile5 = createWriteFileTool();
 function createEditFileTool(config = {}) {
   const mergedConfig = { ...DEFAULT_FILESYSTEM_CONFIG, ...config };
   return {
@@ -45562,7 +45965,7 @@ EXAMPLES:
         };
       }
       const resolvedPath = validation.resolvedPath;
-      if (!fs15.existsSync(resolvedPath)) {
+      if (!fs16.existsSync(resolvedPath)) {
         return {
           success: false,
           error: `File not found: ${file_path}`,
@@ -45570,7 +45973,7 @@ EXAMPLES:
         };
       }
       try {
-        const content = await fs14.readFile(resolvedPath, "utf-8");
+        const content = await fs15.readFile(resolvedPath, "utf-8");
         let occurrences = 0;
         let searchIndex = 0;
         while (true) {
@@ -45609,7 +46012,7 @@ EXAMPLES:
         } else {
           newContent = content.replace(old_string, new_string);
         }
-        await fs14.writeFile(resolvedPath, newContent, "utf-8");
+        await fs15.writeFile(resolvedPath, newContent, "utf-8");
         const diffPreview = generateDiffPreview(old_string, new_string);
         return {
           success: true,
@@ -45665,11 +46068,11 @@ async function findFiles(dir, pattern, baseDir, config, results = [], depth = 0)
     return results;
   }
   try {
-    const entries = await fs14.readdir(dir, { withFileTypes: true });
+    const entries = await fs15.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
       if (results.length >= config.maxResults) break;
-      const fullPath = path3.join(dir, entry.name);
-      const relativePath = path3.relative(baseDir, fullPath);
+      const fullPath = path2.join(dir, entry.name);
+      const relativePath = path2.relative(baseDir, fullPath);
       if (entry.isDirectory()) {
         const isBlocked = config.blockedDirectories.some(
           (blocked) => entry.name === blocked || relativePath.includes(`/${blocked}/`) || relativePath.startsWith(`${blocked}/`)
@@ -45679,7 +46082,7 @@ async function findFiles(dir, pattern, baseDir, config, results = [], depth = 0)
       } else if (entry.isFile()) {
         if (matchGlobPattern(pattern, relativePath)) {
           try {
-            const stats = await fs14.stat(fullPath);
+            const stats = await fs15.stat(fullPath);
             results.push({
               path: relativePath,
               mtime: stats.mtimeMs
@@ -45761,7 +46164,7 @@ WHEN TO USE:
         };
       }
       const resolvedDir = validation.resolvedPath;
-      if (!fs15.existsSync(resolvedDir)) {
+      if (!fs16.existsSync(resolvedDir)) {
         return {
           success: false,
           error: `Directory not found: ${searchDir}`
@@ -45816,9 +46219,9 @@ async function findFilesToSearch(dir, baseDir, config, globPattern, fileType, fi
     return files;
   }
   try {
-    const entries = await fs14.readdir(dir, { withFileTypes: true });
+    const entries = await fs15.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = path3.join(dir, entry.name);
+      const fullPath = path2.join(dir, entry.name);
       if (entry.isDirectory()) {
         const isBlocked = config.blockedDirectories.some(
           (blocked) => entry.name === blocked
@@ -45830,7 +46233,7 @@ async function findFilesToSearch(dir, baseDir, config, globPattern, fileType, fi
         if (fileType) {
           const extensions = FILE_TYPE_MAP[fileType.toLowerCase()];
           if (extensions) {
-            const ext = path3.extname(entry.name).toLowerCase();
+            const ext = path2.extname(entry.name).toLowerCase();
             if (!extensions.includes(ext)) continue;
           }
         }
@@ -45849,7 +46252,7 @@ async function findFilesToSearch(dir, baseDir, config, globPattern, fileType, fi
 async function searchFile(filePath, regex, contextBefore, contextAfter) {
   const matches = [];
   try {
-    const content = await fs14.readFile(filePath, "utf-8");
+    const content = await fs15.readFile(filePath, "utf-8");
     const lines = content.split("\n");
     for (let i = 0; i < lines.length; i++) {
       const line = lines[i] ?? "";
@@ -45990,7 +46393,7 @@ WHEN TO USE:
         };
       }
       const resolvedPath = validation.resolvedPath;
-      if (!fs15.existsSync(resolvedPath)) {
+      if (!fs16.existsSync(resolvedPath)) {
         return {
           success: false,
           error: `Path not found: ${searchPath}`
@@ -46006,7 +46409,7 @@ WHEN TO USE:
         };
       }
       try {
-        const stats = await fs14.stat(resolvedPath);
+        const stats = await fs15.stat(resolvedPath);
         let filesToSearch;
         if (stats.isFile()) {
           filesToSearch = [resolvedPath];
@@ -46032,7 +46435,7 @@ WHEN TO USE:
           );
           if (matches.length > 0) {
             filesMatched++;
-            const relativePath = path3.relative(resolvedPath, file) || file;
+            const relativePath = path2.relative(resolvedPath, file) || file;
             for (const match of matches) {
               match.file = relativePath;
             }
@@ -46094,11 +46497,11 @@ async function listDir(dir, baseDir, config, recursive, filter, maxDepth = 3, cu
     return entries;
   }
   try {
-    const dirEntries = await fs14.readdir(dir, { withFileTypes: true });
+    const dirEntries = await fs15.readdir(dir, { withFileTypes: true });
     for (const entry of dirEntries) {
       if (entries.length >= config.maxResults) break;
-      const fullPath = path3.join(dir, entry.name);
-      const relativePath = path3.relative(baseDir, fullPath);
+      const fullPath = path2.join(dir, entry.name);
+      const relativePath = path2.relative(baseDir, fullPath);
       if (entry.isDirectory() && config.blockedDirectories.includes(entry.name)) {
         continue;
       }
@@ -46112,7 +46515,7 @@ async function listDir(dir, baseDir, config, recursive, filter, maxDepth = 3, cu
       }
       if (filter === "directories" && !isDir) continue;
       try {
-        const stats = await fs14.stat(fullPath);
+        const stats = await fs15.stat(fullPath);
         const dirEntry = {
           name: entry.name,
           path: relativePath,
@@ -46208,14 +46611,14 @@ EXAMPLES:
         };
       }
       const resolvedPath = validation.resolvedPath;
-      if (!fs15.existsSync(resolvedPath)) {
+      if (!fs16.existsSync(resolvedPath)) {
         return {
           success: false,
           error: `Directory not found: ${path6}`
         };
       }
       try {
-        const stats = await fs14.stat(resolvedPath);
+        const stats = await fs15.stat(resolvedPath);
         if (!stats.isDirectory()) {
           return {
             success: false,
@@ -46403,7 +46806,8 @@ EXAMPLES:
           shell: mergedConfig.shell,
           cwd: mergedConfig.workingDirectory,
           env,
-          stdio: ["pipe", "pipe", "pipe"]
+          stdio: ["pipe", "pipe", "pipe"],
+          detached: true
         });
         if (run_in_background && mergedConfig.allowBackground) {
           const bgId = generateBackgroundId();
@@ -46430,14 +46834,27 @@ EXAMPLES:
         let stdout = "";
         let stderr = "";
         let killed = false;
+        const killProcessGroup = (signal) => {
+          try {
+            if (childProcess.pid) {
+              process.kill(-childProcess.pid, signal);
+            }
+          } catch {
+            try {
+              childProcess.kill(signal);
+            } catch {
+            }
+          }
+        };
+        const GRACEFUL_KILL_WAIT_MS = 3e3;
         const timeoutId = setTimeout(() => {
           killed = true;
-          childProcess.kill("SIGTERM");
+          killProcessGroup("SIGTERM");
           setTimeout(() => {
             if (!childProcess.killed) {
-              childProcess.kill("SIGKILL");
+              killProcessGroup("SIGKILL");
             }
-          }, 5e3);
+          }, GRACEFUL_KILL_WAIT_MS);
         }, effectiveTimeout);
         childProcess.stdout.on("data", (data) => {
           stdout += data.toString();
@@ -46451,8 +46868,28 @@ EXAMPLES:
             stderr = stderr.slice(-mergedConfig.maxOutputSize);
           }
         });
-        childProcess.on("close", (code, signal) => {
+        let resolved = false;
+        const safeResolve = (result) => {
+          if (resolved) return;
+          resolved = true;
           clearTimeout(timeoutId);
+          clearTimeout(hardTimeoutId);
+          resolve4(result);
+        };
+        const HARD_TIMEOUT_GRACE_MS = 5e3;
+        const hardTimeoutId = setTimeout(() => {
+          if (!resolved) {
+            killProcessGroup("SIGKILL");
+            safeResolve({
+              success: false,
+              stdout,
+              stderr,
+              duration: Date.now() - startTime,
+              error: `Command timed out after ${effectiveTimeout}ms (hard timeout: process group did not exit)`
+            });
+          }
+        }, effectiveTimeout + GRACEFUL_KILL_WAIT_MS + HARD_TIMEOUT_GRACE_MS);
+        childProcess.on("close", (code, signal) => {
           const duration = Date.now() - startTime;
           let truncated = false;
           if (stdout.length > mergedConfig.maxOutputSize) {
@@ -46464,7 +46901,7 @@ EXAMPLES:
             truncated = true;
           }
           if (killed) {
-            resolve4({
+            safeResolve({
               success: false,
               stdout,
               stderr,
@@ -46475,7 +46912,7 @@ EXAMPLES:
               error: `Command timed out after ${effectiveTimeout}ms`
             });
           } else {
-            resolve4({
+            safeResolve({
               success: code === 0,
               stdout,
               stderr,
@@ -46488,8 +46925,7 @@ EXAMPLES:
           }
         });
         childProcess.on("error", (error) => {
-          clearTimeout(timeoutId);
-          resolve4({
+          safeResolve({
             success: false,
             error: `Failed to execute command: ${error.message}`,
             duration: Date.now() - startTime
@@ -46825,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 = [];
@@ -46899,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.";
   }
@@ -47008,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:
 {
@@ -47172,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:
 {
@@ -47660,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,
@@ -47707,230 +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,
-      // Note: raw HTML not available with native method (returns markdown instead)
-      markdown: args.includeMarkdown ? cleanContent : void 0,
-      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,
-      // Note: raw HTML not available with JS method (returns markdown instead)
-      markdown: args.includeMarkdown ? cleanContent : void 0,
-      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 cleanContent = stripBase64DataUris(result.result?.content || "");
-    const cleanMarkdown = result.result?.markdown ? stripBase64DataUris(result.result.markdown) : void 0;
-    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: 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",
@@ -47943,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,
@@ -47988,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 — 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);
     },
-    // Authenticated fetch
-    authenticatedFetch,
-    // Standard fetch
+    // 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;
@@ -48029,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}
@@ -48044,75 +48162,32 @@ 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
   });
   const result = await resultPromise;
   return result !== void 0 ? result : sandbox.output;
 }
-var MIME_TYPES = {
-  png: "image/png",
-  jpeg: "image/jpeg",
-  jpg: "image/jpeg",
-  webp: "image/webp",
-  gif: "image/gif",
-  mp4: "video/mp4",
-  webm: "video/webm",
-  mp3: "audio/mpeg",
-  wav: "audio/wav",
-  opus: "audio/opus",
-  ogg: "audio/ogg",
-  aac: "audio/aac",
-  flac: "audio/flac",
-  pcm: "audio/pcm"
-};
-var FileMediaOutputHandler = class {
-  outputDir;
-  initialized = false;
-  constructor(outputDir) {
-    this.outputDir = outputDir ?? path3__namespace.join(os__namespace.tmpdir(), "oneringai-media");
-  }
-  async save(data, metadata) {
-    if (!this.initialized) {
-      await fs14__namespace.mkdir(this.outputDir, { recursive: true });
-      this.initialized = true;
-    }
-    const filename = metadata.suggestedFilename ?? this.generateFilename(metadata);
-    const filePath = path3__namespace.join(this.outputDir, filename);
-    await fs14__namespace.writeFile(filePath, data);
-    const format = metadata.format.toLowerCase();
-    const mimeType = MIME_TYPES[format] ?? `application/octet-stream`;
-    return {
-      location: filePath,
-      mimeType,
-      size: data.length
-    };
-  }
-  generateFilename(metadata) {
-    const timestamp = Date.now();
-    const random2 = crypto2__namespace.randomBytes(4).toString("hex");
-    const indexSuffix = metadata.index != null ? `_${metadata.index}` : "";
-    return `${metadata.type}_${timestamp}_${random2}${indexSuffix}.${metadata.format}`;
-  }
-};
 
 // src/tools/multimedia/config.ts
-var _outputHandler = null;
-function getMediaOutputHandler() {
-  if (!_outputHandler) {
-    _outputHandler = new FileMediaOutputHandler();
+var _storage = null;
+function getMediaStorage() {
+  if (!_storage) {
+    _storage = new FileMediaStorage();
   }
-  return _outputHandler;
+  return _storage;
 }
-function setMediaOutputHandler(handler) {
-  _outputHandler = handler;
+function setMediaStorage(storage) {
+  _storage = storage;
 }
+var getMediaOutputHandler = getMediaStorage;
+var setMediaOutputHandler = setMediaStorage;
 
 // src/tools/multimedia/imageGeneration.ts
-function createImageGenerationTool(connector, outputHandler) {
+function createImageGenerationTool(connector, storage, userId) {
   const vendor = connector.vendor;
-  const handler = outputHandler ?? getMediaOutputHandler();
+  const handler = storage ?? getMediaStorage();
   const vendorModels = vendor ? getImageModelsByVendor(vendor) : [];
   const modelNames = vendorModels.map((m) => m.name);
   const properties = {
@@ -48185,8 +48260,9 @@ function createImageGenerationTool(connector, outputHandler) {
         }
       }
     },
-    execute: async (args) => {
+    execute: async (args, context) => {
       try {
+        const effectiveUserId = userId ?? context?.userId;
         const imageGen = ImageGeneration.create({ connector });
         const response = await imageGen.generate({
           prompt: args.prompt,
@@ -48217,7 +48293,8 @@ function createImageGenerationTool(connector, outputHandler) {
             format,
             model: modelName,
             vendor: vendor || "unknown",
-            index: response.data.length > 1 ? i : void 0
+            index: response.data.length > 1 ? i : void 0,
+            userId: effectiveUserId
           });
           images.push({
             location: result.location,
@@ -48244,9 +48321,9 @@ function createImageGenerationTool(connector, outputHandler) {
 
 // src/tools/multimedia/videoGeneration.ts
 var videoGenInstances = /* @__PURE__ */ new Map();
-function createVideoTools(connector, outputHandler) {
+function createVideoTools(connector, storage, userId) {
   const vendor = connector.vendor;
-  const handler = outputHandler ?? getMediaOutputHandler();
+  const handler = storage ?? getMediaStorage();
   const vendorModels = vendor ? getVideoModelsByVendor(vendor) : [];
   const modelNames = vendorModels.map((m) => m.name);
   const generateProperties = {
@@ -48310,7 +48387,7 @@ function createVideoTools(connector, outputHandler) {
         }
       }
     },
-    execute: async (args) => {
+    execute: async (args, _context) => {
       try {
         const videoGen = VideoGeneration.create({ connector });
         const response = await videoGen.generate({
@@ -48359,8 +48436,9 @@ function createVideoTools(connector, outputHandler) {
         }
       }
     },
-    execute: async (args) => {
+    execute: async (args, context) => {
       try {
+        const effectiveUserId = userId ?? context?.userId;
         let videoGen = videoGenInstances.get(args.jobId);
         if (!videoGen) {
           videoGen = VideoGeneration.create({ connector });
@@ -48386,7 +48464,8 @@ function createVideoTools(connector, outputHandler) {
               type: "video",
               format,
               model: modelName,
-              vendor: vendor || "unknown"
+              vendor: vendor || "unknown",
+              userId: effectiveUserId
             });
             videoGenInstances.delete(args.jobId);
             return {
@@ -48434,9 +48513,9 @@ function createVideoTools(connector, outputHandler) {
 }
 
 // src/tools/multimedia/textToSpeech.ts
-function createTextToSpeechTool(connector, outputHandler) {
+function createTextToSpeechTool(connector, storage, userId) {
   const vendor = connector.vendor;
-  const handler = outputHandler ?? getMediaOutputHandler();
+  const handler = storage ?? getMediaStorage();
   const vendorModels = vendor ? getTTSModelsByVendor(vendor) : [];
   const modelNames = vendorModels.map((m) => m.name);
   const properties = {
@@ -48497,8 +48576,9 @@ function createTextToSpeechTool(connector, outputHandler) {
         }
       }
     },
-    execute: async (args) => {
+    execute: async (args, context) => {
       try {
+        const effectiveUserId = userId ?? context?.userId;
         const tts = TextToSpeech.create({
           connector,
           model: args.model,
@@ -48512,7 +48592,8 @@ function createTextToSpeechTool(connector, outputHandler) {
           type: "audio",
           format,
           model: args.model || modelNames[0] || "unknown",
-          vendor: vendor || "unknown"
+          vendor: vendor || "unknown",
+          userId: effectiveUserId
         });
         return {
           success: true,
@@ -48535,14 +48616,17 @@ function createTextToSpeechTool(connector, outputHandler) {
     }
   };
 }
-function createSpeechToTextTool(connector) {
+
+// src/tools/multimedia/speechToText.ts
+function createSpeechToTextTool(connector, storage) {
   const vendor = connector.vendor;
+  const handler = storage ?? getMediaStorage();
   const vendorModels = vendor ? getSTTModelsByVendor(vendor) : [];
   const modelNames = vendorModels.map((m) => m.name);
   const properties = {
-    audioFilePath: {
+    audioSource: {
       type: "string",
-      description: "Path to the audio file to transcribe"
+      description: "Path or location of the audio file to transcribe (file path, storage location, etc.)"
     }
   };
   if (modelNames.length > 0) {
@@ -48570,13 +48654,19 @@ function createSpeechToTextTool(connector) {
         parameters: {
           type: "object",
           properties,
-          required: ["audioFilePath"]
+          required: ["audioSource"]
         }
       }
     },
-    execute: async (args) => {
+    execute: async (args, _context) => {
       try {
-        const audioBuffer = await fs14__namespace.readFile(args.audioFilePath);
+        const audioBuffer = await handler.read(args.audioSource);
+        if (!audioBuffer) {
+          return {
+            success: false,
+            error: `Audio not found at: ${args.audioSource}`
+          };
+        }
         const stt = SpeechToText.create({
           connector,
           model: args.model,
@@ -48598,7 +48688,7 @@ function createSpeechToTextTool(connector) {
         };
       }
     },
-    describeCall: (args) => args.audioFilePath,
+    describeCall: (args) => args.audioSource,
     permission: {
       scope: "session",
       riskLevel: "low",
@@ -48613,21 +48703,22 @@ var VENDOR_CAPABILITIES = {
   [Vendor.Google]: ["image", "video", "tts"],
   [Vendor.Grok]: ["image", "video"]
 };
-function registerMultimediaTools() {
+function registerMultimediaTools(storage) {
   for (const [vendor, capabilities] of Object.entries(VENDOR_CAPABILITIES)) {
-    ConnectorTools.registerService(vendor, (connector, _userId) => {
+    ConnectorTools.registerService(vendor, (connector, userId) => {
+      const handler = getMediaStorage();
       const tools = [];
       if (capabilities.includes("image")) {
-        tools.push(createImageGenerationTool(connector));
+        tools.push(createImageGenerationTool(connector, handler, userId));
       }
       if (capabilities.includes("video")) {
-        tools.push(...createVideoTools(connector));
+        tools.push(...createVideoTools(connector, handler, userId));
       }
       if (capabilities.includes("tts")) {
-        tools.push(createTextToSpeechTool(connector));
+        tools.push(createTextToSpeechTool(connector, handler, userId));
       }
       if (capabilities.includes("stt")) {
-        tools.push(createSpeechToTextTool(connector));
+        tools.push(createSpeechToTextTool(connector, handler));
       }
       return tools;
     });
@@ -48637,6 +48728,858 @@ function registerMultimediaTools() {
 // src/tools/multimedia/index.ts
 registerMultimediaTools();
 
+// src/tools/github/types.ts
+function parseRepository(input) {
+  if (!input || input.trim().length === 0) {
+    throw new Error("Repository cannot be empty");
+  }
+  const trimmed = input.trim();
+  try {
+    const url2 = new URL(trimmed);
+    if (url2.hostname === "github.com" || url2.hostname === "www.github.com") {
+      const segments = url2.pathname.split("/").filter(Boolean);
+      if (segments.length >= 2) {
+        return { owner: segments[0], repo: segments[1].replace(/\.git$/, "") };
+      }
+    }
+  } catch {
+  }
+  const parts = trimmed.split("/");
+  if (parts.length === 2 && parts[0].length > 0 && parts[1].length > 0) {
+    return { owner: parts[0], repo: parts[1] };
+  }
+  throw new Error(
+    `Invalid repository format: "${input}". Expected "owner/repo" or "https://github.com/owner/repo"`
+  );
+}
+function resolveRepository(repository, connector) {
+  const repoStr = repository ?? connector.getOptions().defaultRepository;
+  if (!repoStr) {
+    return {
+      success: false,
+      error: 'No repository specified. Provide a "repository" parameter (e.g., "owner/repo") or configure defaultRepository on the connector.'
+    };
+  }
+  try {
+    return { success: true, repo: parseRepository(repoStr) };
+  } catch (err) {
+    return { success: false, error: err instanceof Error ? err.message : String(err) };
+  }
+}
+var GitHubAPIError = class extends Error {
+  constructor(status, statusText, body) {
+    const msg = typeof body === "object" && body !== null && "message" in body ? body.message : statusText;
+    super(`GitHub API error ${status}: ${msg}`);
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+    this.name = "GitHubAPIError";
+  }
+};
+async function githubFetch(connector, endpoint, options) {
+  let url2 = endpoint;
+  if (options?.queryParams && Object.keys(options.queryParams).length > 0) {
+    const params = new URLSearchParams();
+    for (const [key, value] of Object.entries(options.queryParams)) {
+      params.append(key, String(value));
+    }
+    url2 += (url2.includes("?") ? "&" : "?") + params.toString();
+  }
+  const headers = {
+    "Accept": options?.accept ?? "application/vnd.github+json",
+    "X-GitHub-Api-Version": "2022-11-28"
+  };
+  if (options?.body) {
+    headers["Content-Type"] = "application/json";
+  }
+  const response = await connector.fetch(
+    url2,
+    {
+      method: options?.method ?? "GET",
+      headers,
+      body: options?.body ? JSON.stringify(options.body) : void 0
+    },
+    options?.userId
+  );
+  const text = await response.text();
+  let data;
+  try {
+    data = JSON.parse(text);
+  } catch {
+    data = text;
+  }
+  if (!response.ok) {
+    throw new GitHubAPIError(response.status, response.statusText, data);
+  }
+  return data;
+}
+
+// src/tools/github/searchFiles.ts
+function matchGlobPattern2(pattern, filePath) {
+  let regexPattern = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*\*/g, "{{GLOBSTAR}}").replace(/\*/g, "[^/]*").replace(/\?/g, ".").replace(/\{\{GLOBSTAR\}\}/g, ".*");
+  regexPattern = "^" + regexPattern + "$";
+  try {
+    const regex = new RegExp(regexPattern);
+    return regex.test(filePath);
+  } catch {
+    return false;
+  }
+}
+function createSearchFilesTool(connector, userId) {
+  return {
+    definition: {
+      type: "function",
+      function: {
+        name: "search_files",
+        description: `Search for files by name/path pattern in a GitHub repository.
+
+USAGE:
+- Supports glob patterns like "**/*.ts", "src/**/*.tsx"
+- Returns matching file paths sorted alphabetically
+- Uses the repository's file tree for fast matching
+
+PATTERN SYNTAX:
+- * matches any characters except /
+- ** matches any characters including /
+- ? matches a single character
+
+EXAMPLES:
+- Find all TypeScript files: { "pattern": "**/*.ts" }
+- Find files in src: { "pattern": "src/**/*.{ts,tsx}" }
+- Find package.json: { "pattern": "**/package.json" }
+- Search specific branch: { "pattern": "**/*.ts", "ref": "develop" }`,
+        parameters: {
+          type: "object",
+          properties: {
+            repository: {
+              type: "string",
+              description: 'Repository in "owner/repo" format or full GitHub URL. Optional if connector has a default repository.'
+            },
+            pattern: {
+              type: "string",
+              description: 'Glob pattern to match files (e.g., "**/*.ts", "src/**/*.tsx")'
+            },
+            ref: {
+              type: "string",
+              description: "Branch, tag, or commit SHA. Defaults to the repository's default branch."
+            }
+          },
+          required: ["pattern"]
+        }
+      }
+    },
+    describeCall: (args) => {
+      const parts = [args.pattern];
+      if (args.repository) parts.push(`in ${args.repository}`);
+      if (args.ref) parts.push(`@${args.ref}`);
+      return parts.join(" ");
+    },
+    permission: {
+      scope: "session",
+      riskLevel: "low",
+      approvalMessage: `Search files in a GitHub repository via ${connector.displayName}`
+    },
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
+      const resolved = resolveRepository(args.repository, connector);
+      if (!resolved.success) {
+        return { success: false, error: resolved.error };
+      }
+      const { owner, repo } = resolved.repo;
+      try {
+        let ref = args.ref;
+        if (!ref) {
+          const repoInfo = await githubFetch(
+            connector,
+            `/repos/${owner}/${repo}`,
+            { userId: effectiveUserId }
+          );
+          ref = repoInfo.default_branch;
+        }
+        const tree = await githubFetch(
+          connector,
+          `/repos/${owner}/${repo}/git/trees/${ref}?recursive=1`,
+          { userId: effectiveUserId }
+        );
+        const matching = tree.tree.filter(
+          (entry) => entry.type === "blob" && matchGlobPattern2(args.pattern, entry.path)
+        ).map((entry) => ({
+          path: entry.path,
+          size: entry.size ?? 0,
+          type: entry.type
+        })).sort((a, b) => a.path.localeCompare(b.path));
+        return {
+          success: true,
+          files: matching,
+          count: matching.length,
+          truncated: tree.truncated
+        };
+      } catch (error) {
+        return {
+          success: false,
+          error: `Failed to search files: ${error instanceof Error ? error.message : String(error)}`
+        };
+      }
+    }
+  };
+}
+
+// src/tools/github/searchCode.ts
+function createSearchCodeTool(connector, userId) {
+  return {
+    definition: {
+      type: "function",
+      function: {
+        name: "search_code",
+        description: `Search for code content across a GitHub repository.
+
+USAGE:
+- Search by keyword, function name, class name, or any text
+- Filter by language, path, or file extension
+- Returns matching files with text fragments showing context
+
+RATE LIMITS:
+- GitHub's code search API is limited to 30 requests per minute
+- Results may be incomplete for very large repositories
+
+EXAMPLES:
+- Find function: { "query": "function handleAuth", "language": "typescript" }
+- Find imports: { "query": "import React", "extension": "tsx" }
+- Search in path: { "query": "TODO", "path": "src/utils" }
+- Limit results: { "query": "console.log", "limit": 10 }`,
+        parameters: {
+          type: "object",
+          properties: {
+            repository: {
+              type: "string",
+              description: 'Repository in "owner/repo" format or full GitHub URL. Optional if connector has a default repository.'
+            },
+            query: {
+              type: "string",
+              description: "Search query \u2014 keyword, function name, or any text to find in code"
+            },
+            language: {
+              type: "string",
+              description: 'Filter by programming language (e.g., "typescript", "python", "go")'
+            },
+            path: {
+              type: "string",
+              description: 'Filter by file path prefix (e.g., "src/", "lib/utils")'
+            },
+            extension: {
+              type: "string",
+              description: 'Filter by file extension without dot (e.g., "ts", "py", "go")'
+            },
+            limit: {
+              type: "number",
+              description: "Maximum number of results (default: 30, max: 100)"
+            }
+          },
+          required: ["query"]
+        }
+      }
+    },
+    describeCall: (args) => {
+      const parts = [`"${args.query}"`];
+      if (args.language) parts.push(`lang:${args.language}`);
+      if (args.repository) parts.push(`in ${args.repository}`);
+      return parts.join(" ");
+    },
+    permission: {
+      scope: "session",
+      riskLevel: "low",
+      approvalMessage: `Search code in a GitHub repository via ${connector.displayName}`
+    },
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
+      const resolved = resolveRepository(args.repository, connector);
+      if (!resolved.success) {
+        return { success: false, error: resolved.error };
+      }
+      const { owner, repo } = resolved.repo;
+      try {
+        const qualifiers = [`repo:${owner}/${repo}`];
+        if (args.language) qualifiers.push(`language:${args.language}`);
+        if (args.path) qualifiers.push(`path:${args.path}`);
+        if (args.extension) qualifiers.push(`extension:${args.extension}`);
+        const q = `${args.query} ${qualifiers.join(" ")}`;
+        const perPage = Math.min(args.limit ?? 30, 100);
+        const result = await githubFetch(
+          connector,
+          `/search/code`,
+          {
+            userId: effectiveUserId,
+            // Request text-match fragments
+            accept: "application/vnd.github.text-match+json",
+            queryParams: { q, per_page: perPage }
+          }
+        );
+        const matches = result.items.map((item) => ({
+          file: item.path,
+          fragment: item.text_matches?.[0]?.fragment
+        }));
+        return {
+          success: true,
+          matches,
+          count: result.total_count,
+          truncated: result.incomplete_results || result.total_count > perPage
+        };
+      } catch (error) {
+        return {
+          success: false,
+          error: `Failed to search code: ${error instanceof Error ? error.message : String(error)}`
+        };
+      }
+    }
+  };
+}
+
+// src/tools/github/readFile.ts
+function createGitHubReadFileTool(connector, userId) {
+  return {
+    definition: {
+      type: "function",
+      function: {
+        name: "read_file",
+        description: `Read file content from a GitHub repository.
+
+USAGE:
+- Reads a file and returns content with line numbers
+- Supports line range selection with offset/limit for large files
+- By default reads up to 2000 lines from the beginning
+
+EXAMPLES:
+- Read entire file: { "path": "src/index.ts" }
+- Read specific branch: { "path": "README.md", "ref": "develop" }
+- Read lines 100-200: { "path": "src/app.ts", "offset": 100, "limit": 100 }
+- Specific repo: { "repository": "owner/repo", "path": "package.json" }
+
+NOTE: Files larger than 1MB are fetched via the Git Blob API. Very large files (>5MB) may be truncated.`,
+        parameters: {
+          type: "object",
+          properties: {
+            repository: {
+              type: "string",
+              description: 'Repository in "owner/repo" format or full GitHub URL. Optional if connector has a default repository.'
+            },
+            path: {
+              type: "string",
+              description: 'File path within the repository (e.g., "src/index.ts")'
+            },
+            ref: {
+              type: "string",
+              description: "Branch, tag, or commit SHA. Defaults to the repository's default branch."
+            },
+            offset: {
+              type: "number",
+              description: "Line number to start reading from (1-indexed). Only provide if the file is too large."
+            },
+            limit: {
+              type: "number",
+              description: "Number of lines to read (default: 2000). Only provide if the file is too large."
+            }
+          },
+          required: ["path"]
+        }
+      }
+    },
+    describeCall: (args) => {
+      const parts = [args.path];
+      if (args.repository) parts.push(`in ${args.repository}`);
+      if (args.ref) parts.push(`@${args.ref}`);
+      if (args.offset && args.limit) parts.push(`[lines ${args.offset}-${args.offset + args.limit}]`);
+      return parts.join(" ");
+    },
+    permission: {
+      scope: "session",
+      riskLevel: "low",
+      approvalMessage: `Read a file from a GitHub repository via ${connector.displayName}`
+    },
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
+      const resolved = resolveRepository(args.repository, connector);
+      if (!resolved.success) {
+        return { success: false, error: resolved.error };
+      }
+      const { owner, repo } = resolved.repo;
+      try {
+        let fileContent;
+        let fileSha;
+        let fileSize;
+        const refParam = args.ref ? `?ref=${encodeURIComponent(args.ref)}` : "";
+        const contentResp = await githubFetch(
+          connector,
+          `/repos/${owner}/${repo}/contents/${args.path}${refParam}`,
+          { userId: effectiveUserId }
+        );
+        if (contentResp.type !== "file") {
+          return {
+            success: false,
+            error: `Path is not a file: ${args.path} (type: ${contentResp.type}). Use search_files to explore the repository.`,
+            path: args.path
+          };
+        }
+        fileSha = contentResp.sha;
+        fileSize = contentResp.size;
+        if (contentResp.content && contentResp.encoding === "base64") {
+          fileContent = Buffer.from(contentResp.content, "base64").toString("utf-8");
+        } else if (contentResp.git_url) {
+          const blob = await githubFetch(
+            connector,
+            contentResp.git_url,
+            { userId: effectiveUserId }
+          );
+          fileContent = Buffer.from(blob.content, "base64").toString("utf-8");
+          fileSize = blob.size;
+        } else {
+          return {
+            success: false,
+            error: `Cannot read file content: ${args.path} (no content or git_url in response)`,
+            path: args.path
+          };
+        }
+        const offset = args.offset ?? 1;
+        const limit = args.limit ?? 2e3;
+        const allLines = fileContent.split("\n");
+        const totalLines = allLines.length;
+        const startIndex = Math.max(0, offset - 1);
+        const endIndex = Math.min(totalLines, startIndex + limit);
+        const selectedLines = allLines.slice(startIndex, endIndex);
+        const lineNumberWidth = String(endIndex).length;
+        const formattedLines = selectedLines.map((line, i) => {
+          const lineNum = startIndex + i + 1;
+          const paddedNum = String(lineNum).padStart(lineNumberWidth, " ");
+          const truncatedLine = line.length > 2e3 ? line.substring(0, 2e3) + "..." : line;
+          return `${paddedNum}	${truncatedLine}`;
+        });
+        const truncated = endIndex < totalLines;
+        const result = formattedLines.join("\n");
+        return {
+          success: true,
+          content: result,
+          path: args.path,
+          size: fileSize,
+          lines: totalLines,
+          truncated,
+          sha: fileSha
+        };
+      } catch (error) {
+        return {
+          success: false,
+          error: `Failed to read file: ${error instanceof Error ? error.message : String(error)}`,
+          path: args.path
+        };
+      }
+    }
+  };
+}
+
+// src/tools/github/getPR.ts
+function createGetPRTool(connector, userId) {
+  return {
+    definition: {
+      type: "function",
+      function: {
+        name: "get_pr",
+        description: `Get full details of a pull request from a GitHub repository.
+
+Returns: title, description, state, author, labels, reviewers, merge status, branches, file stats, and more.
+
+EXAMPLES:
+- Get PR: { "pull_number": 123 }
+- Specific repo: { "repository": "owner/repo", "pull_number": 456 }`,
+        parameters: {
+          type: "object",
+          properties: {
+            repository: {
+              type: "string",
+              description: 'Repository in "owner/repo" format or full GitHub URL. Optional if connector has a default repository.'
+            },
+            pull_number: {
+              type: "number",
+              description: "Pull request number"
+            }
+          },
+          required: ["pull_number"]
+        }
+      }
+    },
+    describeCall: (args) => {
+      const parts = [`#${args.pull_number}`];
+      if (args.repository) parts.push(`in ${args.repository}`);
+      return parts.join(" ");
+    },
+    permission: {
+      scope: "session",
+      riskLevel: "low",
+      approvalMessage: `Get pull request details from GitHub via ${connector.displayName}`
+    },
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
+      const resolved = resolveRepository(args.repository, connector);
+      if (!resolved.success) {
+        return { success: false, error: resolved.error };
+      }
+      const { owner, repo } = resolved.repo;
+      try {
+        const pr = await githubFetch(
+          connector,
+          `/repos/${owner}/${repo}/pulls/${args.pull_number}`,
+          { userId: effectiveUserId }
+        );
+        return {
+          success: true,
+          data: {
+            number: pr.number,
+            title: pr.title,
+            body: pr.body,
+            state: pr.state,
+            draft: pr.draft,
+            author: pr.user.login,
+            labels: pr.labels.map((l) => l.name),
+            reviewers: pr.requested_reviewers.map((r) => r.login),
+            mergeable: pr.mergeable,
+            head: pr.head.ref,
+            base: pr.base.ref,
+            url: pr.html_url,
+            created_at: pr.created_at,
+            updated_at: pr.updated_at,
+            additions: pr.additions,
+            deletions: pr.deletions,
+            changed_files: pr.changed_files
+          }
+        };
+      } catch (error) {
+        return {
+          success: false,
+          error: `Failed to get PR: ${error instanceof Error ? error.message : String(error)}`
+        };
+      }
+    }
+  };
+}
+
+// src/tools/github/prFiles.ts
+function createPRFilesTool(connector, userId) {
+  return {
+    definition: {
+      type: "function",
+      function: {
+        name: "pr_files",
+        description: `Get the files changed in a pull request with diffs.
+
+Returns: filename, status (added/modified/removed/renamed), additions, deletions, and patch (diff) content for each file.
+
+EXAMPLES:
+- Get files: { "pull_number": 123 }
+- Specific repo: { "repository": "owner/repo", "pull_number": 456 }
+
+NOTE: Very large diffs may be truncated by GitHub. Patch content may be absent for binary files.`,
+        parameters: {
+          type: "object",
+          properties: {
+            repository: {
+              type: "string",
+              description: 'Repository in "owner/repo" format or full GitHub URL. Optional if connector has a default repository.'
+            },
+            pull_number: {
+              type: "number",
+              description: "Pull request number"
+            }
+          },
+          required: ["pull_number"]
+        }
+      }
+    },
+    describeCall: (args) => {
+      const parts = [`files for #${args.pull_number}`];
+      if (args.repository) parts.push(`in ${args.repository}`);
+      return parts.join(" ");
+    },
+    permission: {
+      scope: "session",
+      riskLevel: "low",
+      approvalMessage: `Get PR changed files from GitHub via ${connector.displayName}`
+    },
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
+      const resolved = resolveRepository(args.repository, connector);
+      if (!resolved.success) {
+        return { success: false, error: resolved.error };
+      }
+      const { owner, repo } = resolved.repo;
+      try {
+        const files = await githubFetch(
+          connector,
+          `/repos/${owner}/${repo}/pulls/${args.pull_number}/files`,
+          {
+            userId: effectiveUserId,
+            queryParams: { per_page: 100 }
+          }
+        );
+        return {
+          success: true,
+          files: files.map((f) => ({
+            filename: f.filename,
+            status: f.status,
+            additions: f.additions,
+            deletions: f.deletions,
+            changes: f.changes,
+            patch: f.patch
+          })),
+          count: files.length
+        };
+      } catch (error) {
+        return {
+          success: false,
+          error: `Failed to get PR files: ${error instanceof Error ? error.message : String(error)}`
+        };
+      }
+    }
+  };
+}
+
+// src/tools/github/prComments.ts
+function createPRCommentsTool(connector, userId) {
+  return {
+    definition: {
+      type: "function",
+      function: {
+        name: "pr_comments",
+        description: `Get all comments and reviews on a pull request.
+
+Returns a unified list of:
+- **review_comment**: Line-level comments on specific code (includes file path and line number)
+- **review**: Full reviews (approve/request changes/comment)
+- **comment**: General comments on the PR (issue-level)
+
+All entries are sorted by creation date (oldest first).
+
+EXAMPLES:
+- Get comments: { "pull_number": 123 }
+- Specific repo: { "repository": "owner/repo", "pull_number": 456 }`,
+        parameters: {
+          type: "object",
+          properties: {
+            repository: {
+              type: "string",
+              description: 'Repository in "owner/repo" format or full GitHub URL. Optional if connector has a default repository.'
+            },
+            pull_number: {
+              type: "number",
+              description: "Pull request number"
+            }
+          },
+          required: ["pull_number"]
+        }
+      }
+    },
+    describeCall: (args) => {
+      const parts = [`comments for #${args.pull_number}`];
+      if (args.repository) parts.push(`in ${args.repository}`);
+      return parts.join(" ");
+    },
+    permission: {
+      scope: "session",
+      riskLevel: "low",
+      approvalMessage: `Get PR comments and reviews from GitHub via ${connector.displayName}`
+    },
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
+      const resolved = resolveRepository(args.repository, connector);
+      if (!resolved.success) {
+        return { success: false, error: resolved.error };
+      }
+      const { owner, repo } = resolved.repo;
+      try {
+        const basePath = `/repos/${owner}/${repo}`;
+        const queryOpts = { userId: effectiveUserId, queryParams: { per_page: 100 } };
+        const [reviewComments, reviews, issueComments] = await Promise.all([
+          githubFetch(
+            connector,
+            `${basePath}/pulls/${args.pull_number}/comments`,
+            queryOpts
+          ),
+          githubFetch(
+            connector,
+            `${basePath}/pulls/${args.pull_number}/reviews`,
+            queryOpts
+          ),
+          githubFetch(
+            connector,
+            `${basePath}/issues/${args.pull_number}/comments`,
+            queryOpts
+          )
+        ]);
+        const allComments = [];
+        for (const rc of reviewComments) {
+          allComments.push({
+            id: rc.id,
+            type: "review_comment",
+            author: rc.user.login,
+            body: rc.body,
+            created_at: rc.created_at,
+            path: rc.path,
+            line: rc.line ?? rc.original_line ?? void 0
+          });
+        }
+        for (const r of reviews) {
+          if (!r.body && r.state === "APPROVED") continue;
+          allComments.push({
+            id: r.id,
+            type: "review",
+            author: r.user.login,
+            body: r.body || `[${r.state}]`,
+            created_at: r.submitted_at,
+            state: r.state
+          });
+        }
+        for (const ic of issueComments) {
+          allComments.push({
+            id: ic.id,
+            type: "comment",
+            author: ic.user.login,
+            body: ic.body,
+            created_at: ic.created_at
+          });
+        }
+        allComments.sort(
+          (a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime()
+        );
+        return {
+          success: true,
+          comments: allComments,
+          count: allComments.length
+        };
+      } catch (error) {
+        return {
+          success: false,
+          error: `Failed to get PR comments: ${error instanceof Error ? error.message : String(error)}`
+        };
+      }
+    }
+  };
+}
+
+// src/tools/github/createPR.ts
+function createCreatePRTool(connector, userId) {
+  return {
+    definition: {
+      type: "function",
+      function: {
+        name: "create_pr",
+        description: `Create a pull request on a GitHub repository.
+
+USAGE:
+- Specify source branch (head) and target branch (base)
+- Optionally create as draft
+
+EXAMPLES:
+- Create PR: { "title": "Add feature", "head": "feature-branch", "base": "main" }
+- Draft PR: { "title": "WIP: Refactor", "head": "refactor", "base": "develop", "draft": true }
+- With body: { "title": "Fix bug #42", "body": "Fixes the login issue\\n\\n## Changes\\n- Fixed auth flow", "head": "fix/42", "base": "main" }`,
+        parameters: {
+          type: "object",
+          properties: {
+            repository: {
+              type: "string",
+              description: 'Repository in "owner/repo" format or full GitHub URL. Optional if connector has a default repository.'
+            },
+            title: {
+              type: "string",
+              description: "Pull request title"
+            },
+            body: {
+              type: "string",
+              description: "Pull request description/body (Markdown supported)"
+            },
+            head: {
+              type: "string",
+              description: "Source branch name (the branch with your changes)"
+            },
+            base: {
+              type: "string",
+              description: 'Target branch name (the branch you want to merge into, e.g., "main")'
+            },
+            draft: {
+              type: "boolean",
+              description: "Create as a draft pull request (default: false)"
+            }
+          },
+          required: ["title", "head", "base"]
+        }
+      }
+    },
+    describeCall: (args) => {
+      const parts = [args.title];
+      if (args.repository) parts.push(`in ${args.repository}`);
+      return parts.join(" ");
+    },
+    permission: {
+      scope: "session",
+      riskLevel: "medium",
+      approvalMessage: `Create a pull request on GitHub via ${connector.displayName}`
+    },
+    execute: async (args, context) => {
+      const effectiveUserId = context?.userId ?? userId;
+      const resolved = resolveRepository(args.repository, connector);
+      if (!resolved.success) {
+        return { success: false, error: resolved.error };
+      }
+      const { owner, repo } = resolved.repo;
+      try {
+        const pr = await githubFetch(
+          connector,
+          `/repos/${owner}/${repo}/pulls`,
+          {
+            method: "POST",
+            userId: effectiveUserId,
+            body: {
+              title: args.title,
+              body: args.body,
+              head: args.head,
+              base: args.base,
+              draft: args.draft ?? false
+            }
+          }
+        );
+        return {
+          success: true,
+          data: {
+            number: pr.number,
+            url: pr.html_url,
+            state: pr.state,
+            title: pr.title
+          }
+        };
+      } catch (error) {
+        return {
+          success: false,
+          error: `Failed to create PR: ${error instanceof Error ? error.message : String(error)}`
+        };
+      }
+    }
+  };
+}
+
+// src/tools/github/register.ts
+function registerGitHubTools() {
+  ConnectorTools.registerService("github", (connector, userId) => {
+    return [
+      createSearchFilesTool(connector, userId),
+      createSearchCodeTool(connector, userId),
+      createGitHubReadFileTool(connector, userId),
+      createGetPRTool(connector, userId),
+      createPRFilesTool(connector, userId),
+      createPRCommentsTool(connector, userId),
+      createCreatePRTool(connector, userId)
+    ];
+  });
+}
+
+// src/tools/github/index.ts
+registerGitHubTools();
+
 // src/tools/registry.generated.ts
 var toolRegistry = [
   {
@@ -48690,7 +49633,7 @@ var toolRegistry = [
     displayName: "Read File",
     category: "filesystem",
     description: "Read content from a file on the local filesystem.",
-    tool: readFile4,
+    tool: readFile5,
     safeByDefault: true
   },
   {
@@ -48699,7 +49642,7 @@ var toolRegistry = [
     displayName: "Write File",
     category: "filesystem",
     description: "Write content to a file on the local filesystem.",
-    tool: writeFile4,
+    tool: writeFile5,
     safeByDefault: false
   },
   {
@@ -48728,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() {
@@ -48928,8 +49840,8 @@ var ToolRegistry = class {
 
 // src/tools/index.ts
 var developerTools = [
-  readFile4,
-  writeFile4,
+  readFile5,
+  writeFile5,
   editFile,
   glob,
   grep,
@@ -49153,7 +50065,8 @@ exports.ExternalDependencyHandler = ExternalDependencyHandler;
 exports.FileAgentDefinitionStorage = FileAgentDefinitionStorage;
 exports.FileConnectorStorage = FileConnectorStorage;
 exports.FileContextStorage = FileContextStorage;
-exports.FileMediaOutputHandler = FileMediaOutputHandler;
+exports.FileMediaOutputHandler = FileMediaStorage;
+exports.FileMediaStorage = FileMediaStorage;
 exports.FilePersistentInstructionsStorage = FilePersistentInstructionsStorage;
 exports.FileStorage = FileStorage;
 exports.HookManager = HookManager;
@@ -49259,11 +50172,15 @@ exports.createAgentStorage = createAgentStorage;
 exports.createAuthenticatedFetch = createAuthenticatedFetch;
 exports.createBashTool = createBashTool;
 exports.createConnectorFromTemplate = createConnectorFromTemplate;
+exports.createCreatePRTool = createCreatePRTool;
 exports.createEditFileTool = createEditFileTool;
 exports.createEstimator = createEstimator;
 exports.createExecuteJavaScriptTool = createExecuteJavaScriptTool;
 exports.createFileAgentDefinitionStorage = createFileAgentDefinitionStorage;
 exports.createFileContextStorage = createFileContextStorage;
+exports.createFileMediaStorage = createFileMediaStorage;
+exports.createGetPRTool = createGetPRTool;
+exports.createGitHubReadFileTool = createGitHubReadFileTool;
 exports.createGlobTool = createGlobTool;
 exports.createGrepTool = createGrepTool;
 exports.createImageGenerationTool = createImageGenerationTool;
@@ -49271,9 +50188,13 @@ exports.createImageProvider = createImageProvider;
 exports.createListDirectoryTool = createListDirectoryTool;
 exports.createMessageWithImages = createMessageWithImages;
 exports.createMetricsCollector = createMetricsCollector;
+exports.createPRCommentsTool = createPRCommentsTool;
+exports.createPRFilesTool = createPRFilesTool;
 exports.createPlan = createPlan;
 exports.createProvider = createProvider;
 exports.createReadFileTool = createReadFileTool;
+exports.createSearchCodeTool = createSearchCodeTool;
+exports.createSearchFilesTool = createSearchFilesTool;
 exports.createSpeechToTextTool = createSpeechToTextTool;
 exports.createTask = createTask;
 exports.createTextMessage = createTextMessage;
@@ -49313,6 +50234,7 @@ exports.getImageModelInfo = getImageModelInfo;
 exports.getImageModelsByVendor = getImageModelsByVendor;
 exports.getImageModelsWithFeature = getImageModelsWithFeature;
 exports.getMediaOutputHandler = getMediaOutputHandler;
+exports.getMediaStorage = getMediaStorage;
 exports.getModelInfo = getModelInfo;
 exports.getModelsByVendor = getModelsByVendor;
 exports.getNextExecutableTasks = getNextExecutableTasks;
@@ -49335,6 +50257,7 @@ exports.getToolsByCategory = getToolsByCategory;
 exports.getToolsRequiringConnector = getToolsRequiringConnector;
 exports.getVendorAuthTemplate = getVendorAuthTemplate;
 exports.getVendorColor = getVendorColor;
+exports.getVendorDefaultBaseURL = getVendorDefaultBaseURL;
 exports.getVendorInfo = getVendorInfo;
 exports.getVendorLogo = getVendorLogo;
 exports.getVendorLogoCdnUrl = getVendorLogoCdnUrl;
@@ -49373,15 +50296,18 @@ exports.listVendors = listVendors;
 exports.listVendorsByAuthType = listVendorsByAuthType;
 exports.listVendorsByCategory = listVendorsByCategory;
 exports.listVendorsWithLogos = listVendorsWithLogos;
+exports.parseRepository = parseRepository;
 exports.readClipboardImage = readClipboardImage;
-exports.readFile = readFile4;
+exports.readFile = readFile5;
 exports.registerScrapeProvider = registerScrapeProvider;
 exports.resolveConnector = resolveConnector;
 exports.resolveDependencies = resolveDependencies;
+exports.resolveRepository = resolveRepository;
 exports.retryWithBackoff = retryWithBackoff;
 exports.scopeEquals = scopeEquals;
 exports.scopeMatches = scopeMatches;
 exports.setMediaOutputHandler = setMediaOutputHandler;
+exports.setMediaStorage = setMediaStorage;
 exports.setMetricsCollector = setMetricsCollector;
 exports.simpleTokenEstimator = simpleTokenEstimator;
 exports.toConnectorOptions = toConnectorOptions;
@@ -49389,6 +50315,6 @@ exports.toolRegistry = toolRegistry;
 exports.tools = tools_exports;
 exports.updateTaskStatus = updateTaskStatus;
 exports.validatePath = validatePath;
-exports.writeFile = writeFile4;
+exports.writeFile = writeFile5;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map