@adminforth/agent 1.24.11 → 1.24.13

package/apiBasedTools.ts

@@ -5,6 +5,7 @@ import {
   type IAdminForth,
   type IAdminForthHttpResponse,
   type IHttpServer,
+  type IRegisteredApiSchema,
 } from 'adminforth';
 import dayjs from 'dayjs';
 import timezone from 'dayjs/plugin/timezone.js';
@@ -467,6 +468,25 @@ function endpointPathToToolName(path: string) {
     .replace(/^_+|_+$/g, '');
 }
 
+function stripAdminApiPrefix(path: string, adminforth: IAdminForth) {
+  const configuredBaseUrl = adminforth.config.baseUrl || '';
+  const normalizedBaseUrl = configuredBaseUrl.endsWith('/')
+    ? configuredBaseUrl.slice(0, -1)
+    : configuredBaseUrl;
+  const apiPrefix = `${normalizedBaseUrl}/adminapi/v1`;
+
+  if (path.startsWith(apiPrefix)) {
+    const strippedPath = path.slice(apiPrefix.length);
+    return strippedPath.startsWith('/') ? strippedPath : `/${strippedPath}`;
+  }
+
+  return path;
+}
+
+function openApiSchemaPathToToolName(path: string, adminforth: IAdminForth) {
+  return endpointPathToToolName(stripAdminApiPrefix(path, adminforth));
+}
+
 export async function formatApiBasedToolCall(params: {
   adminforth: IAdminForth;
   adminUser?: AdminUser;
@@ -739,15 +759,10 @@ export function prepareApiBasedTools(adminforth: IAdminForth): Record<string, Ap
   const captureServer: IHttpServer = {
     setupSpaServer() {},
     endpoint: ((options: EndpointWithSchemas) => {
-      const normalizedResponseSchema = options.response_schema ?? options.responce_schema;
-      if (!options.request_schema && !normalizedResponseSchema) {
-        return;
-      }
-
       capturedEndpoints.push({
         ...options,
-        response_schema: normalizedResponseSchema,
-        normalizedResponseSchema,
+        response_schema: options.response_schema ?? options.responce_schema,
+        normalizedResponseSchema: options.response_schema ?? options.responce_schema,
       });
     }) as IHttpServer['endpoint'],
   };
@@ -758,15 +773,30 @@ export function prepareApiBasedTools(adminforth: IAdminForth): Record<string, Ap
   const capturedEndpointsByToolName = Object.fromEntries(
     capturedEndpoints.map((endpoint) => [endpointPathToToolName(endpoint.path), endpoint]),
   );
+  const openApiSchemas = adminforth.openApi.registeredSchemas.filter(
+    (schema) => schema.request_schema || schema.response_schema,
+  );
+  const openApiSchemasByToolName = new Map<string, IRegisteredApiSchema>();
 
-  for (const endpoint of capturedEndpoints) {
-    const toolName = endpointPathToToolName(endpoint.path);
+  for (const schema of openApiSchemas) {
+    const toolName = openApiSchemaPathToToolName(schema.path, adminforth);
+    openApiSchemasByToolName.set(toolName, schema);
+  }
+
+  for (const [toolName, schema] of openApiSchemasByToolName.entries()) {
+    const endpoint = capturedEndpointsByToolName[toolName];
     apiBasedTools[toolName] = {
-      description: endpoint.description,
-      input_schema: endpoint.request_schema,
-      input_schma: endpoint.request_schema,
-      output_schema: endpoint.normalizedResponseSchema,
+      description: schema.description,
+      input_schema: schema.request_schema,
+      input_schma: schema.request_schema,
+      output_schema: schema.response_schema,
       call: async ({ adminUser, adminuser, inputs, httpExtra, userTimeZone } = {}) => {
+        if (!endpoint) {
+          throw new Error(
+            `Tool "${toolName}" is defined in OpenAPI but has no callable AdminForth endpoint handler.`,
+          );
+        }
+
         const output = await callCapturedEndpoint({
           adminforth,
           endpoint,

package/build.log

@@ -38,5 +38,5 @@ custom/skills/fetch_data/SKILL.md
 custom/skills/mutate_data/
 custom/skills/mutate_data/SKILL.md
 
-sent 201,345 bytes  received 566 bytes  403,822.00 bytes/sec
-total size is 199,037  speedup is 0.99
+sent 202,025 bytes  received 566 bytes  405,182.00 bytes/sec
+total size is 199,751  speedup is 0.99

package/custom/ChatSurface.vue

@@ -254,6 +254,7 @@ onMounted(async () => {
     agentStore.setIsTeleportedToBody(isTeleportedToBodyFromLocalStorage || props.meta.stickByDefault);
   }
   await agentStore.fetchSessionsList();
+  agentStore.setFullScreen(true);
 });
 
 function autoResize() {

package/custom/CustomAutoScrollContainer.vue

@@ -11,12 +11,16 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted, nextTick, watch } from 'vue'
+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 agentStore = useAgentStore();
+const scrollParams = ref({
+  scrollTop: 0,
+  scrollHeight: 0,
+  clientHeight: 0
+});
 
 const props = withDefaults(defineProps<{
   enabled?: boolean
@@ -42,6 +46,9 @@ function isNearBottom(): boolean {
   if (!container) return true
   
   const { scrollTop, scrollHeight, clientHeight } = container
+  scrollParams.value.scrollTop = scrollTop
+  scrollParams.value.scrollHeight = scrollHeight
+  scrollParams.value.clientHeight = clientHeight
   return scrollHeight - scrollTop - clientHeight <= props.threshold
 }
 
@@ -107,6 +114,9 @@ onMounted(() => {
       }
       
       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()
       }
@@ -128,7 +138,8 @@ defineExpose({
   scrollToBottom: () => scrollToBottom(true),
   isUserScrolledUp: () => isUserScrolledUp.value,
   container: containerRef,
-  handleScroll
+  handleScroll,
+  scrollParams
 })
 </script>
 

package/custom/conversation_area/ConversationArea.vue

@@ -8,7 +8,7 @@
     class="absolute bg-black/10 backdrop-blur-md z-10 h-full w-full"
   >
   </div>
-  <div class="relative flex-1 min-h-0 overflow-hidden" @click="recalculateScroll()">
+  <div ref="chatContainerRef" class="relative flex-1 min-h-0 overflow-hidden" @click="recalculateScroll()">
     <CustomAutoScrollContainer
       v-if="showScrollContainer"
       :enabled="!showScrollToBottomButton" 
@@ -24,10 +24,6 @@
         marginLeft: 'auto',
         marginRight: 'auto',
       }"
-      :contentStyle="{
-        height: '100%',
-        maxHeight: '100%',
-      }"
       :style="{ 
         maxWidth: agentStore.isFullScreen ? agentStore.MAX_WIDTH+'rem' : '100%',
         transition: `
@@ -46,11 +42,15 @@
       </div>
       <div 
         v-if="props.messages.length === 0"
-        class="flex-1 flex flex-col items-center justify-center text-gray-400 tracking-widest text-xl font-medium h-full"
+        class="flex-1 flex flex-col items-center justify-center text-gray-400 tracking-widest text-xl font-medium h-max"
+        :style="{
+          height: chatContainerRef ? chatContainerRef.clientHeight + 'px' : '100%',
+        }"
       >
         <p>{{ $t('Start the conversation') }}</p>
         <p class="tracking-normal text-base text">{{ $t('Give any input to begin') }}</p>
       </div>
+      <div></div>
     </CustomAutoScrollContainer>
     <button @click="scrollContainer.scrollToBottom();">
       <IconArrowDownOutline 
@@ -83,6 +83,11 @@ const innerScrollContainerRef = ref(null);
 const agentStore = useAgentStore();
 const agentTransitions = useAgentTransitions();
 const showScrollContainer = ref(true);
+const chatContainerRef = ref(null);
+
+const scrollHeight = computed(() => {
+  return scrollContainer.value ? scrollContainer.value.scrollParams.scrollHeight : 0;
+});
 
 function recalculateScroll() {
   if (scrollContainer.value) {

package/dist/apiBasedTools.js

@@ -286,6 +286,21 @@ function endpointPathToToolName(path) {
         .replace(/[^a-zA-Z0-9_]+/g, '_')
         .replace(/^_+|_+$/g, '');
 }
+function stripAdminApiPrefix(path, adminforth) {
+    const configuredBaseUrl = adminforth.config.baseUrl || '';
+    const normalizedBaseUrl = configuredBaseUrl.endsWith('/')
+        ? configuredBaseUrl.slice(0, -1)
+        : configuredBaseUrl;
+    const apiPrefix = `${normalizedBaseUrl}/adminapi/v1`;
+    if (path.startsWith(apiPrefix)) {
+        const strippedPath = path.slice(apiPrefix.length);
+        return strippedPath.startsWith('/') ? strippedPath : `/${strippedPath}`;
+    }
+    return path;
+}
+function openApiSchemaPathToToolName(path, adminforth) {
+    return endpointPathToToolName(stripAdminApiPrefix(path, adminforth));
+}
 export function formatApiBasedToolCall(params) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -478,25 +493,30 @@ export function prepareApiBasedTools(adminforth) {
     const captureServer = {
         setupSpaServer() { },
         endpoint: ((options) => {
-            var _a;
-            const normalizedResponseSchema = (_a = options.response_schema) !== null && _a !== void 0 ? _a : options.responce_schema;
-            if (!options.request_schema && !normalizedResponseSchema) {
-                return;
-            }
-            capturedEndpoints.push(Object.assign(Object.assign({}, options), { response_schema: normalizedResponseSchema, normalizedResponseSchema }));
+            var _a, _b;
+            capturedEndpoints.push(Object.assign(Object.assign({}, options), { response_schema: (_a = options.response_schema) !== null && _a !== void 0 ? _a : options.responce_schema, normalizedResponseSchema: (_b = options.response_schema) !== null && _b !== void 0 ? _b : options.responce_schema }));
         }),
     };
     adminforth.setupEndpoints(captureServer);
     const apiBasedTools = {};
     const capturedEndpointsByToolName = Object.fromEntries(capturedEndpoints.map((endpoint) => [endpointPathToToolName(endpoint.path), endpoint]));
-    for (const endpoint of capturedEndpoints) {
-        const toolName = endpointPathToToolName(endpoint.path);
+    const openApiSchemas = adminforth.openApi.registeredSchemas.filter((schema) => schema.request_schema || schema.response_schema);
+    const openApiSchemasByToolName = new Map();
+    for (const schema of openApiSchemas) {
+        const toolName = openApiSchemaPathToToolName(schema.path, adminforth);
+        openApiSchemasByToolName.set(toolName, schema);
+    }
+    for (const [toolName, schema] of openApiSchemasByToolName.entries()) {
+        const endpoint = capturedEndpointsByToolName[toolName];
         apiBasedTools[toolName] = {
-            description: endpoint.description,
-            input_schema: endpoint.request_schema,
-            input_schma: endpoint.request_schema,
-            output_schema: endpoint.normalizedResponseSchema,
+            description: schema.description,
+            input_schema: schema.request_schema,
+            input_schma: schema.request_schema,
+            output_schema: schema.response_schema,
             call: (...args_1) => __awaiter(this, [...args_1], void 0, function* ({ adminUser, adminuser, inputs, httpExtra, userTimeZone } = {}) {
+                if (!endpoint) {
+                    throw new Error(`Tool "${toolName}" is defined in OpenAPI but has no callable AdminForth endpoint handler.`);
+                }
                 const output = yield callCapturedEndpoint({
                     adminforth,
                     endpoint,

package/dist/custom/ChatSurface.vue

@@ -254,6 +254,7 @@ onMounted(async () => {
     agentStore.setIsTeleportedToBody(isTeleportedToBodyFromLocalStorage || props.meta.stickByDefault);
   }
   await agentStore.fetchSessionsList();
+  agentStore.setFullScreen(true);
 });
 
 function autoResize() {

package/dist/custom/CustomAutoScrollContainer.vue

@@ -11,12 +11,16 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted, nextTick, watch } from 'vue'
+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 agentStore = useAgentStore();
+const scrollParams = ref({
+  scrollTop: 0,
+  scrollHeight: 0,
+  clientHeight: 0
+});
 
 const props = withDefaults(defineProps<{
   enabled?: boolean
@@ -42,6 +46,9 @@ function isNearBottom(): boolean {
   if (!container) return true
   
   const { scrollTop, scrollHeight, clientHeight } = container
+  scrollParams.value.scrollTop = scrollTop
+  scrollParams.value.scrollHeight = scrollHeight
+  scrollParams.value.clientHeight = clientHeight
   return scrollHeight - scrollTop - clientHeight <= props.threshold
 }
 
@@ -107,6 +114,9 @@ onMounted(() => {
       }
       
       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()
       }
@@ -128,7 +138,8 @@ defineExpose({
   scrollToBottom: () => scrollToBottom(true),
   isUserScrolledUp: () => isUserScrolledUp.value,
   container: containerRef,
-  handleScroll
+  handleScroll,
+  scrollParams
 })
 </script>
 

package/dist/custom/conversation_area/ConversationArea.vue

@@ -8,7 +8,7 @@
     class="absolute bg-black/10 backdrop-blur-md z-10 h-full w-full"
   >
   </div>
-  <div class="relative flex-1 min-h-0 overflow-hidden" @click="recalculateScroll()">
+  <div ref="chatContainerRef" class="relative flex-1 min-h-0 overflow-hidden" @click="recalculateScroll()">
     <CustomAutoScrollContainer
       v-if="showScrollContainer"
       :enabled="!showScrollToBottomButton" 
@@ -24,10 +24,6 @@
         marginLeft: 'auto',
         marginRight: 'auto',
       }"
-      :contentStyle="{
-        height: '100%',
-        maxHeight: '100%',
-      }"
       :style="{ 
         maxWidth: agentStore.isFullScreen ? agentStore.MAX_WIDTH+'rem' : '100%',
         transition: `
@@ -46,11 +42,15 @@
       </div>
       <div 
         v-if="props.messages.length === 0"
-        class="flex-1 flex flex-col items-center justify-center text-gray-400 tracking-widest text-xl font-medium h-full"
+        class="flex-1 flex flex-col items-center justify-center text-gray-400 tracking-widest text-xl font-medium h-max"
+        :style="{
+          height: chatContainerRef ? chatContainerRef.clientHeight + 'px' : '100%',
+        }"
       >
         <p>{{ $t('Start the conversation') }}</p>
         <p class="tracking-normal text-base text">{{ $t('Give any input to begin') }}</p>
       </div>
+      <div></div>
     </CustomAutoScrollContainer>
     <button @click="scrollContainer.scrollToBottom();">
       <IconArrowDownOutline 
@@ -83,6 +83,11 @@ const innerScrollContainerRef = ref(null);
 const agentStore = useAgentStore();
 const agentTransitions = useAgentTransitions();
 const showScrollContainer = ref(true);
+const chatContainerRef = ref(null);
+
+const scrollHeight = computed(() => {
+  return scrollContainer.value ? scrollContainer.value.scrollParams.scrollHeight : 0;
+});
 
 function recalculateScroll() {
   if (scrollContainer.value) {

package/package.json

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