@inkeep/agents-core 0.24.1 → 0.25.0

package/dist/index.cjs

@@ -2519,7 +2519,7 @@ var require_typescript = __commonJS({
         affectsEmitOptionDeclarations: () => affectsEmitOptionDeclarations,
         allKeysStartWithDot: () => allKeysStartWithDot,
         altDirectorySeparator: () => altDirectorySeparator,
-        and: () => and20,
+        and: () => and21,
         append: () => append,
         appendIfUnique: () => appendIfUnique,
         arrayFrom: () => arrayFrom,
@@ -4741,16 +4741,16 @@ var require_typescript = __commonJS({
         return -1;
       }
       function countWhere(array, predicate) {
-        let count16 = 0;
+        let count17 = 0;
         if (array !== void 0) {
           for (let i = 0; i < array.length; i++) {
             const v = array[i];
             if (predicate(v, i)) {
-              count16++;
+              count17++;
             }
           }
         }
-        return count16;
+        return count17;
       }
       function filter(array, f) {
         if (array !== void 0) {
@@ -5303,12 +5303,12 @@ var require_typescript = __commonJS({
         }
         return ~low;
       }
-      function reduceLeft(array, f, initial, start, count16) {
+      function reduceLeft(array, f, initial, start, count17) {
         if (array && array.length > 0) {
           const size = array.length;
           if (size > 0) {
             let pos = start === void 0 || start < 0 ? 0 : start;
-            const end = count16 === void 0 || pos + count16 > size - 1 ? size - 1 : pos + count16;
+            const end = count17 === void 0 || pos + count17 > size - 1 ? size - 1 : pos + count17;
             let result;
             if (arguments.length <= 2) {
               result = array[pos];
@@ -5360,9 +5360,9 @@ var require_typescript = __commonJS({
         }
         return values;
       }
-      function arrayOf(count16, f) {
-        const result = new Array(count16);
-        for (let i = 0; i < count16; i++) {
+      function arrayOf(count17, f) {
+        const result = new Array(count17);
+        for (let i = 0; i < count17; i++) {
           result[i] = f(i);
         }
         return result;
@@ -5970,7 +5970,7 @@ var require_typescript = __commonJS({
       function isPatternMatch({ prefix, suffix }, candidate) {
         return candidate.length >= prefix.length + suffix.length && startsWith(candidate, prefix) && endsWith(candidate, suffix);
       }
-      function and20(f, g) {
+      function and21(f, g) {
         return (arg) => f(arg) && g(arg);
       }
       function or(...fs2) {
@@ -7474,8 +7474,8 @@ ${lanes.join("\n")}
       var durations = /* @__PURE__ */ new Map();
       function mark(markName) {
         if (enabled) {
-          const count16 = counts.get(markName) ?? 0;
-          counts.set(markName, count16 + 1);
+          const count17 = counts.get(markName) ?? 0;
+          counts.set(markName, count17 + 1);
           marks.set(markName, timestamp());
           performanceImpl == null ? void 0 : performanceImpl.mark(markName);
           if (typeof onProfilerEvent === "function") {
@@ -14985,20 +14985,20 @@ ${lanes.join("\n")}
           tokenValue = text2.substring(start2, pos);
           return isOctal;
         }
-        function scanExactNumberOfHexDigits(count16, canHaveSeparators) {
+        function scanExactNumberOfHexDigits(count17, canHaveSeparators) {
           const valueString = scanHexDigits(
             /*minCount*/
-            count16,
+            count17,
             /*scanAsManyAsPossible*/
             false,
             canHaveSeparators
           );
           return valueString ? parseInt(valueString, 16) : -1;
         }
-        function scanMinimumNumberOfHexDigits(count16, canHaveSeparators) {
+        function scanMinimumNumberOfHexDigits(count17, canHaveSeparators) {
           return scanHexDigits(
             /*minCount*/
-            count16,
+            count17,
             /*scanAsManyAsPossible*/
             true,
             canHaveSeparators
@@ -33815,13 +33815,13 @@ ${lanes.join("\n")}
             [expression]
           );
         }
-        function createReadHelper(iteratorRecord, count16) {
+        function createReadHelper(iteratorRecord, count17) {
           context.requestEmitHelper(readHelper);
           return factory2.createCallExpression(
             getUnscopedHelperName("__read"),
             /*typeArguments*/
             void 0,
-            count16 !== void 0 ? [iteratorRecord, factory2.createNumericLiteral(count16 + "")] : [iteratorRecord]
+            count17 !== void 0 ? [iteratorRecord, factory2.createNumericLiteral(count17 + "")] : [iteratorRecord]
           );
         }
         function createGeneratorHelper(body) {
@@ -56128,11 +56128,11 @@ ${lanes.join("\n")}
         return comparePaths(a, b, ignoreCase) === 0;
       }
       function countPathComponents(path2) {
-        let count16 = 0;
+        let count17 = 0;
         for (let i = startsWith(path2, "./") ? 2 : 0; i < path2.length; i++) {
-          if (path2.charCodeAt(i) === 47) count16++;
+          if (path2.charCodeAt(i) === 47) count17++;
         }
-        return count16;
+        return count17;
       }
       function comparePathsByRedirectAndNumberOfDirectorySeparators(a, b) {
         return compareBooleans(b.isRedirect, a.isRedirect) || compareNumberOfDirectorySeparators(a.path, b.path);
@@ -56965,7 +56965,7 @@ ${lanes.join("\n")}
         SignatureCheckMode3[SignatureCheckMode3["Callback"] = 3] = "Callback";
         return SignatureCheckMode3;
       })(SignatureCheckMode || {});
-      var isNotOverloadAndNotAccessor = and20(isNotOverload, isNotAccessor);
+      var isNotOverloadAndNotAccessor = and21(isNotOverload, isNotAccessor);
       var intrinsicTypeKinds = new Map(Object.entries({
         Uppercase: 0,
         Lowercase: 1,
@@ -62705,7 +62705,7 @@ ${lanes.join("\n")}
                   deepCloneOrReuseNode
                 )), node);
               }
-              function deepCloneOrReuseNodes(nodes, visitor, test, start, count16) {
+              function deepCloneOrReuseNodes(nodes, visitor, test, start, count17) {
                 if (nodes && nodes.length === 0) {
                   return setTextRange(factory.createNodeArray(
                     /*elements*/
@@ -62713,7 +62713,7 @@ ${lanes.join("\n")}
                     nodes.hasTrailingComma
                   ), nodes);
                 }
-                return visitNodes2(nodes, visitor, test, start, count16);
+                return visitNodes2(nodes, visitor, test, start, count17);
               }
             }
             function createTypeNodeFromObjectType(type2) {
@@ -66669,10 +66669,10 @@ ${lanes.join("\n")}
               if (t.flags & 512 || !expandingEnum && t.flags | 1056) {
                 const baseType = t.flags & 512 ? booleanType : getBaseTypeOfEnumLikeType(t);
                 if (baseType.flags & 1048576) {
-                  const count16 = baseType.types.length;
-                  if (i + count16 <= types.length && getRegularTypeOfLiteralType(types[i + count16 - 1]) === getRegularTypeOfLiteralType(baseType.types[count16 - 1])) {
+                  const count17 = baseType.types.length;
+                  if (i + count17 <= types.length && getRegularTypeOfLiteralType(types[i + count17 - 1]) === getRegularTypeOfLiteralType(baseType.types[count17 - 1])) {
                     result.push(baseType);
-                    i += count16 - 1;
+                    i += count17 - 1;
                     continue;
                   }
                 }
@@ -71638,18 +71638,18 @@ ${lanes.join("\n")}
             let i = 0;
             while (i < length2) {
               const startId = types[i].id;
-              let count16 = 1;
-              while (i + count16 < length2 && types[i + count16].id === startId + count16) {
-                count16++;
+              let count17 = 1;
+              while (i + count17 < length2 && types[i + count17].id === startId + count17) {
+                count17++;
               }
               if (result.length) {
                 result += ",";
               }
               result += startId;
-              if (count16 > 1) {
-                result += ":" + count16;
+              if (count17 > 1) {
+                result += ":" + count17;
               }
-              i += count16;
+              i += count17;
             }
           }
           return result;
@@ -72929,7 +72929,7 @@ ${lanes.join("\n")}
           const hasEmptyObject = hasObjectTypes && some(types, (t) => !!(t.flags & 524288) && !isGenericMappedType(t) && isEmptyResolvedType(resolveStructuredTypeMembers(t)));
           const len = types.length;
           let i = len;
-          let count16 = 0;
+          let count17 = 0;
           while (i > 0) {
             i--;
             const source = types[i];
@@ -72944,15 +72944,15 @@ ${lanes.join("\n")}
               const keyPropertyType = keyProperty && getRegularTypeOfLiteralType(getTypeOfSymbol(keyProperty));
               for (const target of types) {
                 if (source !== target) {
-                  if (count16 === 1e5) {
-                    const estimatedCount = count16 / (len - i) * len;
+                  if (count17 === 1e5) {
+                    const estimatedCount = count17 / (len - i) * len;
                     if (estimatedCount > 1e6) {
                       (_a = tracing) == null ? void 0 : _a.instant(tracing.Phase.CheckTypes, "removeSubtypes_DepthLimit", { typeIds: types.map((t) => t.id) });
                       error2(currentNode, Diagnostics.Expression_produces_a_union_type_that_is_too_complex_to_represent);
                       return void 0;
                     }
                   }
-                  count16++;
+                  count17++;
                   if (keyProperty && target.flags & (524288 | 2097152 | 58982400)) {
                     const t = getTypeOfPropertyOfType(target, keyProperty.escapedName);
                     if (t && isUnitType(t) && getRegularTypeOfLiteralType(t) !== keyPropertyType) {
@@ -73453,9 +73453,9 @@ ${lanes.join("\n")}
           return true;
         }
         function getCrossProductIntersections(types, flags) {
-          const count16 = getCrossProductUnionSize(types);
+          const count17 = getCrossProductUnionSize(types);
           const intersections = [];
-          for (let i = 0; i < count16; i++) {
+          for (let i = 0; i < count17; i++) {
             const constituents = types.slice();
             let n = i;
             for (let j = types.length - 1; j >= 0; j--) {
@@ -79317,14 +79317,14 @@ ${lanes.join("\n")}
               return some(type.types, (t) => isDeeplyNestedType(t, stack, depth, maxDepth));
             }
             const identity2 = getRecursionIdentity(type);
-            let count16 = 0;
+            let count17 = 0;
             let lastTypeId = 0;
             for (let i = 0; i < depth; i++) {
               const t = stack[i];
               if (hasMatchingRecursionIdentity(t, identity2)) {
                 if (t.id >= lastTypeId) {
-                  count16++;
-                  if (count16 >= maxDepth) {
+                  count17++;
+                  if (count17 >= maxDepth) {
                     return true;
                   }
                 }
@@ -80784,8 +80784,8 @@ ${lanes.join("\n")}
             ];
           }
           function inferFromTypeArguments(sourceTypes, targetTypes, variances) {
-            const count16 = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
-            for (let i = 0; i < count16; i++) {
+            const count17 = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
+            for (let i = 0; i < count17; i++) {
               if (i < variances.length && (variances[i] & 7) === 2) {
                 inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
               } else {
@@ -81529,7 +81529,7 @@ ${lanes.join("\n")}
         }
         function mapTypesByKeyProperty(types, name) {
           const map2 = /* @__PURE__ */ new Map();
-          let count16 = 0;
+          let count17 = 0;
           for (const type of types) {
             if (type.flags & (524288 | 2097152 | 58982400)) {
               const discriminant = getTypeOfPropertyOfType(type, name);
@@ -81548,11 +81548,11 @@ ${lanes.join("\n")}
                     duplicate = true;
                   }
                 });
-                if (!duplicate) count16++;
+                if (!duplicate) count17++;
               }
             }
           }
-          return count16 >= 10 && count16 * 2 >= types.length ? map2 : void 0;
+          return count17 >= 10 && count17 * 2 >= types.length ? map2 : void 0;
         }
         function getKeyPropertyName(unionType) {
           const types = unionType.types;
@@ -99776,7 +99776,7 @@ ${lanes.join("\n")}
                 if (flags & (1920 | 384)) {
                   return;
                 }
-                const exportedDeclarationsCount = countWhere(declarations, and20(isNotOverloadAndNotAccessor, not2(isInterfaceDeclaration)));
+                const exportedDeclarationsCount = countWhere(declarations, and21(isNotOverloadAndNotAccessor, not2(isInterfaceDeclaration)));
                 if (flags & 524288 && exportedDeclarationsCount <= 2) {
                   return;
                 }
@@ -104164,7 +104164,7 @@ ${lanes.join("\n")}
         Debug.assertNode(visitedNode, test);
         return visitedNode;
       }
-      function visitNodes2(nodes, visitor, test, start, count16) {
+      function visitNodes2(nodes, visitor, test, start, count17) {
         if (nodes === void 0) {
           return nodes;
         }
@@ -104172,20 +104172,20 @@ ${lanes.join("\n")}
         if (start === void 0 || start < 0) {
           start = 0;
         }
-        if (count16 === void 0 || count16 > length2 - start) {
-          count16 = length2 - start;
+        if (count17 === void 0 || count17 > length2 - start) {
+          count17 = length2 - start;
         }
         let hasTrailingComma;
         let pos = -1;
         let end = -1;
-        if (start > 0 || count16 < length2) {
-          hasTrailingComma = nodes.hasTrailingComma && start + count16 === length2;
+        if (start > 0 || count17 < length2) {
+          hasTrailingComma = nodes.hasTrailingComma && start + count17 === length2;
         } else {
           pos = nodes.pos;
           end = nodes.end;
           hasTrailingComma = nodes.hasTrailingComma;
         }
-        const updated = visitArrayWorker(nodes, visitor, test, start, count16);
+        const updated = visitArrayWorker(nodes, visitor, test, start, count17);
         if (updated !== nodes) {
           const updatedArray = factory.createNodeArray(updated, hasTrailingComma);
           setTextRangePosEnd(updatedArray, pos, end);
@@ -104193,7 +104193,7 @@ ${lanes.join("\n")}
         }
         return nodes;
       }
-      function visitArray(nodes, visitor, test, start, count16) {
+      function visitArray(nodes, visitor, test, start, count17) {
         if (nodes === void 0) {
           return nodes;
         }
@@ -104201,18 +104201,18 @@ ${lanes.join("\n")}
         if (start === void 0 || start < 0) {
           start = 0;
         }
-        if (count16 === void 0 || count16 > length2 - start) {
-          count16 = length2 - start;
+        if (count17 === void 0 || count17 > length2 - start) {
+          count17 = length2 - start;
         }
-        return visitArrayWorker(nodes, visitor, test, start, count16);
+        return visitArrayWorker(nodes, visitor, test, start, count17);
       }
-      function visitArrayWorker(nodes, visitor, test, start, count16) {
+      function visitArrayWorker(nodes, visitor, test, start, count17) {
         let updated;
         const length2 = nodes.length;
-        if (start > 0 || count16 < length2) {
+        if (start > 0 || count17 < length2) {
           updated = [];
         }
-        for (let i = 0; i < count16; i++) {
+        for (let i = 0; i < count17; i++) {
           const node = nodes[i + start];
           const visited = node !== void 0 ? visitor ? visitor(node) : node : void 0;
           if (updated !== void 0 || visited === void 0 || visited !== node) {
@@ -135496,7 +135496,7 @@ ${lanes.join("\n")}
               break;
           }
         }
-        function emitList(parentNode, children, format, parenthesizerRule, start, count16) {
+        function emitList(parentNode, children, format, parenthesizerRule, start, count17) {
           emitNodeList(
             emit,
             parentNode,
@@ -135504,18 +135504,18 @@ ${lanes.join("\n")}
             format | (parentNode && getEmitFlags(parentNode) & 2 ? 65536 : 0),
             parenthesizerRule,
             start,
-            count16
+            count17
           );
         }
-        function emitExpressionList(parentNode, children, format, parenthesizerRule, start, count16) {
-          emitNodeList(emitExpression, parentNode, children, format, parenthesizerRule, start, count16);
+        function emitExpressionList(parentNode, children, format, parenthesizerRule, start, count17) {
+          emitNodeList(emitExpression, parentNode, children, format, parenthesizerRule, start, count17);
         }
-        function emitNodeList(emit2, parentNode, children, format, parenthesizerRule, start = 0, count16 = children ? children.length - start : 0) {
+        function emitNodeList(emit2, parentNode, children, format, parenthesizerRule, start = 0, count17 = children ? children.length - start : 0) {
           const isUndefined = children === void 0;
           if (isUndefined && format & 16384) {
             return;
           }
-          const isEmpty = children === void 0 || start >= children.length || count16 === 0;
+          const isEmpty = children === void 0 || start >= children.length || count17 === 0;
           if (isEmpty && format & 32768) {
             onBeforeEmitNodeArray == null ? void 0 : onBeforeEmitNodeArray(children);
             onAfterEmitNodeArray == null ? void 0 : onAfterEmitNodeArray(children);
@@ -135539,7 +135539,7 @@ ${lanes.join("\n")}
               writeSpace();
             }
           } else {
-            emitNodeListItems(emit2, parentNode, children, format, parenthesizerRule, start, count16, children.hasTrailingComma, children);
+            emitNodeListItems(emit2, parentNode, children, format, parenthesizerRule, start, count17, children.hasTrailingComma, children);
           }
           onAfterEmitNodeArray == null ? void 0 : onAfterEmitNodeArray(children);
           if (format & 15360) {
@@ -135549,7 +135549,7 @@ ${lanes.join("\n")}
             writePunctuation(getClosingBracket(format));
           }
         }
-        function emitNodeListItems(emit2, parentNode, children, format, parenthesizerRule, start, count16, hasTrailingComma, childrenTextRange) {
+        function emitNodeListItems(emit2, parentNode, children, format, parenthesizerRule, start, count17, hasTrailingComma, childrenTextRange) {
           const mayEmitInterveningComments = (format & 262144) === 0;
           let shouldEmitInterveningComments = mayEmitInterveningComments;
           const leadingLineTerminatorCount = getLeadingLineTerminatorCount(parentNode, children[start], format);
@@ -135565,7 +135565,7 @@ ${lanes.join("\n")}
           const emitListItem = getEmitListItem(emit2, parenthesizerRule);
           let previousSibling;
           let shouldDecreaseIndentAfterEmit = false;
-          for (let i = 0; i < count16; i++) {
+          for (let i = 0; i < count17; i++) {
             const child = children[start + i];
             if (format & 32) {
               writeLine();
@@ -135630,7 +135630,7 @@ ${lanes.join("\n")}
           if (format & 128) {
             decreaseIndent();
           }
-          const closingLineTerminatorCount = getClosingLineTerminatorCount(parentNode, children[start + count16 - 1], format, childrenTextRange);
+          const closingLineTerminatorCount = getClosingLineTerminatorCount(parentNode, children[start + count17 - 1], format, childrenTextRange);
           if (closingLineTerminatorCount) {
             writeLine(closingLineTerminatorCount);
           } else if (format & (2097152 | 256)) {
@@ -135680,8 +135680,8 @@ ${lanes.join("\n")}
             writer.write(s);
           }
         }
-        function writeLine(count16 = 1) {
-          for (let i = 0; i < count16; i++) {
+        function writeLine(count17 = 1) {
+          for (let i = 0; i < count17; i++) {
             writer.writeLine(i > 0);
           }
         }
@@ -136210,10 +136210,10 @@ ${lanes.join("\n")}
             }
           }
           while (true) {
-            const count16 = tempFlags2 & 268435455;
+            const count17 = tempFlags2 & 268435455;
             tempFlags2++;
-            if (count16 !== 8 && count16 !== 13) {
-              const name = count16 < 26 ? "_" + String.fromCharCode(97 + count16) : "_" + (count16 - 26);
+            if (count17 !== 8 && count17 !== 13) {
+              const name = count17 < 26 ? "_" + String.fromCharCode(97 + count17) : "_" + (count17 - 26);
               const fullName = formatGeneratedName(privateName, prefix, name, suffix);
               if (isUniqueName(fullName, privateName)) {
                 if (privateName) {
@@ -148280,12 +148280,12 @@ ${lanes.join("\n")}
         for (const line of output) {
           sys2.write(line);
         }
-        function example(ex, desc15) {
+        function example(ex, desc16) {
           const examples = typeof ex === "string" ? [ex] : ex;
           for (const example2 of examples) {
             output.push("  " + colors.blue(example2) + sys2.newLine);
           }
-          output.push("  " + getDiagnosticText(desc15) + sys2.newLine + sys2.newLine);
+          output.push("  " + getDiagnosticText(desc16) + sys2.newLine + sys2.newLine);
         }
       }
       function printAllHelp(sys2, compilerOptions, buildOptions, watchOptions) {
@@ -148937,7 +148937,7 @@ ${lanes.join("\n")}
               reportCountStatistic("Lines of " + key, value);
             }
           } else {
-            reportCountStatistic("Lines", reduceLeftIterator(lineCounts.values(), (sum, count16) => sum + count16, 0));
+            reportCountStatistic("Lines", reduceLeftIterator(lineCounts.values(), (sum, count17) => sum + count17, 0));
           }
           reportCountStatistic("Identifiers", program.getIdentifierCount());
           reportCountStatistic("Symbols", program.getSymbolCount());
@@ -149042,11 +149042,11 @@ ${lanes.join("\n")}
           statistics.push(s);
           if (aggregate) solutionPerformance == null ? void 0 : solutionPerformance.addAggregateStatistic(s);
         }
-        function reportCountStatistic(name, count16) {
+        function reportCountStatistic(name, count17) {
           reportStatisticalValue(
             {
               name,
-              value: count16,
+              value: count17,
               type: 1
               /* count */
             },
@@ -149547,8 +149547,8 @@ ${lanes.join("\n")}
                 nonlocalNode ? visitNodesWithoutCopyingPositions : void 0
               );
             }
-            function visitNodesWithoutCopyingPositions(nodes, visitor, test, start, count16) {
-              let result = visitNodes2(nodes, visitor, test, start, count16);
+            function visitNodesWithoutCopyingPositions(nodes, visitor, test, start, count17) {
+              let result = visitNodes2(nodes, visitor, test, start, count17);
               if (result) {
                 if (result.pos !== -1 || result.end !== -1) {
                   if (result === nodes) {
@@ -152441,9 +152441,9 @@ ${lanes.join("\n")}
       function getSnapshotText(snap) {
         return snap.getText(0, snap.getLength());
       }
-      function repeatString(str, count16) {
+      function repeatString(str, count17) {
         let result = "";
-        for (let i = 0; i < count16; i++) {
+        for (let i = 0; i < count17; i++) {
           result += str;
         }
         return result;
@@ -170564,7 +170564,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         const maybeHeritageClauseSymbol = getHeritageClauseSymbolTable(classDeclaration, checker);
         const implementedType = checker.getTypeAtLocation(implementedTypeNode);
         const implementedTypeSymbols = checker.getPropertiesOfType(implementedType);
-        const nonPrivateAndNotExistedInHeritageClauseMembers = implementedTypeSymbols.filter(and20(symbolPointsToNonPrivateMember, (symbol) => !maybeHeritageClauseSymbol.has(symbol.escapedName)));
+        const nonPrivateAndNotExistedInHeritageClauseMembers = implementedTypeSymbols.filter(and21(symbolPointsToNonPrivateMember, (symbol) => !maybeHeritageClauseSymbol.has(symbol.escapedName)));
         const classType = checker.getTypeAtLocation(classDeclaration);
         const constructor = find(classDeclaration.members, (m) => isConstructorDeclaration(m));
         if (!classType.getNumberIndexType()) {
@@ -185221,8 +185221,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       function isAmbientModuleDeclaration(node) {
         return node.kind === 268 && node.name.kind === 11;
       }
-      function isExternalModuleImportEquals(eq20) {
-        return eq20.moduleReference.kind === 284 && eq20.moduleReference.expression.kind === 11;
+      function isExternalModuleImportEquals(eq21) {
+        return eq21.moduleReference.kind === 284 && eq21.moduleReference.expression.kind === 11;
       }
       var DefinitionKind = /* @__PURE__ */ ((DefinitionKind2) => {
         DefinitionKind2[DefinitionKind2["Symbol"] = 0] = "Symbol";
@@ -190869,13 +190869,13 @@ ${content}
           if (candidates[i] === resolvedSignature) {
             selectedItemIndex = itemsSeen;
             if (item.length > 1) {
-              let count16 = 0;
+              let count17 = 0;
               for (const i2 of item) {
                 if (i2.isVariadic || i2.parameters.length >= argumentCount) {
-                  selectedItemIndex = itemsSeen + count16;
+                  selectedItemIndex = itemsSeen + count17;
                   break;
                 }
-                count16++;
+                count17++;
               }
             }
           }
@@ -193176,8 +193176,8 @@ ${options.prefix}` : "\n" : options.prefix
         setTextRangePosEnd(newNode, getPos2(node), getEnd(node));
         return newNode;
       }
-      function assignPositionsToNodeArray(nodes, visitor, test, start, count16) {
-        const visited = visitNodes2(nodes, visitor, test, start, count16);
+      function assignPositionsToNodeArray(nodes, visitor, test, start, count17) {
+        const visited = visitNodes2(nodes, visitor, test, start, count17);
         if (!visited) {
           return visited;
         }
@@ -197854,7 +197854,7 @@ ${options.prefix}` : "\n" : options.prefix
         affectsEmitOptionDeclarations: () => affectsEmitOptionDeclarations,
         allKeysStartWithDot: () => allKeysStartWithDot,
         altDirectorySeparator: () => altDirectorySeparator,
-        and: () => and20,
+        and: () => and21,
         append: () => append,
         appendIfUnique: () => appendIfUnique,
         arrayFrom: () => arrayFrom,
@@ -213467,6 +213467,8 @@ __export(schema_exports, {
   subAgentArtifactComponentsRelations: () => subAgentArtifactComponentsRelations,
   subAgentDataComponents: () => subAgentDataComponents,
   subAgentDataComponentsRelations: () => subAgentDataComponentsRelations,
+  subAgentExternalAgentRelations: () => subAgentExternalAgentRelations,
+  subAgentExternalAgentRelationsRelations: () => subAgentExternalAgentRelationsRelations,
   subAgentFunctionToolRelations: () => subAgentFunctionToolRelations,
   subAgentFunctionToolRelationsRelations: () => subAgentFunctionToolRelationsRelations,
   subAgentRelations: () => subAgentRelations,
@@ -213612,7 +213614,6 @@ var subAgentRelations = sqliteCore.sqliteTable(
     ...agentScoped,
     sourceSubAgentId: sqliteCore.text("source_sub_agent_id").notNull(),
     targetSubAgentId: sqliteCore.text("target_sub_agent_id"),
-    externalSubAgentId: sqliteCore.text("external_sub_agent_id"),
     relationType: sqliteCore.text("relation_type"),
     ...timestamps
   },
@@ -213628,19 +213629,18 @@ var subAgentRelations = sqliteCore.sqliteTable(
 var externalAgents = sqliteCore.sqliteTable(
   "external_agents",
   {
-    ...agentScoped,
+    ...projectScoped,
     ...uiProperties,
     baseUrl: sqliteCore.text("base_url").notNull(),
     credentialReferenceId: sqliteCore.text("credential_reference_id"),
-    headers: sqliteCore.blob("headers", { mode: "json" }).$type(),
     ...timestamps
   },
   (table) => [
-    sqliteCore.primaryKey({ columns: [table.tenantId, table.projectId, table.agentId, table.id] }),
+    sqliteCore.primaryKey({ columns: [table.tenantId, table.projectId, table.id] }),
     sqliteCore.foreignKey({
-      columns: [table.tenantId, table.projectId, table.agentId],
-      foreignColumns: [agents.tenantId, agents.projectId, agents.id],
-      name: "external_agents_agent_fk"
+      columns: [table.tenantId, table.projectId],
+      foreignColumns: [projects.tenantId, projects.id],
+      name: "external_agents_project_fk"
     }).onDelete("cascade"),
     sqliteCore.foreignKey({
       columns: [table.tenantId, table.projectId, table.credentialReferenceId],
@@ -213859,6 +213859,28 @@ var subAgentToolRelations = sqliteCore.sqliteTable(
     }).onDelete("cascade")
   ]
 );
+var subAgentExternalAgentRelations = sqliteCore.sqliteTable(
+  "sub_agent_external_agent_relations",
+  {
+    ...subAgentScoped,
+    externalAgentId: sqliteCore.text("external_agent_id").notNull(),
+    headers: sqliteCore.blob("headers", { mode: "json" }).$type(),
+    ...timestamps
+  },
+  (table) => [
+    sqliteCore.primaryKey({ columns: [table.tenantId, table.projectId, table.agentId, table.id] }),
+    sqliteCore.foreignKey({
+      columns: [table.tenantId, table.projectId, table.agentId, table.subAgentId],
+      foreignColumns: [subAgents.tenantId, subAgents.projectId, subAgents.agentId, subAgents.id],
+      name: "sub_agent_external_agent_relations_sub_agent_fk"
+    }).onDelete("cascade"),
+    sqliteCore.foreignKey({
+      columns: [table.tenantId, table.projectId, table.externalAgentId],
+      foreignColumns: [externalAgents.tenantId, externalAgents.projectId, externalAgents.id],
+      name: "sub_agent_external_agent_relations_external_agent_fk"
+    }).onDelete("cascade")
+  ]
+);
 var subAgentFunctionToolRelations = sqliteCore.sqliteTable(
   "sub_agent_function_tool_relations",
   {
@@ -214120,7 +214142,7 @@ var externalAgentsRelations = drizzleOrm.relations(externalAgents, ({ one, many
     fields: [externalAgents.tenantId, externalAgents.projectId],
     references: [projects.tenantId, projects.id]
   }),
-  subAgentRelations: many(subAgentRelations),
+  subAgentExternalAgentRelations: many(subAgentExternalAgentRelations),
   credentialReference: one(credentialReferences, {
     fields: [externalAgents.credentialReferenceId],
     references: [credentialReferences.id]
@@ -214192,13 +214214,13 @@ var messagesRelations = drizzleOrm.relations(messages, ({ one, many }) => ({
     relationName: "receivedMessages"
   }),
   fromExternalAgent: one(externalAgents, {
-    fields: [messages.fromExternalAgentId],
-    references: [externalAgents.id],
+    fields: [messages.tenantId, messages.projectId, messages.fromExternalAgentId],
+    references: [externalAgents.tenantId, externalAgents.projectId, externalAgents.id],
     relationName: "receivedExternalMessages"
   }),
   toExternalAgent: one(externalAgents, {
-    fields: [messages.toExternalAgentId],
-    references: [externalAgents.id],
+    fields: [messages.tenantId, messages.projectId, messages.toExternalAgentId],
+    references: [externalAgents.tenantId, externalAgents.projectId, externalAgents.id],
     relationName: "sentExternalMessages"
   }),
   task: one(tasks, {
@@ -214282,10 +214304,6 @@ var subAgentRelationsRelations = drizzleOrm.relations(subAgentRelations, ({ one
     fields: [subAgentRelations.targetSubAgentId],
     references: [subAgents.id],
     relationName: "targetRelations"
-  }),
-  externalAgent: one(externalAgents, {
-    fields: [subAgentRelations.externalSubAgentId],
-    references: [externalAgents.id]
   })
 }));
 var functionToolsRelations = drizzleOrm.relations(functionTools, ({ one, many }) => ({
@@ -214316,6 +214334,28 @@ var subAgentFunctionToolRelationsRelations = drizzleOrm.relations(
     })
   })
 );
+var subAgentExternalAgentRelationsRelations = drizzleOrm.relations(
+  subAgentExternalAgentRelations,
+  ({ one }) => ({
+    subAgent: one(subAgents, {
+      fields: [
+        subAgentExternalAgentRelations.tenantId,
+        subAgentExternalAgentRelations.projectId,
+        subAgentExternalAgentRelations.agentId,
+        subAgentExternalAgentRelations.subAgentId
+      ],
+      references: [subAgents.tenantId, subAgents.projectId, subAgents.agentId, subAgents.id]
+    }),
+    externalAgent: one(externalAgents, {
+      fields: [
+        subAgentExternalAgentRelations.tenantId,
+        subAgentExternalAgentRelations.projectId,
+        subAgentExternalAgentRelations.externalAgentId
+      ],
+      references: [externalAgents.tenantId, externalAgents.projectId, externalAgents.id]
+    })
+  })
+);
 
 // src/types/utility.ts
 var TOOL_STATUS_VALUES = ["healthy", "unhealthy", "unknown", "needs_auth"];
@@ -214628,16 +214668,15 @@ var SubAgentArtifactComponentApiUpdateSchema = createAgentScopedApiUpdateSchema(
   SubAgentArtifactComponentUpdateSchema
 );
 var ExternalAgentSelectSchema = drizzleZod.createSelectSchema(externalAgents).extend({
-  credentialReferenceId: zodOpenapi.z.string().nullable().optional(),
-  headers: zodOpenapi.z.record(zodOpenapi.z.string(), zodOpenapi.z.string()).nullable().optional()
+  credentialReferenceId: zodOpenapi.z.string().nullable().optional()
 });
 var ExternalAgentInsertSchema = drizzleZod.createInsertSchema(externalAgents).extend({
   id: resourceIdSchema
 });
 var ExternalAgentUpdateSchema = ExternalAgentInsertSchema.partial();
-var ExternalAgentApiSelectSchema = createAgentScopedApiSchema(ExternalAgentSelectSchema).openapi("ExternalAgent");
-var ExternalAgentApiInsertSchema = createAgentScopedApiInsertSchema(ExternalAgentInsertSchema).openapi("ExternalAgentCreate");
-var ExternalAgentApiUpdateSchema = createAgentScopedApiUpdateSchema(ExternalAgentUpdateSchema).openapi("ExternalAgentUpdate");
+var ExternalAgentApiSelectSchema = createApiSchema(ExternalAgentSelectSchema).openapi("ExternalAgent");
+var ExternalAgentApiInsertSchema = createApiInsertSchema(ExternalAgentInsertSchema).openapi("ExternalAgentCreate");
+var ExternalAgentApiUpdateSchema = createApiUpdateSchema(ExternalAgentUpdateSchema).openapi("ExternalAgentUpdate");
 var AllAgentSchema = zodOpenapi.z.discriminatedUnion("type", [
   SubAgentApiSelectSchema.extend({ type: zodOpenapi.z.literal("internal") }),
   ExternalAgentApiSelectSchema.extend({ type: zodOpenapi.z.literal("external") })
@@ -214702,7 +214741,8 @@ var CredentialReferenceInsertSchema = drizzleZod.createInsertSchema(credentialRe
 var CredentialReferenceUpdateSchema = CredentialReferenceInsertSchema.partial();
 var CredentialReferenceApiSelectSchema = createApiSchema(CredentialReferenceSelectSchema).extend({
   type: zodOpenapi.z.enum(CredentialStoreType),
-  tools: zodOpenapi.z.array(ToolSelectSchema).optional()
+  tools: zodOpenapi.z.array(ToolSelectSchema).optional(),
+  externalAgents: zodOpenapi.z.array(ExternalAgentSelectSchema).optional()
 }).openapi("CredentialReference");
 var CredentialReferenceApiInsertSchema = createApiInsertSchema(
   CredentialReferenceInsertSchema
@@ -214831,6 +214871,27 @@ var SubAgentToolRelationApiInsertSchema = createAgentScopedApiInsertSchema(
 var SubAgentToolRelationApiUpdateSchema = createAgentScopedApiUpdateSchema(
   SubAgentToolRelationUpdateSchema
 ).openapi("SubAgentToolRelationUpdate");
+var SubAgentExternalAgentRelationSelectSchema = drizzleZod.createSelectSchema(
+  subAgentExternalAgentRelations
+);
+var SubAgentExternalAgentRelationInsertSchema = drizzleZod.createInsertSchema(
+  subAgentExternalAgentRelations
+).extend({
+  id: resourceIdSchema,
+  subAgentId: resourceIdSchema,
+  externalAgentId: resourceIdSchema,
+  headers: zodOpenapi.z.record(zodOpenapi.z.string(), zodOpenapi.z.string()).nullish()
+});
+var SubAgentExternalAgentRelationUpdateSchema = SubAgentExternalAgentRelationInsertSchema.partial();
+var SubAgentExternalAgentRelationApiSelectSchema = createAgentScopedApiSchema(
+  SubAgentExternalAgentRelationSelectSchema
+).openapi("SubAgentExternalAgentRelation");
+var SubAgentExternalAgentRelationApiInsertSchema = createAgentScopedApiInsertSchema(
+  SubAgentExternalAgentRelationInsertSchema
+).omit({ id: true, subAgentId: true }).openapi("SubAgentExternalAgentRelationCreate");
+var SubAgentExternalAgentRelationApiUpdateSchema = createAgentScopedApiUpdateSchema(
+  SubAgentExternalAgentRelationUpdateSchema
+).openapi("SubAgentExternalAgentRelationUpdate");
 var LedgerArtifactSelectSchema = drizzleZod.createSelectSchema(ledgerArtifacts);
 var LedgerArtifactInsertSchema = drizzleZod.createInsertSchema(ledgerArtifacts);
 var LedgerArtifactUpdateSchema = LedgerArtifactInsertSchema.partial();
@@ -214859,6 +214920,11 @@ var CanUseItemSchema = zodOpenapi.z.object({
   toolSelection: zodOpenapi.z.array(zodOpenapi.z.string()).nullish(),
   headers: zodOpenapi.z.record(zodOpenapi.z.string(), zodOpenapi.z.string()).nullish()
 }).openapi("CanUseItem");
+var canDelegateToExternalAgentSchema = zodOpenapi.z.object({
+  externalAgentId: zodOpenapi.z.string(),
+  subAgentExternalAgentRelationId: zodOpenapi.z.string().optional(),
+  headers: zodOpenapi.z.record(zodOpenapi.z.string(), zodOpenapi.z.string()).nullish()
+});
 var FullAgentAgentInsertSchema = SubAgentApiInsertSchema.extend({
   type: zodOpenapi.z.literal("internal"),
   canUse: zodOpenapi.z.array(CanUseItemSchema),
@@ -214866,16 +214932,22 @@ var FullAgentAgentInsertSchema = SubAgentApiInsertSchema.extend({
   dataComponents: zodOpenapi.z.array(zodOpenapi.z.string()).optional(),
   artifactComponents: zodOpenapi.z.array(zodOpenapi.z.string()).optional(),
   canTransferTo: zodOpenapi.z.array(zodOpenapi.z.string()).optional(),
-  canDelegateTo: zodOpenapi.z.array(zodOpenapi.z.string()).optional()
+  canDelegateTo: zodOpenapi.z.array(
+    zodOpenapi.z.union([
+      zodOpenapi.z.string(),
+      // Internal subAgent ID
+      canDelegateToExternalAgentSchema
+      // External agent with headers
+    ])
+  ).optional()
 });
 var AgentWithinContextOfProjectSchema = AgentApiInsertSchema.extend({
-  subAgents: zodOpenapi.z.record(
-    zodOpenapi.z.string(),
-    zodOpenapi.z.union([FullAgentAgentInsertSchema, ExternalAgentApiInsertSchema])
-  ),
+  subAgents: zodOpenapi.z.record(zodOpenapi.z.string(), FullAgentAgentInsertSchema),
   // Lookup maps for UI to resolve canUse items
   tools: zodOpenapi.z.record(zodOpenapi.z.string(), ToolApiInsertSchema).optional(),
   // MCP tools (project-scoped)
+  externalAgents: zodOpenapi.z.record(zodOpenapi.z.string(), ExternalAgentApiInsertSchema).optional(),
+  // External agents (project-scoped)
   functionTools: zodOpenapi.z.record(zodOpenapi.z.string(), FunctionToolApiInsertSchema).optional(),
   // Function tools (agent-scoped)
   functions: zodOpenapi.z.record(zodOpenapi.z.string(), FunctionApiInsertSchema).optional(),
@@ -214937,6 +215009,7 @@ var FullProjectDefinitionSchema = ProjectApiInsertSchema.extend({
   functions: zodOpenapi.z.record(zodOpenapi.z.string(), FunctionApiInsertSchema).optional(),
   dataComponents: zodOpenapi.z.record(zodOpenapi.z.string(), DataComponentApiInsertSchema).optional(),
   artifactComponents: zodOpenapi.z.record(zodOpenapi.z.string(), ArtifactComponentApiInsertSchema).optional(),
+  externalAgents: zodOpenapi.z.record(zodOpenapi.z.string(), ExternalAgentApiInsertSchema).optional(),
   statusUpdates: zodOpenapi.z.optional(StatusUpdateSchema),
   credentialReferences: zodOpenapi.z.record(zodOpenapi.z.string(), CredentialReferenceApiInsertSchema).optional(),
   createdAt: zodOpenapi.z.string().optional(),
@@ -215842,7 +215915,7 @@ var listContextConfigsPaginated = (db) => async (params) => {
   };
 };
 var createContextConfig = (db) => async (params) => {
-  const id = params.id || nanoid.nanoid();
+  const id = params.id || generateId();
   const now = (/* @__PURE__ */ new Date()).toISOString();
   let contextVariables = params.contextVariables;
   if (contextVariables !== void 0 && contextVariables !== null && typeof contextVariables === "object" && Object.keys(contextVariables).length === 0) {
@@ -215948,8 +216021,7 @@ var getExternalAgent = (db) => async (params) => {
     where: drizzleOrm.and(
       drizzleOrm.eq(externalAgents.tenantId, params.scopes.tenantId),
       drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId),
-      drizzleOrm.eq(externalAgents.agentId, params.scopes.agentId),
-      drizzleOrm.eq(externalAgents.id, params.subAgentId)
+      drizzleOrm.eq(externalAgents.id, params.externalAgentId)
     )
   });
   return result || null;
@@ -215959,7 +216031,6 @@ var getExternalAgentByUrl = (db) => async (params) => {
     where: drizzleOrm.and(
       drizzleOrm.eq(externalAgents.tenantId, params.scopes.tenantId),
       drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId),
-      drizzleOrm.eq(externalAgents.agentId, params.scopes.agentId),
       drizzleOrm.eq(externalAgents.baseUrl, params.baseUrl)
     )
   });
@@ -215969,8 +216040,7 @@ var listExternalAgents = (db) => async (params) => {
   return await db.query.externalAgents.findMany({
     where: drizzleOrm.and(
       drizzleOrm.eq(externalAgents.tenantId, params.scopes.tenantId),
-      drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId),
-      drizzleOrm.eq(externalAgents.agentId, params.scopes.agentId)
+      drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId)
     ),
     orderBy: [drizzleOrm.asc(externalAgents.name)]
   });
@@ -215983,15 +216053,13 @@ var listExternalAgentsPaginated = (db) => async (params) => {
     db.select().from(externalAgents).where(
       drizzleOrm.and(
         drizzleOrm.eq(externalAgents.tenantId, params.scopes.tenantId),
-        drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId),
-        drizzleOrm.eq(externalAgents.agentId, params.scopes.agentId)
+        drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId)
       )
     ).limit(limit).offset(offset).orderBy(drizzleOrm.desc(externalAgents.createdAt)),
     db.select({ count: drizzleOrm.count() }).from(externalAgents).where(
       drizzleOrm.and(
         drizzleOrm.eq(externalAgents.tenantId, params.scopes.tenantId),
-        drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId),
-        drizzleOrm.eq(externalAgents.agentId, params.scopes.agentId)
+        drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId)
       )
     )
   ]);
@@ -216010,9 +216078,6 @@ var updateExternalAgent = (db) => async (params) => {
   if (Object.keys(updateData).length === 1) {
     throw new Error("No fields to update");
   }
-  if (updateData.headers !== void 0 && (updateData.headers === null || Object.keys(updateData.headers || {}).length === 0)) {
-    updateData.headers = null;
-  }
   if (updateData.credentialReferenceId === void 0) {
     updateData.credentialReferenceId = null;
   }
@@ -216020,8 +216085,7 @@ var updateExternalAgent = (db) => async (params) => {
     drizzleOrm.and(
       drizzleOrm.eq(externalAgents.tenantId, params.scopes.tenantId),
       drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId),
-      drizzleOrm.eq(externalAgents.agentId, params.scopes.agentId),
-      drizzleOrm.eq(externalAgents.id, params.subAgentId)
+      drizzleOrm.eq(externalAgents.id, params.externalAgentId)
     )
   ).returning();
   return result[0] || null;
@@ -216029,23 +216093,21 @@ var updateExternalAgent = (db) => async (params) => {
 var upsertExternalAgent = (db) => async (params) => {
   const scopes = {
     tenantId: params.data.tenantId,
-    projectId: params.data.projectId,
-    agentId: params.data.agentId
+    projectId: params.data.projectId
   };
   const existing = await getExternalAgent(db)({
     scopes,
-    subAgentId: params.data.id
+    externalAgentId: params.data.id
   });
   if (existing) {
     const updated = await updateExternalAgent(db)({
       scopes,
-      subAgentId: params.data.id,
+      externalAgentId: params.data.id,
       data: {
         name: params.data.name,
         description: params.data.description,
         baseUrl: params.data.baseUrl,
-        credentialReferenceId: params.data.credentialReferenceId,
-        headers: params.data.headers
+        credentialReferenceId: params.data.credentialReferenceId
       }
     });
     if (!updated) {
@@ -216062,8 +216124,7 @@ var deleteExternalAgent = (db) => async (params) => {
       drizzleOrm.and(
         drizzleOrm.eq(externalAgents.tenantId, params.scopes.tenantId),
         drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId),
-        drizzleOrm.eq(externalAgents.agentId, params.scopes.agentId),
-        drizzleOrm.eq(externalAgents.id, params.subAgentId)
+        drizzleOrm.eq(externalAgents.id, params.externalAgentId)
       )
     ).returning();
     return result.length > 0;
@@ -216084,8 +216145,7 @@ var countExternalAgents = (db) => async (params) => {
   const result = await db.select({ count: drizzleOrm.count() }).from(externalAgents).where(
     drizzleOrm.and(
       drizzleOrm.eq(externalAgents.tenantId, params.scopes.tenantId),
-      drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId),
-      drizzleOrm.eq(externalAgents.agentId, params.scopes.agentId)
+      drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId)
     )
   );
   const countValue = result[0]?.count;
@@ -216402,7 +216462,7 @@ var addFunctionToolToSubAgent = (db) => {
     const { scopes, subAgentId, functionToolId } = params;
     const { tenantId, projectId, agentId } = scopes;
     try {
-      const relationId = nanoid.nanoid();
+      const relationId = generateId();
       await db.insert(subAgentFunctionToolRelations).values({
         id: relationId,
         tenantId,
@@ -216455,6 +216515,284 @@ var updateSubAgentFunctionToolRelation = (db) => {
     }
   };
 };
+var getSubAgentExternalAgentRelationById = (db) => async (params) => {
+  return db.query.subAgentExternalAgentRelations.findFirst({
+    where: drizzleOrm.and(
+      drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.id, params.relationId)
+    )
+  });
+};
+var listSubAgentExternalAgentRelations = (db) => async (params) => {
+  const page = params.pagination?.page || 1;
+  const limit = Math.min(params.pagination?.limit || 10, 100);
+  const offset = (page - 1) * limit;
+  const whereClause = drizzleOrm.and(
+    drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+    drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+    drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId),
+    drizzleOrm.eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId)
+  );
+  const [data, totalResult] = await Promise.all([
+    db.select().from(subAgentExternalAgentRelations).where(whereClause).limit(limit).offset(offset).orderBy(drizzleOrm.desc(subAgentExternalAgentRelations.createdAt)),
+    db.select({ count: drizzleOrm.count() }).from(subAgentExternalAgentRelations).where(whereClause)
+  ]);
+  const total = totalResult[0]?.count || 0;
+  const pages = Math.ceil(total / limit);
+  return { data, pagination: { page, limit, total, pages } };
+};
+var getSubAgentExternalAgentRelations = (db) => async (params) => {
+  return await db.query.subAgentExternalAgentRelations.findMany({
+    where: drizzleOrm.and(
+      drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId)
+    )
+  });
+};
+var getSubAgentExternalAgentRelationsByAgent = (db) => async (params) => {
+  return await db.query.subAgentExternalAgentRelations.findMany({
+    where: drizzleOrm.and(
+      drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId)
+    )
+  });
+};
+var getSubAgentExternalAgentRelationsByExternalAgent = (db) => async (params) => {
+  const page = params.pagination?.page || 1;
+  const limit = Math.min(params.pagination?.limit || 10, 100);
+  const offset = (page - 1) * limit;
+  const whereClause = drizzleOrm.and(
+    drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+    drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+    drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId),
+    drizzleOrm.eq(subAgentExternalAgentRelations.externalAgentId, params.externalAgentId)
+  );
+  const [data, totalResult] = await Promise.all([
+    db.select().from(subAgentExternalAgentRelations).where(whereClause).limit(limit).offset(offset).orderBy(drizzleOrm.desc(subAgentExternalAgentRelations.createdAt)),
+    db.select({ count: drizzleOrm.count() }).from(subAgentExternalAgentRelations).where(whereClause)
+  ]);
+  const total = totalResult[0]?.count || 0;
+  const pages = Math.ceil(total / limit);
+  return {
+    data,
+    pagination: { page, limit, total, pages }
+  };
+};
+var getExternalAgentsForSubAgent = (db) => async (params) => {
+  const page = params.pagination?.page || 1;
+  const limit = Math.min(params.pagination?.limit || 10, 100);
+  const offset = (page - 1) * limit;
+  const [data, totalResult] = await Promise.all([
+    db.select({
+      id: subAgentExternalAgentRelations.id,
+      tenantId: subAgentExternalAgentRelations.tenantId,
+      projectId: subAgentExternalAgentRelations.projectId,
+      agentId: subAgentExternalAgentRelations.agentId,
+      subAgentId: subAgentExternalAgentRelations.subAgentId,
+      externalAgentId: subAgentExternalAgentRelations.externalAgentId,
+      headers: subAgentExternalAgentRelations.headers,
+      createdAt: subAgentExternalAgentRelations.createdAt,
+      updatedAt: subAgentExternalAgentRelations.updatedAt,
+      externalAgent: {
+        id: externalAgents.id,
+        name: externalAgents.name,
+        description: externalAgents.description,
+        baseUrl: externalAgents.baseUrl,
+        credentialReferenceId: externalAgents.credentialReferenceId,
+        tenantId: externalAgents.tenantId,
+        projectId: externalAgents.projectId,
+        createdAt: externalAgents.createdAt,
+        updatedAt: externalAgents.updatedAt
+      }
+    }).from(subAgentExternalAgentRelations).innerJoin(
+      externalAgents,
+      drizzleOrm.and(
+        drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, externalAgents.tenantId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.projectId, externalAgents.projectId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.externalAgentId, externalAgents.id)
+      )
+    ).where(
+      drizzleOrm.and(
+        drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId)
+      )
+    ).limit(limit).offset(offset).orderBy(drizzleOrm.desc(subAgentExternalAgentRelations.createdAt)),
+    db.select({ count: drizzleOrm.count() }).from(subAgentExternalAgentRelations).where(
+      drizzleOrm.and(
+        drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId)
+      )
+    )
+  ]);
+  const total = totalResult[0]?.count || 0;
+  const pages = Math.ceil(total / limit);
+  return {
+    data,
+    pagination: { page, limit, total, pages }
+  };
+};
+var getSubAgentsForExternalAgent = (db) => async (params) => {
+  const page = params.pagination?.page || 1;
+  const limit = Math.min(params.pagination?.limit || 10, 100);
+  const offset = (page - 1) * limit;
+  const [data, totalResult] = await Promise.all([
+    db.select({
+      id: subAgentExternalAgentRelations.id,
+      tenantId: subAgentExternalAgentRelations.tenantId,
+      projectId: subAgentExternalAgentRelations.projectId,
+      agentId: subAgentExternalAgentRelations.agentId,
+      subAgentId: subAgentExternalAgentRelations.subAgentId,
+      externalAgentId: subAgentExternalAgentRelations.externalAgentId,
+      headers: subAgentExternalAgentRelations.headers,
+      createdAt: subAgentExternalAgentRelations.createdAt,
+      updatedAt: subAgentExternalAgentRelations.updatedAt,
+      subAgent: {
+        id: subAgents.id,
+        name: subAgents.name,
+        description: subAgents.description,
+        prompt: subAgents.prompt,
+        conversationHistoryConfig: subAgents.conversationHistoryConfig,
+        models: subAgents.models,
+        stopWhen: subAgents.stopWhen,
+        createdAt: subAgents.createdAt,
+        updatedAt: subAgents.updatedAt
+      }
+    }).from(subAgentExternalAgentRelations).innerJoin(
+      subAgents,
+      drizzleOrm.and(
+        drizzleOrm.eq(subAgentExternalAgentRelations.subAgentId, subAgents.id),
+        drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, subAgents.tenantId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.projectId, subAgents.projectId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.agentId, subAgents.agentId)
+      )
+    ).where(
+      drizzleOrm.and(
+        drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.externalAgentId, params.externalAgentId)
+      )
+    ).limit(limit).offset(offset).orderBy(drizzleOrm.desc(subAgentExternalAgentRelations.createdAt)),
+    db.select({ count: drizzleOrm.count() }).from(subAgentExternalAgentRelations).where(
+      drizzleOrm.and(
+        drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId),
+        drizzleOrm.eq(subAgentExternalAgentRelations.externalAgentId, params.externalAgentId)
+      )
+    )
+  ]);
+  const total = totalResult[0]?.count || 0;
+  const pages = Math.ceil(total / limit);
+  return {
+    data,
+    pagination: { page, limit, total, pages }
+  };
+};
+var createSubAgentExternalAgentRelation = (db) => async (params) => {
+  const finalRelationId = params.relationId ?? nanoid.nanoid();
+  const relation = await db.insert(subAgentExternalAgentRelations).values({
+    id: finalRelationId,
+    tenantId: params.scopes.tenantId,
+    projectId: params.scopes.projectId,
+    agentId: params.scopes.agentId,
+    subAgentId: params.scopes.subAgentId,
+    externalAgentId: params.data.externalAgentId,
+    headers: params.data.headers
+  }).returning();
+  return relation[0];
+};
+var getSubAgentExternalAgentRelationByParams = (db) => async (params) => {
+  return db.query.subAgentExternalAgentRelations.findFirst({
+    where: drizzleOrm.and(
+      drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.externalAgentId, params.externalAgentId)
+    )
+  });
+};
+var upsertSubAgentExternalAgentRelation = (db) => async (params) => {
+  if (params.relationId) {
+    return await updateSubAgentExternalAgentRelation(db)({
+      scopes: params.scopes,
+      relationId: params.relationId,
+      data: params.data
+    });
+  }
+  const existing = await getSubAgentExternalAgentRelationByParams(db)({
+    scopes: params.scopes,
+    externalAgentId: params.data.externalAgentId
+  });
+  if (existing) {
+    return await updateSubAgentExternalAgentRelation(db)({
+      scopes: params.scopes,
+      relationId: existing.id,
+      data: params.data
+    });
+  }
+  return await createSubAgentExternalAgentRelation(db)(params);
+};
+var updateSubAgentExternalAgentRelation = (db) => async (params) => {
+  const updateData = {
+    ...params.data,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  const relation = await db.update(subAgentExternalAgentRelations).set(updateData).where(
+    drizzleOrm.and(
+      drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.id, params.relationId)
+    )
+  ).returning();
+  return relation[0];
+};
+var deleteSubAgentExternalAgentRelation = (db) => async (params) => {
+  const result = await db.delete(subAgentExternalAgentRelations).where(
+    drizzleOrm.and(
+      drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.id, params.relationId)
+    )
+  );
+  return (result.rowsAffected || 0) > 0;
+};
+var deleteSubAgentExternalAgentRelationsBySubAgent = (db) => async (params) => {
+  const result = await db.delete(subAgentExternalAgentRelations).where(
+    drizzleOrm.and(
+      drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId)
+    )
+  );
+  return (result.rowsAffected || 0) > 0;
+};
+var deleteSubAgentExternalAgentRelationsByAgent = (db) => async (params) => {
+  const result = await db.delete(subAgentExternalAgentRelations).where(
+    drizzleOrm.and(
+      drizzleOrm.eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId),
+      drizzleOrm.eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId)
+    )
+  );
+  return (result.rowsAffected || 0) > 0;
+};
 var getAgentRelationById = (db) => async (params) => {
   return db.query.subAgentRelations.findFirst({
     where: drizzleOrm.and(
@@ -216543,29 +216881,8 @@ var getSubAgentRelationsByTarget = (db) => async (params) => {
     pagination: { page, limit, total, pages }
   };
 };
-var getExternalAgentRelations = (db) => async (params) => {
-  const page = params.pagination?.page || 1;
-  const limit = Math.min(params.pagination?.limit || 10, 100);
-  const offset = (page - 1) * limit;
-  const whereClause = drizzleOrm.and(
-    drizzleOrm.eq(subAgentRelations.tenantId, params.scopes.tenantId),
-    drizzleOrm.eq(subAgentRelations.projectId, params.scopes.projectId),
-    drizzleOrm.eq(subAgentRelations.agentId, params.scopes.agentId),
-    drizzleOrm.eq(subAgentRelations.externalSubAgentId, params.externalSubAgentId)
-  );
-  const [data, totalResult] = await Promise.all([
-    db.select().from(subAgentRelations).where(whereClause).limit(limit).offset(offset).orderBy(drizzleOrm.desc(subAgentRelations.createdAt)),
-    db.select({ count: drizzleOrm.count() }).from(subAgentRelations).where(whereClause)
-  ]);
-  const total = totalResult[0]?.count || 0;
-  const pages = Math.ceil(total / limit);
-  return {
-    data,
-    pagination: { page, limit, total, pages }
-  };
-};
 var getRelatedAgentsForAgent = (db) => async (params) => {
-  const internalRelations = await db.select({
+  const data = await db.select({
     id: subAgents.id,
     name: subAgents.name,
     description: subAgents.description,
@@ -216587,35 +216904,8 @@ var getRelatedAgentsForAgent = (db) => async (params) => {
       drizzleOrm.isNotNull(subAgentRelations.targetSubAgentId)
     )
   );
-  const externalRelations = await db.select({
-    id: subAgentRelations.id,
-    relationType: subAgentRelations.relationType,
-    externalAgent: {
-      id: externalAgents.id,
-      name: externalAgents.name,
-      description: externalAgents.description,
-      baseUrl: externalAgents.baseUrl
-    }
-  }).from(subAgentRelations).innerJoin(
-    externalAgents,
-    drizzleOrm.and(
-      drizzleOrm.eq(subAgentRelations.externalSubAgentId, externalAgents.id),
-      drizzleOrm.eq(subAgentRelations.tenantId, externalAgents.tenantId),
-      drizzleOrm.eq(subAgentRelations.projectId, externalAgents.projectId),
-      drizzleOrm.eq(subAgentRelations.agentId, externalAgents.agentId)
-    )
-  ).where(
-    drizzleOrm.and(
-      drizzleOrm.eq(subAgentRelations.tenantId, params.scopes.tenantId),
-      drizzleOrm.eq(subAgentRelations.projectId, params.scopes.projectId),
-      drizzleOrm.eq(subAgentRelations.agentId, params.scopes.agentId),
-      drizzleOrm.eq(subAgentRelations.sourceSubAgentId, params.subAgentId),
-      drizzleOrm.isNotNull(subAgentRelations.externalSubAgentId)
-    )
-  );
   return {
-    internalRelations,
-    externalRelations
+    data
   };
 };
 var createSubAgentRelation = (db) => async (params) => {
@@ -216643,9 +216933,6 @@ var getAgentRelationByParams = (db) => async (params) => {
   if (params.targetSubAgentId) {
     whereConditions.push(drizzleOrm.eq(subAgentRelations.targetSubAgentId, params.targetSubAgentId));
   }
-  if (params.externalSubAgentId) {
-    whereConditions.push(drizzleOrm.eq(subAgentRelations.externalSubAgentId, params.externalSubAgentId));
-  }
   return db.query.subAgentRelations.findFirst({
     where: drizzleOrm.and(...whereConditions)
   });
@@ -216655,7 +216942,6 @@ var upsertSubAgentRelation = (db) => async (params) => {
     scopes: { tenantId: params.tenantId, projectId: params.projectId, agentId: params.agentId },
     sourceSubAgentId: params.sourceSubAgentId,
     targetSubAgentId: params.targetSubAgentId,
-    externalSubAgentId: params.externalSubAgentId,
     relationType: params.relationType ?? ""
   });
   if (!existing) {
@@ -216663,12 +216949,6 @@ var upsertSubAgentRelation = (db) => async (params) => {
   }
   return existing;
 };
-var createExternalAgentRelation = (db) => async (params) => {
-  return await createSubAgentRelation(db)({
-    ...params,
-    targetSubAgentId: void 0
-  });
-};
 var updateAgentRelation = (db) => async (params) => {
   const updateData = {
     ...params.data,
@@ -216705,7 +216985,7 @@ var deleteAgentRelationsByAgent = (db) => async (params) => {
   return (result.rowsAffected || 0) > 0;
 };
 var createAgentToolRelation = (db) => async (params) => {
-  const finalRelationId = params.relationId ?? nanoid.nanoid();
+  const finalRelationId = params.relationId ?? generateId();
   const relation = await db.insert(subAgentToolRelations).values({
     id: finalRelationId,
     tenantId: params.scopes.tenantId,
@@ -216965,7 +217245,7 @@ var getAgentsForTool = (db) => async (params) => {
     pagination: { page, limit, total, pages }
   };
 };
-var validateInternalSubAgent = (db) => async (params) => {
+var validateSubAgent = (db) => async (params) => {
   const result = await db.select({ id: subAgents.id }).from(subAgents).where(
     drizzleOrm.and(
       drizzleOrm.eq(subAgents.tenantId, params.scopes.tenantId),
@@ -216976,17 +217256,6 @@ var validateInternalSubAgent = (db) => async (params) => {
   ).limit(1);
   return result.length > 0;
 };
-var validateExternalAgent = (db) => async (params) => {
-  const result = await db.select({ id: externalAgents.id }).from(externalAgents).where(
-    drizzleOrm.and(
-      drizzleOrm.eq(externalAgents.tenantId, params.scopes.tenantId),
-      drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId),
-      drizzleOrm.eq(externalAgents.agentId, params.scopes.agentId),
-      drizzleOrm.eq(externalAgents.id, params.scopes.subAgentId)
-    )
-  ).limit(1);
-  return result.length > 0;
-};
 var getSubAgentById = (db) => async (params) => {
   const result = await db.query.subAgents.findFirst({
     where: drizzleOrm.and(
@@ -217126,7 +217395,7 @@ async function generateApiKey() {
   const key = `sk_${publicId}.${secret}`;
   const keyPrefix = key.substring(0, 12);
   const keyHash = await hashApiKey(key);
-  const id = nanoid.nanoid();
+  const id = generateId();
   return {
     id,
     publicId,
@@ -217854,8 +218123,8 @@ var getCredentialReference = (db) => async (params) => {
     )
   });
 };
-var getCredentialReferenceWithTools = (db) => async (params) => {
-  const [credential, relatedTools] = await Promise.all([
+var getCredentialReferenceWithResources = (db) => async (params) => {
+  const [credential, relatedTools, relatedExternalAgents] = await Promise.all([
     db.query.credentialReferences.findFirst({
       where: drizzleOrm.and(
         drizzleOrm.eq(credentialReferences.tenantId, params.scopes.tenantId),
@@ -217869,6 +218138,13 @@ var getCredentialReferenceWithTools = (db) => async (params) => {
         drizzleOrm.eq(tools.projectId, params.scopes.projectId),
         drizzleOrm.eq(tools.credentialReferenceId, params.id)
       )
+    ),
+    db.select().from(externalAgents).where(
+      drizzleOrm.and(
+        drizzleOrm.eq(externalAgents.tenantId, params.scopes.tenantId),
+        drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId),
+        drizzleOrm.eq(externalAgents.credentialReferenceId, params.id)
+      )
     )
   ]);
   if (!credential) {
@@ -217876,7 +218152,8 @@ var getCredentialReferenceWithTools = (db) => async (params) => {
   }
   return {
     ...credential,
-    tools: relatedTools
+    tools: relatedTools,
+    externalAgents: relatedExternalAgents
   };
 };
 var listCredentialReferences = (db) => async (params) => {
@@ -217928,7 +218205,7 @@ var updateCredentialReference = (db) => async (params) => {
       drizzleOrm.eq(credentialReferences.id, params.id)
     )
   );
-  return await getCredentialReferenceWithTools(db)({
+  return await getCredentialReferenceWithResources(db)({
     scopes: params.scopes,
     id: params.id
   });
@@ -218259,7 +218536,7 @@ var deleteTool = (db) => async (params) => {
   return !!deleted;
 };
 var addToolToAgent = (db) => async (params) => {
-  const id = nanoid.nanoid();
+  const id = generateId();
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const [created] = await db.insert(subAgentToolRelations).values({
     id,
@@ -218504,11 +218781,12 @@ var getFullAgentDefinition = (db) => async ({
       drizzleOrm.eq(subAgents.agentId, agentId)
     )
   });
+  const externalAgentRelations = await getSubAgentExternalAgentRelationsByAgent(db)({
+    scopes: { tenantId, projectId, agentId }
+  });
   const externalSubAgentIds = /* @__PURE__ */ new Set();
-  for (const relation of agentRelations2) {
-    if (relation.externalSubAgentId) {
-      externalSubAgentIds.add(relation.externalSubAgentId);
-    }
+  for (const relation of externalAgentRelations) {
+    externalSubAgentIds.add(relation.externalAgentId);
   }
   const processedSubAgents = await Promise.all(
     agentSubAgents.map(async (agent2) => {
@@ -218517,7 +218795,13 @@ var getFullAgentDefinition = (db) => async ({
         (relation) => relation.sourceSubAgentId === agent2.id
       );
       const canTransferTo = subAgentRelationsList.filter((rel) => rel.relationType === "transfer" || rel.relationType === "transfer_to").map((rel) => rel.targetSubAgentId).filter((id) => id !== null);
-      const canDelegateTo = subAgentRelationsList.filter((rel) => rel.relationType === "delegate" || rel.relationType === "delegate_to").map((rel) => rel.targetSubAgentId || rel.externalSubAgentId).filter((id) => id !== null);
+      const canDelegateToInternal = subAgentRelationsList.filter((rel) => rel.relationType === "delegate" || rel.relationType === "delegate_to").map((rel) => rel.targetSubAgentId).filter((id) => id !== null);
+      const canDelegateToExternal = externalAgentRelations.filter((rel) => rel.subAgentId === agent2.id).map((rel) => ({
+        externalAgentId: rel.externalAgentId,
+        subAgentExternalAgentRelationId: rel.id,
+        headers: rel.headers
+      }));
+      const canDelegateTo = [...canDelegateToInternal, ...canDelegateToExternal];
       const subAgentTools = await db.select({
         id: tools.id,
         name: tools.name,
@@ -218622,10 +218906,10 @@ var getFullAgentDefinition = (db) => async ({
     })
   );
   const externalAgents2 = await Promise.all(
-    Array.from(externalSubAgentIds).map(async (subAgentId) => {
+    Array.from(externalSubAgentIds).map(async (externalAgentId) => {
       const subAgent = await getExternalAgent(db)({
-        scopes: { tenantId, projectId, agentId },
-        subAgentId
+        scopes: { tenantId, projectId },
+        externalAgentId
       });
       if (!subAgent) return null;
       return {
@@ -218634,24 +218918,26 @@ var getFullAgentDefinition = (db) => async ({
       };
     })
   );
-  const validSubAgents = [...processedSubAgents, ...externalAgents2].filter(
+  const validSubAgents = processedSubAgents.filter(
+    (agent2) => agent2 !== null
+  );
+  const validExternalAgents = externalAgents2.filter(
     (agent2) => agent2 !== null
   );
   const agentsObject = {};
+  const externalAgentsObject = {};
   for (const subAgent of validSubAgents) {
-    if ("baseUrl" in subAgent && subAgent.baseUrl) {
-      agentsObject[subAgent.id] = {
-        id: subAgent.id,
-        name: subAgent.name,
-        description: subAgent.description,
-        baseUrl: subAgent.baseUrl,
-        credentialReferenceId: subAgent.credentialReferenceId,
-        headers: subAgent.headers,
-        type: "external"
-      };
-    } else {
-      agentsObject[subAgent.id] = subAgent;
-    }
+    agentsObject[subAgent.id] = subAgent;
+  }
+  for (const externalAgent of validExternalAgents) {
+    externalAgentsObject[externalAgent.id] = {
+      id: externalAgent.id,
+      name: externalAgent.name,
+      description: externalAgent.description,
+      baseUrl: externalAgent.baseUrl,
+      credentialReferenceId: externalAgent.credentialReferenceId,
+      type: "external"
+    };
   }
   let contextConfig2 = null;
   if (agent.contextConfigId) {
@@ -218711,6 +218997,9 @@ var getFullAgentDefinition = (db) => async ({
     createdAt: agent.createdAt && !Number.isNaN(new Date(agent.createdAt).getTime()) ? new Date(agent.createdAt).toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: agent.updatedAt && !Number.isNaN(new Date(agent.updatedAt).getTime()) ? new Date(agent.updatedAt).toISOString() : (/* @__PURE__ */ new Date()).toISOString()
   };
+  if (Object.keys(externalAgentsObject).length > 0) {
+    result.externalAgents = externalAgentsObject;
+  }
   if (agent.models) {
     result.models = agent.models;
   }
@@ -218838,7 +219127,7 @@ var getFullAgentDefinition = (db) => async ({
   return result;
 };
 var upsertAgent = (db) => async (params) => {
-  const agentId = params.data.id || nanoid.nanoid();
+  const agentId = params.data.id || generateId();
   const scopes = { tenantId: params.data.tenantId, projectId: params.data.projectId, agentId };
   const existing = await getAgentById(db)({
     scopes
@@ -219242,7 +219531,7 @@ var getArtifactComponentsForAgent = (db) => async (params) => {
 };
 var associateArtifactComponentWithAgent = (db) => async (params) => {
   const [association] = await db.insert(subAgentArtifactComponents).values({
-    id: nanoid.nanoid(),
+    id: generateId(),
     tenantId: params.scopes.tenantId,
     projectId: params.scopes.projectId,
     agentId: params.scopes.agentId,
@@ -219405,7 +219694,7 @@ var getCacheEntry = (db) => async (params) => {
 var setCacheEntry = (db) => async (entry) => {
   try {
     const cacheData = {
-      id: nanoid.nanoid(),
+      id: generateId(),
       tenantId: entry.tenantId,
       projectId: entry.projectId,
       conversationId: entry.conversationId,
@@ -219962,7 +220251,7 @@ var getDataComponentsForAgent = (db) => async (params) => {
 };
 var associateDataComponentWithAgent = (db) => async (params) => {
   const association = await db.insert(subAgentDataComponents).values({
-    id: nanoid.nanoid(),
+    id: generateId(),
     tenantId: params.scopes.tenantId,
     projectId: params.scopes.projectId,
     agentId: params.scopes.agentId,
@@ -220056,12 +220345,6 @@ var upsertDataComponent = (db) => async (params) => {
 };
 
 // src/validation/agentFull.ts
-function isInternalAgent(agent) {
-  return "prompt" in agent;
-}
-function isExternalAgent(agent) {
-  return "baseUrl" in agent;
-}
 function validateAndTypeAgentData(data) {
   return AgentWithinContextOfProjectSchema.parse(data);
 }
@@ -220071,7 +220354,7 @@ function validateToolReferences(agentData, availableToolIds) {
   }
   const errors = [];
   for (const [subAgentId, subAgent] of Object.entries(agentData.subAgents)) {
-    if (isInternalAgent(subAgent) && subAgent.canUse && Array.isArray(subAgent.canUse)) {
+    if (subAgent.canUse && Array.isArray(subAgent.canUse)) {
       for (const canUseItem of subAgent.canUse) {
         if (!availableToolIds.has(canUseItem.toolId)) {
           errors.push(`Agent '${subAgentId}' references non-existent tool '${canUseItem.toolId}'`);
@@ -220090,7 +220373,7 @@ function validateDataComponentReferences(agentData, availableDataComponentIds) {
   }
   const errors = [];
   for (const [subAgentId, subAgent] of Object.entries(agentData.subAgents)) {
-    if (isInternalAgent(subAgent) && subAgent.dataComponents) {
+    if (subAgent.dataComponents) {
       for (const dataComponentId of subAgent.dataComponents) {
         if (!availableDataComponentIds.has(dataComponentId)) {
           errors.push(
@@ -220111,7 +220394,7 @@ function validateArtifactComponentReferences(agentData, availableArtifactCompone
   }
   const errors = [];
   for (const [subAgentId, subAgent] of Object.entries(agentData.subAgents)) {
-    if (isInternalAgent(subAgent) && subAgent.artifactComponents) {
+    if (subAgent.artifactComponents) {
       for (const artifactComponentId of subAgent.artifactComponents) {
         if (!availableArtifactComponentIds.has(artifactComponentId)) {
           errors.push(
@@ -220129,32 +220412,56 @@ ${errors.join("\n")}`);
 function validateAgentRelationships(agentData) {
   const errors = [];
   const availableAgentIds = new Set(Object.keys(agentData.subAgents));
+  const availableExternalAgentIds = new Set(Object.keys(agentData.externalAgents ?? {}));
   for (const [subAgentId, subAgent] of Object.entries(agentData.subAgents)) {
-    if (isInternalAgent(subAgent)) {
-      if (subAgent.canTransferTo && Array.isArray(subAgent.canTransferTo)) {
-        for (const targetId of subAgent.canTransferTo) {
-          if (!availableAgentIds.has(targetId)) {
+    if (subAgent.canTransferTo && Array.isArray(subAgent.canTransferTo)) {
+      for (const targetId of subAgent.canTransferTo) {
+        if (!availableAgentIds.has(targetId)) {
+          errors.push(
+            `Agent '${subAgentId}' has transfer target '${targetId}' that doesn't exist in agent`
+          );
+        }
+      }
+    }
+    if (subAgent.canDelegateTo && Array.isArray(subAgent.canDelegateTo)) {
+      for (const targetItem of subAgent.canDelegateTo) {
+        console.log("targetItem", targetItem);
+        if (typeof targetItem === "string") {
+          console.log("targetItem is string", targetItem);
+          if (!availableAgentIds.has(targetItem) && !availableExternalAgentIds.has(targetItem)) {
             errors.push(
-              `Agent '${subAgentId}' has transfer target '${targetId}' that doesn't exist in agent`
+              `Agent '${subAgentId}' has delegation target '${targetItem}' that doesn't exist in agent`
             );
           }
         }
       }
-      if (subAgent.canDelegateTo && Array.isArray(subAgent.canDelegateTo)) {
-        for (const targetId of subAgent.canDelegateTo) {
-          if (!availableAgentIds.has(targetId)) {
+    }
+  }
+  if (errors.length > 0)
+    throw new Error(`Agent relationship validation failed:
+${errors.join("\n")}`);
+}
+function validateSubAgentExternalAgentRelations(agentData, availableExternalAgentIds) {
+  if (!availableExternalAgentIds) {
+    return;
+  }
+  const errors = [];
+  for (const [subAgentId, subAgent] of Object.entries(agentData.subAgents)) {
+    if (subAgent.canDelegateTo && Array.isArray(subAgent.canDelegateTo)) {
+      for (const targetItem of subAgent.canDelegateTo) {
+        if (typeof targetItem === "object" && "externalAgentId" in targetItem) {
+          if (!availableExternalAgentIds.has(targetItem.externalAgentId)) {
             errors.push(
-              `Agent '${subAgentId}' has delegation target '${targetId}' that doesn't exist in agent`
+              `Agent '${subAgentId}' has delegation target '${targetItem.externalAgentId}' that doesn't exist in agent`
             );
           }
         }
       }
     }
   }
-  if (errors.length > 0) {
-    throw new Error(`Agent relationship validation failed:
+  if (errors.length > 0)
+    throw new Error(`Sub agent external agent relation validation failed:
 ${errors.join("\n")}`);
-  }
 }
 function validateAgentStructure(agentData, projectResources) {
   if (agentData.defaultSubAgentId && !agentData.subAgents[agentData.defaultSubAgentId]) {
@@ -220164,6 +220471,7 @@ function validateAgentStructure(agentData, projectResources) {
     validateToolReferences(agentData, projectResources.toolIds);
     validateDataComponentReferences(agentData, projectResources.dataComponentIds);
     validateArtifactComponentReferences(agentData, projectResources.artifactComponentIds);
+    validateSubAgentExternalAgentRelations(agentData, projectResources.externalAgentIds);
   }
   validateAgentRelationships(agentData);
 }
@@ -220225,7 +220533,7 @@ async function applyExecutionLimitsInheritance(db, logger14, scopes, agentData)
         "Propagating stepCountIs to agents"
       );
       for (const [subAgentId, subAgentData] of Object.entries(agentData.subAgents)) {
-        if (isInternalAgent(subAgentData)) {
+        if (subAgentData.canTransferTo && Array.isArray(subAgentData.canTransferTo)) {
           const agent = agentData;
           if (!agent.stopWhen) {
             agent.stopWhen = {};
@@ -220266,7 +220574,7 @@ var createFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
     logger14.info({}, "MCP Tools are project-scoped - skipping tool creation in agent");
     let finalAgentId;
     try {
-      const agentId = typed.id || nanoid.nanoid();
+      const agentId = typed.id || generateId();
       logger14.info({ agentId }, "Creating agent metadata");
       const agent = await upsertAgent(db)({
         data: {
@@ -220438,85 +220746,39 @@ var createFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
         "All function tools created successfully"
       );
     }
-    const internalAgentPromises = Object.entries(typed.subAgents).filter(([_, agentData2]) => isInternalAgent(agentData2)).map(async ([subAgentId, agentData2]) => {
-      const internalAgent = agentData2;
-      try {
-        logger14.info({ subAgentId }, "Processing internal agent");
-        await upsertSubAgent(db)({
-          data: {
-            id: subAgentId,
-            tenantId,
-            projectId,
-            agentId: finalAgentId,
-            name: internalAgent.name || "",
-            description: internalAgent.description || "",
-            prompt: internalAgent.prompt || "",
-            conversationHistoryConfig: internalAgent.conversationHistoryConfig,
-            models: internalAgent.models,
-            stopWhen: internalAgent.stopWhen
-          }
-        });
-        logger14.info({ subAgentId }, "Internal agent processed successfully");
-      } catch (error) {
-        logger14.error({ subAgentId, error }, "Failed to create/update internal agent");
-        throw error;
-      }
-    });
-    await Promise.all(internalAgentPromises);
-    const internalAgentCount = Object.entries(typed.subAgents).filter(
-      ([_, agentData2]) => isInternalAgent(agentData2)
-    ).length;
-    logger14.info({ internalAgentCount }, "All internal agents created/updated successfully");
-    const externalAgentPromises = Object.entries(typed.subAgents).filter(([_, agentData2]) => isExternalAgent(agentData2)).map(async ([subAgentId, agentData2]) => {
-      const externalAgent = agentData2;
-      try {
-        logger14.info({ subAgentId }, "Processing external agent");
-        await upsertExternalAgent(db)({
-          data: {
-            id: subAgentId,
-            tenantId,
-            projectId,
-            agentId: finalAgentId,
-            name: externalAgent.name,
-            description: externalAgent.description || "",
-            baseUrl: externalAgent.baseUrl,
-            credentialReferenceId: externalAgent.credentialReferenceId || void 0,
-            headers: externalAgent.headers || void 0
-          }
-        });
-        logger14.info({ subAgentId }, "External agent processed successfully");
-      } catch (error) {
-        logger14.error({ subAgentId, error }, "Failed to create/update external agent");
-        throw error;
-      }
-    });
-    await Promise.all(externalAgentPromises);
-    const externalAgentCount = Object.entries(typed.subAgents).filter(
-      ([_, agentData2]) => isExternalAgent(agentData2)
-    ).length;
-    logger14.info({ externalAgentCount }, "All external agents created/updated successfully");
-    if (contextConfigId) {
-      try {
-        logger14.info(
-          { agentId: finalAgentId, contextConfigId },
-          "Updating agent with context config"
-        );
-        await updateAgent(db)({
-          scopes: { tenantId, projectId, agentId: finalAgentId },
-          data: { contextConfigId }
-        });
-        logger14.info({ agentId: finalAgentId }, "Agent updated with context config");
-      } catch (error) {
-        logger14.error(
-          { agentId: finalAgentId, error },
-          "Failed to update agent with context config"
-        );
-        throw error;
+    const subAgentPromises = Object.entries(typed.subAgents).map(
+      async ([subAgentId, agentData2]) => {
+        const subAgent = agentData2;
+        try {
+          logger14.info({ subAgentId }, "Processing sub-agent");
+          await upsertSubAgent(db)({
+            data: {
+              id: subAgentId,
+              tenantId,
+              projectId,
+              agentId: finalAgentId,
+              name: subAgent.name || "",
+              description: subAgent.description || "",
+              prompt: subAgent.prompt || "",
+              conversationHistoryConfig: subAgent.conversationHistoryConfig,
+              models: subAgent.models,
+              stopWhen: subAgent.stopWhen
+            }
+          });
+          logger14.info({ subAgentId }, "Sub-agent processed successfully");
+        } catch (error) {
+          logger14.error({ subAgentId, error }, "Failed to create/update sub-agent");
+          throw error;
+        }
       }
-    }
+    );
+    await Promise.all(subAgentPromises);
+    const subAgentCount = Object.entries(typed.subAgents).length;
+    logger14.info({ subAgentCount }, "All sub-agents created/updated successfully");
+    logger14.info({}, "External agents are project-scoped and managed at the project level.");
     const agentToolPromises = [];
     for (const [subAgentId, agentData2] of Object.entries(typed.subAgents)) {
-      if (isInternalAgent(agentData2) && agentData2.canUse && Array.isArray(agentData2.canUse)) {
+      if (agentData2.canUse && Array.isArray(agentData2.canUse)) {
         for (const canUseItem of agentData2.canUse) {
           agentToolPromises.push(
             (async () => {
@@ -220578,7 +220840,7 @@ var createFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
     );
     const agentDataComponentPromises = [];
     for (const [subAgentId, agentData2] of Object.entries(typed.subAgents)) {
-      if (isInternalAgent(agentData2) && agentData2.dataComponents) {
+      if (agentData2.dataComponents) {
         for (const dataComponentId of agentData2.dataComponents) {
           agentDataComponentPromises.push(
             (async () => {
@@ -220610,7 +220872,7 @@ var createFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
     logger14.info({}, "All agent-data component relations created");
     const agentArtifactComponentPromises = [];
     for (const [subAgentId, agentData2] of Object.entries(typed.subAgents)) {
-      if (isInternalAgent(agentData2) && agentData2.artifactComponents) {
+      if (agentData2.artifactComponents) {
         for (const artifactComponentId of agentData2.artifactComponents) {
           agentArtifactComponentPromises.push(
             (async () => {
@@ -220641,8 +220903,9 @@ var createFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
     await Promise.all(agentArtifactComponentPromises);
     logger14.info({}, "All agent-artifact component relations created");
     const subAgentRelationPromises = [];
+    const subAgentExternalAgentRelationPromises = [];
     for (const [subAgentId, agentData2] of Object.entries(typed.subAgents)) {
-      if (isInternalAgent(agentData2) && agentData2.canTransferTo) {
+      if (agentData2.canTransferTo) {
         for (const targetSubAgentId of agentData2.canTransferTo) {
           subAgentRelationPromises.push(
             (async () => {
@@ -220652,7 +220915,7 @@ var createFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
                   "Processing agent transfer relation"
                 );
                 await upsertSubAgentRelation(db)({
-                  id: nanoid.nanoid(),
+                  id: generateId(),
                   tenantId,
                   projectId,
                   agentId: finalAgentId,
@@ -220673,48 +220936,98 @@ var createFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
             })()
           );
         }
-      }
-      if (isInternalAgent(agentData2) && agentData2.canDelegateTo) {
-        for (const targetSubAgentId of agentData2.canDelegateTo) {
-          const targetAgentData = typed.subAgents[targetSubAgentId];
-          const isTargetExternal = isExternalAgent(targetAgentData);
-          subAgentRelationPromises.push(
-            (async () => {
-              try {
-                logger14.info(
-                  { subAgentId, targetSubAgentId, type: "delegate" },
-                  "Processing agent delegation relation"
-                );
-                await upsertSubAgentRelation(db)({
-                  id: nanoid.nanoid(),
-                  tenantId,
-                  projectId,
-                  agentId: finalAgentId,
-                  sourceSubAgentId: subAgentId,
-                  targetSubAgentId: isTargetExternal ? void 0 : targetSubAgentId,
-                  externalSubAgentId: isTargetExternal ? targetSubAgentId : void 0,
-                  relationType: "delegate"
-                });
-                logger14.info(
-                  { subAgentId, targetSubAgentId, type: "delegate" },
-                  "Agent delegation relation processed successfully"
-                );
-              } catch (error) {
-                logger14.error(
-                  { subAgentId, targetSubAgentId, type: "delegate", error },
-                  "Failed to create delegation relation"
-                );
-              }
-            })()
-          );
+        if (agentData2.canDelegateTo) {
+          for (const targetItem of agentData2.canDelegateTo) {
+            if (typeof targetItem === "string") {
+              subAgentRelationPromises.push(
+                (async () => {
+                  try {
+                    logger14.info(
+                      { subAgentId, targetSubAgentId: targetItem, type: "delegate" },
+                      "Processing sub-agent delegation relation"
+                    );
+                    await upsertSubAgentRelation(db)({
+                      id: generateId(),
+                      tenantId,
+                      projectId,
+                      agentId: finalAgentId,
+                      sourceSubAgentId: subAgentId,
+                      targetSubAgentId: targetItem,
+                      relationType: "delegate"
+                    });
+                    logger14.info(
+                      { subAgentId, targetSubAgentId: targetItem, type: "delegate" },
+                      "Sub-agent delegation relation processed successfully"
+                    );
+                  } catch (error) {
+                    logger14.error(
+                      { subAgentId, targetSubAgentId: targetItem, type: "delegate", error },
+                      "Failed to create sub-agent delegation relation"
+                    );
+                  }
+                })()
+              );
+            } else {
+              subAgentExternalAgentRelationPromises.push(
+                (async () => {
+                  try {
+                    logger14.info(
+                      {
+                        subAgentId,
+                        externalAgentId: targetItem.externalAgentId,
+                        type: "delegate"
+                      },
+                      "Processing external agent delegation relation"
+                    );
+                    await upsertSubAgentExternalAgentRelation(db)({
+                      scopes: {
+                        tenantId,
+                        projectId,
+                        agentId: finalAgentId,
+                        subAgentId
+                      },
+                      relationId: targetItem.subAgentExternalAgentRelationId,
+                      data: {
+                        externalAgentId: targetItem.externalAgentId,
+                        headers: targetItem.headers || null
+                      }
+                    });
+                    logger14.info(
+                      {
+                        subAgentId,
+                        externalAgentId: targetItem.externalAgentId,
+                        type: "delegate"
+                      },
+                      "External agent delegation relation processed successfully"
+                    );
+                  } catch (error) {
+                    logger14.error(
+                      {
+                        subAgentId,
+                        externalAgentId: targetItem.externalAgentId,
+                        type: "delegate",
+                        error
+                      },
+                      "Failed to create external delegation relation"
+                    );
+                  }
+                })()
+              );
+            }
+          }
         }
       }
     }
     await Promise.all(subAgentRelationPromises);
+    await Promise.all(subAgentExternalAgentRelationPromises);
     logger14.info(
       { subAgentRelationCount: subAgentRelationPromises.length },
       "All sub-agent relations created"
     );
+    logger14.info(
+      { subAgentExternalAgentRelationCount: subAgentExternalAgentRelationPromises.length },
+      "All sub-agent external agent relations created"
+    );
     const createdAgent = await getFullAgentDefinition(db)({
       scopes: { tenantId, projectId, agentId: finalAgentId }
     });
@@ -220769,7 +221082,7 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
     logger14.info({}, "MCP Tools are project-scoped - skipping tool creation in agent update");
     let finalAgentId;
     try {
-      const agentId = typedAgentDefinition.id || nanoid.nanoid();
+      const agentId = typedAgentDefinition.id || generateId();
       logger14.info({ agentId }, "Getting/creating agent metadata");
       const agent = await upsertAgent(db)({
         data: {
@@ -220946,151 +221259,147 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
         "All function tools updated successfully"
       );
     }
-    const internalAgentPromises = Object.entries(typedAgentDefinition.subAgents).filter(([_, agentData2]) => isInternalAgent(agentData2)).map(async ([subAgentId, agentData2]) => {
-      const internalAgent = agentData2;
-      let existingSubAgent = null;
-      try {
-        existingSubAgent = await db.query.subAgents.findFirst({
-          where: drizzleOrm.and(
-            drizzleOrm.eq(subAgents.id, subAgentId),
-            drizzleOrm.eq(subAgents.tenantId, tenantId),
-            drizzleOrm.eq(subAgents.projectId, projectId)
-          ),
-          columns: {
-            models: true
-          }
-        });
-      } catch (_error) {
-      }
-      let finalModelSettings = internalAgent.models === void 0 ? void 0 : internalAgent.models;
-      if (existingSubAgent?.models && typedAgentDefinition.models) {
-        const subAgentModels = existingSubAgent.models;
-        const agentModels = typedAgentDefinition.models;
-        const modelTypes = ["base", "structuredOutput", "summarizer"];
-        const cascadedModels = { ...finalModelSettings };
-        for (const modelType of modelTypes) {
-          if (subAgentModels[modelType]?.model && existingAgentModels?.[modelType]?.model && subAgentModels[modelType].model === existingAgentModels[modelType].model && agentModels[modelType] && (agentModels[modelType].model !== existingAgentModels[modelType]?.model || JSON.stringify(agentModels[modelType].providerOptions) !== JSON.stringify(existingAgentModels[modelType]?.providerOptions))) {
-            cascadedModels[modelType] = agentModels[modelType];
-            logger14.info(
-              {
-                subAgentId,
-                modelType,
-                oldModel: existingAgentModels[modelType]?.model,
-                newModel: agentModels[modelType].model,
-                hasProviderOptions: !!agentModels[modelType].providerOptions
-              },
-              "Cascading model change from parent agent to subAgent"
-            );
+    const subAgentPromises = Object.entries(typedAgentDefinition.subAgents).map(
+      async ([subAgentId, agentData2]) => {
+        const subAgent = agentData2;
+        let existingSubAgent = null;
+        try {
+          existingSubAgent = await db.query.subAgents.findFirst({
+            where: drizzleOrm.and(
+              drizzleOrm.eq(subAgents.id, subAgentId),
+              drizzleOrm.eq(subAgents.tenantId, tenantId),
+              drizzleOrm.eq(subAgents.projectId, projectId)
+            ),
+            columns: {
+              models: true
+            }
+          });
+        } catch (_error) {
+        }
+        let finalModelSettings = subAgent.models === void 0 ? void 0 : subAgent.models;
+        if (existingSubAgent?.models && typedAgentDefinition.models) {
+          const subAgentModels = existingSubAgent.models;
+          const agentModels = typedAgentDefinition.models;
+          const modelTypes = ["base", "structuredOutput", "summarizer"];
+          const cascadedModels = { ...finalModelSettings };
+          for (const modelType of modelTypes) {
+            if (subAgentModels[modelType]?.model && existingAgentModels?.[modelType]?.model && subAgentModels[modelType].model === existingAgentModels[modelType].model && agentModels[modelType] && (agentModels[modelType].model !== existingAgentModels[modelType]?.model || JSON.stringify(agentModels[modelType].providerOptions) !== JSON.stringify(existingAgentModels[modelType]?.providerOptions))) {
+              cascadedModels[modelType] = agentModels[modelType];
+              logger14.info(
+                {
+                  subAgentId,
+                  modelType,
+                  oldModel: existingAgentModels[modelType]?.model,
+                  newModel: agentModels[modelType].model,
+                  hasProviderOptions: !!agentModels[modelType].providerOptions
+                },
+                "Cascading model change from parent agent to subAgent"
+              );
+            }
           }
+          finalModelSettings = cascadedModels;
+        }
+        try {
+          logger14.info({ subAgentId }, "Processing sub-agent");
+          await upsertSubAgent(db)({
+            data: {
+              id: subAgentId,
+              tenantId,
+              projectId,
+              agentId: finalAgentId,
+              name: subAgent.name || "",
+              description: subAgent.description || "",
+              prompt: subAgent.prompt || "",
+              conversationHistoryConfig: subAgent.conversationHistoryConfig,
+              models: finalModelSettings,
+              stopWhen: subAgent.stopWhen
+            }
+          });
+          logger14.info({ subAgentId }, "Sub-agent processed successfully");
+        } catch (error) {
+          logger14.error({ subAgentId, error }, "Failed to create/update sub-agent");
+          throw error;
         }
-        finalModelSettings = cascadedModels;
-      }
-      try {
-        logger14.info({ subAgentId }, "Processing internal agent");
-        await upsertSubAgent(db)({
-          data: {
-            id: subAgentId,
-            tenantId,
-            projectId,
-            agentId: finalAgentId,
-            name: internalAgent.name || "",
-            description: internalAgent.description || "",
-            prompt: internalAgent.prompt || "",
-            conversationHistoryConfig: internalAgent.conversationHistoryConfig,
-            models: finalModelSettings,
-            stopWhen: internalAgent.stopWhen
-          }
-        });
-        logger14.info({ subAgentId }, "Internal agent processed successfully");
-      } catch (error) {
-        logger14.error({ subAgentId, error }, "Failed to create/update internal agent");
-        throw error;
-      }
-    });
-    await Promise.all(internalAgentPromises);
-    const internalAgentCount = Object.entries(typedAgentDefinition.subAgents).filter(
-      ([_, agentData2]) => isInternalAgent(agentData2)
-    ).length;
-    logger14.info({ internalAgentCount }, "All internal agents created/updated successfully");
-    const externalAgentPromises = Object.entries(typedAgentDefinition.subAgents).filter(([_, agentData2]) => isExternalAgent(agentData2)).map(async ([subAgentId, agentData2]) => {
-      const externalAgent = agentData2;
-      try {
-        logger14.info({ subAgentId }, "Processing external agent");
-        await upsertExternalAgent(db)({
-          data: {
-            id: subAgentId,
-            tenantId,
-            projectId,
-            agentId: finalAgentId,
-            name: externalAgent.name,
-            description: externalAgent.description || "",
-            baseUrl: externalAgent.baseUrl,
-            credentialReferenceId: externalAgent.credentialReferenceId || void 0,
-            headers: externalAgent.headers || void 0
-          }
-        });
-        logger14.info({ subAgentId }, "External agent processed successfully");
-      } catch (error) {
-        logger14.error({ subAgentId, error }, "Failed to create/update external agent");
-        throw error;
       }
-    });
-    await Promise.all(externalAgentPromises);
-    const externalAgentCount = Object.entries(typedAgentDefinition.subAgents).filter(
-      ([_, agentData2]) => isExternalAgent(agentData2)
-    ).length;
-    logger14.info({ externalAgentCount }, "All external agents created/updated successfully");
-    const incomingAgentIds = new Set(Object.keys(typedAgentDefinition.subAgents));
-    const existingInternalAgents = await listSubAgents(db)({
-      scopes: { tenantId, projectId, agentId: finalAgentId }
-    });
-    const existingExternalAgents = await listExternalAgents(db)({
+    );
+    await Promise.all(subAgentPromises);
+    const subAgentCount = Object.entries(typedAgentDefinition.subAgents).length;
+    logger14.info({ subAgentCount }, "All sub-agents created/updated successfully");
+    logger14.info({}, "External agents are project-scoped and managed at the project level.");
+    const incomingSubAgentIds = new Set(Object.keys(typedAgentDefinition.subAgents));
+    const existingSubAgents = await listSubAgents(db)({
       scopes: { tenantId, projectId, agentId: finalAgentId }
     });
-    let deletedInternalCount = 0;
-    for (const agent of existingInternalAgents) {
-      if (!incomingAgentIds.has(agent.id)) {
+    let deletedSubAgentCount = 0;
+    for (const subAgent of existingSubAgents) {
+      if (!incomingSubAgentIds.has(subAgent.id)) {
         try {
           await deleteSubAgent(db)({
             scopes: { tenantId, projectId, agentId: finalAgentId },
-            subAgentId: agent.id
+            subAgentId: subAgent.id
           });
-          deletedInternalCount++;
-          logger14.info({ subAgentId: agent.id }, "Deleted orphaned internal agent");
+          deletedSubAgentCount++;
+          logger14.info({ subAgentId: subAgent.id }, "Deleted orphaned sub-agent");
         } catch (error) {
-          logger14.error(
-            { subAgentId: agent.id, error },
-            "Failed to delete orphaned internal agent"
-          );
+          logger14.error({ subAgentId: subAgent.id, error }, "Failed to delete orphaned sub-agent");
         }
       }
     }
-    let deletedExternalCount = 0;
-    for (const agent of existingExternalAgents) {
-      if (!incomingAgentIds.has(agent.id)) {
+    if (deletedSubAgentCount > 0) {
+      logger14.info(
+        {
+          deletedSubAgentCount
+        },
+        "Deleted orphaned sub-agents from agent"
+      );
+    }
+    const incomingExternalAgentRelationIds = /* @__PURE__ */ new Set();
+    for (const [_subAgentId, agentData2] of Object.entries(typedAgentDefinition.subAgents)) {
+      if (agentData2.canDelegateTo && Array.isArray(agentData2.canDelegateTo)) {
+        for (const delegateItem of agentData2.canDelegateTo) {
+          if (typeof delegateItem === "object" && delegateItem.subAgentExternalAgentRelationId) {
+            incomingExternalAgentRelationIds.add(delegateItem.subAgentExternalAgentRelationId);
+          }
+        }
+      }
+    }
+    const existingExternalAgentRelations = await getSubAgentExternalAgentRelationsByAgent(db)({
+      scopes: { tenantId, projectId, agentId: finalAgentId }
+    });
+    let deletedExternalAgentRelationCount = 0;
+    for (const relation of existingExternalAgentRelations) {
+      if (!incomingExternalAgentRelationIds.has(relation.id)) {
         try {
-          await deleteExternalAgent(db)({
-            scopes: { tenantId, projectId, agentId: finalAgentId },
-            subAgentId: agent.id
+          await deleteSubAgentExternalAgentRelation(db)({
+            scopes: {
+              tenantId,
+              projectId,
+              agentId: finalAgentId,
+              subAgentId: relation.subAgentId
+            },
+            relationId: relation.id
           });
-          deletedExternalCount++;
-          logger14.info({ subAgentId: agent.id }, "Deleted orphaned external agent");
+          deletedExternalAgentRelationCount++;
+          logger14.info(
+            {
+              relationId: relation.id,
+              subAgentId: relation.subAgentId,
+              externalAgentId: relation.externalAgentId
+            },
+            "Deleted orphaned external agent relation"
+          );
         } catch (error) {
           logger14.error(
-            { subAgentId: agent.id, error },
-            "Failed to delete orphaned external agent"
+            { relationId: relation.id, error },
+            "Failed to delete orphaned external agent relation"
           );
         }
       }
     }
-    if (deletedInternalCount > 0 || deletedExternalCount > 0) {
+    if (deletedExternalAgentRelationCount > 0) {
       logger14.info(
-        {
-          deletedInternalCount,
-          deletedExternalCount,
-          totalDeleted: deletedInternalCount + deletedExternalCount
-        },
-        "Deleted orphaned agents from agent"
+        { deletedExternalAgentRelationCount },
+        "Deleted orphaned external agent relations from agent"
       );
     }
     await updateAgent(db)({
@@ -221109,7 +221418,7 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
     logger14.info({ agentId: typedAgentDefinition.id }, "Agent metadata updated");
     const incomingRelationshipIds = /* @__PURE__ */ new Set();
     for (const [_subAgentId, agentData2] of Object.entries(typedAgentDefinition.subAgents)) {
-      if (isInternalAgent(agentData2) && agentData2.canUse && Array.isArray(agentData2.canUse)) {
+      if (agentData2.canUse && Array.isArray(agentData2.canUse)) {
         for (const canUseItem of agentData2.canUse) {
           if (canUseItem.agentToolRelationId) {
             incomingRelationshipIds.add(canUseItem.agentToolRelationId);
@@ -221149,17 +221458,20 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
         logger14.error({ subAgentId, error }, "Failed to delete orphaned agent-tool relations");
       }
     }
-    const agentToolPromises = [];
+    const subAgentToolPromises = [];
     for (const [subAgentId, agentData2] of Object.entries(typedAgentDefinition.subAgents)) {
-      if (isInternalAgent(agentData2) && agentData2.canUse && Array.isArray(agentData2.canUse)) {
+      if (agentData2.canUse && Array.isArray(agentData2.canUse)) {
         for (const canUseItem of agentData2.canUse) {
-          agentToolPromises.push(
+          subAgentToolPromises.push(
             (async () => {
               try {
                 const { toolId, toolSelection, headers: headers2, agentToolRelationId } = canUseItem;
                 const isFunctionTool = typedAgentDefinition.functionTools && toolId in typedAgentDefinition.functionTools;
                 if (isFunctionTool) {
-                  logger14.info({ subAgentId, toolId }, "Processing agent-function tool relation");
+                  logger14.info(
+                    { subAgentId, toolId },
+                    "Processing sub-agent-function tool relation"
+                  );
                   await upsertSubAgentFunctionToolRelation(db)({
                     scopes: { tenantId, projectId, agentId: finalAgentId },
                     subAgentId,
@@ -221168,10 +221480,10 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
                   });
                   logger14.info(
                     { subAgentId, toolId, relationId: agentToolRelationId },
-                    "Agent-function tool relation upserted"
+                    "Sub-agent-function tool relation upserted"
                   );
                 } else {
-                  logger14.info({ subAgentId, toolId }, "Processing agent-MCP tool relation");
+                  logger14.info({ subAgentId, toolId }, "Processing sub-agent-MCP tool relation");
                   await upsertSubAgentToolRelation(db)({
                     scopes: { tenantId, projectId, agentId: finalAgentId },
                     subAgentId,
@@ -221182,7 +221494,7 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
                   });
                   logger14.info(
                     { subAgentId, toolId, relationId: agentToolRelationId },
-                    "Agent-MCP tool relation upserted"
+                    "Sub-agent-MCP tool relation upserted"
                   );
                 }
               } catch (error) {
@@ -221201,10 +221513,10 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
         }
       }
     }
-    await Promise.all(agentToolPromises);
+    await Promise.all(subAgentToolPromises);
     logger14.info(
-      { agentToolPromisesCount: agentToolPromises.length },
-      "All agent-tool relations updated"
+      { subAgentToolPromisesCount: subAgentToolPromises.length },
+      "All sub-agent-tool relations updated"
     );
     for (const subAgentId of Object.keys(typedAgentDefinition.subAgents)) {
       await deleteAgentDataComponentRelationByAgent(db)({
@@ -221213,7 +221525,7 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
     }
     const agentDataComponentPromises = [];
     for (const [subAgentId, agentData2] of Object.entries(typedAgentDefinition.subAgents)) {
-      if (isInternalAgent(agentData2) && agentData2.dataComponents) {
+      if (agentData2.dataComponents) {
         for (const dataComponentId of agentData2.dataComponents) {
           agentDataComponentPromises.push(
             (async () => {
@@ -221224,12 +221536,12 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
                 });
                 logger14.info(
                   { subAgentId, dataComponentId },
-                  "Agent-dataComponent relation created"
+                  "Sub-agent-dataComponent relation created"
                 );
               } catch (error) {
                 logger14.error(
                   { subAgentId, dataComponentId, error },
-                  "Failed to create agent-dataComponent relation"
+                  "Failed to create sub-agent-dataComponent relation"
                 );
               }
             })()
@@ -221240,7 +221552,7 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
     await Promise.all(agentDataComponentPromises);
     logger14.info(
       { agentDataComponentPromisesCount: agentDataComponentPromises.length },
-      "All agent-dataComponent relations updated"
+      "All sub-agent-dataComponent relations updated"
     );
     for (const subAgentId of Object.keys(typedAgentDefinition.subAgents)) {
       await deleteAgentArtifactComponentRelationByAgent(db)({
@@ -221249,7 +221561,7 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
     }
     const agentArtifactComponentPromises = [];
     for (const [subAgentId, agentData2] of Object.entries(typedAgentDefinition.subAgents)) {
-      if (isInternalAgent(agentData2) && agentData2.artifactComponents) {
+      if (agentData2.artifactComponents) {
         for (const artifactComponentId of agentData2.artifactComponents) {
           agentArtifactComponentPromises.push(
             (async () => {
@@ -221260,12 +221572,12 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
                 });
                 logger14.info(
                   { subAgentId, artifactComponentId },
-                  "Agent-artifactComponent relation created"
+                  "Sub-agent-artifactComponent relation created"
                 );
               } catch (error) {
                 logger14.error(
                   { subAgentId, artifactComponentId, error },
-                  "Failed to create agent-artifactComponent relation"
+                  "Failed to create sub-agent-artifactComponent relation"
                 );
               }
             })()
@@ -221276,37 +221588,29 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
     await Promise.all(agentArtifactComponentPromises);
     logger14.info(
       { agentArtifactComponentPromisesCount: agentArtifactComponentPromises.length },
-      "All agent-artifactComponent relations updated"
+      "All sub-agent-artifactComponent relations updated"
     );
     await deleteAgentRelationsByAgent(db)({
       scopes: { tenantId, projectId, agentId: typedAgentDefinition.id }
     });
-    const agentRelationPromises = [];
+    const subAgentRelationPromises = [];
+    const subAgentExternalAgentRelationPromises = [];
     for (const [subAgentId, agentData2] of Object.entries(typedAgentDefinition.subAgents)) {
-      if (isInternalAgent(agentData2) && agentData2.canTransferTo) {
+      if (agentData2.canTransferTo) {
         for (const targetSubAgentId of agentData2.canTransferTo) {
-          agentRelationPromises.push(
+          subAgentRelationPromises.push(
             (async () => {
               try {
-                const targetAgentData = typedAgentDefinition.subAgents[targetSubAgentId];
-                const isTargetExternal = isExternalAgent(targetAgentData);
-                const targetField = isTargetExternal ? "externalSubAgentId" : "targetSubAgentId";
-                const relationData = {
-                  id: nanoid.nanoid(),
-                  agentId: typedAgentDefinition.id || "",
-                  sourceSubAgentId: subAgentId,
-                  relationType: "transfer",
-                  [targetField]: targetSubAgentId
-                };
                 await createSubAgentRelation(db)({
                   tenantId,
                   projectId,
-                  ...relationData
+                  id: generateId(),
+                  agentId: typedAgentDefinition.id || "",
+                  sourceSubAgentId: subAgentId,
+                  targetSubAgentId,
+                  relationType: "transfer"
                 });
-                logger14.info(
-                  { subAgentId, targetSubAgentId, isTargetExternal },
-                  "Transfer relation created"
-                );
+                logger14.info({ subAgentId, targetSubAgentId }, "Transfer relation created");
               } catch (error) {
                 logger14.error(
                   { subAgentId, targetSubAgentId, error },
@@ -221317,42 +221621,77 @@ var updateFullAgentServerSide = (db, logger14 = defaultLogger) => async (scopes,
           );
         }
       }
-      if (isInternalAgent(agentData2) && agentData2.canDelegateTo) {
-        for (const targetSubAgentId of agentData2.canDelegateTo) {
-          const targetAgentData = typedAgentDefinition.subAgents[targetSubAgentId];
-          const isTargetExternal = isExternalAgent(targetAgentData);
-          const targetField = isTargetExternal ? "externalSubAgentId" : "targetSubAgentId";
-          agentRelationPromises.push(
-            (async () => {
-              try {
-                const relationData = {
-                  id: nanoid.nanoid(),
-                  agentId: typedAgentDefinition.id || "",
-                  sourceSubAgentId: subAgentId,
-                  relationType: "delegate",
-                  [targetField]: targetSubAgentId
-                };
-                await createSubAgentRelation(db)({
-                  tenantId,
-                  projectId,
-                  ...relationData
-                });
-                logger14.info({ subAgentId, targetSubAgentId }, "Delegation relation created");
-              } catch (error) {
-                logger14.error(
-                  { subAgentId, targetSubAgentId, error },
-                  "Failed to create delegation relation"
-                );
-              }
-            })()
-          );
+      if (agentData2.canDelegateTo) {
+        for (const targetItem of agentData2.canDelegateTo) {
+          if (typeof targetItem === "string") {
+            subAgentRelationPromises.push(
+              (async () => {
+                try {
+                  await createSubAgentRelation(db)({
+                    tenantId,
+                    projectId,
+                    id: generateId(),
+                    agentId: typedAgentDefinition.id || "",
+                    sourceSubAgentId: subAgentId,
+                    targetSubAgentId: targetItem,
+                    relationType: "delegate"
+                  });
+                  logger14.info(
+                    { subAgentId, targetSubAgentId: targetItem },
+                    "Sub-agent delegation relation created"
+                  );
+                } catch (error) {
+                  logger14.error(
+                    { subAgentId, targetSubAgentId: targetItem, error },
+                    "Failed to create sub-agent delegation relation"
+                  );
+                }
+              })()
+            );
+          } else {
+            subAgentExternalAgentRelationPromises.push(
+              (async () => {
+                try {
+                  await upsertSubAgentExternalAgentRelation(db)({
+                    scopes: {
+                      tenantId,
+                      projectId,
+                      agentId: typedAgentDefinition.id || "",
+                      subAgentId
+                    },
+                    relationId: targetItem.subAgentExternalAgentRelationId,
+                    data: {
+                      externalAgentId: targetItem.externalAgentId,
+                      headers: targetItem.headers || null
+                    }
+                  });
+                  logger14.info(
+                    { subAgentId, externalAgentId: targetItem.externalAgentId },
+                    "External delegation relation created"
+                  );
+                } catch (error) {
+                  logger14.error(
+                    { subAgentId, externalAgentId: targetItem.externalAgentId, error },
+                    "Failed to create external delegation relation"
+                  );
+                }
+              })()
+            );
+          }
         }
       }
     }
-    await Promise.all(agentRelationPromises);
+    await Promise.all(subAgentRelationPromises);
+    logger14.info(
+      { subAgentRelationPromisesCount: subAgentRelationPromises.length },
+      "All sub-agent relations updated"
+    );
+    await Promise.all(subAgentExternalAgentRelationPromises);
     logger14.info(
-      { agentRelationPromisesCount: agentRelationPromises.length },
-      "All agent relations updated"
+      {
+        subAgentExternalAgentRelationPromisesCount: subAgentExternalAgentRelationPromises.length
+      },
+      "All sub-agent external agent relations updated"
     );
     const updatedAgent = await getFullAgentDefinition(db)({
       scopes: { tenantId, projectId, agentId: typedAgentDefinition.id }
@@ -221541,7 +221880,7 @@ var upsertLedgerArtifact = (db) => async (params) => {
   const sanitizedArt = sanitizeArtifactForDatabase(artifact);
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const artifactRow = {
-    id: sanitizedArt.artifactId ?? nanoid.nanoid(),
+    id: sanitizedArt.artifactId ?? generateId(),
     tenantId: scopes.tenantId,
     projectId: scopes.projectId,
     taskId,
@@ -221591,7 +221930,7 @@ var addLedgerArtifacts = (db) => async (params) => {
     const sanitizedArt = sanitizeArtifactForDatabase(art);
     const resolvedTaskId = taskId ?? sanitizedArt.taskId ?? sanitizedArt.metadata?.taskId ?? null;
     return {
-      id: sanitizedArt.artifactId ?? nanoid.nanoid(),
+      id: sanitizedArt.artifactId ?? generateId(),
       tenantId: scopes.tenantId,
       projectId: scopes.projectId,
       taskId: resolvedTaskId,
@@ -222159,6 +222498,50 @@ var createFullProjectServerSide = (db, logger14 = defaultLogger2) => async (scop
         "All project tools created successfully"
       );
     }
+    if (typed.externalAgents && Object.keys(typed.externalAgents).length > 0) {
+      logger14.info(
+        {
+          projectId: typed.id,
+          count: Object.keys(typed.externalAgents).length
+        },
+        "Creating project externalAgents"
+      );
+      const externalAgentPromises = Object.entries(typed.externalAgents).map(
+        async ([externalAgentId, externalAgentData]) => {
+          try {
+            logger14.info(
+              { projectId: typed.id, externalAgentId },
+              "Creating externalAgent in project"
+            );
+            await upsertExternalAgent(db)({
+              data: {
+                ...externalAgentData,
+                tenantId,
+                projectId: typed.id
+              }
+            });
+            logger14.info(
+              { projectId: typed.id, externalAgentId },
+              "ExternalAgent created successfully"
+            );
+          } catch (error) {
+            logger14.error(
+              { projectId: typed.id, externalAgentId, error },
+              "Failed to create externalAgent in project"
+            );
+            throw error;
+          }
+        }
+      );
+      await Promise.all(externalAgentPromises);
+      logger14.info(
+        {
+          projectId: typed.id,
+          count: Object.keys(typed.externalAgents).length
+        },
+        "All project externalAgents created successfully"
+      );
+    }
     if (typed.dataComponents && Object.keys(typed.dataComponents).length > 0) {
       logger14.info(
         {
@@ -222266,6 +222649,8 @@ var createFullProjectServerSide = (db, logger14 = defaultLogger2) => async (scop
             // Pass project-level functions for validation
             dataComponents: typed.dataComponents || {},
             artifactComponents: typed.artifactComponents || {},
+            externalAgents: typed.externalAgents || {},
+            // Pass project-level external agents
             credentialReferences: typed.credentialReferences || {},
             statusUpdates: agentData.statusUpdates === null ? void 0 : agentData.statusUpdates
           };
@@ -222467,6 +222852,50 @@ var updateFullProjectServerSide = (db, logger14 = defaultLogger2) => async (scop
         "All project tools updated successfully"
       );
     }
+    if (typed.externalAgents && Object.keys(typed.externalAgents).length > 0) {
+      logger14.info(
+        {
+          projectId: typed.id,
+          count: Object.keys(typed.externalAgents).length
+        },
+        "Updating project externalAgents"
+      );
+      const externalAgentPromises = Object.entries(typed.externalAgents).map(
+        async ([externalAgentId, externalAgentData]) => {
+          try {
+            logger14.info(
+              { projectId: typed.id, externalAgentId },
+              "Updating externalAgent in project"
+            );
+            await upsertExternalAgent(db)({
+              data: {
+                ...externalAgentData,
+                tenantId,
+                projectId: typed.id
+              }
+            });
+            logger14.info(
+              { projectId: typed.id, externalAgentId },
+              "ExternalAgent updated successfully"
+            );
+          } catch (error) {
+            logger14.error(
+              { projectId: typed.id, externalAgentId, error },
+              "Failed to update externalAgent in project"
+            );
+            throw error;
+          }
+        }
+      );
+      await Promise.all(externalAgentPromises);
+      logger14.info(
+        {
+          projectId: typed.id,
+          count: Object.keys(typed.externalAgents).length
+        },
+        "All project externalAgents updated successfully"
+      );
+    }
     if (typed.dataComponents && Object.keys(typed.dataComponents).length > 0) {
       logger14.info(
         {
@@ -222607,6 +223036,8 @@ var updateFullProjectServerSide = (db, logger14 = defaultLogger2) => async (scop
             // Pass project-level functions for validation
             dataComponents: typed.dataComponents || {},
             artifactComponents: typed.artifactComponents || {},
+            externalAgents: typed.externalAgents || {},
+            // Pass project-level external agents
             credentialReferences: typed.credentialReferences || {},
             statusUpdates: agentData.statusUpdates === null ? void 0 : agentData.statusUpdates
           };
@@ -222700,6 +223131,30 @@ var getFullProject = (db, logger14 = defaultLogger2) => async (params) => {
     } catch (error) {
       logger14.warn({ tenantId, projectId, error }, "Failed to retrieve tools for project");
     }
+    const projectExternalAgents = {};
+    try {
+      const externalAgentsList = await listExternalAgents(db)({
+        scopes: { tenantId, projectId }
+      });
+      for (const externalAgent of externalAgentsList) {
+        projectExternalAgents[externalAgent.id] = {
+          id: externalAgent.id,
+          name: externalAgent.name,
+          description: externalAgent.description,
+          baseUrl: externalAgent.baseUrl,
+          credentialReferenceId: externalAgent.credentialReferenceId || void 0
+        };
+      }
+      logger14.info(
+        { tenantId, projectId, count: Object.keys(projectExternalAgents).length },
+        "ExternalAgents retrieved for project"
+      );
+    } catch (error) {
+      logger14.warn(
+        { tenantId, projectId, error },
+        "Failed to retrieve externalAgents for project"
+      );
+    }
     const projectDataComponents = {};
     try {
       const dataComponentsList = await listDataComponents(db)({
@@ -222811,6 +223266,7 @@ var getFullProject = (db, logger14 = defaultLogger2) => async (params) => {
       stopWhen: project.stopWhen || void 0,
       agents: agents2,
       tools: projectTools,
+      externalAgents: projectExternalAgents,
       dataComponents: projectDataComponents,
       artifactComponents: projectArtifactComponents,
       credentialReferences: projectCredentialReferences,
@@ -222981,6 +223437,8 @@ var createValidatedDataAccess = (db, dataAccessFunctions) => {
 
 // src/utils/tracer.ts
 var tracer = getTracer("agents-core");
+
+// src/context/contextCache.ts
 var logger8 = getLogger("context-cache");
 var ContextCache = class {
   constructor(tenantId, projectId, dbClient) {
@@ -223043,7 +223501,7 @@ var ContextCache = class {
   async set(entry) {
     try {
       const cacheData = {
-        id: nanoid.nanoid(),
+        id: generateId(),
         tenantId: this.tenantId,
         projectId: this.projectId,
         conversationId: entry.conversationId,
@@ -225513,6 +225971,12 @@ exports.SubAgentDataComponentListResponse = SubAgentDataComponentListResponse;
 exports.SubAgentDataComponentResponse = SubAgentDataComponentResponse;
 exports.SubAgentDataComponentSelectSchema = SubAgentDataComponentSelectSchema;
 exports.SubAgentDataComponentUpdateSchema = SubAgentDataComponentUpdateSchema;
+exports.SubAgentExternalAgentRelationApiInsertSchema = SubAgentExternalAgentRelationApiInsertSchema;
+exports.SubAgentExternalAgentRelationApiSelectSchema = SubAgentExternalAgentRelationApiSelectSchema;
+exports.SubAgentExternalAgentRelationApiUpdateSchema = SubAgentExternalAgentRelationApiUpdateSchema;
+exports.SubAgentExternalAgentRelationInsertSchema = SubAgentExternalAgentRelationInsertSchema;
+exports.SubAgentExternalAgentRelationSelectSchema = SubAgentExternalAgentRelationSelectSchema;
+exports.SubAgentExternalAgentRelationUpdateSchema = SubAgentExternalAgentRelationUpdateSchema;
 exports.SubAgentInsertSchema = SubAgentInsertSchema;
 exports.SubAgentListResponse = SubAgentListResponse;
 exports.SubAgentRelationApiInsertSchema = SubAgentRelationApiInsertSchema;
@@ -225588,6 +226052,7 @@ exports.artifactComponents = artifactComponents;
 exports.artifactComponentsRelations = artifactComponentsRelations;
 exports.associateArtifactComponentWithAgent = associateArtifactComponentWithAgent;
 exports.associateDataComponentWithAgent = associateDataComponentWithAgent;
+exports.canDelegateToExternalAgentSchema = canDelegateToExternalAgentSchema;
 exports.cleanupTenantCache = cleanupTenantCache;
 exports.clearContextConfigCache = clearContextConfigCache;
 exports.clearConversationCache = clearConversationCache;
@@ -225628,7 +226093,6 @@ exports.createDatabaseClient = createDatabaseClient;
 exports.createDefaultCredentialStores = createDefaultCredentialStores;
 exports.createExecutionContext = createExecutionContext;
 exports.createExternalAgent = createExternalAgent;
-exports.createExternalAgentRelation = createExternalAgentRelation;
 exports.createFullAgentServerSide = createFullAgentServerSide;
 exports.createFullProjectServerSide = createFullProjectServerSide;
 exports.createFunctionTool = createFunctionTool;
@@ -225639,6 +226103,7 @@ exports.createNangoCredentialStore = createNangoCredentialStore;
 exports.createOrGetConversation = createOrGetConversation;
 exports.createProject = createProject;
 exports.createSubAgent = createSubAgent;
+exports.createSubAgentExternalAgentRelation = createSubAgentExternalAgentRelation;
 exports.createSubAgentRelation = createSubAgentRelation;
 exports.createTask = createTask;
 exports.createTool = createTool;
@@ -225670,6 +226135,9 @@ exports.deleteLedgerArtifactsByTask = deleteLedgerArtifactsByTask;
 exports.deleteMessage = deleteMessage;
 exports.deleteProject = deleteProject;
 exports.deleteSubAgent = deleteSubAgent;
+exports.deleteSubAgentExternalAgentRelation = deleteSubAgentExternalAgentRelation;
+exports.deleteSubAgentExternalAgentRelationsByAgent = deleteSubAgentExternalAgentRelationsByAgent;
+exports.deleteSubAgentExternalAgentRelationsBySubAgent = deleteSubAgentExternalAgentRelationsBySubAgent;
 exports.deleteSubAgentRelation = deleteSubAgentRelation;
 exports.deleteTool = deleteTool;
 exports.detectAuthenticationRequired = detectAuthenticationRequired;
@@ -225722,13 +226190,13 @@ exports.getConversationHistory = getConversationHistory;
 exports.getConversationId = getConversationId;
 exports.getCredentialReference = getCredentialReference;
 exports.getCredentialReferenceById = getCredentialReferenceById;
-exports.getCredentialReferenceWithTools = getCredentialReferenceWithTools;
+exports.getCredentialReferenceWithResources = getCredentialReferenceWithResources;
 exports.getCredentialStoreLookupKeyFromRetrievalParams = getCredentialStoreLookupKeyFromRetrievalParams;
 exports.getDataComponent = getDataComponent;
 exports.getDataComponentsForAgent = getDataComponentsForAgent;
 exports.getExternalAgent = getExternalAgent;
 exports.getExternalAgentByUrl = getExternalAgentByUrl;
-exports.getExternalAgentRelations = getExternalAgentRelations;
+exports.getExternalAgentsForSubAgent = getExternalAgentsForSubAgent;
 exports.getFullAgent = getFullAgent;
 exports.getFullAgentDefinition = getFullAgentDefinition;
 exports.getFullProject = getFullProject;
@@ -225746,8 +226214,14 @@ exports.getProjectResourceCounts = getProjectResourceCounts;
 exports.getRelatedAgentsForAgent = getRelatedAgentsForAgent;
 exports.getRequestExecutionContext = getRequestExecutionContext;
 exports.getSubAgentById = getSubAgentById;
+exports.getSubAgentExternalAgentRelationById = getSubAgentExternalAgentRelationById;
+exports.getSubAgentExternalAgentRelationByParams = getSubAgentExternalAgentRelationByParams;
+exports.getSubAgentExternalAgentRelations = getSubAgentExternalAgentRelations;
+exports.getSubAgentExternalAgentRelationsByAgent = getSubAgentExternalAgentRelationsByAgent;
+exports.getSubAgentExternalAgentRelationsByExternalAgent = getSubAgentExternalAgentRelationsByExternalAgent;
 exports.getSubAgentRelationsByTarget = getSubAgentRelationsByTarget;
 exports.getSubAgentsByIds = getSubAgentsByIds;
+exports.getSubAgentsForExternalAgent = getSubAgentsForExternalAgent;
 exports.getTask = getTask;
 exports.getToolById = getToolById;
 exports.getToolsForAgent = getToolsForAgent;
@@ -225767,8 +226241,6 @@ exports.invalidateInvocationDefinitionsCache = invalidateInvocationDefinitionsCa
 exports.isApiKeyExpired = isApiKeyExpired;
 exports.isArtifactComponentAssociatedWithAgent = isArtifactComponentAssociatedWithAgent;
 exports.isDataComponentAssociatedWithAgent = isDataComponentAssociatedWithAgent;
-exports.isExternalAgent = isExternalAgent;
-exports.isInternalAgent = isInternalAgent;
 exports.isValidHttpRequest = isValidHttpRequest;
 exports.isValidResourceId = isValidResourceId;
 exports.isZodSchema = isZodSchema;
@@ -225796,6 +226268,7 @@ exports.listFunctions = listFunctions;
 exports.listMessages = listMessages;
 exports.listProjects = listProjects;
 exports.listProjectsPaginated = listProjectsPaginated;
+exports.listSubAgentExternalAgentRelations = listSubAgentExternalAgentRelations;
 exports.listSubAgents = listSubAgents;
 exports.listSubAgentsPaginated = listSubAgentsPaginated;
 exports.listTaskIdsByContextId = listTaskIdsByContextId;
@@ -225824,6 +226297,8 @@ exports.subAgentArtifactComponents = subAgentArtifactComponents;
 exports.subAgentArtifactComponentsRelations = subAgentArtifactComponentsRelations;
 exports.subAgentDataComponents = subAgentDataComponents;
 exports.subAgentDataComponentsRelations = subAgentDataComponentsRelations;
+exports.subAgentExternalAgentRelations = subAgentExternalAgentRelations;
+exports.subAgentExternalAgentRelationsRelations = subAgentExternalAgentRelationsRelations;
 exports.subAgentFunctionToolRelations = subAgentFunctionToolRelations;
 exports.subAgentFunctionToolRelationsRelations = subAgentFunctionToolRelationsRelations;
 exports.subAgentRelations = subAgentRelations;
@@ -225855,6 +226330,7 @@ exports.updateFunctionTool = updateFunctionTool;
 exports.updateMessage = updateMessage;
 exports.updateProject = updateProject;
 exports.updateSubAgent = updateSubAgent;
+exports.updateSubAgentExternalAgentRelation = updateSubAgentExternalAgentRelation;
 exports.updateSubAgentFunctionToolRelation = updateSubAgentFunctionToolRelation;
 exports.updateTask = updateTask;
 exports.updateTool = updateTool;
@@ -225870,6 +226346,7 @@ exports.upsertFunction = upsertFunction;
 exports.upsertFunctionTool = upsertFunctionTool;
 exports.upsertLedgerArtifact = upsertLedgerArtifact;
 exports.upsertSubAgent = upsertSubAgent;
+exports.upsertSubAgentExternalAgentRelation = upsertSubAgentExternalAgentRelation;
 exports.upsertSubAgentFunctionToolRelation = upsertSubAgentFunctionToolRelation;
 exports.upsertSubAgentRelation = upsertSubAgentRelation;
 exports.upsertSubAgentToolRelation = upsertSubAgentToolRelation;
@@ -225882,13 +226359,13 @@ exports.validateAndTypeAgentData = validateAndTypeAgentData;
 exports.validateApiKey = validateApiKey;
 exports.validateArtifactComponentReferences = validateArtifactComponentReferences;
 exports.validateDataComponentReferences = validateDataComponentReferences;
-exports.validateExternalAgent = validateExternalAgent;
 exports.validateHeaders = validateHeaders;
 exports.validateHttpRequestHeaders = validateHttpRequestHeaders;
-exports.validateInternalSubAgent = validateInternalSubAgent;
 exports.validatePreview = validatePreview;
 exports.validateProjectExists = validateProjectExists;
 exports.validatePropsAsJsonSchema = validatePropsAsJsonSchema;
+exports.validateSubAgent = validateSubAgent;
+exports.validateSubAgentExternalAgentRelations = validateSubAgentExternalAgentRelations;
 exports.validateToolReferences = validateToolReferences;
 exports.validationHelper = validationHelper;
 exports.withProjectValidation = withProjectValidation;