@xpert-ai/plugin-sdk 3.12.2 → 3.14.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @xpert-ai/plugin-sdk
 
+## 3.14.0
+
+### Minor Changes
+
+- 6f679b8: fix plugin tenant scope & human chat files types
+
+### Patch Changes
+
+- Updated dependencies [6f679b8]
+  - @xpert-ai/contracts@3.15.0
+
+## 3.13.0
+
+### Minor Changes
+
+- 54cff15: tenants and managed connections
+- 6978bfd: release plugin tenant scope
+
+### Patch Changes
+
+- Updated dependencies [54cff15]
+- Updated dependencies [6978bfd]
+  - @xpert-ai/contracts@3.14.0
+
 ## 3.12.2
 
 ### Patch Changes

package/index.cjs.js

@@ -91,7 +91,36 @@ var _axios__namespace = /*#__PURE__*/_interopNamespaceDefault(_axios);
 const ORGANIZATION_METADATA_KEY = 'xpert:organizationId';
 const PLUGIN_METADATA_KEY = 'xpert:pluginName';
 const GLOBAL_ORGANIZATION_SCOPE = 'global';
+const BUILTIN_GLOBAL_SCOPE = 'builtin:global';
+const TENANT_GLOBAL_SCOPE_PREFIX = 'tenant:';
+const TENANT_GLOBAL_SCOPE_SUFFIX = ':global';
 const STRATEGY_META_KEY = 'XPERT_STRATEGY_META_KEY';
+let defaultTenantId = null;
+function normalizeOptionalString(value) {
+    return typeof value === 'string' && value.trim().length > 0 ? value.trim() : null;
+}
+function getTenantGlobalScopeKey(tenantId) {
+    return `${TENANT_GLOBAL_SCOPE_PREFIX}${tenantId}${TENANT_GLOBAL_SCOPE_SUFFIX}`;
+}
+function isTenantGlobalScopeKey(value) {
+    return typeof value === 'string' && value.startsWith(TENANT_GLOBAL_SCOPE_PREFIX) && value.endsWith(TENANT_GLOBAL_SCOPE_SUFFIX);
+}
+function setDefaultTenantId(tenantId) {
+    defaultTenantId = normalizeOptionalString(tenantId);
+}
+function getDefaultTenantId() {
+    return defaultTenantId;
+}
+function resolveTenantGlobalScopeKey(tenantId) {
+    const normalizedTenantId = normalizeOptionalString(tenantId);
+    if (!normalizedTenantId) {
+        return GLOBAL_ORGANIZATION_SCOPE;
+    }
+    if (defaultTenantId && normalizedTenantId !== defaultTenantId) {
+        return getTenantGlobalScopeKey(normalizedTenantId);
+    }
+    return GLOBAL_ORGANIZATION_SCOPE;
+}
 
 function _extends() {
     _extends = Object.assign || function assign(target) {
@@ -485,14 +514,14 @@ class BaseStrategyRegistry {
         if (type) {
             var _instance_metatype;
             const target = (_instance_metatype = instance.metatype) != null ? _instance_metatype : instance.constructor;
+            const pluginName = this.reflector.get(PLUGIN_METADATA_KEY, target);
             var _this_reflector_get;
-            const organizationId = (_this_reflector_get = this.reflector.get(ORGANIZATION_METADATA_KEY, target)) != null ? _this_reflector_get : GLOBAL_ORGANIZATION_SCOPE;
+            const organizationId = (_this_reflector_get = this.reflector.get(ORGANIZATION_METADATA_KEY, target)) != null ? _this_reflector_get : pluginName ? GLOBAL_ORGANIZATION_SCOPE : BUILTIN_GLOBAL_SCOPE;
             var _this_strategies_get;
             const orgMap = (_this_strategies_get = this.strategies.get(organizationId)) != null ? _this_strategies_get : new Map();
             orgMap.set(type, instance);
             this.strategies.set(organizationId, orgMap);
-            const pluginName = this.reflector.get(PLUGIN_METADATA_KEY, target);
-            this.logger.debug(`Registered strategy of type ${type} for organization ${organizationId} from plugin ${pluginName}`);
+            this.logger.debug(`Registered strategy of type ${type} for scope ${organizationId} from plugin ${pluginName}`);
             if (pluginName) {
                 var _this_pluginStrategies_get;
                 const pluginStrategies = (_this_pluginStrategies_get = this.pluginStrategies.get(pluginName)) != null ? _this_pluginStrategies_get : new Set();
@@ -502,7 +531,7 @@ class BaseStrategyRegistry {
         }
     }
     /**
-     * Remove all strategies registered by the given plugin for the given organization.
+     * Remove all strategies registered by the given plugin for the given scope.
      */ remove(organizationId, pluginName) {
         const strategies = this.pluginStrategies.get(pluginName);
         const orgMap = this.strategies.get(organizationId);
@@ -511,10 +540,33 @@ class BaseStrategyRegistry {
         }
     }
     /**
-     * Resolve organization id, falling back to request context org or global scope.
+     * Resolve the primary scope key, falling back to request context org or tenant-global scope.
      */ resolveOrganization(organizationId) {
-        var _ref;
-        return (_ref = organizationId != null ? organizationId : RequestContext.getOrganizationId()) != null ? _ref : GLOBAL_ORGANIZATION_SCOPE;
+        var _RequestContext_getScope;
+        var _RequestContext_getScope_tenantId;
+        const tenantId = (_RequestContext_getScope_tenantId = (_RequestContext_getScope = RequestContext.getScope()) == null ? void 0 : _RequestContext_getScope.tenantId) != null ? _RequestContext_getScope_tenantId : RequestContext.currentTenantId();
+        const requested = organizationId != null ? organizationId : RequestContext.getOrganizationId();
+        return !requested || requested === GLOBAL_ORGANIZATION_SCOPE ? resolveTenantGlobalScopeKey(tenantId) : requested;
+    }
+    resolveGlobalFallbackOrganization() {
+        var _RequestContext_getScope;
+        var _RequestContext_getScope_tenantId;
+        const tenantId = (_RequestContext_getScope_tenantId = (_RequestContext_getScope = RequestContext.getScope()) == null ? void 0 : _RequestContext_getScope.tenantId) != null ? _RequestContext_getScope_tenantId : RequestContext.currentTenantId();
+        return resolveTenantGlobalScopeKey(tenantId);
+    }
+    resolveStrategyScopeKeys(organizationId) {
+        const orgKey = this.resolveOrganization(organizationId);
+        const globalKey = this.resolveGlobalFallbackOrganization();
+        const scopeKeys = [
+            orgKey
+        ];
+        if (orgKey !== globalKey) {
+            scopeKeys.push(globalKey);
+        }
+        if (!scopeKeys.includes(BUILTIN_GLOBAL_SCOPE)) {
+            scopeKeys.push(BUILTIN_GLOBAL_SCOPE);
+        }
+        return scopeKeys;
     }
     /**
      * Get strategy by type from the given organization including global strategies as fallback.
@@ -523,11 +575,11 @@ class BaseStrategyRegistry {
      * @param organizationId
      * @returns
      */ get(type, organizationId) {
-        var _this_strategies_get, _this_strategies_get1;
         organizationId != null ? organizationId : organizationId = RequestContext.getOrganizationId();
-        const orgKey = this.resolveOrganization(organizationId);
-        var _this_strategies_get_get;
-        const strategy = (_this_strategies_get_get = (_this_strategies_get = this.strategies.get(orgKey)) == null ? void 0 : _this_strategies_get.get(type)) != null ? _this_strategies_get_get : orgKey === GLOBAL_ORGANIZATION_SCOPE ? undefined : (_this_strategies_get1 = this.strategies.get(GLOBAL_ORGANIZATION_SCOPE)) == null ? void 0 : _this_strategies_get1.get(type);
+        const strategy = this.resolveStrategyScopeKeys(organizationId).map((scopeKey)=>{
+            var _this_strategies_get;
+            return (_this_strategies_get = this.strategies.get(scopeKey)) == null ? void 0 : _this_strategies_get.get(type);
+        }).find((item)=>!!item);
         if (!strategy) {
             throw new Error(`No strategy found for type '${type}' for strategy '${this.strategyKey}'`);
         }
@@ -539,18 +591,12 @@ class BaseStrategyRegistry {
      * @param organizationId
      * @returns
      */ list(organizationId) {
-        var _this_strategies_get;
         organizationId != null ? organizationId : organizationId = RequestContext.getOrganizationId();
-        const orgKey = this.resolveOrganization(organizationId);
         const effective = new Map();
-        var _this_strategies_get_entries;
-        for (const [type, strategy] of (_this_strategies_get_entries = (_this_strategies_get = this.strategies.get(orgKey)) == null ? void 0 : _this_strategies_get.entries()) != null ? _this_strategies_get_entries : []){
-            effective.set(type, strategy);
-        }
-        if (orgKey !== GLOBAL_ORGANIZATION_SCOPE) {
-            var _this_strategies_get1;
-            var _this_strategies_get_entries1;
-            for (const [type, strategy] of (_this_strategies_get_entries1 = (_this_strategies_get1 = this.strategies.get(GLOBAL_ORGANIZATION_SCOPE)) == null ? void 0 : _this_strategies_get1.entries()) != null ? _this_strategies_get_entries1 : []){
+        for (const scopeKey of this.resolveStrategyScopeKeys(organizationId)){
+            var _this_strategies_get;
+            var _this_strategies_get_entries;
+            for (const [type, strategy] of (_this_strategies_get_entries = (_this_strategies_get = this.strategies.get(scopeKey)) == null ? void 0 : _this_strategies_get.entries()) != null ? _this_strategies_get_entries : []){
                 if (!effective.has(type)) {
                     effective.set(type, strategy);
                 }
@@ -560,7 +606,7 @@ class BaseStrategyRegistry {
     }
     constructor(strategyKey, discoveryService, reflector){
         this.logger = new common.Logger(BaseStrategyRegistry.name);
-        // Map<organizationId, Map<type, strategy>>
+        // Map<scopeKey, Map<type, strategy>>
         this.strategies = new Map();
         this.pluginStrategies = new Map();
         this.strategyKey = strategyKey;
@@ -2756,9 +2802,9 @@ exports.AgentMiddlewareRegistry = __decorate([
 /**
  * jump targets (user facing)
  */ const JUMP_TO_TARGETS = [
-    "model",
-    "tools",
-    "end"
+    'model',
+    'tools',
+    'end'
 ];
 
 const AssistantTaskRuntimeCapability = createRuntimeCapability('platform.assistant_task', {
@@ -4066,22 +4112,19 @@ function resolveSandboxTerminalAdapter(sandbox) {
     return isSandboxTerminalAdapter(candidate) ? candidate : null;
 }
 
+const MANAGED_CONNECTION_REGISTRY_TOKEN = 'XPERT_MANAGED_CONNECTION_REGISTRY';
+const CONNECTION_COMMAND_ROUTER_TOKEN = 'XPERT_CONNECTION_COMMAND_ROUTER';
+
 const VIEW_EXTENSION_PROVIDER = 'VIEW_EXTENSION_PROVIDER';
 const ViewExtensionProvider = (providerKey)=>common.applyDecorators(common.SetMetadata(VIEW_EXTENSION_PROVIDER, providerKey), common.SetMetadata(STRATEGY_META_KEY, VIEW_EXTENSION_PROVIDER));
 
 exports.ViewExtensionProviderRegistry = class ViewExtensionProviderRegistry extends BaseStrategyRegistry {
     listEntries(organizationId) {
-        var _this_strategies_get;
-        const orgKey = this.resolveOrganization(organizationId);
         const entries = new Map();
-        var _this_strategies_get_entries;
-        for (const [providerKey, provider] of (_this_strategies_get_entries = (_this_strategies_get = this.strategies.get(orgKey)) == null ? void 0 : _this_strategies_get.entries()) != null ? _this_strategies_get_entries : []){
-            entries.set(providerKey, provider);
-        }
-        if (orgKey !== GLOBAL_ORGANIZATION_SCOPE) {
-            var _this_strategies_get1;
-            var _this_strategies_get_entries1;
-            for (const [providerKey, provider] of (_this_strategies_get_entries1 = (_this_strategies_get1 = this.strategies.get(GLOBAL_ORGANIZATION_SCOPE)) == null ? void 0 : _this_strategies_get1.entries()) != null ? _this_strategies_get_entries1 : []){
+        for (const scopeKey of this.resolveStrategyScopeKeys(organizationId)){
+            var _this_strategies_get;
+            var _this_strategies_get_entries;
+            for (const [providerKey, provider] of (_this_strategies_get_entries = (_this_strategies_get = this.strategies.get(scopeKey)) == null ? void 0 : _this_strategies_get.entries()) != null ? _this_strategies_get_entries : []){
                 if (!entries.has(providerKey)) {
                     entries.set(providerKey, provider);
                 }
@@ -4540,6 +4583,7 @@ exports.AgentMiddlewareStrategy = AgentMiddlewareStrategy;
 exports.AiModelNotFoundException = AiModelNotFoundException;
 exports.AssistantTaskRuntimeCapability = AssistantTaskRuntimeCapability;
 exports.BOUND_IDENTITY_LOGIN_PERMISSION_SERVICE_TOKEN = BOUND_IDENTITY_LOGIN_PERMISSION_SERVICE_TOKEN;
+exports.BUILTIN_GLOBAL_SCOPE = BUILTIN_GLOBAL_SCOPE;
 exports.BaseHTTPQueryRunner = BaseHTTPQueryRunner;
 exports.BaseQueryRunner = BaseQueryRunner;
 exports.BaseSQLQueryRunner = BaseSQLQueryRunner;
@@ -4550,6 +4594,7 @@ exports.BaseToolset = BaseToolset;
 exports.BuiltinToolset = BuiltinToolset;
 exports.CHAT_CHANNEL = CHAT_CHANNEL;
 exports.CHAT_CHANNEL_TEXT_LIMITS = CHAT_CHANNEL_TEXT_LIMITS;
+exports.CONNECTION_COMMAND_ROUTER_TOKEN = CONNECTION_COMMAND_ROUTER_TOKEN;
 exports.CancelConversationCommand = CancelConversationCommand;
 exports.ChatChannel = ChatChannel;
 exports.ChatOAICompatReasoningModel = ChatOAICompatReasoningModel;
@@ -4598,6 +4643,7 @@ exports.KnowledgebaseDocumentsRuntimeCapability = KnowledgebaseDocumentsRuntimeC
 exports.KnowledgebaseRuntimeCapability = KnowledgebaseRuntimeCapability;
 exports.LLMUsage = LLMUsage;
 exports.LargeLanguageModel = LargeLanguageModel;
+exports.MANAGED_CONNECTION_REGISTRY_TOKEN = MANAGED_CONNECTION_REGISTRY_TOKEN;
 exports.ORGANIZATION_METADATA_KEY = ORGANIZATION_METADATA_KEY;
 exports.OpenAICompatibleReranker = OpenAICompatibleReranker;
 exports.PERMISSION_OPERATION_METADATA_KEY = PERMISSION_OPERATION_METADATA_KEY;
@@ -4631,6 +4677,8 @@ exports.SandboxProviderStrategy = SandboxProviderStrategy;
 exports.SkillSourceProviderStrategy = SkillSourceProviderStrategy;
 exports.Speech2TextChatModel = Speech2TextChatModel;
 exports.SpeechToTextModel = SpeechToTextModel;
+exports.TENANT_GLOBAL_SCOPE_PREFIX = TENANT_GLOBAL_SCOPE_PREFIX;
+exports.TENANT_GLOBAL_SCOPE_SUFFIX = TENANT_GLOBAL_SCOPE_SUFFIX;
 exports.TEXT_SPLITTER_STRATEGY = TEXT_SPLITTER_STRATEGY;
 exports.TOOLSET_STRATEGY = TOOLSET_STRATEGY;
 exports.TextEmbeddingModelManager = TextEmbeddingModelManager;
@@ -4665,6 +4713,7 @@ exports.defineAgentMessageType = defineAgentMessageType;
 exports.defineChannelMessageType = defineChannelMessageType;
 exports.downloadRemoteFile = downloadRemoteFile;
 exports.formatSandboxTimeout = formatSandboxTimeout;
+exports.getDefaultTenantId = getDefaultTenantId;
 exports.getErrorMessage = getErrorMessage;
 exports.getModelContextSize = getModelContextSize;
 exports.getPermissionOperationMetadata = getPermissionOperationMetadata;
@@ -4672,12 +4721,14 @@ exports.getPositionList = getPositionList;
 exports.getPositionMap = getPositionMap;
 exports.getRequestContext = getRequestContext;
 exports.getRequiredPermissionOperation = getRequiredPermissionOperation;
+exports.getTenantGlobalScopeKey = getTenantGlobalScopeKey;
 exports.isRemoteFile = isRemoteFile;
 exports.isSandboxBackend = isSandboxBackend;
 exports.isSandboxManagedServiceAdapter = isSandboxManagedServiceAdapter;
 exports.isSandboxServiceProxyAdapter = isSandboxServiceProxyAdapter;
 exports.isSandboxTerminalAdapter = isSandboxTerminalAdapter;
 exports.isStructuredMessageType = isStructuredMessageType;
+exports.isTenantGlobalScopeKey = isTenantGlobalScopeKey;
 exports.loadYamlFile = loadYamlFile;
 exports.mergeCredentials = mergeCredentials;
 exports.mergeParentChildChunks = mergeParentChildChunks;
@@ -4688,6 +4739,8 @@ exports.resolveSandboxExecutionOptions = resolveSandboxExecutionOptions;
 exports.resolveSandboxManagedServiceAdapter = resolveSandboxManagedServiceAdapter;
 exports.resolveSandboxServiceProxyAdapter = resolveSandboxServiceProxyAdapter;
 exports.resolveSandboxTerminalAdapter = resolveSandboxTerminalAdapter;
+exports.resolveTenantGlobalScopeKey = resolveTenantGlobalScopeKey;
 exports.runWithRequestContext = runWithRequestContext;
 exports.secondsToMilliseconds = secondsToMilliseconds;
+exports.setDefaultTenantId = setDefaultTenantId;
 exports.sumTokenUsage = sumTokenUsage;

package/index.esm.js

@@ -71,7 +71,36 @@ import { getModelContextSize as getModelContextSize$1 } from '@langchain/core/la
 const ORGANIZATION_METADATA_KEY = 'xpert:organizationId';
 const PLUGIN_METADATA_KEY = 'xpert:pluginName';
 const GLOBAL_ORGANIZATION_SCOPE = 'global';
+const BUILTIN_GLOBAL_SCOPE = 'builtin:global';
+const TENANT_GLOBAL_SCOPE_PREFIX = 'tenant:';
+const TENANT_GLOBAL_SCOPE_SUFFIX = ':global';
 const STRATEGY_META_KEY = 'XPERT_STRATEGY_META_KEY';
+let defaultTenantId = null;
+function normalizeOptionalString(value) {
+    return typeof value === 'string' && value.trim().length > 0 ? value.trim() : null;
+}
+function getTenantGlobalScopeKey(tenantId) {
+    return `${TENANT_GLOBAL_SCOPE_PREFIX}${tenantId}${TENANT_GLOBAL_SCOPE_SUFFIX}`;
+}
+function isTenantGlobalScopeKey(value) {
+    return typeof value === 'string' && value.startsWith(TENANT_GLOBAL_SCOPE_PREFIX) && value.endsWith(TENANT_GLOBAL_SCOPE_SUFFIX);
+}
+function setDefaultTenantId(tenantId) {
+    defaultTenantId = normalizeOptionalString(tenantId);
+}
+function getDefaultTenantId() {
+    return defaultTenantId;
+}
+function resolveTenantGlobalScopeKey(tenantId) {
+    const normalizedTenantId = normalizeOptionalString(tenantId);
+    if (!normalizedTenantId) {
+        return GLOBAL_ORGANIZATION_SCOPE;
+    }
+    if (defaultTenantId && normalizedTenantId !== defaultTenantId) {
+        return getTenantGlobalScopeKey(normalizedTenantId);
+    }
+    return GLOBAL_ORGANIZATION_SCOPE;
+}
 
 function _extends() {
     _extends = Object.assign || function assign(target) {
@@ -465,14 +494,14 @@ class BaseStrategyRegistry {
         if (type) {
             var _instance_metatype;
             const target = (_instance_metatype = instance.metatype) != null ? _instance_metatype : instance.constructor;
+            const pluginName = this.reflector.get(PLUGIN_METADATA_KEY, target);
             var _this_reflector_get;
-            const organizationId = (_this_reflector_get = this.reflector.get(ORGANIZATION_METADATA_KEY, target)) != null ? _this_reflector_get : GLOBAL_ORGANIZATION_SCOPE;
+            const organizationId = (_this_reflector_get = this.reflector.get(ORGANIZATION_METADATA_KEY, target)) != null ? _this_reflector_get : pluginName ? GLOBAL_ORGANIZATION_SCOPE : BUILTIN_GLOBAL_SCOPE;
             var _this_strategies_get;
             const orgMap = (_this_strategies_get = this.strategies.get(organizationId)) != null ? _this_strategies_get : new Map();
             orgMap.set(type, instance);
             this.strategies.set(organizationId, orgMap);
-            const pluginName = this.reflector.get(PLUGIN_METADATA_KEY, target);
-            this.logger.debug(`Registered strategy of type ${type} for organization ${organizationId} from plugin ${pluginName}`);
+            this.logger.debug(`Registered strategy of type ${type} for scope ${organizationId} from plugin ${pluginName}`);
             if (pluginName) {
                 var _this_pluginStrategies_get;
                 const pluginStrategies = (_this_pluginStrategies_get = this.pluginStrategies.get(pluginName)) != null ? _this_pluginStrategies_get : new Set();
@@ -482,7 +511,7 @@ class BaseStrategyRegistry {
         }
     }
     /**
-     * Remove all strategies registered by the given plugin for the given organization.
+     * Remove all strategies registered by the given plugin for the given scope.
      */ remove(organizationId, pluginName) {
         const strategies = this.pluginStrategies.get(pluginName);
         const orgMap = this.strategies.get(organizationId);
@@ -491,10 +520,33 @@ class BaseStrategyRegistry {
         }
     }
     /**
-     * Resolve organization id, falling back to request context org or global scope.
+     * Resolve the primary scope key, falling back to request context org or tenant-global scope.
      */ resolveOrganization(organizationId) {
-        var _ref;
-        return (_ref = organizationId != null ? organizationId : RequestContext.getOrganizationId()) != null ? _ref : GLOBAL_ORGANIZATION_SCOPE;
+        var _RequestContext_getScope;
+        var _RequestContext_getScope_tenantId;
+        const tenantId = (_RequestContext_getScope_tenantId = (_RequestContext_getScope = RequestContext.getScope()) == null ? void 0 : _RequestContext_getScope.tenantId) != null ? _RequestContext_getScope_tenantId : RequestContext.currentTenantId();
+        const requested = organizationId != null ? organizationId : RequestContext.getOrganizationId();
+        return !requested || requested === GLOBAL_ORGANIZATION_SCOPE ? resolveTenantGlobalScopeKey(tenantId) : requested;
+    }
+    resolveGlobalFallbackOrganization() {
+        var _RequestContext_getScope;
+        var _RequestContext_getScope_tenantId;
+        const tenantId = (_RequestContext_getScope_tenantId = (_RequestContext_getScope = RequestContext.getScope()) == null ? void 0 : _RequestContext_getScope.tenantId) != null ? _RequestContext_getScope_tenantId : RequestContext.currentTenantId();
+        return resolveTenantGlobalScopeKey(tenantId);
+    }
+    resolveStrategyScopeKeys(organizationId) {
+        const orgKey = this.resolveOrganization(organizationId);
+        const globalKey = this.resolveGlobalFallbackOrganization();
+        const scopeKeys = [
+            orgKey
+        ];
+        if (orgKey !== globalKey) {
+            scopeKeys.push(globalKey);
+        }
+        if (!scopeKeys.includes(BUILTIN_GLOBAL_SCOPE)) {
+            scopeKeys.push(BUILTIN_GLOBAL_SCOPE);
+        }
+        return scopeKeys;
     }
     /**
      * Get strategy by type from the given organization including global strategies as fallback.
@@ -503,11 +555,11 @@ class BaseStrategyRegistry {
      * @param organizationId
      * @returns
      */ get(type, organizationId) {
-        var _this_strategies_get, _this_strategies_get1;
         organizationId != null ? organizationId : organizationId = RequestContext.getOrganizationId();
-        const orgKey = this.resolveOrganization(organizationId);
-        var _this_strategies_get_get;
-        const strategy = (_this_strategies_get_get = (_this_strategies_get = this.strategies.get(orgKey)) == null ? void 0 : _this_strategies_get.get(type)) != null ? _this_strategies_get_get : orgKey === GLOBAL_ORGANIZATION_SCOPE ? undefined : (_this_strategies_get1 = this.strategies.get(GLOBAL_ORGANIZATION_SCOPE)) == null ? void 0 : _this_strategies_get1.get(type);
+        const strategy = this.resolveStrategyScopeKeys(organizationId).map((scopeKey)=>{
+            var _this_strategies_get;
+            return (_this_strategies_get = this.strategies.get(scopeKey)) == null ? void 0 : _this_strategies_get.get(type);
+        }).find((item)=>!!item);
         if (!strategy) {
             throw new Error(`No strategy found for type '${type}' for strategy '${this.strategyKey}'`);
         }
@@ -519,18 +571,12 @@ class BaseStrategyRegistry {
      * @param organizationId
      * @returns
      */ list(organizationId) {
-        var _this_strategies_get;
         organizationId != null ? organizationId : organizationId = RequestContext.getOrganizationId();
-        const orgKey = this.resolveOrganization(organizationId);
         const effective = new Map();
-        var _this_strategies_get_entries;
-        for (const [type, strategy] of (_this_strategies_get_entries = (_this_strategies_get = this.strategies.get(orgKey)) == null ? void 0 : _this_strategies_get.entries()) != null ? _this_strategies_get_entries : []){
-            effective.set(type, strategy);
-        }
-        if (orgKey !== GLOBAL_ORGANIZATION_SCOPE) {
-            var _this_strategies_get1;
-            var _this_strategies_get_entries1;
-            for (const [type, strategy] of (_this_strategies_get_entries1 = (_this_strategies_get1 = this.strategies.get(GLOBAL_ORGANIZATION_SCOPE)) == null ? void 0 : _this_strategies_get1.entries()) != null ? _this_strategies_get_entries1 : []){
+        for (const scopeKey of this.resolveStrategyScopeKeys(organizationId)){
+            var _this_strategies_get;
+            var _this_strategies_get_entries;
+            for (const [type, strategy] of (_this_strategies_get_entries = (_this_strategies_get = this.strategies.get(scopeKey)) == null ? void 0 : _this_strategies_get.entries()) != null ? _this_strategies_get_entries : []){
                 if (!effective.has(type)) {
                     effective.set(type, strategy);
                 }
@@ -540,7 +586,7 @@ class BaseStrategyRegistry {
     }
     constructor(strategyKey, discoveryService, reflector){
         this.logger = new Logger(BaseStrategyRegistry.name);
-        // Map<organizationId, Map<type, strategy>>
+        // Map<scopeKey, Map<type, strategy>>
         this.strategies = new Map();
         this.pluginStrategies = new Map();
         this.strategyKey = strategyKey;
@@ -2736,9 +2782,9 @@ AgentMiddlewareRegistry = __decorate([
 /**
  * jump targets (user facing)
  */ const JUMP_TO_TARGETS = [
-    "model",
-    "tools",
-    "end"
+    'model',
+    'tools',
+    'end'
 ];
 
 const AssistantTaskRuntimeCapability = createRuntimeCapability('platform.assistant_task', {
@@ -4046,22 +4092,19 @@ function resolveSandboxTerminalAdapter(sandbox) {
     return isSandboxTerminalAdapter(candidate) ? candidate : null;
 }
 
+const MANAGED_CONNECTION_REGISTRY_TOKEN = 'XPERT_MANAGED_CONNECTION_REGISTRY';
+const CONNECTION_COMMAND_ROUTER_TOKEN = 'XPERT_CONNECTION_COMMAND_ROUTER';
+
 const VIEW_EXTENSION_PROVIDER = 'VIEW_EXTENSION_PROVIDER';
 const ViewExtensionProvider = (providerKey)=>applyDecorators(SetMetadata(VIEW_EXTENSION_PROVIDER, providerKey), SetMetadata(STRATEGY_META_KEY, VIEW_EXTENSION_PROVIDER));
 
 let ViewExtensionProviderRegistry = class ViewExtensionProviderRegistry extends BaseStrategyRegistry {
     listEntries(organizationId) {
-        var _this_strategies_get;
-        const orgKey = this.resolveOrganization(organizationId);
         const entries = new Map();
-        var _this_strategies_get_entries;
-        for (const [providerKey, provider] of (_this_strategies_get_entries = (_this_strategies_get = this.strategies.get(orgKey)) == null ? void 0 : _this_strategies_get.entries()) != null ? _this_strategies_get_entries : []){
-            entries.set(providerKey, provider);
-        }
-        if (orgKey !== GLOBAL_ORGANIZATION_SCOPE) {
-            var _this_strategies_get1;
-            var _this_strategies_get_entries1;
-            for (const [providerKey, provider] of (_this_strategies_get_entries1 = (_this_strategies_get1 = this.strategies.get(GLOBAL_ORGANIZATION_SCOPE)) == null ? void 0 : _this_strategies_get1.entries()) != null ? _this_strategies_get_entries1 : []){
+        for (const scopeKey of this.resolveStrategyScopeKeys(organizationId)){
+            var _this_strategies_get;
+            var _this_strategies_get_entries;
+            for (const [providerKey, provider] of (_this_strategies_get_entries = (_this_strategies_get = this.strategies.get(scopeKey)) == null ? void 0 : _this_strategies_get.entries()) != null ? _this_strategies_get_entries : []){
                 if (!entries.has(providerKey)) {
                     entries.set(providerKey, provider);
                 }
@@ -4500,4 +4543,4 @@ function escapeHtmlAttribute(value) {
 
 const VIEW_EXTENSION_CACHE_SERVICE_TOKEN = 'XPERT_PLUGIN_VIEW_EXTENSION_CACHE_SERVICE';
 
-export { ACCOUNT_BINDING_PERMISSION_SERVICE_TOKEN, AGENT_CHAT_DISPATCH_MESSAGE_TYPE, AGENT_MIDDLEWARE_STRATEGY, AIModelProviderNotFoundException, AIModelProviderRegistry, AIModelProviderStrategy, AI_MODEL_PROVIDER, ANALYTICS_PERMISSION_SERVICE_TOKEN, AdapterDataSourceStrategy, AgentMiddlewareRegistry, AgentMiddlewareStrategy, AiModelNotFoundException, AssistantTaskRuntimeCapability, BOUND_IDENTITY_LOGIN_PERMISSION_SERVICE_TOKEN, BaseHTTPQueryRunner, BaseQueryRunner, BaseSQLQueryRunner, BaseSandbox, BaseStrategyRegistry, BaseTool, BaseToolset, BuiltinToolset, CHAT_CHANNEL, CHAT_CHANNEL_TEXT_LIMITS, CancelConversationCommand, ChatChannel, ChatChannelRegistry, ChatOAICompatReasoningModel, CommonParameterRules, CreateModelClientCommand, CredentialsValidateFailedError, DATASOURCE_STRATEGY, DBCreateTableMode, DBProtocolEnum, DBSyntaxEnum, DBTableAction, DBTableDataAction, DEFAULT_EXECUTION_CONFIG, DEFAULT_SANDBOX_EXECUTION_MAX_OUTPUT_BYTES, DEFAULT_SANDBOX_FILE_OPERATION_EXECUTION_OPTIONS, DEFAULT_SANDBOX_FILE_OPERATION_TIMEOUT_MS, DEFAULT_SANDBOX_FILE_OPERATION_TIMEOUT_SEC, DEFAULT_SANDBOX_FILE_SEARCH_EXECUTION_OPTIONS, DEFAULT_SANDBOX_FILE_SEARCH_TIMEOUT_MS, DEFAULT_SANDBOX_FILE_SEARCH_TIMEOUT_SEC, DEFAULT_SANDBOX_SHELL_EXECUTION_OPTIONS, DEFAULT_SANDBOX_SHELL_TIMEOUT_MS, DEFAULT_SANDBOX_SHELL_TIMEOUT_SEC, DOCUMENT_SOURCE_STRATEGY, DOCUMENT_TRANSFORMER_STRATEGY, DataSourceStrategy, DataSourceStrategyRegistry, DefaultRuntimeCapabilityRegistry as DefaultAgentMiddlewareRuntimeCapabilityRegistry, DefaultRuntimeCapabilityRegistry, DocumentSourceRegistry, DocumentSourceStrategy, DocumentTransformerRegistry, DocumentTransformerStrategy, FILE_STORAGE_PROVIDER, FILE_UPLOAD_TARGET_STRATEGY, FileRuntimeCapability, FileStorageProvider, FileStorageProviderRegistry, FileUploadTargetRegistry, FileUploadTargetStrategy, GLOBAL_ORGANIZATION_SCOPE, HANDOFF_PERMISSION_SERVICE_TOKEN, HANDOFF_PROCESSOR_STRATEGY, HANDOFF_QUEUE_SERVICE_TOKEN, HandoffProcessorRegistry, HandoffProcessorStrategy, IMAGE_UNDERSTANDING_STRATEGY, INTEGRATION_PERMISSION_SERVICE_TOKEN, INTEGRATION_STRATEGY, ImageUnderstandingRegistry, ImageUnderstandingStrategy, IntegrationStrategyKey, IntegrationStrategyRegistry, JUMP_TO_TARGETS, JsonSchemaValidator, KNOWLEDGE_STRATEGY, KnowledgeStrategyKey, KnowledgeStrategyRegistry, KnowledgebaseDocumentsRuntimeCapability, KnowledgebaseRuntimeCapability, LLMUsage, LargeLanguageModel, ModelProvider, ORGANIZATION_METADATA_KEY, OpenAICompatibleReranker, PERMISSION_OPERATION_METADATA_KEY, PLUGIN_CONFIG_RESOLVER_TOKEN, PLUGIN_METADATA, PLUGIN_METADATA_KEY, PLUGIN_WEBHOOK_AUTH_METADATA_KEY, PLUGIN_WEBHOOK_AUTH_SERVICE_TOKEN, PROVIDE_AI_MODEL_LLM, PROVIDE_AI_MODEL_MODERATION, PROVIDE_AI_MODEL_RERANK, PROVIDE_AI_MODEL_SPEECH2TEXT, PROVIDE_AI_MODEL_TEXT_EMBEDDING, PROVIDE_AI_MODEL_TTS, PluginWebhookAuth, PluginWebhookAuthGuard, RETRIEVER_STRATEGY, RequestContext, RequestContextMiddleware, RequirePermissionOperation, RerankModel, RetrieverRegistry, RetrieverStrategy, SANDBOX_PROVIDER, SANDBOX_SHELL_TIMEOUT_LIMITS_SEC, SKILL_SOURCE_PROVIDER, SPEECH_TO_TEXT_PERMISSION_SERVICE_TOKEN, SPEECH_TO_TEXT_SERVICE_TOKEN, SSOProviderRegistry, SSOProviderStrategyKey, SSO_BINDING_PERMISSION_SERVICE_TOKEN, SSO_PROVIDER, STRATEGY_META_KEY, SandboxProviderRegistry, SandboxProviderStrategy, SkillSourceProviderRegistry, SkillSourceProviderStrategy, Speech2TextChatModel, SpeechToTextModel, StrategyBus, TEXT_SPLITTER_STRATEGY, TOOLSET_STRATEGY, TextEmbeddingModelManager, TextSplitterRegistry, TextSplitterStrategy, TextToSpeechModel, ToolsetRegistry, ToolsetStrategy, USER_PERMISSION_SERVICE_TOKEN, VECTOR_STORE_STRATEGY, VIEW_EXTENSION_CACHE_SERVICE_TOKEN, VIEW_EXTENSION_PROVIDER, VectorStoreRegistry, VectorStoreStrategy, ViewExtensionProvider, ViewExtensionProviderRegistry, WORKFLOW_NODE_STRATEGY, WORKFLOW_TRIGGER_STRATEGY, WorkflowNodeRegistry, WorkflowNodeStrategy, WorkflowTriggerRegistry, WorkflowTriggerStrategy, WorkspaceFilesRuntimeCapability, WrapWorkflowNodeExecutionCommand, XPERT_RUNTIME_CAPABILITIES_TOKEN, XpFileSystem, XpertServerPlugin, als, appendSandboxMessage, buildSandboxTimeoutMessage, calcTokenUsage, chunkText, countTokensSafe, createI18nInstance, createPluginLogger, createRuntimeCapability, defineAgentMessageType, defineChannelMessageType, downloadRemoteFile, formatSandboxTimeout, getErrorMessage, getModelContextSize, getPermissionOperationMetadata, getPositionList, getPositionMap, getRequestContext, getRequiredPermissionOperation, isRemoteFile, isSandboxBackend, isSandboxManagedServiceAdapter, isSandboxServiceProxyAdapter, isSandboxTerminalAdapter, isStructuredMessageType, loadYamlFile, mergeCredentials, mergeParentChildChunks, normalizeContextSize, renderRemoteReactIframeHtml, resolveSandboxBackend, resolveSandboxExecutionOptions, resolveSandboxManagedServiceAdapter, resolveSandboxServiceProxyAdapter, resolveSandboxTerminalAdapter, runWithRequestContext, secondsToMilliseconds, sumTokenUsage };
+export { ACCOUNT_BINDING_PERMISSION_SERVICE_TOKEN, AGENT_CHAT_DISPATCH_MESSAGE_TYPE, AGENT_MIDDLEWARE_STRATEGY, AIModelProviderNotFoundException, AIModelProviderRegistry, AIModelProviderStrategy, AI_MODEL_PROVIDER, ANALYTICS_PERMISSION_SERVICE_TOKEN, AdapterDataSourceStrategy, AgentMiddlewareRegistry, AgentMiddlewareStrategy, AiModelNotFoundException, AssistantTaskRuntimeCapability, BOUND_IDENTITY_LOGIN_PERMISSION_SERVICE_TOKEN, BUILTIN_GLOBAL_SCOPE, BaseHTTPQueryRunner, BaseQueryRunner, BaseSQLQueryRunner, BaseSandbox, BaseStrategyRegistry, BaseTool, BaseToolset, BuiltinToolset, CHAT_CHANNEL, CHAT_CHANNEL_TEXT_LIMITS, CONNECTION_COMMAND_ROUTER_TOKEN, CancelConversationCommand, ChatChannel, ChatChannelRegistry, ChatOAICompatReasoningModel, CommonParameterRules, CreateModelClientCommand, CredentialsValidateFailedError, DATASOURCE_STRATEGY, DBCreateTableMode, DBProtocolEnum, DBSyntaxEnum, DBTableAction, DBTableDataAction, DEFAULT_EXECUTION_CONFIG, DEFAULT_SANDBOX_EXECUTION_MAX_OUTPUT_BYTES, DEFAULT_SANDBOX_FILE_OPERATION_EXECUTION_OPTIONS, DEFAULT_SANDBOX_FILE_OPERATION_TIMEOUT_MS, DEFAULT_SANDBOX_FILE_OPERATION_TIMEOUT_SEC, DEFAULT_SANDBOX_FILE_SEARCH_EXECUTION_OPTIONS, DEFAULT_SANDBOX_FILE_SEARCH_TIMEOUT_MS, DEFAULT_SANDBOX_FILE_SEARCH_TIMEOUT_SEC, DEFAULT_SANDBOX_SHELL_EXECUTION_OPTIONS, DEFAULT_SANDBOX_SHELL_TIMEOUT_MS, DEFAULT_SANDBOX_SHELL_TIMEOUT_SEC, DOCUMENT_SOURCE_STRATEGY, DOCUMENT_TRANSFORMER_STRATEGY, DataSourceStrategy, DataSourceStrategyRegistry, DefaultRuntimeCapabilityRegistry as DefaultAgentMiddlewareRuntimeCapabilityRegistry, DefaultRuntimeCapabilityRegistry, DocumentSourceRegistry, DocumentSourceStrategy, DocumentTransformerRegistry, DocumentTransformerStrategy, FILE_STORAGE_PROVIDER, FILE_UPLOAD_TARGET_STRATEGY, FileRuntimeCapability, FileStorageProvider, FileStorageProviderRegistry, FileUploadTargetRegistry, FileUploadTargetStrategy, GLOBAL_ORGANIZATION_SCOPE, HANDOFF_PERMISSION_SERVICE_TOKEN, HANDOFF_PROCESSOR_STRATEGY, HANDOFF_QUEUE_SERVICE_TOKEN, HandoffProcessorRegistry, HandoffProcessorStrategy, IMAGE_UNDERSTANDING_STRATEGY, INTEGRATION_PERMISSION_SERVICE_TOKEN, INTEGRATION_STRATEGY, ImageUnderstandingRegistry, ImageUnderstandingStrategy, IntegrationStrategyKey, IntegrationStrategyRegistry, JUMP_TO_TARGETS, JsonSchemaValidator, KNOWLEDGE_STRATEGY, KnowledgeStrategyKey, KnowledgeStrategyRegistry, KnowledgebaseDocumentsRuntimeCapability, KnowledgebaseRuntimeCapability, LLMUsage, LargeLanguageModel, MANAGED_CONNECTION_REGISTRY_TOKEN, ModelProvider, ORGANIZATION_METADATA_KEY, OpenAICompatibleReranker, PERMISSION_OPERATION_METADATA_KEY, PLUGIN_CONFIG_RESOLVER_TOKEN, PLUGIN_METADATA, PLUGIN_METADATA_KEY, PLUGIN_WEBHOOK_AUTH_METADATA_KEY, PLUGIN_WEBHOOK_AUTH_SERVICE_TOKEN, PROVIDE_AI_MODEL_LLM, PROVIDE_AI_MODEL_MODERATION, PROVIDE_AI_MODEL_RERANK, PROVIDE_AI_MODEL_SPEECH2TEXT, PROVIDE_AI_MODEL_TEXT_EMBEDDING, PROVIDE_AI_MODEL_TTS, PluginWebhookAuth, PluginWebhookAuthGuard, RETRIEVER_STRATEGY, RequestContext, RequestContextMiddleware, RequirePermissionOperation, RerankModel, RetrieverRegistry, RetrieverStrategy, SANDBOX_PROVIDER, SANDBOX_SHELL_TIMEOUT_LIMITS_SEC, SKILL_SOURCE_PROVIDER, SPEECH_TO_TEXT_PERMISSION_SERVICE_TOKEN, SPEECH_TO_TEXT_SERVICE_TOKEN, SSOProviderRegistry, SSOProviderStrategyKey, SSO_BINDING_PERMISSION_SERVICE_TOKEN, SSO_PROVIDER, STRATEGY_META_KEY, SandboxProviderRegistry, SandboxProviderStrategy, SkillSourceProviderRegistry, SkillSourceProviderStrategy, Speech2TextChatModel, SpeechToTextModel, StrategyBus, TENANT_GLOBAL_SCOPE_PREFIX, TENANT_GLOBAL_SCOPE_SUFFIX, TEXT_SPLITTER_STRATEGY, TOOLSET_STRATEGY, TextEmbeddingModelManager, TextSplitterRegistry, TextSplitterStrategy, TextToSpeechModel, ToolsetRegistry, ToolsetStrategy, USER_PERMISSION_SERVICE_TOKEN, VECTOR_STORE_STRATEGY, VIEW_EXTENSION_CACHE_SERVICE_TOKEN, VIEW_EXTENSION_PROVIDER, VectorStoreRegistry, VectorStoreStrategy, ViewExtensionProvider, ViewExtensionProviderRegistry, WORKFLOW_NODE_STRATEGY, WORKFLOW_TRIGGER_STRATEGY, WorkflowNodeRegistry, WorkflowNodeStrategy, WorkflowTriggerRegistry, WorkflowTriggerStrategy, WorkspaceFilesRuntimeCapability, WrapWorkflowNodeExecutionCommand, XPERT_RUNTIME_CAPABILITIES_TOKEN, XpFileSystem, XpertServerPlugin, als, appendSandboxMessage, buildSandboxTimeoutMessage, calcTokenUsage, chunkText, countTokensSafe, createI18nInstance, createPluginLogger, createRuntimeCapability, defineAgentMessageType, defineChannelMessageType, downloadRemoteFile, formatSandboxTimeout, getDefaultTenantId, getErrorMessage, getModelContextSize, getPermissionOperationMetadata, getPositionList, getPositionMap, getRequestContext, getRequiredPermissionOperation, getTenantGlobalScopeKey, isRemoteFile, isSandboxBackend, isSandboxManagedServiceAdapter, isSandboxServiceProxyAdapter, isSandboxTerminalAdapter, isStructuredMessageType, isTenantGlobalScopeKey, loadYamlFile, mergeCredentials, mergeParentChildChunks, normalizeContextSize, renderRemoteReactIframeHtml, resolveSandboxBackend, resolveSandboxExecutionOptions, resolveSandboxManagedServiceAdapter, resolveSandboxServiceProxyAdapter, resolveSandboxTerminalAdapter, resolveTenantGlobalScopeKey, runWithRequestContext, secondsToMilliseconds, setDefaultTenantId, sumTokenUsage };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xpert-ai/plugin-sdk",
-  "version": "3.12.2",
+  "version": "3.14.0",
   "license": "AGPL-3.0",
   "repository": {
     "type": "git",
@@ -16,6 +16,7 @@
     "directory": "dist"
   },
   "dependencies": {
+    "@langchain/openai": "0.6.9",
     "@xpert-ai/contracts": "workspace:*",
     "js-tiktoken": "^1.0.21"
   },

package/src/index.d.ts

@@ -18,4 +18,5 @@ export * from './lib/file/index';
 export * from './lib/strategy';
 export * from './lib/sso/index';
 export * from './lib/sandbox/index';
+export * from './lib/managed-connection/index';
 export * from './lib/view-extension/index';

package/src/lib/agent/handoff/agent-chat.contract.d.ts

@@ -1,4 +1,4 @@
-import { TChatOptions, TChatRequest } from '@xpert-ai/contracts';
+import { TChatOptions, TChatRequest, TChatRuntimePrincipal, TChatSourceAuditOptions } from '@xpert-ai/contracts';
 export declare const AGENT_CHAT_DISPATCH_MESSAGE_TYPE: import("./message-type").StructuredHandoffMessageType;
 export interface AgentChatHandoffMessageCallbackTarget {
     transport?: 'handoff-message';
@@ -11,13 +11,15 @@ export interface AgentChatRedisPubSubCallbackTarget {
     context?: Record<string, unknown>;
 }
 export type AgentChatCallbackTarget = AgentChatHandoffMessageCallbackTarget | AgentChatRedisPubSubCallbackTarget;
+export type AgentChatRuntimePrincipal = TChatRuntimePrincipal;
 export interface AgentChatDispatchPayload extends Record<string, unknown> {
     request: TChatRequest;
-    options: TChatOptions & {
+    options: TChatOptions & TChatSourceAuditOptions & {
         xpertId?: string;
         isDraft?: boolean;
         from?: string;
         fromEndUserId?: string;
+        runtimePrincipal?: AgentChatRuntimePrincipal;
         execution?: {
             id: string;
         };

package/src/lib/agent/middleware/types.d.ts

@@ -1,15 +1,18 @@
 import { LanguageModelLike } from '@langchain/core/language_models/base';
 import { AIMessage, BaseMessage, SystemMessage } from '@langchain/core/messages';
 import { DynamicStructuredTool, DynamicTool, StructuredToolInterface } from '@langchain/core/tools';
-import type { ToolCall, ToolMessage } from "@langchain/core/messages/tool";
+import type { ToolCall, ToolMessage } from '@langchain/core/messages/tool';
 import { InferInteropZodOutput, InteropZodObject } from '@langchain/core/utils/types';
 import { RunnableToolLike } from '@langchain/core/runnables';
 import { Command } from '@langchain/langgraph';
+import type { JsonSchemaObjectType } from '@xpert-ai/contracts';
 import { AgentBuiltInState, Runtime } from './runtime';
 import { PromiseOrValue } from '../../types';
 export type ServerTool = Record<string, unknown>;
 export type ClientTool = StructuredToolInterface | DynamicTool | RunnableToolLike;
-export type NormalizedSchemaInput<TSchema extends InteropZodObject | undefined | never = any> = [TSchema] extends [never] ? AgentBuiltInState : TSchema extends InteropZodObject ? InferInteropZodOutput<TSchema> & AgentBuiltInState : TSchema extends Record<string, unknown> ? TSchema & AgentBuiltInState : AgentBuiltInState;
+export type NormalizedSchemaInput<TSchema extends InteropZodObject | undefined | never = any> = [TSchema] extends [
+    never
+] ? AgentBuiltInState : TSchema extends InteropZodObject ? InferInteropZodOutput<TSchema> & AgentBuiltInState : TSchema extends Record<string, unknown> ? TSchema & AgentBuiltInState : AgentBuiltInState;
 type NormalizeContextSchema<TContextSchema extends InteropZodObject | undefined = undefined> = TContextSchema extends InteropZodObject ? InferInteropZodOutput<TContextSchema> : never;
 /**
  * jump targets (user facing)
@@ -120,8 +123,8 @@ export interface ModelRequest<TState extends Record<string, unknown> = Record<st
      * - `"required"`: means the model must call one or more tools.
      * - `{ type: "function", function: { name: string } }`: The model will use the specified function.
      */
-    toolChoice?: "auto" | "none" | "required" | {
-        type: "function";
+    toolChoice?: 'auto' | 'none' | 'required' | {
+        type: 'function';
         function: {
             name: string;
         };
@@ -207,6 +210,12 @@ export interface AgentMiddleware<TSchema extends InteropZodObject | undefined =
      * - Undefined
      */
     stateSchema?: TSchema;
+    /**
+     * Optional JSON schema used by host form renderers for middleware state.
+     * Keep runtime validation and state typing in `stateSchema`; use this field
+     * only for form/UI metadata such as i18n labels and x-ui extensions.
+     */
+    stateFormSchema?: JsonSchemaObjectType;
     /**
      * The schema of the middleware context. Middleware context is read-only and not persisted between multiple invocations. It can be either:
      * - A Zod object

package/src/lib/managed-connection/index.d.ts

@@ -0,0 +1,98 @@
+export declare const MANAGED_CONNECTION_REGISTRY_TOKEN = "XPERT_MANAGED_CONNECTION_REGISTRY";
+export declare const CONNECTION_COMMAND_ROUTER_TOKEN = "XPERT_CONNECTION_COMMAND_ROUTER";
+export type ManagedConnectionTransportType = 'websocket' | 'socket_io' | 'sse' | 'tcp_tunnel' | 'worker' | 'custom';
+export type ManagedConnectionStatus = 'connected' | 'disconnected' | 'stale' | 'error';
+export type ManagedConnectionDirection = 'inbound' | 'outbound' | 'internal';
+export type ManagedConnectionRecord = {
+    id?: string;
+    pluginName: string;
+    connectionType: string;
+    connectionKey: string;
+    transportType: ManagedConnectionTransportType;
+    direction: ManagedConnectionDirection;
+    ownerInstanceId: string;
+    status: ManagedConnectionStatus;
+    connectedAt?: Date | string | null;
+    lastSeenAt?: Date | string | null;
+    leaseExpiresAt?: Date | string | null;
+    disconnectedAt?: Date | string | null;
+    remoteAddress?: string | null;
+    metadata?: Record<string, unknown> | null;
+    lastError?: string | null;
+    tenantId?: string | null;
+    organizationId?: string | null;
+};
+export type RegisterManagedConnectionInput = {
+    pluginName: string;
+    connectionType: string;
+    connectionKey: string;
+    transportType: ManagedConnectionTransportType;
+    direction?: ManagedConnectionDirection;
+    tenantId?: string | null;
+    organizationId?: string | null;
+    remoteAddress?: string | null;
+    metadata?: Record<string, unknown>;
+    leaseTtlMs?: number;
+};
+export type ManagedConnectionKeyInput = {
+    pluginName?: string;
+    connectionType: string;
+    connectionKey: string;
+    tenantId?: string | null;
+    organizationId?: string | null;
+};
+export type ManagedConnectionHeartbeatInput = ManagedConnectionKeyInput & {
+    remoteAddress?: string | null;
+    metadata?: Record<string, unknown>;
+    leaseTtlMs?: number;
+};
+export type ManagedConnectionMetadataInput = ManagedConnectionKeyInput & {
+    metadata?: Record<string, unknown>;
+    merge?: boolean;
+    leaseTtlMs?: number;
+};
+export type ManagedConnectionListQuery = {
+    pluginName?: string;
+    connectionType?: string;
+    connectionKey?: string;
+    transportType?: ManagedConnectionTransportType;
+    direction?: ManagedConnectionDirection;
+    ownerInstanceId?: string;
+    status?: ManagedConnectionStatus | ManagedConnectionStatus[];
+    activeOnly?: boolean;
+    tenantId?: string | null;
+    organizationId?: string | null;
+    limit?: number;
+    offset?: number;
+};
+export type ManagedConnectionCommandRequest<TPayload = unknown> = {
+    requestId: string;
+    connectionType: string;
+    connectionKey: string;
+    command: string;
+    payload?: TPayload;
+};
+export type ManagedConnectionCommandHandler<TPayload = unknown, TResult = unknown> = (request: ManagedConnectionCommandRequest<TPayload>) => Promise<TResult> | TResult;
+export type ManagedConnectionCommandResult<TResult = unknown> = {
+    ok: boolean;
+    result?: TResult;
+    error?: string;
+};
+export type ConnectionCommandInvokeOptions = {
+    pluginName?: string;
+    tenantId?: string | null;
+    organizationId?: string | null;
+    timeoutMs?: number;
+};
+export interface ManagedConnectionRegistry {
+    register(input: RegisterManagedConnectionInput): Promise<ManagedConnectionRecord>;
+    heartbeat(input: ManagedConnectionHeartbeatInput): Promise<void>;
+    syncMetadata(input: ManagedConnectionMetadataInput): Promise<void>;
+    markDisconnected(input: ManagedConnectionKeyInput, reason?: string): Promise<void>;
+    list(query: ManagedConnectionListQuery): Promise<ManagedConnectionRecord[]>;
+    getOwner(input: ManagedConnectionKeyInput): Promise<string | null>;
+}
+export interface ConnectionCommandRouter {
+    registerHandler(connectionType: string, handler: ManagedConnectionCommandHandler): void;
+    invokeOwner(connectionType: string, connectionKey: string, command: string, payload?: unknown, options?: ConnectionCommandInvokeOptions): Promise<unknown>;
+}

package/src/lib/strategy.d.ts

@@ -13,13 +13,15 @@ export declare class BaseStrategyRegistry<S> implements OnModuleInit {
     onModuleInit(): void;
     upsert(instance: any): void;
     /**
-     * Remove all strategies registered by the given plugin for the given organization.
+     * Remove all strategies registered by the given plugin for the given scope.
      */
     remove(organizationId: string, pluginName: string): void;
     /**
-     * Resolve organization id, falling back to request context org or global scope.
+     * Resolve the primary scope key, falling back to request context org or tenant-global scope.
      */
     protected resolveOrganization(organizationId?: string): string;
+    protected resolveGlobalFallbackOrganization(): string;
+    protected resolveStrategyScopeKeys(organizationId?: string): string[];
     /**
      * Get strategy by type from the given organization including global strategies as fallback.
      *

package/src/lib/toolset/strategy.interface.d.ts

@@ -1,7 +1,7 @@
 import { DynamicStructuredTool } from '@langchain/core/tools';
 import { I18nObject, IconDefinition } from '@xpert-ai/contracts';
 import { ZodSchema } from 'zod';
-import { BuiltinToolset } from './builtin';
+import { BuiltinToolset, TBuiltinToolsetParams } from './builtin';
 export interface IToolsetStrategy<TConfig = any> {
     /**
      * Metadata about this toolset
@@ -19,6 +19,6 @@ export interface IToolsetStrategy<TConfig = any> {
      * Validate the configuration
      */
     validateConfig(config: TConfig): Promise<void>;
-    create(config: TConfig): Promise<BuiltinToolset>;
+    create(config: TConfig, params?: TBuiltinToolsetParams): Promise<BuiltinToolset>;
     createTools(): DynamicStructuredTool<ZodSchema>[];
 }

package/src/lib/types.d.ts

@@ -6,7 +6,15 @@ import type { Permissions } from './core/permissions';
 export declare const ORGANIZATION_METADATA_KEY = "xpert:organizationId";
 export declare const PLUGIN_METADATA_KEY = "xpert:pluginName";
 export declare const GLOBAL_ORGANIZATION_SCOPE = "global";
+export declare const BUILTIN_GLOBAL_SCOPE = "builtin:global";
+export declare const TENANT_GLOBAL_SCOPE_PREFIX = "tenant:";
+export declare const TENANT_GLOBAL_SCOPE_SUFFIX = ":global";
 export declare const STRATEGY_META_KEY = "XPERT_STRATEGY_META_KEY";
+export declare function getTenantGlobalScopeKey(tenantId: string): string;
+export declare function isTenantGlobalScopeKey(value?: string | null): boolean;
+export declare function setDefaultTenantId(tenantId?: string | null): void;
+export declare function getDefaultTenantId(): string;
+export declare function resolveTenantGlobalScopeKey(tenantId?: string | null): string;
 export interface PluginLifecycle {
     /** Called after module registration but before application startup */
     onInit?(ctx: PluginContext): Promise<void> | void;

package/src/lib/workflow/trigger/strategy.interface.d.ts

@@ -27,7 +27,7 @@ export interface IWorkflowTriggerStrategy<T> {
      * @param payload
      * @param callback
      */
-    publish(payload: TWorkflowTriggerParams<T>, callback: (payload: any) => void): Promise<any> | void;
+    publish(payload: TWorkflowTriggerParams<T>, callback: (payload: any) => Promise<void> | void): Promise<any> | void;
     /**
      * Stop the trigger
      */