@adminforth/agent 1.26.13 → 1.26.15

package/agent/simpleAgent.ts

@@ -267,7 +267,7 @@ export async function callAgent(params: {
     sequenceDebugMiddleware,
     summarizationMiddleware({
       model: summaryModel,
-      trigger: { tokens: 1024 * 128 },
+      trigger: { tokens: 1024 * 64 },
       keep: { messages: 10 },
     }),
   ] as const;

package/apiBasedTools.ts

@@ -46,9 +46,11 @@ type GetResourceDataToolResponse = {
 };
 
 type DateTimeColumnType = AdminForthDataTypes.DATETIME | AdminForthDataTypes.TIME;
+type InternalApiOriginProvider = {
+  getInternalApiOrigin?: () => string | undefined;
+};
 
 const DEFAULT_USER_TIME_ZONE = 'UTC';
-const DEFAULT_REQUEST_PROTOCOL = process.env.NODE_ENV === 'production' ? 'https' : 'http';
 
 function getInputString(inputs: Record<string, unknown> | undefined, key: string) {
   const value = inputs?.[key];
@@ -580,22 +582,6 @@ const HEADERS_NOT_FORWARDED_TO_API_TOOL = new Set([
   'upgrade',
 ]);
 
-function getHeaderValue(
-  headers: Partial<HttpExtra>['headers'] | undefined,
-  headerName: string,
-) {
-  const normalizedHeaderName = headerName.toLowerCase();
-  const value = Object.entries(headers ?? {}).find(
-    ([name]) => name.toLowerCase() === normalizedHeaderName,
-  )?.[1];
-
-  if (typeof value !== 'string') {
-    return undefined;
-  }
-
-  return value.split(',')[0].trim();
-}
-
 function isAbsoluteHttpUrl(value: string) {
   try {
     const url = new URL(value);
@@ -605,42 +591,25 @@ function isAbsoluteHttpUrl(value: string) {
   }
 }
 
-function getRequestOrigin(httpExtra?: Partial<HttpExtra>) {
-  const requestUrl = httpExtra?.requestUrl;
-
-  if (requestUrl && isAbsoluteHttpUrl(requestUrl)) {
-    return new URL(requestUrl).origin;
-  }
-
-  const host = getHeaderValue(httpExtra?.headers, 'x-forwarded-host')
-    ?? getHeaderValue(httpExtra?.headers, 'host');
-
-  if (!host) {
-    return undefined;
-  }
-
-  const protocol = DEFAULT_REQUEST_PROTOCOL;
-  return `${protocol}://${host}`;
-}
-
 function resolveOpenApiRequestUrl(params: {
-  httpExtra?: Partial<HttpExtra>;
+  adminforth: IAdminForth;
   path: string;
   toolName: string;
 }) {
-  if (isAbsoluteHttpUrl(params.path)) {
-    return params.path;
-  }
+  const internalApiOrigin = (params.adminforth.express as InternalApiOriginProvider)
+    .getInternalApiOrigin?.();
 
-  const origin = getRequestOrigin(params.httpExtra);
+  if (internalApiOrigin) {
+    const path = isAbsoluteHttpUrl(params.path)
+      ? `${new URL(params.path).pathname}${new URL(params.path).search}`
+      : params.path;
 
-  if (!origin) {
-    throw new Error(
-      `Tool "${params.toolName}" has relative OpenAPI path "${params.path}" but request host header is unavailable.`,
-    );
+    return new URL(path, internalApiOrigin).toString();
   }
 
-  return new URL(params.path, origin).toString();
+  throw new Error(
+    `Tool "${params.toolName}" cannot call OpenAPI path "${params.path}" because internal API origin is unavailable.`,
+  );
 }
 
 function createToolRequestHeaders(
@@ -736,7 +705,7 @@ async function callOpenApiSchema(params: {
     userTimeZone,
   );
   const requestUrl = resolveOpenApiRequestUrl({
-    httpExtra,
+    adminforth,
     path: schema.path,
     toolName,
   });

package/build.log

@@ -38,5 +38,5 @@ custom/skills/fetch_data/SKILL.md
 custom/skills/mutate_data/
 custom/skills/mutate_data/SKILL.md
 
-sent 207,920 bytes  received 562 bytes  416,964.00 bytes/sec
-total size is 205,644  speedup is 0.99
+sent 207,843 bytes  received 562 bytes  416,810.00 bytes/sec
+total size is 205,567  speedup is 0.99

package/custom/ChatSurface.vue

@@ -178,14 +178,14 @@
 <script setup lang="ts">
 import { IconChatBubbleLeft20Solid, IconSparklesSolid, IconArrowsPointingOut, IconArrowsPointingIn } from '@iconify-prerendered/vue-heroicons';
 import { IconCloseOutline, IconBarsOutline, IconArrowUpOutline, IconCloseSidebarSolid, IconOpenSidebarSolid, IconAngleDownOutline } from '@iconify-prerendered/vue-flowbite';
-import { useTemplateRef, onMounted, ref,computed } from 'vue';
+import { useTemplateRef, onMounted, ref } from 'vue';
 import { onClickOutside } from '@vueuse/core'
 import ConversationArea from './conversation_area/ConversationArea.vue';
 import { useAgentStore } from './composables/useAgentStore';
 import { useAgentTransitions } from './composables/useAgentTransitions';
 import { Button } from '@/afcl';
 import { useCoreStore } from '@/stores/core';
-import { remToPx, pxToRem } from './utils';
+import { remToPx } from './utils';
 
 const props = defineProps<{
   meta: {
@@ -210,6 +210,23 @@ const isModeMenuOpen = ref(false);
 let startX = 0
 let startWidth = 0
 
+onClickOutside(chatSurface, () => {if (!agentStore.isTeleportedToBody) agentStore.setIsChatOpen(false);});
+onClickOutside(modeMenu, () => { isModeMenuOpen.value = false; });
+
+onMounted(async () => {
+  agentStore.setAvailableModes(props.meta.modes, props.meta.defaultModeName);
+  agentStore.regisrerTextInput(textInput.value);
+  textInput.value?.focus();
+  const isTeleportedToBodyFromLocalStorage = agentStore.getLocalStorageItem('isTeleportedToBody') === 'true' || agentStore.getLocalStorageItem('isTeleportedToBodyBeforeFullScreen') === 'true';
+  if( coreStore.isMobile ) {
+    agentStore.setIsTeleportedToBody(false);
+  } else {
+    agentStore.setIsTeleportedToBody(isTeleportedToBodyFromLocalStorage || props.meta.stickByDefault);
+  }
+  await agentStore.fetchSessionsList();
+});
+
+
 const startResize = (e: MouseEvent) => {
   startX = e.clientX
   startWidth = remToPx(agentStore.chatWidth)
@@ -242,22 +259,6 @@ const stopResize = () => {
   }
 }
 
-onClickOutside(chatSurface, () => {if (!agentStore.isTeleportedToBody) agentStore.setIsChatOpen(false);});
-onClickOutside(modeMenu, () => { isModeMenuOpen.value = false; });
-
-onMounted(async () => {
-  agentStore.setAvailableModes(props.meta.modes, props.meta.defaultModeName);
-  agentStore.regisrerTextInput(textInput.value);
-  textInput.value?.focus();
-  const isTeleportedToBodyFromLocalStorage = agentStore.getLocalStorageItem('isTeleportedToBody') === 'true' || agentStore.getLocalStorageItem('isTeleportedToBodyBeforeFullScreen') === 'true';
-  if( coreStore.isMobile ) {
-    agentStore.setIsTeleportedToBody(false);
-  } else {
-    agentStore.setIsTeleportedToBody(isTeleportedToBodyFromLocalStorage || props.meta.stickByDefault);
-  }
-  await agentStore.fetchSessionsList();
-});
-
 function autoResize() {
   const el = textInput.value
   if (!el) return

package/custom/CustomAutoScrollContainer.vue

@@ -15,13 +15,7 @@
 import { ref, onMounted, onUnmounted, nextTick, computed } from 'vue'
 import CustomScrollbar from 'custom-vue-scrollbar';
 import 'custom-vue-scrollbar/dist/style.css';
-import { useAgentStore } from './composables/useAgentStore';
 
-const scrollParams = ref({
-  scrollTop: 0,
-  scrollHeight: 0,
-  clientHeight: 0
-});
 
 const props = withDefaults(defineProps<{
   enabled?: boolean
@@ -43,6 +37,57 @@ const scrollElement = ref<HTMLElement | null>(null)
 
 let lastScrollTop = 0
 let lastScrollHeight = 0
+let observer: MutationObserver | null = null
+
+const scrollParams = ref({
+  scrollTop: 0,
+  scrollHeight: 0,
+  clientHeight: 0
+});
+
+defineExpose({
+  scrollToBottom: () => scrollToBottom(true),
+  isUserScrolledUp: () => isUserScrolledUp.value,
+  container: containerRef,
+  handleScroll,
+  scrollParams
+})
+
+onMounted(() => {
+  if (!containerRef.value) return
+  
+  scrollElement.value = containerRef.value.scrollEl
+  lastScrollTop = containerRef.value.scrollEl.scrollTop
+  lastScrollHeight = containerRef.value.scrollEl.scrollHeight
+  
+  observer = new MutationObserver(() => {
+    nextTick(() => {
+      if (!containerRef.value?.scrollEl) return
+      
+      if (!hasScrollbar()) {
+        isUserScrolledUp.value = false
+      }
+      
+      lastScrollHeight = containerRef.value.scrollEl.scrollHeight
+      scrollParams.value.scrollTop = containerRef.value.scrollEl.scrollTop
+      scrollParams.value.scrollHeight = containerRef.value.scrollEl.scrollHeight
+      scrollParams.value.clientHeight = containerRef.value.scrollEl.clientHeight
+      if (props.enabled && !isUserScrolledUp.value) {
+        scrollToBottom()
+      }
+    })
+  })
+  
+  observer.observe(containerRef.value?.scrollEl, {
+    childList: true,
+    subtree: true,
+    characterData: true
+  })
+})
+
+onUnmounted(() => {
+  observer?.disconnect()
+})
 
 function isNearBottom(): boolean {
   const container = containerRef.value?.scrollEl
@@ -99,51 +144,6 @@ function handleScroll(detectScrollDown = true): void {
   lastScrollHeight = scrollHeight
 }
 
-let observer: MutationObserver | null = null
-
-onMounted(() => {
-  if (!containerRef.value) return
-  
-  scrollElement.value = containerRef.value.scrollEl
-  lastScrollTop = containerRef.value.scrollEl.scrollTop
-  lastScrollHeight = containerRef.value.scrollEl.scrollHeight
-  
-  observer = new MutationObserver(() => {
-    nextTick(() => {
-      if (!containerRef.value?.scrollEl) return
-      
-      if (!hasScrollbar()) {
-        isUserScrolledUp.value = false
-      }
-      
-      lastScrollHeight = containerRef.value.scrollEl.scrollHeight
-      scrollParams.value.scrollTop = containerRef.value.scrollEl.scrollTop
-      scrollParams.value.scrollHeight = containerRef.value.scrollEl.scrollHeight
-      scrollParams.value.clientHeight = containerRef.value.scrollEl.clientHeight
-      if (props.enabled && !isUserScrolledUp.value) {
-        scrollToBottom()
-      }
-    })
-  })
-  
-  observer.observe(containerRef.value?.scrollEl, {
-    childList: true,
-    subtree: true,
-    characterData: true
-  })
-})
-
-onUnmounted(() => {
-  observer?.disconnect()
-})
-
-defineExpose({
-  scrollToBottom: () => scrollToBottom(true),
-  isUserScrolledUp: () => isUserScrolledUp.value,
-  container: containerRef,
-  handleScroll,
-  scrollParams
-})
 </script>
 
 <style>

package/dist/agent/simpleAgent.js

@@ -141,7 +141,7 @@ export function callAgent(params) {
             sequenceDebugMiddleware,
             summarizationMiddleware({
                 model: summaryModel,
-                trigger: { tokens: 1024 * 128 },
+                trigger: { tokens: 1024 * 64 },
                 keep: { messages: 10 },
             }),
         ];

package/dist/apiBasedTools.js

@@ -16,7 +16,6 @@ import YAML from 'yaml';
 dayjs.extend(utc);
 dayjs.extend(timezone);
 const DEFAULT_USER_TIME_ZONE = 'UTC';
-const DEFAULT_REQUEST_PROTOCOL = process.env.NODE_ENV === 'production' ? 'https' : 'http';
 function getInputString(inputs, key) {
     const value = inputs === null || inputs === void 0 ? void 0 : inputs[key];
     return typeof value === 'string' && value ? value : undefined;
@@ -395,15 +394,6 @@ const HEADERS_NOT_FORWARDED_TO_API_TOOL = new Set([
     'transfer-encoding',
     'upgrade',
 ]);
-function getHeaderValue(headers, headerName) {
-    var _a;
-    const normalizedHeaderName = headerName.toLowerCase();
-    const value = (_a = Object.entries(headers !== null && headers !== void 0 ? headers : {}).find(([name]) => name.toLowerCase() === normalizedHeaderName)) === null || _a === void 0 ? void 0 : _a[1];
-    if (typeof value !== 'string') {
-        return undefined;
-    }
-    return value.split(',')[0].trim();
-}
 function isAbsoluteHttpUrl(value) {
     try {
         const url = new URL(value);
@@ -413,28 +403,16 @@ function isAbsoluteHttpUrl(value) {
         return false;
     }
 }
-function getRequestOrigin(httpExtra) {
-    var _a;
-    const requestUrl = httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.requestUrl;
-    if (requestUrl && isAbsoluteHttpUrl(requestUrl)) {
-        return new URL(requestUrl).origin;
-    }
-    const host = (_a = getHeaderValue(httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.headers, 'x-forwarded-host')) !== null && _a !== void 0 ? _a : getHeaderValue(httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.headers, 'host');
-    if (!host) {
-        return undefined;
-    }
-    const protocol = DEFAULT_REQUEST_PROTOCOL;
-    return `${protocol}://${host}`;
-}
 function resolveOpenApiRequestUrl(params) {
-    if (isAbsoluteHttpUrl(params.path)) {
-        return params.path;
-    }
-    const origin = getRequestOrigin(params.httpExtra);
-    if (!origin) {
-        throw new Error(`Tool "${params.toolName}" has relative OpenAPI path "${params.path}" but request host header is unavailable.`);
+    var _a, _b;
+    const internalApiOrigin = (_b = (_a = params.adminforth.express).getInternalApiOrigin) === null || _b === void 0 ? void 0 : _b.call(_a);
+    if (internalApiOrigin) {
+        const path = isAbsoluteHttpUrl(params.path)
+            ? `${new URL(params.path).pathname}${new URL(params.path).search}`
+            : params.path;
+        return new URL(path, internalApiOrigin).toString();
     }
-    return new URL(params.path, origin).toString();
+    throw new Error(`Tool "${params.toolName}" cannot call OpenAPI path "${params.path}" because internal API origin is unavailable.`);
 }
 function createToolRequestHeaders(httpExtra, userTimeZone) {
     var _a;
@@ -499,7 +477,7 @@ function callOpenApiSchema(params) {
         const method = schema.method.toUpperCase();
         const body = normalizeDateTimeInputsToUtc(((_a = inputs !== null && inputs !== void 0 ? inputs : httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.body) !== null && _a !== void 0 ? _a : {}), adminforth, userTimeZone);
         const requestUrl = resolveOpenApiRequestUrl({
-            httpExtra,
+            adminforth,
             path: schema.path,
             toolName,
         });

package/dist/custom/ChatSurface.vue

@@ -178,14 +178,14 @@
 <script setup lang="ts">
 import { IconChatBubbleLeft20Solid, IconSparklesSolid, IconArrowsPointingOut, IconArrowsPointingIn } from '@iconify-prerendered/vue-heroicons';
 import { IconCloseOutline, IconBarsOutline, IconArrowUpOutline, IconCloseSidebarSolid, IconOpenSidebarSolid, IconAngleDownOutline } from '@iconify-prerendered/vue-flowbite';
-import { useTemplateRef, onMounted, ref,computed } from 'vue';
+import { useTemplateRef, onMounted, ref } from 'vue';
 import { onClickOutside } from '@vueuse/core'
 import ConversationArea from './conversation_area/ConversationArea.vue';
 import { useAgentStore } from './composables/useAgentStore';
 import { useAgentTransitions } from './composables/useAgentTransitions';
 import { Button } from '@/afcl';
 import { useCoreStore } from '@/stores/core';
-import { remToPx, pxToRem } from './utils';
+import { remToPx } from './utils';
 
 const props = defineProps<{
   meta: {
@@ -210,6 +210,23 @@ const isModeMenuOpen = ref(false);
 let startX = 0
 let startWidth = 0
 
+onClickOutside(chatSurface, () => {if (!agentStore.isTeleportedToBody) agentStore.setIsChatOpen(false);});
+onClickOutside(modeMenu, () => { isModeMenuOpen.value = false; });
+
+onMounted(async () => {
+  agentStore.setAvailableModes(props.meta.modes, props.meta.defaultModeName);
+  agentStore.regisrerTextInput(textInput.value);
+  textInput.value?.focus();
+  const isTeleportedToBodyFromLocalStorage = agentStore.getLocalStorageItem('isTeleportedToBody') === 'true' || agentStore.getLocalStorageItem('isTeleportedToBodyBeforeFullScreen') === 'true';
+  if( coreStore.isMobile ) {
+    agentStore.setIsTeleportedToBody(false);
+  } else {
+    agentStore.setIsTeleportedToBody(isTeleportedToBodyFromLocalStorage || props.meta.stickByDefault);
+  }
+  await agentStore.fetchSessionsList();
+});
+
+
 const startResize = (e: MouseEvent) => {
   startX = e.clientX
   startWidth = remToPx(agentStore.chatWidth)
@@ -242,22 +259,6 @@ const stopResize = () => {
   }
 }
 
-onClickOutside(chatSurface, () => {if (!agentStore.isTeleportedToBody) agentStore.setIsChatOpen(false);});
-onClickOutside(modeMenu, () => { isModeMenuOpen.value = false; });
-
-onMounted(async () => {
-  agentStore.setAvailableModes(props.meta.modes, props.meta.defaultModeName);
-  agentStore.regisrerTextInput(textInput.value);
-  textInput.value?.focus();
-  const isTeleportedToBodyFromLocalStorage = agentStore.getLocalStorageItem('isTeleportedToBody') === 'true' || agentStore.getLocalStorageItem('isTeleportedToBodyBeforeFullScreen') === 'true';
-  if( coreStore.isMobile ) {
-    agentStore.setIsTeleportedToBody(false);
-  } else {
-    agentStore.setIsTeleportedToBody(isTeleportedToBodyFromLocalStorage || props.meta.stickByDefault);
-  }
-  await agentStore.fetchSessionsList();
-});
-
 function autoResize() {
   const el = textInput.value
   if (!el) return

package/dist/custom/CustomAutoScrollContainer.vue

@@ -15,13 +15,7 @@
 import { ref, onMounted, onUnmounted, nextTick, computed } from 'vue'
 import CustomScrollbar from 'custom-vue-scrollbar';
 import 'custom-vue-scrollbar/dist/style.css';
-import { useAgentStore } from './composables/useAgentStore';
 
-const scrollParams = ref({
-  scrollTop: 0,
-  scrollHeight: 0,
-  clientHeight: 0
-});
 
 const props = withDefaults(defineProps<{
   enabled?: boolean
@@ -43,6 +37,57 @@ const scrollElement = ref<HTMLElement | null>(null)
 
 let lastScrollTop = 0
 let lastScrollHeight = 0
+let observer: MutationObserver | null = null
+
+const scrollParams = ref({
+  scrollTop: 0,
+  scrollHeight: 0,
+  clientHeight: 0
+});
+
+defineExpose({
+  scrollToBottom: () => scrollToBottom(true),
+  isUserScrolledUp: () => isUserScrolledUp.value,
+  container: containerRef,
+  handleScroll,
+  scrollParams
+})
+
+onMounted(() => {
+  if (!containerRef.value) return
+  
+  scrollElement.value = containerRef.value.scrollEl
+  lastScrollTop = containerRef.value.scrollEl.scrollTop
+  lastScrollHeight = containerRef.value.scrollEl.scrollHeight
+  
+  observer = new MutationObserver(() => {
+    nextTick(() => {
+      if (!containerRef.value?.scrollEl) return
+      
+      if (!hasScrollbar()) {
+        isUserScrolledUp.value = false
+      }
+      
+      lastScrollHeight = containerRef.value.scrollEl.scrollHeight
+      scrollParams.value.scrollTop = containerRef.value.scrollEl.scrollTop
+      scrollParams.value.scrollHeight = containerRef.value.scrollEl.scrollHeight
+      scrollParams.value.clientHeight = containerRef.value.scrollEl.clientHeight
+      if (props.enabled && !isUserScrolledUp.value) {
+        scrollToBottom()
+      }
+    })
+  })
+  
+  observer.observe(containerRef.value?.scrollEl, {
+    childList: true,
+    subtree: true,
+    characterData: true
+  })
+})
+
+onUnmounted(() => {
+  observer?.disconnect()
+})
 
 function isNearBottom(): boolean {
   const container = containerRef.value?.scrollEl
@@ -99,51 +144,6 @@ function handleScroll(detectScrollDown = true): void {
   lastScrollHeight = scrollHeight
 }
 
-let observer: MutationObserver | null = null
-
-onMounted(() => {
-  if (!containerRef.value) return
-  
-  scrollElement.value = containerRef.value.scrollEl
-  lastScrollTop = containerRef.value.scrollEl.scrollTop
-  lastScrollHeight = containerRef.value.scrollEl.scrollHeight
-  
-  observer = new MutationObserver(() => {
-    nextTick(() => {
-      if (!containerRef.value?.scrollEl) return
-      
-      if (!hasScrollbar()) {
-        isUserScrolledUp.value = false
-      }
-      
-      lastScrollHeight = containerRef.value.scrollEl.scrollHeight
-      scrollParams.value.scrollTop = containerRef.value.scrollEl.scrollTop
-      scrollParams.value.scrollHeight = containerRef.value.scrollEl.scrollHeight
-      scrollParams.value.clientHeight = containerRef.value.scrollEl.clientHeight
-      if (props.enabled && !isUserScrolledUp.value) {
-        scrollToBottom()
-      }
-    })
-  })
-  
-  observer.observe(containerRef.value?.scrollEl, {
-    childList: true,
-    subtree: true,
-    characterData: true
-  })
-})
-
-onUnmounted(() => {
-  observer?.disconnect()
-})
-
-defineExpose({
-  scrollToBottom: () => scrollToBottom(true),
-  isUserScrolledUp: () => isUserScrolledUp.value,
-  container: containerRef,
-  handleScroll,
-  scrollParams
-})
 </script>
 
 <style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/agent",
-  "version": "1.26.13",
+  "version": "1.26.15",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",