wingbot 3.74.8 → 3.75.9-alpha.2

package/.claude/settings.local.json

@@ -2,7 +2,9 @@
   "permissions": {
     "allow": [
       "Bash(npx mocha:*)",
-      "Bash(npx tsc *)"
+      "Bash(npx tsc *)",
+      "Bash(npm test *)",
+      "Bash(node -e \"const p = require\\('./bot/plugins/BTMLLM'\\); console.log\\('factory type:', typeof p\\); console.log\\('factory name:', p.name\\);\")"
     ]
   }
 }

package/index.js

@@ -69,6 +69,8 @@ const LLM = require('./src/LLM');
 const LLMSession = require('./src/LLMSession');
 const LLMTool = require('./src/LLMTool');
 const LLMType = require('./src/LLMType');
+const LLMRouter = require('./src/LLMRouter');
+const prompt = require('./src/prompt');
 
 module.exports = {
 
@@ -162,5 +164,8 @@ module.exports = {
     LLM,
     LLMSession,
     LLMTool,
-    LLMType
+    LLMType,
+
+    LLMRouter,
+    prompt
 };

package/jsconfig.json

@@ -5,7 +5,8 @@
         "target": "ESNext",
         "allowSyntheticDefaultImports": true,
         "checkJs": true,
-        "resolveJsonModule": true
+        "resolveJsonModule": true,
+        "strict": false
     },
     "exclude": [
         "node_modules",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.74.8",
+  "version": "3.75.9-alpha.2",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "type": "commonjs",

package/src/BuildRouter.js

@@ -21,12 +21,16 @@ const { shouldExecuteResolver } = require('./resolvers/resolverTags');
 const MESSAGE_RESOLVER_NAME = 'botbuild.message';
 const PLUGIN_RESOLVER_NAME = 'botbuild.customCode';
 
+/** @typedef {import('./resolvers/bounce').BounceAllow} BounceAllow */
+/** @typedef {import('./resolvers/bounce').BounceReturn} BounceReturn */
+
 /** @typedef {import('./Router').BaseConfiguration} BaseConfiguration */
 /**
  * @typedef {object} BuildInfo
  * @prop {boolean} [expectedToAddResolver]
  * @prop {boolean} [attachedRouter]
  * @prop {boolean} [notLastMessage]
+ * @prop {BounceAllow} [bounceAllowedTo]
  */
 
 /**
@@ -46,9 +50,6 @@ const PLUGIN_RESOLVER_NAME = 'botbuild.customCode';
  * @prop {string} [tag]
  */
 
-/** @typedef {import('./resolvers/bounce').BounceAllow} BounceAllow */
-/** @typedef {import('./resolvers/bounce').BounceReturn} BounceReturn */
-
 /**
  * @typedef {object} Route
  * @prop {number} id
@@ -574,7 +575,10 @@ class BuildRouter extends Router {
         if (this._prebuiltGlobalIntents !== null) {
             this.globalIntents.clear();
             this._prebuiltGlobalIntents.forEach(([k, v]) => this.globalIntents.set(k, v));
+        } else {
+            this.globalIntents.clear();
         }
+        super.resetRouter();
     }
 
     /**
@@ -598,6 +602,7 @@ class BuildRouter extends Router {
             this.globalIntents.clear();
             this._prebuiltGlobalIntents.forEach(([k, v]) => this.globalIntents.set(k, v));
         }
+        super.resetRouter();
 
         if (this._prebuiltRoutesCount === null) {
             this._prebuiltRoutesCount = this._routes.length;
@@ -816,9 +821,10 @@ class BuildRouter extends Router {
      * @param {TransformedRoute} route
      * @param {boolean} nextRouteIsSameResponder
      * @param {string} includedBlockId
+     * @param {boolean} omitBounce
      * @returns {Middleware<S,C>[]}
      */
-    _buildRouteHead (route, nextRouteIsSameResponder, includedBlockId) {
+    _buildRouteHead (route, nextRouteIsSameResponder, includedBlockId, omitBounce) {
         const resolvers = [];
 
         if (!route.isFallback) {
@@ -850,7 +856,9 @@ class BuildRouter extends Router {
 
             if (route.isResponder) {
                 const referredRoutePath = this._linksMap.get(route.respondsToRouteId);
-                const bounceResolver = bounce(route, nextRouteIsSameResponder, referredRoutePath);
+                const bounceResolver = omitBounce
+                    ? null
+                    : bounce(route, nextRouteIsSameResponder, referredRoutePath);
                 if (bounceResolver) {
                     resolvers.push(bounceResolver);
                 }
@@ -885,22 +893,49 @@ class BuildRouter extends Router {
                 return;
             }
 
+            const prevRoute = i > 0
+                ? routes[i - 1]
+                : null;
             const nextRoute = routes.length > (i + 1)
                 ? routes[i + 1]
                 : null;
+            const nextNext = routes.length > (i + 2)
+                ? routes[i + 2]
+                : null;
             let nextRouteIsSameResponder = false;
 
             if (nextRoute && route.isResponder && nextRoute.isResponder) {
                 nextRouteIsSameResponder = nextRoute.respondsToRouteId === route.respondsToRouteId;
             }
 
+            const bounceWithExpectedSupportted = (r, prev, nxt) => r
+                && prev
+                && r.isResponder
+                && r.respondsToRouteId === prev.id
+                && r.bounceAllowedTo !== 'faq'
+                && r.bounceReturn !== 'ifpos'
+                && r.bounceReturn !== 'here'
+                && (!nxt || !nxt.isResponder);
+
+            let bounceAllowedTo = null;
+            if (bounceWithExpectedSupportted(nextRoute, route, nextNext)) {
+                ({ bounceAllowedTo } = nextRoute);
+            }
+            const omitBounce = bounceWithExpectedSupportted(route, prevRoute, nextRoute);
+
             const buildInfo = {
+                bounceAllowedTo,
                 expectedToAddResolver: !!route.expectedPath,
                 attachedRouter: false
             };
 
             const resolvers = [
-                ...this._buildRouteHead(route, nextRouteIsSameResponder, includedBlockId),
+                ...this._buildRouteHead(
+                    route,
+                    nextRouteIsSameResponder,
+                    includedBlockId,
+                    omitBounce
+                ),
                 ...this.buildResolvers(route.resolvers, route, buildInfo)
             ];
 
@@ -910,7 +945,8 @@ class BuildRouter extends Router {
                     path: route.expectedPath,
                     attachedRouter: buildInfo.attachedRouter
                 }, {
-                    isLastIndex: true
+                    isLastIndex: true,
+                    bounceAllowedTo
                 }));
             }
 

package/src/GlobalIntents.js

@@ -0,0 +1,198 @@
+/**
+ * @author David Menger
+ */
+'use strict';
+
+/** @typedef {import('./Request')} Request */
+/** @typedef {import('./Router').ResolvedReducer} ResolvedReducer */
+/** @typedef {import('./AiMatching').Entity} Entity */
+/** @typedef {import('./LLMDispatcher').ILLMRouter} ILLMRouter */
+/** @typedef {import('./LLMRouter').GILLMExtension} GILLMExtension */
+
+let uq = 1;
+
+/**
+ * @typedef {object} MatcherResult
+ * @prop {object} [setState]
+ * @prop {boolean} aboveConfidence
+ * @prop {string} intent
+ * @prop {number} score
+ * @prop {Entity[]} [entities]
+ */
+
+/**
+ * @callback RequestMatcher
+ * @param {Request} req
+ * @returns {MatcherResult}
+ */
+
+/**
+ * @typedef {object} GlobalIntentProps
+ *
+ * @prop {number} id
+ * @prop {RequestMatcher} [matcher]
+ * @prop {string[]} [usedEntities]
+ * @prop {object} [entitiesSetState]
+ * @prop {boolean} [local]
+ * @prop {string} [action]
+ * @prop {string} [title]
+ * @prop {object} [meta]
+ * @prop {string} [classification]
+ * @prop {ILLMRouter} [router]
+ */
+
+/**
+ * @typedef {GlobalIntentProps & GILLMExtension} GlobalIntent
+ */
+
+/**
+ * @typedef {object} GlobalIntentExtension
+ * @prop {string} localPath
+ * @prop {object} meta
+ */
+
+/**
+ * @typedef {GlobalIntentExtension & GlobalIntent} GlobalIntentResolved
+ */
+
+/**
+ * @typedef {Map<number, GlobalIntent>} GlobalIntentsMap
+ */
+
+/**
+ * @typedef {Map<number, GlobalIntentResolved>} ResolvedGlobalIntentsMap
+ */
+
+/**
+ * @typedef {Omit<GlobalIntent, 'id'>} GlobalIntentOptions
+ */
+
+/**
+ * @typedef {object} MatchingResolver
+ * @prop {string} path
+ * @prop {GlobalIntentsMap} globalIntents
+ */
+
+/**
+ * @class GlobalIntents
+ */
+class GlobalIntents {
+
+    /**
+     *
+     * @returns {number}
+     */
+    static id () {
+        return uq++;
+    }
+
+    /**
+     *
+     * @param {string} path
+     * @param {GlobalIntentOptions} options
+     * @returns {MatchingResolver}
+     */
+    static resolver (path, options) {
+        return {
+            path,
+            globalIntents: GlobalIntents.map(options)
+        };
+    }
+
+    /**
+     *
+     * @param {GlobalIntentOptions} options
+     * @returns {GlobalIntentsMap}
+     */
+    static map (options) {
+        const gi = GlobalIntents.create(options);
+        return new Map([[gi.id, gi]]);
+    }
+
+    /**
+     *
+     * @param {GlobalIntentOptions} [options]
+     * @param {number} [id]
+     * @returns {GlobalIntent}
+     */
+    static create (
+        {
+            matcher = null,
+            usedEntities = [],
+            entitiesSetState = {},
+            title = null,
+            meta = {},
+            classification = null,
+            router = null,
+            local = false,
+            keepUserInInteractionsWithBounceAllowed
+        } = {},
+        id = GlobalIntents.id()
+    ) {
+        return {
+            id,
+            matcher,
+            usedEntities,
+            entitiesSetState,
+            local,
+            action: '/*',
+            title,
+            meta,
+            classification,
+            router,
+            ...(typeof keepUserInInteractionsWithBounceAllowed === 'boolean'
+                ? { keepUserInInteractionsWithBounceAllowed }
+                : {}
+            )
+        };
+    }
+
+    /**
+     * @typedef {object} PathContext
+     * @prop {string} path
+     * @prop {object} globalIntentsMeta
+     */
+
+    /**
+     *
+     * @param {ResolvedReducer[]} reducers
+     * @param {Map<number, GlobalIntentResolved>} target
+     * @param {PathContext} pathContext
+     */
+    static mergeGlobalIntents (reducers, target, pathContext) {
+        reducers.forEach(({ globalIntents }) => {
+            for (const gi of globalIntents.values()) {
+                const {
+                    id, matcher = null, action: intentPath, local, title,
+                    entitiesSetState = {}, usedEntities, meta = {},
+                    classification = null, router = null,
+                    keepUserInInteractionsWithBounceAllowed
+
+                } = gi;
+                const action = intentPath === '/*'
+                    ? pathContext.path
+                    : `${pathContext.path}${intentPath}`.replace(/^\/\*/, '');
+
+                target.set(id, {
+                    id,
+                    matcher,
+                    usedEntities,
+                    entitiesSetState,
+                    action,
+                    localPath: pathContext.path,
+                    local,
+                    title,
+                    classification,
+                    router,
+                    meta: { ...pathContext.globalIntentsMeta, ...meta },
+                    ...(typeof keepUserInInteractionsWithBounceAllowed === 'boolean'
+                        ? { keepUserInInteractionsWithBounceAllowed }
+                        : {})
+                });
+            }
+        });
+    }
+
+}
+
+module.exports = GlobalIntents;

package/src/LLM.js

@@ -99,6 +99,7 @@ const LLMSession = require('./LLMSession');
 
 /**
  * @typedef {object} LLMProviderOptions
+ * @prop {string} [preset]
  * @prop {string} [model]
  * @prop {boolean} [parallelToolCalls]
  * @prop {'auto'|'required'|'none'|ForcedFn|string} [toolChoice]
@@ -262,6 +263,7 @@ class LLM {
 
         /** @type {LLMOptions} */
         const defaultPreset = {
+            preset: 'default',
             model,
             transcriptFlag,
             transcriptLength,
@@ -293,6 +295,14 @@ class LLM {
         this._lastResult = null;
 
         this.log = log;
+
+        this.req = null;
+        this.res = null;
+    }
+
+    setReqRes (req, res) {
+        this.req = req;
+        this.res = res;
     }
 
     /**
@@ -318,15 +328,20 @@ class LLM {
     }
 
     /**
+     *
+     * @param {LLMCallPreset} [preset]
      * @returns {LLMSession}
      */
-    session () {
-        return new LLMSession(this);
+    session (preset) {
+        return new LLMSession(this, [], {
+            preset
+        });
     }
 
     /**
      *
      * @param {LLMCallPreset} [requestedPreset]
+     * @returns {LLMCallOptions}
      */
     llmOptions (requestedPreset = LLM.PRESET_DEFAULT) {
         let preset;
@@ -343,7 +358,8 @@ class LLM {
         }
         return {
             ...this._presets.get(preset),
-            ...override
+            ...override,
+            preset
         };
     }