@everworker/oneringai 0.1.0 → 0.1.2

package/dist/index.js

@@ -1597,6 +1597,64 @@ var init_Metrics = __esm({
   }
 });
 
+// src/core/ScopedConnectorRegistry.ts
+var ScopedConnectorRegistry;
+var init_ScopedConnectorRegistry = __esm({
+  "src/core/ScopedConnectorRegistry.ts"() {
+    init_Connector();
+    ScopedConnectorRegistry = class {
+      constructor(policy, context) {
+        this.policy = policy;
+        this.context = context;
+      }
+      get(name) {
+        if (!Connector.has(name)) {
+          const available = this.list().join(", ") || "none";
+          throw new Error(`Connector '${name}' not found. Available: ${available}`);
+        }
+        const connector = Connector.get(name);
+        if (!this.policy.canAccess(connector, this.context)) {
+          const available = this.list().join(", ") || "none";
+          throw new Error(`Connector '${name}' not found. Available: ${available}`);
+        }
+        return connector;
+      }
+      has(name) {
+        if (!Connector.has(name)) return false;
+        const connector = Connector.get(name);
+        return this.policy.canAccess(connector, this.context);
+      }
+      list() {
+        return this.listAll().map((c) => c.name);
+      }
+      listAll() {
+        return Connector.listAll().filter((c) => this.policy.canAccess(c, this.context));
+      }
+      size() {
+        return this.listAll().length;
+      }
+      getDescriptionsForTools() {
+        const connectors = this.listAll();
+        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 connector of this.listAll()) {
+          info[connector.name] = {
+            displayName: connector.displayName,
+            description: connector.config.description || "",
+            baseURL: connector.baseURL
+          };
+        }
+        return info;
+      }
+    };
+  }
+});
+
 // src/core/Connector.ts
 var Connector_exports = {};
 __export(Connector_exports, {
@@ -1616,6 +1674,7 @@ var init_Connector = __esm({
     init_BackoffStrategy();
     init_Logger();
     init_Metrics();
+    init_ScopedConnectorRegistry();
     DEFAULT_CONNECTOR_TIMEOUT = 3e4;
     DEFAULT_MAX_RETRIES = 3;
     DEFAULT_RETRYABLE_STATUSES = [429, 500, 502, 503, 504];
@@ -1700,6 +1759,50 @@ var init_Connector = __esm({
       static size() {
         return _Connector.registry.size;
       }
+      // ============ Access Control ============
+      static _accessPolicy = null;
+      /**
+       * Set a global access policy for connector scoping.
+       * Pass null to clear the policy.
+       */
+      static setAccessPolicy(policy) {
+        _Connector._accessPolicy = policy;
+      }
+      /**
+       * Get the current global access policy (or null if none set).
+       */
+      static getAccessPolicy() {
+        return _Connector._accessPolicy;
+      }
+      /**
+       * Create a scoped (filtered) view of the connector registry.
+       * Requires a global access policy to be set via setAccessPolicy().
+       *
+       * @param context - Opaque context passed to the policy (e.g., { userId, tenantId })
+       * @returns IConnectorRegistry that only exposes accessible connectors
+       * @throws Error if no access policy is set
+       */
+      static scoped(context) {
+        if (!_Connector._accessPolicy) {
+          throw new Error("No access policy set. Call Connector.setAccessPolicy() first.");
+        }
+        return new ScopedConnectorRegistry(_Connector._accessPolicy, context);
+      }
+      /**
+       * Return the static Connector methods as an IConnectorRegistry object (unfiltered).
+       * Useful when code accepts the interface but you want the full admin view.
+       */
+      static asRegistry() {
+        return {
+          get: (name) => _Connector.get(name),
+          has: (name) => _Connector.has(name),
+          list: () => _Connector.list(),
+          listAll: () => _Connector.listAll(),
+          size: () => _Connector.size(),
+          getDescriptionsForTools: () => _Connector.getDescriptionsForTools(),
+          getInfo: () => _Connector.getInfo()
+        };
+      }
       /**
        * Get connector descriptions formatted for tool parameters
        * Useful for generating dynamic tool descriptions
@@ -5291,8 +5394,8 @@ var require_utils = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path5) {
-      let input = path5;
+    function removeDotSegments(path6) {
+      let input = path6;
       const output = [];
       let nextSlash = -1;
       let len = 0;
@@ -5490,8 +5593,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path5, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path5 && path5 !== "/" ? path5 : void 0;
+        const [path6, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path6 && path6 !== "/" ? path6 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -6429,13 +6532,13 @@ var require_core = __commonJS({
     }, warn() {
     }, error() {
     } };
-    function getLogger(logger4) {
-      if (logger4 === false)
+    function getLogger(logger2) {
+      if (logger2 === false)
         return noLogs;
-      if (logger4 === void 0)
+      if (logger2 === void 0)
         return console;
-      if (logger4.log && logger4.warn && logger4.error)
-        return logger4;
+      if (logger2.log && logger2.warn && logger2.error)
+        return logger2;
       throw new Error("logger must implement log, warn and error methods");
     }
     var KEYWORD_NAME = /^[a-z_$][a-z0-9_$:-]*$/i;
@@ -12254,13 +12357,13 @@ var require_core3 = __commonJS({
     }, warn() {
     }, error() {
     } };
-    function getLogger(logger4) {
-      if (logger4 === false)
+    function getLogger(logger2) {
+      if (logger2 === false)
         return noLogs;
-      if (logger4 === void 0)
+      if (logger2 === void 0)
         return console;
-      if (logger4.log && logger4.warn && logger4.error)
-        return logger4;
+      if (logger2.log && logger2.warn && logger2.error)
+        return logger2;
       throw new Error("logger must implement log, warn and error methods");
     }
     var KEYWORD_NAME = /^[a-z_$][a-z0-9_$:-]*$/i;
@@ -14421,12 +14524,12 @@ var require_dist = __commonJS({
         throw new Error(`Unknown format "${name}"`);
       return f;
     };
-    function addFormats(ajv, list, fs16, exportName) {
+    function addFormats(ajv, list, fs18, 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, fs16[f]);
+        ajv.addFormat(f, fs18[f]);
     }
     module.exports = exports$1 = formatsPlugin;
     Object.defineProperty(exports$1, "__esModule", { value: true });
@@ -14439,8 +14542,8 @@ var require_windows = __commonJS({
   "node_modules/isexe/windows.js"(exports$1, module) {
     module.exports = isexe;
     isexe.sync = sync;
-    var fs16 = __require("fs");
-    function checkPathExt(path5, options) {
+    var fs18 = __require("fs");
+    function checkPathExt(path6, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
         return true;
@@ -14451,25 +14554,25 @@ var require_windows = __commonJS({
       }
       for (var i = 0; i < pathext.length; i++) {
         var p = pathext[i].toLowerCase();
-        if (p && path5.substr(-p.length).toLowerCase() === p) {
+        if (p && path6.substr(-p.length).toLowerCase() === p) {
           return true;
         }
       }
       return false;
     }
-    function checkStat(stat5, path5, options) {
+    function checkStat(stat5, path6, options) {
       if (!stat5.isSymbolicLink() && !stat5.isFile()) {
         return false;
       }
-      return checkPathExt(path5, options);
+      return checkPathExt(path6, options);
     }
-    function isexe(path5, options, cb) {
-      fs16.stat(path5, function(er, stat5) {
-        cb(er, er ? false : checkStat(stat5, path5, options));
+    function isexe(path6, options, cb) {
+      fs18.stat(path6, function(er, stat5) {
+        cb(er, er ? false : checkStat(stat5, path6, options));
       });
     }
-    function sync(path5, options) {
-      return checkStat(fs16.statSync(path5), path5, options);
+    function sync(path6, options) {
+      return checkStat(fs18.statSync(path6), path6, options);
     }
   }
 });
@@ -14479,14 +14582,14 @@ var require_mode = __commonJS({
   "node_modules/isexe/mode.js"(exports$1, module) {
     module.exports = isexe;
     isexe.sync = sync;
-    var fs16 = __require("fs");
-    function isexe(path5, options, cb) {
-      fs16.stat(path5, function(er, stat5) {
+    var fs18 = __require("fs");
+    function isexe(path6, options, cb) {
+      fs18.stat(path6, function(er, stat5) {
         cb(er, er ? false : checkStat(stat5, options));
       });
     }
-    function sync(path5, options) {
-      return checkStat(fs16.statSync(path5), options);
+    function sync(path6, options) {
+      return checkStat(fs18.statSync(path6), options);
     }
     function checkStat(stat5, options) {
       return stat5.isFile() && checkMode(stat5, options);
@@ -14519,7 +14622,7 @@ var require_isexe = __commonJS({
     }
     module.exports = isexe;
     isexe.sync = sync;
-    function isexe(path5, options, cb) {
+    function isexe(path6, options, cb) {
       if (typeof options === "function") {
         cb = options;
         options = {};
@@ -14529,7 +14632,7 @@ var require_isexe = __commonJS({
           throw new TypeError("callback not provided");
         }
         return new Promise(function(resolve4, reject) {
-          isexe(path5, options || {}, function(er, is) {
+          isexe(path6, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
@@ -14538,7 +14641,7 @@ var require_isexe = __commonJS({
           });
         });
       }
-      core(path5, options || {}, function(er, is) {
+      core(path6, options || {}, function(er, is) {
         if (er) {
           if (er.code === "EACCES" || options && options.ignoreErrors) {
             er = null;
@@ -14548,9 +14651,9 @@ var require_isexe = __commonJS({
         cb(er, is);
       });
     }
-    function sync(path5, options) {
+    function sync(path6, options) {
       try {
-        return core.sync(path5, options || {});
+        return core.sync(path6, options || {});
       } catch (er) {
         if (options && options.ignoreErrors || er.code === "EACCES") {
           return false;
@@ -14566,7 +14669,7 @@ var require_isexe = __commonJS({
 var require_which = __commonJS({
   "node_modules/which/which.js"(exports$1, module) {
     var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-    var path5 = __require("path");
+    var path6 = __require("path");
     var COLON = isWindows ? ";" : ":";
     var isexe = require_isexe();
     var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -14604,7 +14707,7 @@ var require_which = __commonJS({
           return opt.all && found.length ? resolve4(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path5.join(pathPart, cmd);
+        const pCmd = path6.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         resolve4(subStep(p, i, 0));
       });
@@ -14631,7 +14734,7 @@ var require_which = __commonJS({
       for (let i = 0; i < pathEnv.length; i++) {
         const ppRaw = pathEnv[i];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path5.join(pathPart, cmd);
+        const pCmd = path6.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         for (let j = 0; j < pathExt.length; j++) {
           const cur = p + pathExt[j];
@@ -14677,7 +14780,7 @@ var require_path_key = __commonJS({
 // node_modules/cross-spawn/lib/util/resolveCommand.js
 var require_resolveCommand = __commonJS({
   "node_modules/cross-spawn/lib/util/resolveCommand.js"(exports$1, module) {
-    var path5 = __require("path");
+    var path6 = __require("path");
     var which = require_which();
     var getPathKey = require_path_key();
     function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -14695,7 +14798,7 @@ var require_resolveCommand = __commonJS({
       try {
         resolved = which.sync(parsed.command, {
           path: env[getPathKey({ env })],
-          pathExt: withoutPathExt ? path5.delimiter : void 0
+          pathExt: withoutPathExt ? path6.delimiter : void 0
         });
       } catch (e) {
       } finally {
@@ -14704,7 +14807,7 @@ var require_resolveCommand = __commonJS({
         }
       }
       if (resolved) {
-        resolved = path5.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+        resolved = path6.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
       }
       return resolved;
     }
@@ -14755,8 +14858,8 @@ var require_shebang_command = __commonJS({
       if (!match) {
         return null;
       }
-      const [path5, argument] = match[0].replace(/#! ?/, "").split(" ");
-      const binary = path5.split("/").pop();
+      const [path6, argument] = match[0].replace(/#! ?/, "").split(" ");
+      const binary = path6.split("/").pop();
       if (binary === "env") {
         return argument;
       }
@@ -14768,16 +14871,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 fs16 = __require("fs");
+    var fs18 = __require("fs");
     var shebangCommand = require_shebang_command();
     function readShebang(command) {
       const size = 150;
       const buffer = Buffer.alloc(size);
       let fd;
       try {
-        fd = fs16.openSync(command, "r");
-        fs16.readSync(fd, buffer, 0, size, 0);
-        fs16.closeSync(fd);
+        fd = fs18.openSync(command, "r");
+        fs18.readSync(fd, buffer, 0, size, 0);
+        fs18.closeSync(fd);
       } catch (e) {
       }
       return shebangCommand(buffer.toString());
@@ -14789,7 +14892,7 @@ var require_readShebang = __commonJS({
 // node_modules/cross-spawn/lib/parse.js
 var require_parse = __commonJS({
   "node_modules/cross-spawn/lib/parse.js"(exports$1, module) {
-    var path5 = __require("path");
+    var path6 = __require("path");
     var resolveCommand = require_resolveCommand();
     var escape2 = require_escape();
     var readShebang = require_readShebang();
@@ -14814,7 +14917,7 @@ var require_parse = __commonJS({
       const needsShell = !isExecutableRegExp.test(commandFile);
       if (parsed.options.forceShell || needsShell) {
         const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-        parsed.command = path5.normalize(parsed.command);
+        parsed.command = path6.normalize(parsed.command);
         parsed.command = escape2.command(parsed.command);
         parsed.args = parsed.args.map((arg) => escape2.argument(arg, needsDoubleEscapeMetaChars));
         const shellCommand = [parsed.command].concat(parsed.args).join(" ");
@@ -14924,6 +15027,7 @@ var require_cross_spawn = __commonJS({
 
 // src/core/index.ts
 init_Connector();
+init_ScopedConnectorRegistry();
 
 // src/core/BaseAgent.ts
 init_Connector();
@@ -17998,12 +18102,28 @@ var ContentType = /* @__PURE__ */ ((ContentType2) => {
   ContentType2["TOOL_RESULT"] = "tool_result";
   return ContentType2;
 })(ContentType || {});
+var AGENT_DEFAULTS = {
+  /** Default maximum iterations for agentic loop */
+  MAX_ITERATIONS: 50,
+  /** Default temperature for LLM calls */
+  DEFAULT_TEMPERATURE: 0.7,
+  /** Message injected when max iterations is reached */
+  MAX_ITERATIONS_MESSAGE: `You have reached the maximum iteration limit for this execution. Please:
+1. Summarize what you have accomplished so far
+2. Explain what remains to be done (if anything)
+3. Ask the user if they would like you to continue
+
+Do NOT use any tools in this response - just provide a clear summary and ask for confirmation to proceed.`
+};
+var TOKEN_ESTIMATION = {
+  /** Characters per token for mixed content */
+  MIXED_CHARS_PER_TOKEN: 3.5};
 
 // src/core/context-nextgen/BasePluginNextGen.ts
 var simpleTokenEstimator = {
   estimateTokens(text) {
     if (!text || text.length === 0) return 0;
-    return Math.ceil(text.length / 3.5);
+    return Math.ceil(text.length / TOKEN_ESTIMATION.MIXED_CHARS_PER_TOKEN);
   },
   estimateDataTokens(data) {
     const text = typeof data === "string" ? data : JSON.stringify(data);
@@ -18773,6 +18893,13 @@ var WorkingMemoryPluginNextGen = class {
   _destroyed = false;
   _tokenCache = null;
   _instructionsTokenCache = null;
+  /**
+   * Synchronous snapshot of entries for getState() serialization.
+   * Updated on every mutation (store, delete, evict, cleanupRaw, restoreState).
+   * Solves the async/sync mismatch: IMemoryStorage.getAll() is async but
+   * IContextPluginNextGen.getState() must be sync.
+   */
+  _syncEntries = /* @__PURE__ */ new Map();
   constructor(pluginConfig = {}) {
     this.storage = pluginConfig.storage ?? new InMemoryStorage();
     this.config = pluginConfig.config ?? DEFAULT_MEMORY_CONFIG;
@@ -18833,28 +18960,13 @@ var WorkingMemoryPluginNextGen = class {
   getState() {
     return {
       version: 1,
-      entries: []
-      // Will be populated by async getStateAsync()
-    };
-  }
-  async getStateAsync() {
-    const entries = await this.storage.getAll();
-    return {
-      version: 1,
-      entries: entries.map((e) => ({
-        key: e.key,
-        description: e.description,
-        value: e.value,
-        scope: e.scope,
-        sizeBytes: e.sizeBytes,
-        basePriority: e.basePriority,
-        pinned: e.pinned
-      }))
+      entries: Array.from(this._syncEntries.values())
     };
   }
   restoreState(state) {
     const s = state;
     if (!s || !s.entries) return;
+    this._syncEntries.clear();
     for (const entry of s.entries) {
       const memEntry = createMemoryEntry({
         key: entry.key,
@@ -18865,6 +18977,15 @@ var WorkingMemoryPluginNextGen = class {
         pinned: entry.pinned
       }, this.config);
       this.storage.set(entry.key, memEntry);
+      this._syncEntries.set(entry.key, {
+        key: entry.key,
+        description: entry.description,
+        value: entry.value,
+        scope: entry.scope,
+        sizeBytes: entry.sizeBytes,
+        basePriority: entry.basePriority,
+        pinned: entry.pinned
+      });
     }
     this._tokenCache = null;
   }
@@ -18893,6 +19014,15 @@ var WorkingMemoryPluginNextGen = class {
     }, this.config);
     await this.ensureCapacity(entry.sizeBytes);
     await this.storage.set(finalKey, entry);
+    this._syncEntries.set(finalKey, {
+      key: finalKey,
+      description,
+      value,
+      scope,
+      sizeBytes: entry.sizeBytes,
+      basePriority: finalPriority,
+      pinned: options?.pinned
+    });
     this._tokenCache = null;
     return { key: finalKey, sizeBytes: entry.sizeBytes };
   }
@@ -18918,6 +19048,7 @@ var WorkingMemoryPluginNextGen = class {
     const exists = await this.storage.has(key);
     if (exists) {
       await this.storage.delete(key);
+      this._syncEntries.delete(key);
       this._tokenCache = null;
       return true;
     }
@@ -18981,6 +19112,7 @@ var WorkingMemoryPluginNextGen = class {
     const evictedKeys = [];
     for (const entry of toEvict) {
       await this.storage.delete(entry.key);
+      this._syncEntries.delete(entry.key);
       evictedKeys.push(entry.key);
     }
     if (evictedKeys.length > 0) {
@@ -18997,6 +19129,7 @@ var WorkingMemoryPluginNextGen = class {
     const keys = [];
     for (const entry of rawEntries) {
       await this.storage.delete(entry.key);
+      this._syncEntries.delete(entry.key);
       keys.push(entry.key);
     }
     if (keys.length > 0) {
@@ -19063,6 +19196,7 @@ var WorkingMemoryPluginNextGen = class {
     for (const entry of evictable) {
       if (freedBytes >= bytesToFree && freedCount >= entriesToFree) break;
       await this.storage.delete(entry.key);
+      this._syncEntries.delete(entry.key);
       freedBytes += entry.sizeBytes;
       freedCount++;
     }
@@ -19325,6 +19459,7 @@ var InContextMemoryPluginNextGen = class {
     };
     this.entries.set(key, entry);
     this.enforceMaxEntries();
+    this.enforceTokenLimit();
     this._tokenCache = null;
   }
   /**
@@ -19395,16 +19530,43 @@ ${valueStr}
   }
   enforceMaxEntries() {
     if (this.entries.size <= this.config.maxEntries) return;
-    const evictable = Array.from(this.entries.values()).filter((e) => e.priority !== "critical").sort((a, b) => {
-      const priorityDiff = PRIORITY_VALUES[a.priority] - PRIORITY_VALUES[b.priority];
-      if (priorityDiff !== 0) return priorityDiff;
-      return a.updatedAt - b.updatedAt;
-    });
+    const evictable = this.getEvictableEntries();
     while (this.entries.size > this.config.maxEntries && evictable.length > 0) {
       const toEvict = evictable.shift();
       this.entries.delete(toEvict.key);
     }
   }
+  enforceTokenLimit() {
+    const maxTokens = this.config.maxTotalTokens;
+    if (maxTokens <= 0) return;
+    let totalTokens = this.estimateTotalTokens();
+    if (totalTokens <= maxTokens) return;
+    const evictable = this.getEvictableEntries();
+    while (totalTokens > maxTokens && evictable.length > 0) {
+      const toEvict = evictable.shift();
+      const entryTokens = this.estimator.estimateTokens(this.formatEntry(toEvict));
+      this.entries.delete(toEvict.key);
+      totalTokens -= entryTokens;
+    }
+  }
+  estimateTotalTokens() {
+    let total = 0;
+    for (const entry of this.entries.values()) {
+      total += this.estimator.estimateTokens(this.formatEntry(entry));
+    }
+    return total;
+  }
+  /**
+   * Get entries sorted by eviction priority (lowest priority, oldest first).
+   * Critical entries are excluded.
+   */
+  getEvictableEntries() {
+    return Array.from(this.entries.values()).filter((e) => e.priority !== "critical").sort((a, b) => {
+      const priorityDiff = PRIORITY_VALUES[a.priority] - PRIORITY_VALUES[b.priority];
+      if (priorityDiff !== 0) return priorityDiff;
+      return a.updatedAt - b.updatedAt;
+    });
+  }
   assertNotDestroyed() {
     if (this._destroyed) {
       throw new Error("InContextMemoryPluginNextGen is destroyed");
@@ -19892,8 +20054,8 @@ ${trimmedSection}` : trimmedSection;
 var DEFAULT_THRESHOLD = 0.7;
 var DefaultCompactionStrategy = class {
   name = "default";
-  displayName = "Default";
-  description = "Standard compaction strategy. Compacts plugins first, then conversation history. Triggers at 70% context usage.";
+  displayName = "Dumb";
+  description = "Do not use";
   threshold;
   constructor(config) {
     this.threshold = config?.threshold ?? DEFAULT_THRESHOLD;
@@ -20536,7 +20698,7 @@ var DEFAULT_FEATURES = {
 };
 var DEFAULT_CONFIG2 = {
   responseReserve: 4096,
-  strategy: "default"
+  strategy: "algorithmic"
 };
 
 // src/core/context-nextgen/AgentContextNextGen.ts
@@ -24494,6 +24656,8 @@ var BaseAgent = class extends EventEmitter {
   _sessionConfig = null;
   _autoSaveInterval = null;
   _pendingSessionLoad = null;
+  /** Whether caller provided explicit instructions/systemPrompt (takes precedence over saved session) */
+  _hasExplicitInstructions = false;
   // Provider for LLM calls - single instance shared by all methods
   _provider;
   // ===== Constructor =====
@@ -24525,7 +24689,7 @@ var BaseAgent = class extends EventEmitter {
    */
   resolveConnector(ref) {
     if (typeof ref === "string") {
-      return Connector.get(ref);
+      return this._config.registry ? this._config.registry.get(ref) : Connector.get(ref);
     }
     return ref;
   }
@@ -24670,9 +24834,14 @@ var BaseAgent = class extends EventEmitter {
   /**
    * Restore context from saved state.
    * Override in subclasses to restore agent-specific state from agentState field.
+   * Preserves explicit instructions if caller provided them at construction time.
    */
   async restoreContextState(state) {
+    const explicitPrompt = this._hasExplicitInstructions ? this._agentContext.systemPrompt : void 0;
     this._agentContext.restoreState(state);
+    if (this._hasExplicitInstructions && explicitPrompt !== void 0) {
+      this._agentContext.systemPrompt = explicitPrompt;
+    }
   }
   // ===== Public Permission API =====
   /**
@@ -25769,126 +25938,6 @@ function assertNotDestroyed(obj, operation) {
 
 // src/core/Agent.ts
 init_Metrics();
-
-// src/core/constants.ts
-var PROACTIVE_STRATEGY_DEFAULTS = {
-  /** Target utilization after compaction */
-  TARGET_UTILIZATION: 0.65,
-  /** Base reduction factor for round 1 */
-  BASE_REDUCTION_FACTOR: 0.5,
-  /** Reduction step per round (more aggressive each round) */
-  REDUCTION_STEP: 0.15,
-  /** Maximum compaction rounds */
-  MAX_ROUNDS: 3
-};
-var AGGRESSIVE_STRATEGY_DEFAULTS = {
-  /** Threshold to trigger compaction */
-  THRESHOLD: 0.6,
-  /** Target utilization after compaction */
-  TARGET_UTILIZATION: 0.5,
-  /** Reduction factor (keep 30% of original) */
-  REDUCTION_FACTOR: 0.3
-};
-var LAZY_STRATEGY_DEFAULTS = {
-  /** Target utilization after compaction */
-  TARGET_UTILIZATION: 0.85,
-  /** Reduction factor (keep 70% of original) */
-  REDUCTION_FACTOR: 0.7
-};
-var ADAPTIVE_STRATEGY_DEFAULTS = {
-  /** Number of compactions to learn from */
-  LEARNING_WINDOW: 10,
-  /** Compactions per minute threshold to switch to aggressive */
-  SWITCH_THRESHOLD: 5,
-  /** Low utilization threshold to switch to lazy */
-  LOW_UTILIZATION_THRESHOLD: 70,
-  /** Low frequency threshold to switch to lazy */
-  LOW_FREQUENCY_THRESHOLD: 0.5
-};
-var ROLLING_WINDOW_DEFAULTS = {
-  /** Default maximum messages to keep */
-  MAX_MESSAGES: 20
-};
-var AGENT_DEFAULTS = {
-  /** Default maximum iterations for agentic loop */
-  MAX_ITERATIONS: 50,
-  /** Default temperature for LLM calls */
-  DEFAULT_TEMPERATURE: 0.7,
-  /** Message injected when max iterations is reached */
-  MAX_ITERATIONS_MESSAGE: `You have reached the maximum iteration limit for this execution. Please:
-1. Summarize what you have accomplished so far
-2. Explain what remains to be done (if anything)
-3. Ask the user if they would like you to continue
-
-Do NOT use any tools in this response - just provide a clear summary and ask for confirmation to proceed.`
-};
-var STRATEGY_THRESHOLDS = {
-  proactive: {
-    // Most balanced - good for general use
-    compactionTrigger: 0.75,
-    // Start compaction at 75%
-    compactionTarget: 0.65,
-    // Reduce to 65%
-    smartCompactionTrigger: 0.7,
-    // Trigger smart compaction at 70%
-    maxToolResultsPercent: 0.3,
-    // Tool results can use up to 30% of context
-    protectedContextPercent: 0.1
-    // Protect at least 10% of context (recent messages)
-  },
-  aggressive: {
-    // Memory-constrained - compact early and often
-    compactionTrigger: 0.6,
-    compactionTarget: 0.5,
-    smartCompactionTrigger: 0.55,
-    maxToolResultsPercent: 0.25,
-    protectedContextPercent: 0.08
-  },
-  lazy: {
-    // Preserve context - only compact when critical
-    compactionTrigger: 0.9,
-    compactionTarget: 0.85,
-    smartCompactionTrigger: 0.85,
-    maxToolResultsPercent: 0.4,
-    // Allow more tool results
-    protectedContextPercent: 0.15
-    // Protect more recent context
-  },
-  adaptive: {
-    // Starts with proactive, adjusts based on performance
-    compactionTrigger: 0.75,
-    compactionTarget: 0.65,
-    smartCompactionTrigger: 0.7,
-    maxToolResultsPercent: 0.3,
-    protectedContextPercent: 0.1
-  },
-  "rolling-window": {
-    // Fixed window, similar to lazy but with message count focus
-    compactionTrigger: 0.85,
-    compactionTarget: 0.75,
-    smartCompactionTrigger: 0.8,
-    maxToolResultsPercent: 0.35,
-    protectedContextPercent: 0.12
-  }
-};
-var SAFETY_CAPS = {
-  /** Always keep at least this many messages */
-  MIN_PROTECTED_MESSAGES: 10
-};
-var GUARDIAN_DEFAULTS = {
-  /** Enable guardian validation (can be disabled for testing) */
-  ENABLED: true,
-  /** Maximum tool result size in tokens before truncation (4KB ≈ 1000 tokens) */
-  MAX_TOOL_RESULT_TOKENS: 2e3,
-  /** Minimum system prompt tokens to preserve during emergency compaction */
-  MIN_SYSTEM_PROMPT_TOKENS: 3e3,
-  /** Number of most recent messages to always protect (increased from 4) */
-  PROTECTED_RECENT_MESSAGES: 20,
-  /** Truncation suffix for oversized content */
-  TRUNCATION_SUFFIX: "\n\n[Content truncated by ContextGuardian - original data may be available in memory]"
-};
-
-// src/core/Agent.ts
 var Agent = class _Agent extends BaseAgent {
   // ===== Agent-specific State =====
   hookManager;
@@ -25983,6 +26032,7 @@ var Agent = class _Agent extends BaseAgent {
     });
     if (config.instructions) {
       this._agentContext.systemPrompt = config.instructions;
+      this._hasExplicitInstructions = true;
     }
     this._agentContext.tools.on("tool:registered", ({ name }) => {
       const permission = this._agentContext.tools.getPermission(name);
@@ -27094,10 +27144,6 @@ var Agent = class _Agent extends BaseAgent {
     this._logger.debug("Agent destroyed");
   }
 };
-
-// src/core/context/SmartCompactor.ts
-init_Logger();
-logger.child({ component: "SmartCompactor" });
 (class {
   static DEFAULT_PATHS = [
     "./oneringai.config.json",
@@ -27106,8 +27152,8 @@ logger.child({ component: "SmartCompactor" });
   /**
    * Load configuration from file
    */
-  static async load(path5) {
-    const configPath = path5 ? resolve(path5) : await this.findConfig();
+  static async load(path6) {
+    const configPath = path6 ? resolve(path6) : await this.findConfig();
     if (!configPath) {
       throw new Error("Configuration file not found. Searched: " + this.DEFAULT_PATHS.join(", "));
     }
@@ -27127,14 +27173,14 @@ logger.child({ component: "SmartCompactor" });
   /**
    * Load configuration synchronously
    */
-  static loadSync(path5) {
-    const configPath = path5 ? resolve(path5) : this.findConfigSync();
+  static loadSync(path6) {
+    const configPath = path6 ? resolve(path6) : this.findConfigSync();
     if (!configPath) {
       throw new Error("Configuration file not found. Searched: " + this.DEFAULT_PATHS.join(", "));
     }
     try {
-      const fs16 = __require("fs");
-      const content = fs16.readFileSync(configPath, "utf-8");
+      const fs18 = __require("fs");
+      const content = fs18.readFileSync(configPath, "utf-8");
       let config = JSON.parse(content);
       config = this.interpolateEnvVars(config);
       this.validate(config);
@@ -27150,10 +27196,10 @@ logger.child({ component: "SmartCompactor" });
    * Find configuration file in default paths
    */
   static async findConfig() {
-    for (const path5 of this.DEFAULT_PATHS) {
+    for (const path6 of this.DEFAULT_PATHS) {
       try {
-        await promises.access(resolve(path5));
-        return resolve(path5);
+        await promises.access(resolve(path6));
+        return resolve(path6);
       } catch {
       }
     }
@@ -27163,11 +27209,11 @@ logger.child({ component: "SmartCompactor" });
    * Find configuration file synchronously
    */
   static findConfigSync() {
-    const fs16 = __require("fs");
-    for (const path5 of this.DEFAULT_PATHS) {
+    const fs18 = __require("fs");
+    for (const path6 of this.DEFAULT_PATHS) {
       try {
-        fs16.accessSync(resolve(path5));
-        return resolve(path5);
+        fs18.accessSync(resolve(path6));
+        return resolve(path6);
       } catch {
       }
     }
@@ -30746,8 +30792,8 @@ async function random(size) {
   const evenDistCutoff = Math.pow(2, 8) - Math.pow(2, 8) % mask.length;
   let result = "";
   while (result.length < size) {
-    const randomBytes3 = await getRandomValues(size - result.length);
-    for (const randomByte of randomBytes3) {
+    const randomBytes4 = await getRandomValues(size - result.length);
+    for (const randomByte of randomBytes4) {
       if (randomByte < evenDistCutoff) {
         result += mask[randomByte % mask.length];
       }
@@ -32220,7 +32266,7 @@ var MCPClient = class extends EventEmitter {
       this.transport = this.createTransport();
       this.client = new Client(
         {
-          name: "@oneringai/agents",
+          name: "@everworker/oneringai",
           version: "0.2.0"
         },
         {
@@ -32722,9 +32768,9 @@ var MCPRegistry = class {
   /**
    * Load MCP configuration from file and create clients
    */
-  static async loadFromConfigFile(path5) {
+  static async loadFromConfigFile(path6) {
     try {
-      const configPath = resolve(path5);
+      const configPath = resolve(path6);
       const content = await promises.readFile(configPath, "utf-8");
       const config = JSON.parse(content);
       if (!config.mcp) {
@@ -32736,7 +32782,7 @@ var MCPRegistry = class {
       if (error instanceof MCPError) {
         throw error;
       }
-      throw new MCPError(`Failed to load MCP configuration from '${path5}'`, void 0, error);
+      throw new MCPError(`Failed to load MCP configuration from '${path6}'`, void 0, error);
     }
   }
   /**
@@ -34704,8 +34750,8 @@ var GoogleImageProvider = class extends BaseMediaProvider {
     if (Buffer.isBuffer(image)) {
       imageBytes = image.toString("base64");
     } else {
-      const fs16 = await import('fs');
-      const buffer = fs16.readFileSync(image);
+      const fs18 = await import('fs');
+      const buffer = fs18.readFileSync(image);
       imageBytes = buffer.toString("base64");
     }
     return {
@@ -35266,393 +35312,6 @@ var ErrorHandler = class extends EventEmitter {
 };
 var globalErrorHandler = new ErrorHandler();
 
-// src/core/context/ContextGuardian.ts
-init_Logger();
-var logger3 = logger.child({ component: "ContextGuardian" });
-var ContextGuardian = class {
-  _enabled;
-  _maxToolResultTokens;
-  _minSystemPromptTokens;
-  _configuredProtectedMessages;
-  _maxContextTokens;
-  _strategy;
-  _estimator;
-  constructor(estimator, config = {}) {
-    this._estimator = estimator;
-    this._enabled = config.enabled ?? GUARDIAN_DEFAULTS.ENABLED;
-    this._maxToolResultTokens = config.maxToolResultTokens ?? GUARDIAN_DEFAULTS.MAX_TOOL_RESULT_TOKENS;
-    this._minSystemPromptTokens = config.minSystemPromptTokens ?? GUARDIAN_DEFAULTS.MIN_SYSTEM_PROMPT_TOKENS;
-    this._configuredProtectedMessages = config.protectedRecentMessages ?? GUARDIAN_DEFAULTS.PROTECTED_RECENT_MESSAGES;
-    this._maxContextTokens = config.maxContextTokens;
-    this._strategy = config.strategy ?? "proactive";
-  }
-  /**
-   * Get effective protected message count, considering strategy and context size.
-   * Uses percentage-based calculation if maxContextTokens is available.
-   *
-   * NOTE: If an explicit value was configured (not using default), it's honored
-   * without applying minimum caps - this allows tests and special cases to work.
-   */
-  get _protectedRecentMessages() {
-    if (this._configuredProtectedMessages !== GUARDIAN_DEFAULTS.PROTECTED_RECENT_MESSAGES) {
-      return this._configuredProtectedMessages;
-    }
-    if (this._maxContextTokens) {
-      const thresholds = STRATEGY_THRESHOLDS[this._strategy];
-      const percentBasedTokens = Math.floor(this._maxContextTokens * thresholds.protectedContextPercent);
-      const percentBasedMessages = Math.floor(percentBasedTokens / 100);
-      const calculated = Math.max(percentBasedMessages, this._configuredProtectedMessages);
-      return Math.max(calculated, SAFETY_CAPS.MIN_PROTECTED_MESSAGES);
-    }
-    return Math.max(this._configuredProtectedMessages, SAFETY_CAPS.MIN_PROTECTED_MESSAGES);
-  }
-  /**
-   * Check if guardian is enabled
-   */
-  get enabled() {
-    return this._enabled;
-  }
-  /**
-   * Validate that input fits within token limits
-   *
-   * @param input - The InputItem[] to validate
-   * @param maxTokens - Maximum allowed tokens (after reserving for response)
-   * @returns Validation result with actual counts and breakdown
-   */
-  validate(input, maxTokens) {
-    const breakdown = {
-      system: 0,
-      user: 0,
-      assistant: 0,
-      tool_use: 0,
-      tool_result: 0,
-      other: 0
-    };
-    let actualTokens = 0;
-    for (const item of input) {
-      const tokens = this.estimateInputItemTokens(item);
-      actualTokens += tokens;
-      if (item.type === "message") {
-        const msg = item;
-        if (msg.role === "developer" /* DEVELOPER */) {
-          breakdown.system += tokens;
-        } else if (msg.role === "user" /* USER */) {
-          const hasToolResult = msg.content.some((c) => c.type === "tool_result" /* TOOL_RESULT */);
-          if (hasToolResult) {
-            breakdown.tool_result += tokens;
-          } else {
-            breakdown.user += tokens;
-          }
-        } else if (msg.role === "assistant" /* ASSISTANT */) {
-          const hasToolUse = msg.content.some((c) => c.type === "tool_use" /* TOOL_USE */);
-          if (hasToolUse) {
-            breakdown.tool_use += tokens;
-          } else {
-            breakdown.assistant += tokens;
-          }
-        }
-      } else {
-        breakdown.other += tokens;
-      }
-    }
-    const valid = actualTokens <= maxTokens;
-    const overageTokens = valid ? 0 : actualTokens - maxTokens;
-    logger3.debug({
-      actualTokens,
-      maxTokens,
-      valid,
-      overageTokens,
-      breakdown
-    }, `Guardian validation: ${valid ? "PASS" : "FAIL"}`);
-    return {
-      valid,
-      actualTokens,
-      targetTokens: maxTokens,
-      overageTokens,
-      breakdown
-    };
-  }
-  /**
-   * Apply graceful degradation to reduce input size
-   *
-   * @param input - The InputItem[] to potentially modify
-   * @param targetTokens - Target token count to achieve
-   * @returns Degradation result with potentially modified input
-   */
-  applyGracefulDegradation(input, targetTokens) {
-    const log = [];
-    let tokensFreed = 0;
-    let currentInput = [...input];
-    const initialValidation = this.validate(currentInput, targetTokens);
-    if (initialValidation.valid) {
-      return {
-        input: currentInput,
-        log: ["No degradation needed"],
-        finalTokens: initialValidation.actualTokens,
-        tokensFreed: 0,
-        success: true
-      };
-    }
-    log.push(`Starting graceful degradation: ${initialValidation.actualTokens} tokens, target: ${targetTokens}`);
-    const level1Result = this.truncateToolResults(currentInput, log);
-    currentInput = level1Result.input;
-    tokensFreed += level1Result.tokensFreed;
-    let validation = this.validate(currentInput, targetTokens);
-    if (validation.valid) {
-      log.push(`Level 1 (truncate tool results) successful: ${validation.actualTokens} tokens`);
-      return {
-        input: currentInput,
-        log,
-        finalTokens: validation.actualTokens,
-        tokensFreed,
-        success: true
-      };
-    }
-    const level2Result = this.removeOldestToolPairs(currentInput, validation.overageTokens, log);
-    currentInput = level2Result.input;
-    tokensFreed += level2Result.tokensFreed;
-    validation = this.validate(currentInput, targetTokens);
-    if (validation.valid) {
-      log.push(`Level 2 (remove tool pairs) successful: ${validation.actualTokens} tokens`);
-      return {
-        input: currentInput,
-        log,
-        finalTokens: validation.actualTokens,
-        tokensFreed,
-        success: true
-      };
-    }
-    const level3Result = this.truncateSystemPrompt(currentInput, log);
-    currentInput = level3Result.input;
-    tokensFreed += level3Result.tokensFreed;
-    validation = this.validate(currentInput, targetTokens);
-    if (validation.valid) {
-      log.push(`Level 3 (truncate system prompt) successful: ${validation.actualTokens} tokens`);
-      return {
-        input: currentInput,
-        log,
-        finalTokens: validation.actualTokens,
-        tokensFreed,
-        success: true
-      };
-    }
-    log.push(`All degradation levels exhausted: ${validation.actualTokens} tokens (target: ${targetTokens})`);
-    throw new ContextOverflowError(
-      "All graceful degradation levels exhausted",
-      {
-        actualTokens: validation.actualTokens,
-        maxTokens: targetTokens,
-        overageTokens: validation.overageTokens,
-        breakdown: validation.breakdown,
-        degradationLog: log
-      }
-    );
-  }
-  /**
-   * Emergency compact - more aggressive than graceful degradation
-   * Used when even graceful degradation fails
-   *
-   * @param input - The InputItem[] to compact
-   * @param targetTokens - Target token count
-   * @returns Compacted InputItem[] (may lose significant data)
-   */
-  emergencyCompact(input, targetTokens) {
-    const log = ["EMERGENCY COMPACTION"];
-    let result = [...input];
-    const systemMessages = [];
-    const otherMessages = [];
-    for (const item of result) {
-      if (item.type === "message" && item.role === "developer" /* DEVELOPER */) {
-        systemMessages.push(item);
-      } else {
-        otherMessages.push(item);
-      }
-    }
-    const truncatedSystem = systemMessages.map(
-      (item) => this.truncateMessage(item, this._minSystemPromptTokens)
-    );
-    const protectedMessages = otherMessages.slice(-this._protectedRecentMessages);
-    result = [...truncatedSystem, ...protectedMessages];
-    const validation = this.validate(result, targetTokens);
-    if (!validation.valid) {
-      log.push(`Emergency compaction failed: still at ${validation.actualTokens} tokens`);
-      logger3.error({ validation, log }, "Emergency compaction failed");
-    }
-    return result;
-  }
-  // ============================================================================
-  // Private Helper Methods
-  // ============================================================================
-  /**
-   * Estimate tokens for an InputItem
-   */
-  estimateInputItemTokens(item) {
-    if (item.type !== "message") {
-      return 50;
-    }
-    const msg = item;
-    let total = 4;
-    for (const content of msg.content) {
-      if (content.type === "input_text" /* INPUT_TEXT */ || content.type === "output_text" /* OUTPUT_TEXT */) {
-        total += this._estimator.estimateTokens(content.text || "");
-      } else if (content.type === "tool_use" /* TOOL_USE */) {
-        total += this._estimator.estimateTokens(content.name || "");
-        total += this._estimator.estimateDataTokens(content.input || {});
-      } else if (content.type === "tool_result" /* TOOL_RESULT */) {
-        total += this._estimator.estimateTokens(content.content || "");
-      } else if (content.type === "input_image_url" /* INPUT_IMAGE_URL */) {
-        total += 200;
-      }
-    }
-    return total;
-  }
-  /**
-   * Level 1: Truncate large tool results
-   */
-  truncateToolResults(input, log) {
-    let tokensFreed = 0;
-    const result = [];
-    for (const item of input) {
-      if (item.type !== "message") {
-        result.push(item);
-        continue;
-      }
-      const msg = item;
-      const hasToolResult = msg.content.some((c) => c.type === "tool_result" /* TOOL_RESULT */);
-      if (!hasToolResult) {
-        result.push(item);
-        continue;
-      }
-      const newContent = msg.content.map((c) => {
-        if (c.type !== "tool_result" /* TOOL_RESULT */) return c;
-        const toolResult = c;
-        const content = toolResult.content || "";
-        const currentTokens = this._estimator.estimateTokens(content);
-        if (currentTokens > this._maxToolResultTokens) {
-          const targetChars = this._maxToolResultTokens * 4;
-          const truncated = content.slice(0, targetChars) + GUARDIAN_DEFAULTS.TRUNCATION_SUFFIX;
-          const freed = currentTokens - this._estimator.estimateTokens(truncated);
-          tokensFreed += freed;
-          log.push(`Truncated tool result ${toolResult.tool_use_id}: ${currentTokens} \u2192 ${currentTokens - freed} tokens`);
-          return {
-            ...toolResult,
-            content: truncated
-          };
-        }
-        return c;
-      });
-      result.push({
-        ...msg,
-        content: newContent
-      });
-    }
-    if (tokensFreed > 0) {
-      log.push(`Level 1: Truncated tool results, freed ${tokensFreed} tokens`);
-    }
-    return { input: result, tokensFreed };
-  }
-  /**
-   * Level 2: Remove oldest unprotected tool pairs
-   */
-  removeOldestToolPairs(input, overageTokens, log) {
-    const toolPairs = /* @__PURE__ */ new Map();
-    for (let i = 0; i < input.length; i++) {
-      const item = input[i];
-      if (item?.type !== "message") continue;
-      const msg = item;
-      for (const content of msg.content) {
-        if (content.type === "tool_use" /* TOOL_USE */) {
-          const toolUseId = content.id;
-          if (toolUseId) {
-            toolPairs.set(toolUseId, { useIndex: i, resultIndex: null });
-          }
-        } else if (content.type === "tool_result" /* TOOL_RESULT */) {
-          const toolUseId = content.tool_use_id;
-          const pair = toolPairs.get(toolUseId);
-          if (pair) {
-            pair.resultIndex = i;
-          }
-        }
-      }
-    }
-    const sortedPairs = [...toolPairs.entries()].filter(([, pair]) => pair.resultIndex !== null).sort(([, a], [, b]) => a.useIndex - b.useIndex);
-    const protectedStart = input.length - this._protectedRecentMessages;
-    const indicesToRemove = /* @__PURE__ */ new Set();
-    let tokensFreed = 0;
-    for (const [toolUseId, pair] of sortedPairs) {
-      if (tokensFreed >= overageTokens) break;
-      if (pair.useIndex >= protectedStart || pair.resultIndex !== null && pair.resultIndex >= protectedStart) {
-        continue;
-      }
-      indicesToRemove.add(pair.useIndex);
-      if (pair.resultIndex !== null) {
-        indicesToRemove.add(pair.resultIndex);
-      }
-      const useItem = input[pair.useIndex];
-      const resultItem = pair.resultIndex !== null ? input[pair.resultIndex] : null;
-      if (useItem) tokensFreed += this.estimateInputItemTokens(useItem);
-      if (resultItem) tokensFreed += this.estimateInputItemTokens(resultItem);
-      log.push(`Removing tool pair ${toolUseId}`);
-    }
-    const result = input.filter((_, i) => !indicesToRemove.has(i));
-    if (indicesToRemove.size > 0) {
-      log.push(`Level 2: Removed ${indicesToRemove.size} messages (${sortedPairs.length} tool pairs evaluated), freed ${tokensFreed} tokens`);
-    }
-    return { input: result, tokensFreed };
-  }
-  /**
-   * Level 3: Truncate system prompt
-   */
-  truncateSystemPrompt(input, log) {
-    let tokensFreed = 0;
-    const result = [];
-    for (const item of input) {
-      if (item.type !== "message") {
-        result.push(item);
-        continue;
-      }
-      const msg = item;
-      if (msg.role !== "developer" /* DEVELOPER */) {
-        result.push(item);
-        continue;
-      }
-      const currentTokens = this.estimateInputItemTokens(msg);
-      if (currentTokens > this._minSystemPromptTokens) {
-        const truncated = this.truncateMessage(msg, this._minSystemPromptTokens);
-        const newTokens = this.estimateInputItemTokens(truncated);
-        tokensFreed += currentTokens - newTokens;
-        log.push(`Truncated system prompt: ${currentTokens} \u2192 ${newTokens} tokens`);
-        result.push(truncated);
-      } else {
-        result.push(item);
-      }
-    }
-    if (tokensFreed > 0) {
-      log.push(`Level 3: Truncated system prompt, freed ${tokensFreed} tokens`);
-    }
-    return { input: result, tokensFreed };
-  }
-  /**
-   * Truncate a message to target token count
-   */
-  truncateMessage(msg, targetTokens) {
-    const newContent = msg.content.map((c) => {
-      if (c.type !== "input_text" /* INPUT_TEXT */ && c.type !== "output_text" /* OUTPUT_TEXT */) {
-        return c;
-      }
-      const text = c.text || "";
-      const currentTokens = this._estimator.estimateTokens(text);
-      if (currentTokens > targetTokens) {
-        const targetChars = targetTokens * 4;
-        const truncated = text.slice(0, targetChars) + GUARDIAN_DEFAULTS.TRUNCATION_SUFFIX;
-        return { ...c, text: truncated };
-      }
-      return c;
-    });
-    return { ...msg, content: newContent };
-  }
-};
-
 // src/capabilities/images/ImageGeneration.ts
 init_Connector();
 
@@ -36703,8 +36362,8 @@ var OpenAISoraProvider = class extends BaseMediaProvider {
       return new File([new Uint8Array(image)], "input.png", { type: "image/png" });
     }
     if (!image.startsWith("http")) {
-      const fs16 = await import('fs');
-      const data = fs16.readFileSync(image);
+      const fs18 = await import('fs');
+      const data = fs18.readFileSync(image);
       return new File([new Uint8Array(data)], "input.png", { type: "image/png" });
     }
     const response = await fetch(image);
@@ -36882,22 +36541,22 @@ var GoogleVeoProvider = class extends BaseMediaProvider {
           if (video.videoBytes) {
             buffer = Buffer.from(video.videoBytes, "base64");
           } else if (video.uri) {
-            const fs16 = await import('fs/promises');
-            const os2 = await import('os');
-            const path5 = await import('path');
-            const tempDir = os2.tmpdir();
-            const tempFile = path5.join(tempDir, `veo-${Date.now()}.mp4`);
+            const fs18 = await import('fs/promises');
+            const os3 = await import('os');
+            const path6 = await import('path');
+            const tempDir = os3.tmpdir();
+            const tempFile = path6.join(tempDir, `veo-${Date.now()}.mp4`);
             try {
               await this.client.files.download({
                 file: { video },
                 // Pass as GeneratedVideo
                 downloadPath: tempFile
               });
-              buffer = await fs16.readFile(tempFile);
-              await fs16.unlink(tempFile).catch(() => {
+              buffer = await fs18.readFile(tempFile);
+              await fs18.unlink(tempFile).catch(() => {
               });
             } catch (downloadError) {
-              await fs16.unlink(tempFile).catch(() => {
+              await fs18.unlink(tempFile).catch(() => {
               });
               throw new ProviderError(
                 "google",
@@ -37019,8 +36678,8 @@ var GoogleVeoProvider = class extends BaseMediaProvider {
     if (image.startsWith("http://") || image.startsWith("https://")) {
       return { imageUri: image };
     }
-    const fs16 = await import('fs/promises');
-    const data = await fs16.readFile(image);
+    const fs18 = await import('fs/promises');
+    const data = await fs18.readFile(image);
     return {
       imageBytes: data.toString("base64")
     };
@@ -37327,8 +36986,8 @@ var GrokImagineProvider = class extends BaseMediaProvider {
     if (image.startsWith("http") || image.startsWith("data:")) {
       return image;
     }
-    const fs16 = await import('fs');
-    const data = fs16.readFileSync(image);
+    const fs18 = await import('fs');
+    const data = fs18.readFileSync(image);
     const base64 = data.toString("base64");
     const ext = image.split(".").pop()?.toLowerCase() || "png";
     const mimeType = ext === "jpg" || ext === "jpeg" ? "image/jpeg" : `image/${ext}`;
@@ -39715,10 +39374,10 @@ function detectDependencyCycle(tasks) {
   const visited = /* @__PURE__ */ new Set();
   const recStack = /* @__PURE__ */ new Set();
   const taskMap = new Map(tasks.map((t) => [t.id, t]));
-  function dfs(taskId, path5) {
+  function dfs(taskId, path6) {
     if (recStack.has(taskId)) {
-      const cycleStart = path5.indexOf(taskId);
-      return [...path5.slice(cycleStart), taskId];
+      const cycleStart = path6.indexOf(taskId);
+      return [...path6.slice(cycleStart), taskId];
     }
     if (visited.has(taskId)) {
       return null;
@@ -39728,7 +39387,7 @@ function detectDependencyCycle(tasks) {
     const task = taskMap.get(taskId);
     if (task) {
       for (const depId of task.dependsOn) {
-        const cycle = dfs(depId, [...path5, taskId]);
+        const cycle = dfs(depId, [...path6, taskId]);
         if (cycle) {
           return cycle;
         }
@@ -40110,334 +39769,6 @@ var DEFAULT_CONTEXT_CONFIG = {
   strategyOptions: {}
 };
 
-// src/core/context/utils/ContextUtils.ts
-function estimateComponentTokens(component, estimator) {
-  if (typeof component.content === "string") {
-    return estimator.estimateTokens(component.content);
-  }
-  return estimator.estimateDataTokens(component.content);
-}
-function sortCompactableByPriority(components) {
-  return components.filter((c) => c.compactable).sort((a, b) => b.priority - a.priority);
-}
-function findCompactorForComponent(component, compactors) {
-  return compactors.find((c) => c.canCompact(component));
-}
-async function executeCompactionLoop(options) {
-  const {
-    components,
-    tokensToFree,
-    compactors,
-    estimator,
-    calculateTargetSize,
-    maxRounds = 1,
-    logPrefix = ""
-  } = options;
-  const log = [];
-  let current = [...components];
-  let freedTokens = 0;
-  let round = 0;
-  const sortedComponents = sortCompactableByPriority(current);
-  while (freedTokens < tokensToFree && round < maxRounds) {
-    round++;
-    let roundFreed = 0;
-    for (const component of sortedComponents) {
-      if (freedTokens >= tokensToFree) break;
-      const compactor = findCompactorForComponent(component, compactors);
-      if (!compactor) continue;
-      const beforeSize = estimateComponentTokens(component, estimator);
-      const targetSize = calculateTargetSize(beforeSize, round);
-      if (targetSize >= beforeSize) continue;
-      const compacted = await compactor.compact(component, targetSize);
-      const index = current.findIndex((c) => c.name === component.name);
-      if (index !== -1) {
-        current[index] = compacted;
-      }
-      const afterSize = estimateComponentTokens(compacted, estimator);
-      const saved = beforeSize - afterSize;
-      freedTokens += saved;
-      roundFreed += saved;
-      const prefix = logPrefix ? `${logPrefix}: ` : "";
-      const roundInfo = maxRounds > 1 ? `Round ${round}: ` : "";
-      log.push(
-        `${prefix}${roundInfo}${compactor.name} compacted "${component.name}" by ${saved} tokens`
-      );
-    }
-    if (roundFreed === 0) break;
-  }
-  return { components: current, log, tokensFreed: freedTokens };
-}
-
-// src/core/context/strategies/BaseCompactionStrategy.ts
-var BaseCompactionStrategy = class {
-  metrics = {
-    compactionCount: 0,
-    totalTokensFreed: 0,
-    avgTokensFreedPerCompaction: 0
-  };
-  /**
-   * Get the maximum number of compaction rounds.
-   * Override in subclasses for multi-round strategies.
-   */
-  getMaxRounds() {
-    return 1;
-  }
-  /**
-   * Get the log prefix for compaction messages.
-   * Override to customize logging.
-   */
-  getLogPrefix() {
-    return this.name.charAt(0).toUpperCase() + this.name.slice(1);
-  }
-  /**
-   * Compact components to fit within budget.
-   * Uses the shared compaction loop with strategy-specific target calculation.
-   */
-  async compact(components, budget, compactors, estimator) {
-    const targetUsage = Math.floor(budget.total * this.getTargetUtilization());
-    const tokensToFree = budget.used - targetUsage;
-    const result = await executeCompactionLoop({
-      components,
-      tokensToFree,
-      compactors,
-      estimator,
-      calculateTargetSize: this.calculateTargetSize.bind(this),
-      maxRounds: this.getMaxRounds(),
-      logPrefix: this.getLogPrefix()
-    });
-    this.updateMetrics(result.tokensFreed);
-    return result;
-  }
-  /**
-   * Update internal metrics after compaction
-   */
-  updateMetrics(tokensFreed) {
-    this.metrics.compactionCount++;
-    this.metrics.totalTokensFreed += tokensFreed;
-    this.metrics.avgTokensFreedPerCompaction = this.metrics.totalTokensFreed / this.metrics.compactionCount;
-  }
-  /**
-   * Get strategy metrics
-   */
-  getMetrics() {
-    return { ...this.metrics };
-  }
-  /**
-   * Reset metrics (useful for testing)
-   */
-  resetMetrics() {
-    this.metrics = {
-      compactionCount: 0,
-      totalTokensFreed: 0,
-      avgTokensFreedPerCompaction: 0
-    };
-  }
-};
-
-// src/core/context/strategies/ProactiveStrategy.ts
-var DEFAULT_OPTIONS = {
-  targetUtilization: PROACTIVE_STRATEGY_DEFAULTS.TARGET_UTILIZATION,
-  baseReductionFactor: PROACTIVE_STRATEGY_DEFAULTS.BASE_REDUCTION_FACTOR,
-  reductionStep: PROACTIVE_STRATEGY_DEFAULTS.REDUCTION_STEP,
-  maxRounds: PROACTIVE_STRATEGY_DEFAULTS.MAX_ROUNDS
-};
-var ProactiveCompactionStrategy = class extends BaseCompactionStrategy {
-  name = "proactive";
-  options;
-  constructor(options = {}) {
-    super();
-    this.options = { ...DEFAULT_OPTIONS, ...options };
-  }
-  shouldCompact(budget, _config) {
-    return budget.status === "warning" || budget.status === "critical";
-  }
-  calculateTargetSize(beforeSize, round) {
-    const reductionFactor = this.options.baseReductionFactor - (round - 1) * this.options.reductionStep;
-    return Math.floor(beforeSize * Math.max(reductionFactor, 0.1));
-  }
-  getTargetUtilization() {
-    return this.options.targetUtilization;
-  }
-  getMaxRounds() {
-    return this.options.maxRounds;
-  }
-  getLogPrefix() {
-    return "Proactive";
-  }
-};
-
-// src/core/context/strategies/AggressiveStrategy.ts
-var DEFAULT_OPTIONS2 = {
-  threshold: AGGRESSIVE_STRATEGY_DEFAULTS.THRESHOLD,
-  targetUtilization: AGGRESSIVE_STRATEGY_DEFAULTS.TARGET_UTILIZATION,
-  reductionFactor: AGGRESSIVE_STRATEGY_DEFAULTS.REDUCTION_FACTOR
-};
-var AggressiveCompactionStrategy = class extends BaseCompactionStrategy {
-  name = "aggressive";
-  options;
-  constructor(options = {}) {
-    super();
-    this.options = { ...DEFAULT_OPTIONS2, ...options };
-  }
-  shouldCompact(budget, _config) {
-    const utilizationRatio = (budget.used + budget.reserved) / budget.total;
-    return utilizationRatio >= this.options.threshold;
-  }
-  calculateTargetSize(beforeSize, _round) {
-    return Math.floor(beforeSize * this.options.reductionFactor);
-  }
-  getTargetUtilization() {
-    return this.options.targetUtilization;
-  }
-  getLogPrefix() {
-    return "Aggressive";
-  }
-};
-
-// src/core/context/strategies/LazyStrategy.ts
-var DEFAULT_OPTIONS3 = {
-  targetUtilization: LAZY_STRATEGY_DEFAULTS.TARGET_UTILIZATION,
-  reductionFactor: LAZY_STRATEGY_DEFAULTS.REDUCTION_FACTOR
-};
-var LazyCompactionStrategy = class extends BaseCompactionStrategy {
-  name = "lazy";
-  options;
-  constructor(options = {}) {
-    super();
-    this.options = { ...DEFAULT_OPTIONS3, ...options };
-  }
-  shouldCompact(budget, _config) {
-    return budget.status === "critical";
-  }
-  calculateTargetSize(beforeSize, _round) {
-    return Math.floor(beforeSize * this.options.reductionFactor);
-  }
-  getTargetUtilization() {
-    return this.options.targetUtilization;
-  }
-  getLogPrefix() {
-    return "Lazy";
-  }
-};
-
-// src/core/context/strategies/RollingWindowStrategy.ts
-var RollingWindowStrategy = class {
-  constructor(options = {}) {
-    this.options = options;
-  }
-  name = "rolling-window";
-  shouldCompact(_budget, _config) {
-    return false;
-  }
-  async prepareComponents(components) {
-    return components.map((component) => {
-      if (Array.isArray(component.content)) {
-        const maxMessages = this.options.maxMessages ?? ROLLING_WINDOW_DEFAULTS.MAX_MESSAGES;
-        if (component.content.length > maxMessages) {
-          return {
-            ...component,
-            content: component.content.slice(-maxMessages),
-            metadata: {
-              ...component.metadata,
-              windowed: true,
-              originalLength: component.content.length,
-              keptLength: maxMessages
-            }
-          };
-        }
-      }
-      return component;
-    });
-  }
-  async compact() {
-    return { components: [], log: [], tokensFreed: 0 };
-  }
-};
-
-// src/core/context/strategies/AdaptiveStrategy.ts
-var AdaptiveStrategy = class {
-  constructor(options = {}) {
-    this.options = options;
-    this.currentStrategy = new ProactiveCompactionStrategy();
-  }
-  name = "adaptive";
-  currentStrategy;
-  metrics = {
-    avgUtilization: 0,
-    compactionFrequency: 0,
-    lastCompactions: []
-  };
-  shouldCompact(budget, config) {
-    this.updateMetrics(budget);
-    this.maybeAdapt();
-    return this.currentStrategy.shouldCompact(budget, config);
-  }
-  async compact(components, budget, compactors, estimator) {
-    const result = await this.currentStrategy.compact(components, budget, compactors, estimator);
-    this.metrics.lastCompactions.push(Date.now());
-    const window = this.options.learningWindow ?? ADAPTIVE_STRATEGY_DEFAULTS.LEARNING_WINDOW;
-    if (this.metrics.lastCompactions.length > window) {
-      this.metrics.lastCompactions.shift();
-    }
-    return {
-      ...result,
-      log: [`[Adaptive: using ${this.currentStrategy.name}]`, ...result.log]
-    };
-  }
-  updateMetrics(budget) {
-    const alpha = 0.1;
-    this.metrics.avgUtilization = alpha * budget.utilizationPercent + (1 - alpha) * this.metrics.avgUtilization;
-  }
-  maybeAdapt() {
-    const now = Date.now();
-    if (this.metrics.lastCompactions.length >= 2) {
-      const firstCompaction = this.metrics.lastCompactions[0];
-      if (firstCompaction !== void 0) {
-        const timeSpan = now - firstCompaction;
-        this.metrics.compactionFrequency = this.metrics.lastCompactions.length / timeSpan * 6e4;
-      }
-    }
-    const threshold = this.options.switchThreshold ?? ADAPTIVE_STRATEGY_DEFAULTS.SWITCH_THRESHOLD;
-    if (this.metrics.compactionFrequency > threshold) {
-      if (this.currentStrategy.name !== "aggressive") {
-        this.currentStrategy = new AggressiveCompactionStrategy();
-      }
-    } else if (this.metrics.compactionFrequency < ADAPTIVE_STRATEGY_DEFAULTS.LOW_FREQUENCY_THRESHOLD && this.metrics.avgUtilization < ADAPTIVE_STRATEGY_DEFAULTS.LOW_UTILIZATION_THRESHOLD) {
-      if (this.currentStrategy.name !== "lazy") {
-        this.currentStrategy = new LazyCompactionStrategy();
-      }
-    } else {
-      if (this.currentStrategy.name !== "proactive") {
-        this.currentStrategy = new ProactiveCompactionStrategy();
-      }
-    }
-  }
-  getMetrics() {
-    return {
-      ...this.metrics,
-      currentStrategy: this.currentStrategy.name
-    };
-  }
-};
-
-// src/core/context/strategies/index.ts
-function createStrategy(name, options = {}) {
-  switch (name) {
-    case "proactive":
-      return new ProactiveCompactionStrategy(options);
-    case "aggressive":
-      return new AggressiveCompactionStrategy(options);
-    case "lazy":
-      return new LazyCompactionStrategy(options);
-    case "rolling-window":
-      return new RollingWindowStrategy(options);
-    case "adaptive":
-      return new AdaptiveStrategy(options);
-    default:
-      throw new Error(`Unknown context strategy: ${name}`);
-  }
-}
-
 // src/infrastructure/context/compactors/TruncateCompactor.ts
 var TruncateCompactor = class {
   constructor(estimator) {
@@ -42059,6 +41390,7 @@ init_Connector();
 
 // src/tools/connector/ConnectorTools.ts
 init_Connector();
+init_Logger();
 var PROTECTED_HEADERS = ["authorization", "x-api-key", "api-key", "bearer"];
 function safeStringify2(obj) {
   const seen = /* @__PURE__ */ new WeakSet();
@@ -42125,6 +41457,7 @@ var ConnectorTools = class {
    */
   static registerService(serviceType, factory) {
     this.factories.set(serviceType, factory);
+    logger.debug(`[ConnectorTools.registerService] Registered factory for: ${serviceType} (total factories: ${this.factories.size})`);
   }
   /**
    * Unregister a service tool factory
@@ -42146,8 +41479,8 @@ var ConnectorTools = class {
    * // Returns: [slack_api, slack_send_message, slack_list_channels, ...]
    * ```
    */
-  static for(connectorOrName, userId) {
-    const connector = this.resolveConnector(connectorOrName);
+  static for(connectorOrName, userId, options) {
+    const connector = this.resolveConnector(connectorOrName, options?.registry);
     const tools = [];
     if (connector.baseURL) {
       tools.push(this.createGenericAPITool(connector, { userId }));
@@ -42155,7 +41488,11 @@ var ConnectorTools = class {
     const serviceType = this.detectService(connector);
     if (serviceType && this.factories.has(serviceType)) {
       const factory = this.factories.get(serviceType);
-      tools.push(...factory(connector, userId));
+      const serviceTools = factory(connector, userId);
+      for (const tool of serviceTools) {
+        tool.definition.function.name = `${connector.name}_${tool.definition.function.name}`;
+      }
+      tools.push(...serviceTools);
     }
     return tools;
   }
@@ -42205,18 +41542,29 @@ var ConnectorTools = class {
    * }
    * ```
    */
-  static discoverAll(userId) {
+  static discoverAll(userId, options) {
     const result = /* @__PURE__ */ new Map();
-    for (const connector of Connector.listAll()) {
+    const allConnectors = options?.registry ? options.registry.listAll() : Connector.listAll();
+    const factoryKeys = Array.from(this.factories.keys());
+    logger.debug(`[ConnectorTools.discoverAll] ${allConnectors.length} connectors in library, ${factoryKeys.length} factories registered: [${factoryKeys.join(", ")}]`);
+    for (const connector of allConnectors) {
       const hasServiceType = !!connector.config.serviceType;
       const isExternalAPI = connector.baseURL && !connector.vendor;
-      if (hasServiceType || isExternalAPI) {
-        const tools = this.for(connector, userId);
-        if (tools.length > 0) {
-          result.set(connector.name, tools);
+      const hasVendorFactory = !!connector.vendor && this.factories.has(connector.vendor);
+      logger.debug(`[ConnectorTools.discoverAll] connector=${connector.name}: vendor=${connector.vendor}, serviceType=${connector.config.serviceType}, baseURL=${connector.baseURL ? "yes" : "no"} \u2192 hasServiceType=${hasServiceType}, isExternalAPI=${isExternalAPI}, hasVendorFactory=${hasVendorFactory}`);
+      if (hasServiceType || isExternalAPI || hasVendorFactory) {
+        try {
+          const tools = this.for(connector, userId);
+          logger.debug(`[ConnectorTools.discoverAll]   \u2192 ${tools.length} tools: [${tools.map((t) => t.definition.function.name).join(", ")}]`);
+          if (tools.length > 0) {
+            result.set(connector.name, tools);
+          }
+        } catch (err) {
+          logger.error(`[ConnectorTools.discoverAll]   \u2192 ERROR generating tools for ${connector.name}: ${err instanceof Error ? err.message : String(err)}`);
         }
       }
     }
+    logger.debug(`[ConnectorTools.discoverAll] Result: ${result.size} connectors with tools`);
     return result;
   }
   /**
@@ -42226,8 +41574,9 @@ var ConnectorTools = class {
    * @param serviceType - Service identifier
    * @returns Connector or undefined
    */
-  static findConnector(serviceType) {
-    return Connector.listAll().find((c) => this.detectService(c) === serviceType);
+  static findConnector(serviceType, options) {
+    const connectors = options?.registry ? options.registry.listAll() : Connector.listAll();
+    return connectors.find((c) => this.detectService(c) === serviceType);
   }
   /**
    * Find all connectors for a service type
@@ -42236,8 +41585,9 @@ var ConnectorTools = class {
    * @param serviceType - Service identifier
    * @returns Array of matching connectors
    */
-  static findConnectors(serviceType) {
-    return Connector.listAll().filter((c) => this.detectService(c) === serviceType);
+  static findConnectors(serviceType, options) {
+    const connectors = options?.registry ? options.registry.listAll() : Connector.listAll();
+    return connectors.filter((c) => this.detectService(c) === serviceType);
   }
   /**
    * List services that have registered tool factories
@@ -42267,6 +41617,9 @@ var ConnectorTools = class {
     } else if (connector.baseURL) {
       result = detectServiceFromURL(connector.baseURL);
     }
+    if (!result && connector.vendor) {
+      result = connector.vendor;
+    }
     this.maintainCacheSize(this.serviceTypeCache);
     this.serviceTypeCache.set(cacheKey, result);
     return result;
@@ -42284,8 +41637,11 @@ var ConnectorTools = class {
     }
   }
   // ============ Private Methods ============
-  static resolveConnector(connectorOrName) {
-    return typeof connectorOrName === "string" ? Connector.get(connectorOrName) : connectorOrName;
+  static resolveConnector(connectorOrName, registry) {
+    if (typeof connectorOrName === "string") {
+      return registry ? registry.get(connectorOrName) : Connector.get(connectorOrName);
+    }
+    return connectorOrName;
   }
   static createGenericAPITool(connector, options) {
     const toolName = options?.toolName ?? `${connector.name}_api`;
@@ -43025,7 +42381,7 @@ function initVendorRegistry(templates) {
 function getVendorTemplate(vendorId) {
   if (!vendorRegistry) {
     throw new Error(
-      "Vendor registry not initialized. Make sure to import from @oneringai/agents which auto-registers templates."
+      "Vendor registry not initialized. Make sure to import from @everworker/oneringai which auto-registers templates."
     );
   }
   return vendorRegistry.get(vendorId);
@@ -43033,7 +42389,7 @@ function getVendorTemplate(vendorId) {
 function getAllVendorTemplates() {
   if (!vendorRegistry) {
     throw new Error(
-      "Vendor registry not initialized. Make sure to import from @oneringai/agents which auto-registers templates."
+      "Vendor registry not initialized. Make sure to import from @everworker/oneringai which auto-registers templates."
     );
   }
   return Array.from(vendorRegistry.values());
@@ -43046,7 +42402,7 @@ function getVendorAuthTemplate(vendorId, authId) {
 function listVendorIds() {
   if (!vendorRegistry) {
     throw new Error(
-      "Vendor registry not initialized. Make sure to import from @oneringai/agents which auto-registers templates."
+      "Vendor registry not initialized. Make sure to import from @everworker/oneringai which auto-registers templates."
     );
   }
   return Array.from(vendorRegistry.keys());
@@ -45531,6 +44887,7 @@ __export(tools_exports, {
   ConnectorTools: () => ConnectorTools,
   DEFAULT_FILESYSTEM_CONFIG: () => DEFAULT_FILESYSTEM_CONFIG,
   DEFAULT_SHELL_CONFIG: () => DEFAULT_SHELL_CONFIG,
+  FileMediaOutputHandler: () => FileMediaOutputHandler,
   ToolRegistry: () => ToolRegistry,
   bash: () => bash,
   createBashTool: () => createBashTool,
@@ -45538,8 +44895,12 @@ __export(tools_exports, {
   createExecuteJavaScriptTool: () => createExecuteJavaScriptTool,
   createGlobTool: () => createGlobTool,
   createGrepTool: () => createGrepTool,
+  createImageGenerationTool: () => createImageGenerationTool,
   createListDirectoryTool: () => createListDirectoryTool,
   createReadFileTool: () => createReadFileTool,
+  createSpeechToTextTool: () => createSpeechToTextTool,
+  createTextToSpeechTool: () => createTextToSpeechTool,
+  createVideoTools: () => createVideoTools,
   createWriteFileTool: () => createWriteFileTool,
   developerTools: () => developerTools,
   editFile: () => editFile,
@@ -45547,6 +44908,7 @@ __export(tools_exports, {
   expandTilde: () => expandTilde,
   getAllBuiltInTools: () => getAllBuiltInTools,
   getBackgroundOutput: () => getBackgroundOutput,
+  getMediaOutputHandler: () => getMediaOutputHandler,
   getToolByName: () => getToolByName,
   getToolCategories: () => getToolCategories,
   getToolRegistry: () => getToolRegistry,
@@ -45560,6 +44922,7 @@ __export(tools_exports, {
   killBackgroundProcess: () => killBackgroundProcess,
   listDirectory: () => listDirectory,
   readFile: () => readFile4,
+  setMediaOutputHandler: () => setMediaOutputHandler,
   toolRegistry: () => toolRegistry,
   validatePath: () => validatePath,
   webFetch: () => webFetch,
@@ -46177,8 +45540,8 @@ WHEN TO USE:
       return args.pattern;
     },
     execute: async (args) => {
-      const { pattern, path: path5 } = args;
-      const searchDir = path5 || mergedConfig.workingDirectory;
+      const { pattern, path: path6 } = args;
+      const searchDir = path6 || mergedConfig.workingDirectory;
       const validation = validatePath(searchDir, {
         ...mergedConfig,
         blockedDirectories: []
@@ -46398,7 +45761,7 @@ WHEN TO USE:
     execute: async (args) => {
       const {
         pattern,
-        path: path5,
+        path: path6,
         glob: globPattern,
         type: fileType,
         output_mode = "files_with_matches",
@@ -46407,7 +45770,7 @@ WHEN TO USE:
         context_after = 0,
         limit
       } = args;
-      const searchPath = path5 || mergedConfig.workingDirectory;
+      const searchPath = path6 || mergedConfig.workingDirectory;
       const validation = validatePath(searchPath, {
         ...mergedConfig,
         blockedDirectories: []
@@ -46625,8 +45988,8 @@ EXAMPLES:
       return args.path;
     },
     execute: async (args) => {
-      const { path: path5, recursive = false, filter, max_depth = 3 } = args;
-      const validation = validatePath(path5, {
+      const { path: path6, recursive = false, filter, max_depth = 3 } = args;
+      const validation = validatePath(path6, {
         ...mergedConfig,
         blockedDirectories: []
         // Allow listing any valid directory
@@ -46641,7 +46004,7 @@ EXAMPLES:
       if (!existsSync(resolvedPath)) {
         return {
           success: false,
-          error: `Directory not found: ${path5}`
+          error: `Directory not found: ${path6}`
         };
       }
       try {
@@ -46649,7 +46012,7 @@ EXAMPLES:
         if (!stats.isDirectory()) {
           return {
             success: false,
-            error: `Path is not a directory: ${path5}. Use read_file to read file contents.`
+            error: `Path is not a directory: ${path6}. Use read_file to read file contents.`
           };
         }
         const entries = await listDir(
@@ -46951,19 +46314,19 @@ function killBackgroundProcess(bgId) {
 var bash = createBashTool();
 
 // src/tools/json/pathUtils.ts
-function parsePath(path5) {
-  if (path5 === "" || path5 === "$") {
+function parsePath(path6) {
+  if (path6 === "" || path6 === "$") {
     return [];
   }
-  const keys = path5.split(".");
+  const keys = path6.split(".");
   const filtered = keys.filter((p) => p.length > 0);
   if (filtered.length !== keys.length) {
-    throw new Error(`Invalid path format: ${path5} (consecutive dots not allowed)`);
+    throw new Error(`Invalid path format: ${path6} (consecutive dots not allowed)`);
   }
   return filtered;
 }
-function getValueAtPath(obj, path5) {
-  const keys = parsePath(path5);
+function getValueAtPath(obj, path6) {
+  const keys = parsePath(path6);
   let current = obj;
   for (const key of keys) {
     if (current === null || current === void 0) {
@@ -46973,8 +46336,8 @@ function getValueAtPath(obj, path5) {
   }
   return current;
 }
-function setValueAtPath(obj, path5, value) {
-  const keys = parsePath(path5);
+function setValueAtPath(obj, path6, value) {
+  const keys = parsePath(path6);
   if (keys.length === 0) {
     throw new Error("Cannot set root object - path must not be empty");
   }
@@ -47003,8 +46366,8 @@ function setValueAtPath(obj, path5, value) {
   }
   return true;
 }
-function deleteAtPath(obj, path5) {
-  const keys = parsePath(path5);
+function deleteAtPath(obj, path6) {
+  const keys = parsePath(path6);
   if (keys.length === 0) {
     throw new Error("Cannot delete root object - path must not be empty");
   }
@@ -47034,9 +46397,9 @@ function deleteAtPath(obj, path5) {
   }
   return true;
 }
-function pathExists(obj, path5) {
+function pathExists(obj, path6) {
   try {
-    const value = getValueAtPath(obj, path5);
+    const value = getValueAtPath(obj, path6);
     return value !== void 0;
   } catch {
     return false;
@@ -48481,6 +47844,591 @@ async function executeInVM(code, input, timeout, logs) {
   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.join(os.tmpdir(), "oneringai-media");
+  }
+  async save(data, metadata) {
+    if (!this.initialized) {
+      await fs14.mkdir(this.outputDir, { recursive: true });
+      this.initialized = true;
+    }
+    const filename = metadata.suggestedFilename ?? this.generateFilename(metadata);
+    const filePath = path3.join(this.outputDir, filename);
+    await fs14.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.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();
+  }
+  return _outputHandler;
+}
+function setMediaOutputHandler(handler) {
+  _outputHandler = handler;
+}
+
+// src/tools/multimedia/imageGeneration.ts
+function createImageGenerationTool(connector, outputHandler) {
+  const vendor = connector.vendor;
+  const handler = outputHandler ?? getMediaOutputHandler();
+  const vendorModels = vendor ? getImageModelsByVendor(vendor) : [];
+  const modelNames = vendorModels.map((m) => m.name);
+  const properties = {
+    prompt: {
+      type: "string",
+      description: "Text description of the image to generate"
+    }
+  };
+  if (modelNames.length > 0) {
+    const descriptions = vendorModels.map((m) => `${m.name}: ${m.description || m.displayName}`).join("; ");
+    properties.model = {
+      type: "string",
+      enum: modelNames,
+      description: `Image model to use. Options: ${descriptions}`
+    };
+  }
+  const hasSizes = vendorModels.some((m) => m.capabilities.sizes.length > 1);
+  if (hasSizes) {
+    const allSizes = [...new Set(vendorModels.flatMap((m) => m.capabilities.sizes))];
+    properties.size = {
+      type: "string",
+      enum: allSizes,
+      description: "Image dimensions"
+    };
+  }
+  const hasAspectRatios = vendorModels.some((m) => m.capabilities.aspectRatios?.length);
+  if (hasAspectRatios) {
+    const allRatios = [...new Set(vendorModels.flatMap((m) => m.capabilities.aspectRatios ?? []))];
+    properties.aspectRatio = {
+      type: "string",
+      enum: allRatios,
+      description: "Image aspect ratio"
+    };
+  }
+  const hasQuality = vendorModels.some((m) => m.capabilities.features.qualityControl);
+  if (hasQuality) {
+    properties.quality = {
+      type: "string",
+      enum: ["standard", "hd"],
+      description: "Image quality level"
+    };
+  }
+  const hasStyle = vendorModels.some((m) => m.capabilities.features.styleControl);
+  if (hasStyle) {
+    properties.style = {
+      type: "string",
+      enum: ["vivid", "natural"],
+      description: "Image style (vivid for hyper-real, natural for less hyper-real)"
+    };
+  }
+  const maxN = Math.max(...vendorModels.map((m) => m.capabilities.maxImagesPerRequest));
+  if (maxN > 1) {
+    properties.n = {
+      type: "number",
+      description: `Number of images to generate (1-${maxN})`,
+      minimum: 1,
+      maximum: maxN
+    };
+  }
+  return {
+    definition: {
+      type: "function",
+      function: {
+        name: "generate_image",
+        description: `Generate images from text prompts using ${connector.displayName}`,
+        parameters: {
+          type: "object",
+          properties,
+          required: ["prompt"]
+        }
+      }
+    },
+    execute: async (args) => {
+      try {
+        const imageGen = ImageGeneration.create({ connector });
+        const response = await imageGen.generate({
+          prompt: args.prompt,
+          model: args.model,
+          size: args.size,
+          quality: args.quality,
+          style: args.style,
+          n: args.n,
+          response_format: "b64_json"
+        });
+        const images = [];
+        for (let i = 0; i < response.data.length; i++) {
+          const item = response.data[i];
+          let buffer;
+          if (item.b64_json) {
+            buffer = Buffer.from(item.b64_json, "base64");
+          } else if (item.url) {
+            const resp = await fetch(item.url);
+            buffer = Buffer.from(await resp.arrayBuffer());
+          } else {
+            continue;
+          }
+          const modelName = args.model || modelNames[0] || "unknown";
+          const modelInfo = IMAGE_MODEL_REGISTRY[modelName];
+          const format = modelInfo?.capabilities.outputFormats[0] === "url" ? "png" : modelInfo?.capabilities.outputFormats[0] || "png";
+          const result = await handler.save(buffer, {
+            type: "image",
+            format,
+            model: modelName,
+            vendor: vendor || "unknown",
+            index: response.data.length > 1 ? i : void 0
+          });
+          images.push({
+            location: result.location,
+            mimeType: result.mimeType,
+            revisedPrompt: item.revised_prompt
+          });
+        }
+        return { success: true, images };
+      } catch (error) {
+        return {
+          success: false,
+          error: error instanceof Error ? error.message : String(error)
+        };
+      }
+    },
+    describeCall: (args) => args.prompt.length > 50 ? args.prompt.slice(0, 47) + "..." : args.prompt,
+    permission: {
+      scope: "session",
+      riskLevel: "medium",
+      approvalMessage: `Generate image(s) using ${connector.displayName}`
+    }
+  };
+}
+
+// src/tools/multimedia/videoGeneration.ts
+var videoGenInstances = /* @__PURE__ */ new Map();
+function createVideoTools(connector, outputHandler) {
+  const vendor = connector.vendor;
+  const handler = outputHandler ?? getMediaOutputHandler();
+  const vendorModels = vendor ? getVideoModelsByVendor(vendor) : [];
+  const modelNames = vendorModels.map((m) => m.name);
+  const generateProperties = {
+    prompt: {
+      type: "string",
+      description: "Text description of the video to generate"
+    }
+  };
+  if (modelNames.length > 0) {
+    const descriptions = vendorModels.map((m) => `${m.name}: ${m.displayName}`).join("; ");
+    generateProperties.model = {
+      type: "string",
+      enum: modelNames,
+      description: `Video model to use. Options: ${descriptions}`
+    };
+  }
+  const allDurations = [...new Set(vendorModels.flatMap((m) => m.capabilities.durations))].sort(
+    (a, b) => a - b
+  );
+  if (allDurations.length > 0) {
+    generateProperties.duration = {
+      type: "number",
+      description: `Video duration in seconds. Supported: ${allDurations.join(", ")}`
+    };
+  }
+  const allResolutions = [...new Set(vendorModels.flatMap((m) => m.capabilities.resolutions))];
+  if (allResolutions.length > 0) {
+    generateProperties.resolution = {
+      type: "string",
+      enum: allResolutions,
+      description: "Video resolution"
+    };
+  }
+  const allAspectRatios = [
+    ...new Set(vendorModels.flatMap((m) => m.capabilities.aspectRatios ?? []))
+  ];
+  if (allAspectRatios.length > 0) {
+    generateProperties.aspectRatio = {
+      type: "string",
+      enum: allAspectRatios,
+      description: "Video aspect ratio"
+    };
+  }
+  const hasSeed = vendorModels.some((m) => m.capabilities.features.seed);
+  if (hasSeed) {
+    generateProperties.seed = {
+      type: "number",
+      description: "Random seed for reproducible generation"
+    };
+  }
+  const generateTool = {
+    definition: {
+      type: "function",
+      function: {
+        name: "generate_video",
+        description: `Start video generation from a text prompt using ${connector.displayName}. Returns a jobId to check status with video_status.`,
+        parameters: {
+          type: "object",
+          properties: generateProperties,
+          required: ["prompt"]
+        }
+      }
+    },
+    execute: async (args) => {
+      try {
+        const videoGen = VideoGeneration.create({ connector });
+        const response = await videoGen.generate({
+          prompt: args.prompt,
+          model: args.model,
+          duration: args.duration,
+          resolution: args.resolution,
+          aspectRatio: args.aspectRatio,
+          seed: args.seed
+        });
+        videoGenInstances.set(response.jobId, videoGen);
+        return {
+          success: true,
+          jobId: response.jobId,
+          status: response.status
+        };
+      } catch (error) {
+        return {
+          success: false,
+          error: error instanceof Error ? error.message : String(error)
+        };
+      }
+    },
+    describeCall: (args) => args.prompt.length > 50 ? args.prompt.slice(0, 47) + "..." : args.prompt,
+    permission: {
+      scope: "session",
+      riskLevel: "medium",
+      approvalMessage: `Generate video using ${connector.displayName}`
+    }
+  };
+  const statusTool = {
+    definition: {
+      type: "function",
+      function: {
+        name: "video_status",
+        description: "Check the status of a video generation job. If completed, downloads and saves the video.",
+        parameters: {
+          type: "object",
+          properties: {
+            jobId: {
+              type: "string",
+              description: "The job ID returned by generate_video"
+            }
+          },
+          required: ["jobId"]
+        }
+      }
+    },
+    execute: async (args) => {
+      try {
+        let videoGen = videoGenInstances.get(args.jobId);
+        if (!videoGen) {
+          videoGen = VideoGeneration.create({ connector });
+        }
+        const status = await videoGen.getStatus(args.jobId);
+        if (status.status === "completed") {
+          let buffer;
+          if (status.video?.b64_json) {
+            buffer = Buffer.from(status.video.b64_json, "base64");
+          } else if (status.video?.url) {
+            const resp = await fetch(status.video.url);
+            buffer = Buffer.from(await resp.arrayBuffer());
+          } else if (videoGen.download) {
+            try {
+              buffer = await videoGen.download(args.jobId);
+            } catch {
+            }
+          }
+          if (buffer) {
+            const format = status.video?.format || "mp4";
+            const modelName = modelNames[0] || "unknown";
+            const result = await handler.save(buffer, {
+              type: "video",
+              format,
+              model: modelName,
+              vendor: vendor || "unknown"
+            });
+            videoGenInstances.delete(args.jobId);
+            return {
+              success: true,
+              status: "completed",
+              location: result.location,
+              mimeType: result.mimeType
+            };
+          }
+          videoGenInstances.delete(args.jobId);
+          return {
+            success: true,
+            status: "completed",
+            location: status.video?.url
+          };
+        }
+        if (status.status === "failed") {
+          videoGenInstances.delete(args.jobId);
+          return {
+            success: false,
+            status: "failed",
+            error: status.error || "Video generation failed"
+          };
+        }
+        return {
+          success: true,
+          status: status.status,
+          progress: status.progress
+        };
+      } catch (error) {
+        return {
+          success: false,
+          error: error instanceof Error ? error.message : String(error)
+        };
+      }
+    },
+    describeCall: (args) => `job ${args.jobId}`,
+    permission: {
+      scope: "session",
+      riskLevel: "low",
+      approvalMessage: "Check video generation status"
+    }
+  };
+  return [generateTool, statusTool];
+}
+
+// src/tools/multimedia/textToSpeech.ts
+function createTextToSpeechTool(connector, outputHandler) {
+  const vendor = connector.vendor;
+  const handler = outputHandler ?? getMediaOutputHandler();
+  const vendorModels = vendor ? getTTSModelsByVendor(vendor) : [];
+  const modelNames = vendorModels.map((m) => m.name);
+  const properties = {
+    text: {
+      type: "string",
+      description: "Text to convert to speech"
+    }
+  };
+  if (modelNames.length > 0) {
+    const descriptions = vendorModels.map((m) => `${m.name}: ${m.description || m.displayName}`).join("; ");
+    properties.model = {
+      type: "string",
+      enum: modelNames,
+      description: `TTS model to use. Options: ${descriptions}`
+    };
+  }
+  const allVoices = [
+    ...new Map(
+      vendorModels.flatMap((m) => m.capabilities.voices).map((v) => [v.id, v])
+    ).values()
+  ];
+  if (allVoices.length > 0) {
+    const voiceDescriptions = allVoices.slice(0, 10).map((v) => `${v.id}${v.name !== v.id ? ` (${v.name})` : ""}`).join(", ");
+    properties.voice = {
+      type: "string",
+      enum: allVoices.map((v) => v.id),
+      description: `Voice to use. Options include: ${voiceDescriptions}${allVoices.length > 10 ? `, and ${allVoices.length - 10} more` : ""}`
+    };
+  }
+  const allFormats = [...new Set(vendorModels.flatMap((m) => [...m.capabilities.formats]))];
+  if (allFormats.length > 0) {
+    properties.format = {
+      type: "string",
+      enum: allFormats,
+      description: `Output audio format: ${allFormats.join(", ")}`
+    };
+  }
+  const hasSpeed = vendorModels.some((m) => m.capabilities.speed.supported);
+  if (hasSpeed) {
+    const speedModel = vendorModels.find((m) => m.capabilities.speed.supported);
+    properties.speed = {
+      type: "number",
+      description: `Speech speed (${speedModel?.capabilities.speed.min ?? 0.25} to ${speedModel?.capabilities.speed.max ?? 4})`,
+      minimum: speedModel?.capabilities.speed.min ?? 0.25,
+      maximum: speedModel?.capabilities.speed.max ?? 4
+    };
+  }
+  return {
+    definition: {
+      type: "function",
+      function: {
+        name: "text_to_speech",
+        description: `Convert text to speech audio using ${connector.displayName}`,
+        parameters: {
+          type: "object",
+          properties,
+          required: ["text"]
+        }
+      }
+    },
+    execute: async (args) => {
+      try {
+        const tts = TextToSpeech.create({
+          connector,
+          model: args.model,
+          voice: args.voice,
+          format: args.format,
+          speed: args.speed
+        });
+        const response = await tts.synthesize(args.text);
+        const format = response.format || args.format || "mp3";
+        const result = await handler.save(response.audio, {
+          type: "audio",
+          format,
+          model: args.model || modelNames[0] || "unknown",
+          vendor: vendor || "unknown"
+        });
+        return {
+          success: true,
+          location: result.location,
+          format,
+          mimeType: result.mimeType
+        };
+      } catch (error) {
+        return {
+          success: false,
+          error: error instanceof Error ? error.message : String(error)
+        };
+      }
+    },
+    describeCall: (args) => args.text.length > 50 ? args.text.slice(0, 47) + "..." : args.text,
+    permission: {
+      scope: "session",
+      riskLevel: "medium",
+      approvalMessage: `Convert text to speech using ${connector.displayName}`
+    }
+  };
+}
+function createSpeechToTextTool(connector) {
+  const vendor = connector.vendor;
+  const vendorModels = vendor ? getSTTModelsByVendor(vendor) : [];
+  const modelNames = vendorModels.map((m) => m.name);
+  const properties = {
+    audioFilePath: {
+      type: "string",
+      description: "Path to the audio file to transcribe"
+    }
+  };
+  if (modelNames.length > 0) {
+    const descriptions = vendorModels.map((m) => `${m.name}: ${m.description || m.displayName}`).join("; ");
+    properties.model = {
+      type: "string",
+      enum: modelNames,
+      description: `STT model to use. Options: ${descriptions}`
+    };
+  }
+  properties.language = {
+    type: "string",
+    description: 'Language code (ISO-639-1, e.g., "en", "es", "fr"). Optional for auto-detection.'
+  };
+  properties.prompt = {
+    type: "string",
+    description: "Optional context hint to guide transcription (e.g., domain-specific terms)"
+  };
+  return {
+    definition: {
+      type: "function",
+      function: {
+        name: "speech_to_text",
+        description: `Transcribe audio to text using ${connector.displayName}`,
+        parameters: {
+          type: "object",
+          properties,
+          required: ["audioFilePath"]
+        }
+      }
+    },
+    execute: async (args) => {
+      try {
+        const audioBuffer = await fs14.readFile(args.audioFilePath);
+        const stt = SpeechToText.create({
+          connector,
+          model: args.model,
+          language: args.language
+        });
+        const response = await stt.transcribe(audioBuffer, {
+          prompt: args.prompt
+        });
+        return {
+          success: true,
+          text: response.text,
+          language: response.language,
+          durationSeconds: response.durationSeconds
+        };
+      } catch (error) {
+        return {
+          success: false,
+          error: error instanceof Error ? error.message : String(error)
+        };
+      }
+    },
+    describeCall: (args) => args.audioFilePath,
+    permission: {
+      scope: "session",
+      riskLevel: "low",
+      approvalMessage: `Transcribe audio using ${connector.displayName}`
+    }
+  };
+}
+
+// src/tools/multimedia/register.ts
+var VENDOR_CAPABILITIES = {
+  [Vendor.OpenAI]: ["image", "video", "tts", "stt"],
+  [Vendor.Google]: ["image", "video", "tts"],
+  [Vendor.Grok]: ["image", "video"]
+};
+function registerMultimediaTools() {
+  for (const [vendor, capabilities] of Object.entries(VENDOR_CAPABILITIES)) {
+    ConnectorTools.registerService(vendor, (connector, _userId) => {
+      const tools = [];
+      if (capabilities.includes("image")) {
+        tools.push(createImageGenerationTool(connector));
+      }
+      if (capabilities.includes("video")) {
+        tools.push(...createVideoTools(connector));
+      }
+      if (capabilities.includes("tts")) {
+        tools.push(createTextToSpeechTool(connector));
+      }
+      if (capabilities.includes("stt")) {
+        tools.push(createSpeechToTextTool(connector));
+      }
+      return tools;
+    });
+  }
+}
+
+// src/tools/multimedia/index.ts
+registerMultimediaTools();
 
 // src/tools/registry.generated.ts
 var toolRegistry = [
@@ -48724,17 +48672,23 @@ var ToolRegistry = class {
    */
   static toRegistryEntry(tool, connectorName) {
     let serviceType;
+    let displayPrefix;
     try {
       const connector = Connector.get(connectorName);
       serviceType = ConnectorTools.detectService(connector);
+      if (connector.vendor) {
+        const vendorInfo = getVendorInfo(connector.vendor);
+        displayPrefix = vendorInfo?.name || connector.vendor;
+      }
     } catch {
     }
     const serviceInfo = serviceType ? getServiceInfo(serviceType) : void 0;
+    const displayContext = displayPrefix || serviceInfo?.name;
     const def = tool.definition.function;
     return {
       name: def.name,
       exportName: def.name,
-      displayName: this.deriveDisplayName(def.name, serviceInfo?.name),
+      displayName: this.deriveDisplayName(def.name, displayContext, connectorName),
       category: "connector",
       description: def.description || `API tool for ${connectorName}`,
       tool,
@@ -48747,14 +48701,21 @@ var ToolRegistry = class {
   }
   /**
    * Derive a human-readable display name from a tool name
+   *
+   * @param toolName - Full tool name (e.g., "main-openai_generate_image")
+   * @param contextName - Vendor or service display name (e.g., "OpenAI")
+   * @param connectorName - Connector name used as prefix (e.g., "main-openai")
    */
-  static deriveDisplayName(toolName, serviceName) {
-    if (serviceName) {
-      const suffix = toolName.includes("_api") ? " API" : "";
-      return `${serviceName}${suffix}`;
+  static deriveDisplayName(toolName, contextName, connectorName) {
+    let baseName = toolName;
+    if (connectorName && toolName.startsWith(connectorName + "_")) {
+      baseName = toolName.slice(connectorName.length + 1);
+    }
+    if (baseName === "api") {
+      return contextName ? `${contextName} API` : toolName.replace(/_/g, " ");
     }
-    const withoutSuffix = toolName.replace(/_api$/, " API");
-    return withoutSuffix.split("_").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
+    const readable = baseName.split("_").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
+    return contextName ? `${contextName} ${readable}` : readable;
   }
 };
 
@@ -48948,6 +48909,6 @@ REMEMBER: Keep it conversational, ask one question at a time, and only output th
   }
 };
 
-export { AGENT_DEFINITION_FORMAT_VERSION, AIError, APPROVAL_STATE_VERSION, AdaptiveStrategy, Agent, AgentContextNextGen, AggressiveCompactionStrategy, ApproximateTokenEstimator, BaseMediaProvider, BasePluginNextGen, BaseProvider, BaseTextProvider, BraveProvider, CONNECTOR_CONFIG_VERSION, CONTEXT_SESSION_FORMAT_VERSION, CheckpointManager, CircuitBreaker, CircuitOpenError, Connector, ConnectorConfigStore, ConnectorTools, ConsoleMetrics, ContentType, ContextGuardian, ContextOverflowError, DEFAULT_ALLOWLIST, DEFAULT_BACKOFF_CONFIG, DEFAULT_BASE_DELAY_MS, DEFAULT_CHECKPOINT_STRATEGY, DEFAULT_CIRCUIT_BREAKER_CONFIG, DEFAULT_CONFIG2 as DEFAULT_CONFIG, DEFAULT_CONNECTOR_TIMEOUT, DEFAULT_CONTEXT_CONFIG, DEFAULT_FEATURES, DEFAULT_FILESYSTEM_CONFIG, DEFAULT_HISTORY_MANAGER_CONFIG, DEFAULT_MAX_DELAY_MS, DEFAULT_MAX_RETRIES, DEFAULT_MEMORY_CONFIG, DEFAULT_PERMISSION_CONFIG, DEFAULT_RATE_LIMITER_CONFIG, DEFAULT_RETRYABLE_STATUSES, DEFAULT_SHELL_CONFIG, DefaultCompactionStrategy, DependencyCycleError, ErrorHandler, ExecutionContext, ExternalDependencyHandler, FileAgentDefinitionStorage, FileConnectorStorage, FileContextStorage, FilePersistentInstructionsStorage, FileStorage, FrameworkLogger, HookManager, IMAGE_MODELS, IMAGE_MODEL_REGISTRY, ImageGeneration, InContextMemoryPluginNextGen, InMemoryAgentStateStorage, InMemoryHistoryStorage, InMemoryMetrics, InMemoryPlanStorage, InMemoryStorage, InvalidConfigError, InvalidToolArgumentsError, LLM_MODELS, LazyCompactionStrategy, LoggingPlugin, MCPClient, MCPConnectionError, MCPError, MCPProtocolError, MCPRegistry, MCPResourceError, MCPTimeoutError, MCPToolError, MEMORY_PRIORITY_VALUES, MODEL_REGISTRY, MemoryConnectorStorage, MemoryEvictionCompactor, MemoryStorage, MessageBuilder, MessageRole, ModelNotSupportedError, NoOpMetrics, OAuthManager, ParallelTasksError, PersistentInstructionsPluginNextGen, PlanningAgent, ProactiveCompactionStrategy, ProviderAuthError, ProviderConfigAgent, ProviderContextLengthError, ProviderError, ProviderErrorMapper, ProviderNotFoundError, ProviderRateLimitError, RapidAPIProvider, RateLimitError, RollingWindowStrategy, SERVICE_DEFINITIONS, SERVICE_INFO, SERVICE_URL_PATTERNS, SIMPLE_ICONS_CDN, STT_MODELS, STT_MODEL_REGISTRY, ScrapeProvider, SearchProvider, SerperProvider, Services, SpeechToText, StrategyRegistry, StreamEventType, StreamHelpers, StreamState, SummarizeCompactor, TERMINAL_TASK_STATUSES, TTS_MODELS, TTS_MODEL_REGISTRY, TaskTimeoutError, TaskValidationError, TavilyProvider, TextToSpeech, TokenBucketRateLimiter, ToolCallState, ToolExecutionError, ToolExecutionPipeline, ToolManager, ToolNotFoundError, ToolPermissionManager, ToolRegistry, ToolTimeoutError, TruncateCompactor, VENDORS, VENDOR_ICON_MAP, VIDEO_MODELS, VIDEO_MODEL_REGISTRY, Vendor, VideoGeneration, WorkingMemory, WorkingMemoryPluginNextGen, addJitter, allVendorTemplates, assertNotDestroyed, authenticatedFetch, backoffSequence, backoffWait, bash, buildAuthConfig, buildEndpointWithQuery, buildQueryString, calculateBackoff, calculateCost, calculateEntrySize, calculateImageCost, calculateSTTCost, calculateTTSCost, calculateVideoCost, canTaskExecute, createAgentStorage, createAuthenticatedFetch, createBashTool, createConnectorFromTemplate, createEditFileTool, createEstimator, createExecuteJavaScriptTool, createFileAgentDefinitionStorage, createFileContextStorage, createGlobTool, createGrepTool, createImageProvider, createListDirectoryTool, createMessageWithImages, createMetricsCollector, createPlan, createProvider, createReadFileTool, createStrategy, createTask, createTextMessage, createVideoProvider, createWriteFileTool, defaultDescribeCall, detectDependencyCycle, detectServiceFromURL, developerTools, editFile, evaluateCondition, extractJSON, extractJSONField, extractNumber, findConnectorByServiceTypes, forPlan, forTasks, generateEncryptionKey, generateSimplePlan, generateWebAPITool, getActiveImageModels, getActiveModels, getActiveSTTModels, getActiveTTSModels, getActiveVideoModels, getAllBuiltInTools, getAllServiceIds, getAllVendorLogos, getAllVendorTemplates, getBackgroundOutput, getConnectorTools, getCredentialsSetupURL, getDocsURL, getImageModelInfo, getImageModelsByVendor, getImageModelsWithFeature, getModelInfo, getModelsByVendor, getNextExecutableTasks, getRegisteredScrapeProviders, getSTTModelInfo, getSTTModelsByVendor, getSTTModelsWithFeature, getServiceDefinition, getServiceInfo, getServicesByCategory, getTTSModelInfo, getTTSModelsByVendor, getTTSModelsWithFeature, getTaskDependencies, getToolByName, getToolCallDescription, getToolCategories, getToolRegistry, getToolsByCategory, getToolsRequiringConnector, getVendorAuthTemplate, getVendorColor, getVendorInfo, getVendorLogo, getVendorLogoCdnUrl, getVendorLogoSvg, getVendorTemplate, getVideoModelInfo, getVideoModelsByVendor, getVideoModelsWithAudio, getVideoModelsWithFeature, glob, globalErrorHandler, grep, hasClipboardImage, hasVendorLogo, isBlockedCommand, isErrorEvent, isExcludedExtension, isKnownService, isOutputTextDelta, isResponseComplete, isSimpleScope, isStreamEvent, isTaskAwareScope, isTaskBlocked, isTerminalMemoryStatus, isTerminalStatus, isToolCallArgumentsDelta, isToolCallArgumentsDone, isToolCallStart, isVendor, killBackgroundProcess, listConnectorsByServiceTypes, listDirectory, listVendorIds, listVendors, listVendorsByAuthType, listVendorsByCategory, listVendorsWithLogos, logger, metrics, readClipboardImage, readFile4 as readFile, registerScrapeProvider, resolveConnector, resolveDependencies, retryWithBackoff, scopeEquals, scopeMatches, setMetricsCollector, simpleTokenEstimator, toConnectorOptions, toolRegistry, tools_exports as tools, updateTaskStatus, validatePath, writeFile4 as writeFile };
+export { AGENT_DEFINITION_FORMAT_VERSION, AIError, APPROVAL_STATE_VERSION, Agent, AgentContextNextGen, ApproximateTokenEstimator, BaseMediaProvider, BasePluginNextGen, BaseProvider, BaseTextProvider, BraveProvider, CONNECTOR_CONFIG_VERSION, CONTEXT_SESSION_FORMAT_VERSION, CheckpointManager, CircuitBreaker, CircuitOpenError, Connector, ConnectorConfigStore, ConnectorTools, ConsoleMetrics, ContentType, ContextOverflowError, DEFAULT_ALLOWLIST, DEFAULT_BACKOFF_CONFIG, DEFAULT_BASE_DELAY_MS, DEFAULT_CHECKPOINT_STRATEGY, DEFAULT_CIRCUIT_BREAKER_CONFIG, DEFAULT_CONFIG2 as DEFAULT_CONFIG, DEFAULT_CONNECTOR_TIMEOUT, DEFAULT_CONTEXT_CONFIG, DEFAULT_FEATURES, DEFAULT_FILESYSTEM_CONFIG, DEFAULT_HISTORY_MANAGER_CONFIG, DEFAULT_MAX_DELAY_MS, DEFAULT_MAX_RETRIES, DEFAULT_MEMORY_CONFIG, DEFAULT_PERMISSION_CONFIG, DEFAULT_RATE_LIMITER_CONFIG, DEFAULT_RETRYABLE_STATUSES, DEFAULT_SHELL_CONFIG, DefaultCompactionStrategy, DependencyCycleError, ErrorHandler, ExecutionContext, ExternalDependencyHandler, FileAgentDefinitionStorage, FileConnectorStorage, FileContextStorage, FileMediaOutputHandler, FilePersistentInstructionsStorage, FileStorage, FrameworkLogger, HookManager, IMAGE_MODELS, IMAGE_MODEL_REGISTRY, ImageGeneration, InContextMemoryPluginNextGen, InMemoryAgentStateStorage, InMemoryHistoryStorage, InMemoryMetrics, InMemoryPlanStorage, InMemoryStorage, InvalidConfigError, InvalidToolArgumentsError, LLM_MODELS, LoggingPlugin, MCPClient, MCPConnectionError, MCPError, MCPProtocolError, MCPRegistry, MCPResourceError, MCPTimeoutError, MCPToolError, MEMORY_PRIORITY_VALUES, MODEL_REGISTRY, MemoryConnectorStorage, MemoryEvictionCompactor, MemoryStorage, MessageBuilder, MessageRole, ModelNotSupportedError, NoOpMetrics, OAuthManager, ParallelTasksError, PersistentInstructionsPluginNextGen, PlanningAgent, ProviderAuthError, ProviderConfigAgent, ProviderContextLengthError, ProviderError, ProviderErrorMapper, ProviderNotFoundError, ProviderRateLimitError, RapidAPIProvider, RateLimitError, SERVICE_DEFINITIONS, SERVICE_INFO, SERVICE_URL_PATTERNS, SIMPLE_ICONS_CDN, STT_MODELS, STT_MODEL_REGISTRY, ScopedConnectorRegistry, ScrapeProvider, SearchProvider, SerperProvider, Services, SpeechToText, StrategyRegistry, StreamEventType, StreamHelpers, StreamState, SummarizeCompactor, TERMINAL_TASK_STATUSES, TTS_MODELS, TTS_MODEL_REGISTRY, TaskTimeoutError, TaskValidationError, TavilyProvider, TextToSpeech, TokenBucketRateLimiter, ToolCallState, ToolExecutionError, ToolExecutionPipeline, ToolManager, ToolNotFoundError, ToolPermissionManager, ToolRegistry, ToolTimeoutError, TruncateCompactor, VENDORS, VENDOR_ICON_MAP, VIDEO_MODELS, VIDEO_MODEL_REGISTRY, Vendor, VideoGeneration, WorkingMemory, WorkingMemoryPluginNextGen, addJitter, allVendorTemplates, assertNotDestroyed, authenticatedFetch, backoffSequence, backoffWait, bash, buildAuthConfig, buildEndpointWithQuery, buildQueryString, calculateBackoff, calculateCost, calculateEntrySize, calculateImageCost, calculateSTTCost, calculateTTSCost, calculateVideoCost, canTaskExecute, createAgentStorage, createAuthenticatedFetch, createBashTool, createConnectorFromTemplate, createEditFileTool, createEstimator, createExecuteJavaScriptTool, createFileAgentDefinitionStorage, createFileContextStorage, createGlobTool, createGrepTool, createImageGenerationTool, createImageProvider, createListDirectoryTool, createMessageWithImages, createMetricsCollector, createPlan, createProvider, createReadFileTool, createSpeechToTextTool, createTask, createTextMessage, createTextToSpeechTool, createVideoProvider, createVideoTools, createWriteFileTool, defaultDescribeCall, detectDependencyCycle, detectServiceFromURL, developerTools, editFile, evaluateCondition, extractJSON, extractJSONField, extractNumber, findConnectorByServiceTypes, forPlan, forTasks, generateEncryptionKey, generateSimplePlan, generateWebAPITool, getActiveImageModels, getActiveModels, getActiveSTTModels, getActiveTTSModels, getActiveVideoModels, getAllBuiltInTools, getAllServiceIds, getAllVendorLogos, getAllVendorTemplates, getBackgroundOutput, getConnectorTools, getCredentialsSetupURL, getDocsURL, getImageModelInfo, getImageModelsByVendor, getImageModelsWithFeature, getMediaOutputHandler, getModelInfo, getModelsByVendor, getNextExecutableTasks, getRegisteredScrapeProviders, getSTTModelInfo, getSTTModelsByVendor, getSTTModelsWithFeature, getServiceDefinition, getServiceInfo, getServicesByCategory, getTTSModelInfo, getTTSModelsByVendor, getTTSModelsWithFeature, getTaskDependencies, getToolByName, getToolCallDescription, getToolCategories, getToolRegistry, getToolsByCategory, getToolsRequiringConnector, getVendorAuthTemplate, getVendorColor, getVendorInfo, getVendorLogo, getVendorLogoCdnUrl, getVendorLogoSvg, getVendorTemplate, getVideoModelInfo, getVideoModelsByVendor, getVideoModelsWithAudio, getVideoModelsWithFeature, glob, globalErrorHandler, grep, hasClipboardImage, hasVendorLogo, isBlockedCommand, isErrorEvent, isExcludedExtension, isKnownService, isOutputTextDelta, isResponseComplete, isSimpleScope, isStreamEvent, isTaskAwareScope, isTaskBlocked, isTerminalMemoryStatus, isTerminalStatus, isToolCallArgumentsDelta, isToolCallArgumentsDone, isToolCallStart, isVendor, killBackgroundProcess, listConnectorsByServiceTypes, listDirectory, listVendorIds, listVendors, listVendorsByAuthType, listVendorsByCategory, listVendorsWithLogos, logger, metrics, readClipboardImage, readFile4 as readFile, registerScrapeProvider, resolveConnector, resolveDependencies, retryWithBackoff, scopeEquals, scopeMatches, setMediaOutputHandler, setMetricsCollector, simpleTokenEstimator, toConnectorOptions, toolRegistry, tools_exports as tools, updateTaskStatus, validatePath, writeFile4 as writeFile };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map