@adminforth/agent 1.21.0 → 1.22.0

package/dist/custom/{ToolRenderer.vue → conversation_area/ToolRenderer.vue}

@@ -1,19 +1,34 @@
 <template>
-  <div 
-    class="inline-flex m-2 max-w-[80%] flex-col gap-3 rounded-xl px-2 cursor-pointer text-lightListTableHeadingText dark:text-darkListTableHeadingText hover:opacity-75"         
-    @click="isInputOutputExpanded = !isInputOutputExpanded"
+  <div
+    ref="toolRendererRef" 
+    class="py-1 inline-flex justify-center m-2 
+      flex-col gap-3 rounded-xl px-2 text-lightListTableHeadingText 
+      dark:text-darkListTableHeadingText select-none
+    "         
+    :class="[
+      isInputOutputExpanded ? 'items-start border-none' : '', 
+      activateShrinkedStyle ? 'border items-center' : '',
+      activateFullWidth ? 'w-full' : '',
+    ]"
+    :style="{
+      maxWidth: isAnimatingShrinkFinal ? toolRendererInitialWidth + 'px' : '',
+      transition: 'max-width 0.3s ease',
+    }"
   >
-    <div class="flex items-center gap-3">
+    <div 
+      class="flex items-center gap-1 cursor-pointer"     
+      @click="toggleInputOutput()"
+    >
       <div class="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-white/70 dark:bg-blue-700/20">
         <Spinner v-if="isRunning" class="h-4 w-4" />
         <IconCheckOutline v-else class="h-4 w-4 text-lightPrimary dark:text-darkPrimary" />
       </div>
 
       <div class="min-w-0">
-        <p class="text-xs text-gray-500 dark:text-gray-400 font-bold">
+        <!-- <p class="text-xs text-gray-500 dark:text-gray-400 font-bold">
           {{ statusLabel }}
           <span v-if="props.data?.toolInfo?.durationMs" class="text-xs">({{ (props.data.toolInfo.durationMs / 1000).toFixed(2) }}s)</span>
-        </p>
+        </p> -->
         <p class="break-all font-mono text-sm leading-5">
           {{ props.data?.toolInfo?.toolName }}
         </p>
@@ -47,12 +62,52 @@
 </template>
 
 <script setup lang="ts">
-  import { computed, ref } from 'vue';
-  import { type IPartData } from './types';
+  import { computed, ref, watch, onMounted } from 'vue';
+  import { type IFormattedToolCallPart } from '../types';
   import { Spinner } from '@/afcl';
   import { IconAngleDownOutline, IconCheckOutline } from '@iconify-prerendered/vue-flowbite';
 
   const isInputOutputExpanded = ref(false);
+  const activateShrinkedStyle = ref(true);
+  const isAnimatingShrinkFinal = ref(false);
+  const toolRendererInitialWidth = ref<number | null>(null);
+  const toolRendererRef = ref<HTMLElement | null>(null);
+  const activateFullWidth = ref(false);
+  const blockClicksDuringAnimation = ref(false);
+  const ANIMATION_DURATION = 300;
+
+  onMounted(() => {
+    if (toolRendererRef.value) {
+      toolRendererInitialWidth.value = toolRendererRef.value.offsetWidth;
+    }
+  });  
+
+  watch(isInputOutputExpanded, (newValue) => {
+    if (!newValue) {
+      setTimeout(() => {
+        activateFullWidth.value = false;
+        isAnimatingShrinkFinal.value = true;
+      }, ANIMATION_DURATION - 10)
+      setTimeout(() => {
+        isAnimatingShrinkFinal.value = false;
+      }, ANIMATION_DURATION);
+      setTimeout(() => {
+        activateShrinkedStyle.value = true;
+      }, ANIMATION_DURATION + 10);
+    } else {
+      activateShrinkedStyle.value = false;
+      activateFullWidth.value = true;
+    }
+  });
+
+  function toggleInputOutput() {
+    if (blockClicksDuringAnimation.value) return;
+    isInputOutputExpanded.value = !isInputOutputExpanded.value;
+    blockClicksDuringAnimation.value = true;
+    setTimeout(() => {
+      blockClicksDuringAnimation.value = false;
+    }, ANIMATION_DURATION);
+  }
 
   interface IToolSection {
     label: string;
@@ -63,10 +118,7 @@
   }
 
   const props = defineProps<{
-    data: {
-      type: string;
-      toolInfo: IPartData;
-    }
+    data: IFormattedToolCallPart
   }>();
 
   const isRunning = computed(() => props.data?.toolInfo?.phase === 'start');
@@ -115,7 +167,7 @@
 
 .expand-enter-active,
 .expand-leave-active {
-  transition: all 0.3s ease;
+  transition: all 300ms ease;
 }
 
 .expand-enter-from,

package/dist/custom/conversation_area/ToolsGroup.vue

@@ -0,0 +1,63 @@
+<template >
+  <template v-if="toolGroup.length > 0">
+    <span class="bg-lightNavbar absolute flex items-center justify-center w-5 h-5 bg-brand-softer rounded-full -start-[0.68rem] ring-4 ring-lightNavbar ring-default">
+      <div class="w-5 h-5 rounded-full flex items-center justify-center">
+        <IconWrenchSolid class="w-4 h-4" />
+      </div>
+    </span>
+    <h3 
+      class="flex items-center mb-1 text-sm my-2 ml-3 gap-1"      
+    >
+      <span class="font-semibold select-none ">Call tools</span>
+    </h3>
+    <div class="flex flex-wrap">
+      <template v-for="group in props.toolGroup" :key="group.title">
+        <ToolRenderer v-for="part in group.groupedTools" :key="part.toolInfo.toolCallId" :data="part"/>
+      </template> 
+    </div>
+  </template>
+</template>
+
+<script setup lang="ts">
+import ToolRenderer from './ToolRenderer.vue';
+import type { IToolGroup } from '../types';
+import { ref } from 'vue';
+import { IconWrenchSolid } from '@iconify-prerendered/vue-heroicons';
+
+
+const props = defineProps<{
+  toolGroup: IToolGroup[]
+}>();
+
+const expandedGroups = ref<string[]>([]);
+
+function toggleGroup(groupTitle: string) {
+  if (expandedGroups.value.includes(groupTitle)) {
+    expandedGroups.value = expandedGroups.value.filter((title: string) => title !== groupTitle);
+  } else {
+    expandedGroups.value.push(groupTitle);
+  }
+}
+
+</script>
+
+<style scoped>
+
+.expand-enter-active,
+.expand-leave-active {
+  transition: all 0.3s ease;
+}
+
+.expand-enter-from,
+.expand-leave-to {
+  opacity: 0;
+  max-height: 0;
+}
+
+.expand-enter-to,
+.expand-leave-from {
+  opacity: 1;
+  max-height: 288px;
+}
+
+</style>

package/dist/custom/package.json

@@ -21,6 +21,7 @@
     "dompurify": "^3.3.3",
     "katex": "^0.16.45",
     "marked": "^18.0.0",
-    "vega-embed": "^7.1.0"
+    "vega-embed": "^7.1.0",
+    "vue-custom-scrollbar": "^2.0.2"
   }
 }

package/dist/custom/pnpm-lock.yaml

@@ -41,6 +41,9 @@ importers:
       vega-embed:
         specifier: ^7.1.0
         version: 7.1.0(vega-lite@6.4.2(vega@6.2.0))(vega@6.2.0)
+      vue-custom-scrollbar:
+        specifier: ^2.0.2
+        version: 2.0.2(vue@3.5.32)
 
 packages:
 
@@ -653,6 +656,9 @@ packages:
   parse-entities@4.0.2:
     resolution: {integrity: sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw==}
 
+  perfect-scrollbar@1.5.6:
+    resolution: {integrity: sha512-rixgxw3SxyJbCaSpo1n35A/fwI1r2rdwMKOTCg/AcG+xOEyZcE8UHVjpZMFCVImzsFoCZeJTT+M/rdEIQYO2nw==}
+
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
@@ -873,6 +879,11 @@ packages:
   vfile@6.0.3:
     resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
 
+  vue-custom-scrollbar@2.0.2:
+    resolution: {integrity: sha512-eRyxGb7UFLLH8P0B8FDux2uPrzNBH0X6IN+A/RB5sfmLq1ym7shbCPVKua1pC7LPqPB7dc86evFXyWO/svrfKA==}
+    peerDependencies:
+      vue: ^3.3.0
+
   vue@3.5.32:
     resolution: {integrity: sha512-vM4z4Q9tTafVfMAK7IVzmxg34rSzTFMyIe0UUEijUCkn9+23lj0WRfA83dg7eQZIUlgOSGrkViIaCfqSAUXsMw==}
     peerDependencies:
@@ -1755,6 +1766,8 @@ snapshots:
       is-decimal: 2.0.1
       is-hexadecimal: 2.0.1
 
+  perfect-scrollbar@1.5.6: {}
+
   picocolors@1.1.1: {}
 
   postcss@8.5.10:
@@ -2129,6 +2142,11 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
+  vue-custom-scrollbar@2.0.2(vue@3.5.32):
+    dependencies:
+      perfect-scrollbar: 1.5.6
+      vue: 3.5.32
+
   vue@3.5.32:
     dependencies:
       '@vue/compiler-dom': 3.5.32

package/dist/custom/types.ts

@@ -7,12 +7,22 @@ export interface IPartData {
   durationMs?: number;
 }
 export interface IPart {
-  type: string;
+  type: 'reasoning' | 'data-tool-call' | 'text';
   text?: string;
   state?: 'started' | 'thinking' | 'processing' | 'streaming' | 'done';
   data?: IPartData;
 }
 
+export interface IFormattedToolCallPart {
+  type: 'data-tool-call';
+  toolInfo: IPartData;
+}
+
+export interface IToolGroup {
+  title: string;
+  groupedTools: IFormattedToolCallPart[];
+}
+
 export interface IMessage {
   id: string;
   role: 'user' | 'assistant';

package/dist/custom/utils.ts

@@ -1,3 +1,5 @@
+import { IMessage, IPart } from "./types";
+
 export function remToPx(rem: number): number {
   const rootFontSize = parseFloat(getComputedStyle(document.documentElement).fontSize);
   return rem * rootFontSize;
@@ -7,3 +9,30 @@ export function pxToRem(px: number): number {
   const rootFontSize = parseFloat(getComputedStyle(document.documentElement).fontSize);
   return px / rootFontSize;
 }
+
+
+export function getMessageParts(message: IMessage): IPart[] {
+  return message.parts?.length
+    ? message.parts
+    : [{ text: '', type: 'reasoning', state: 'streaming' }];
+}
+
+function addNewLineBeforeTitles(text: string): string {
+  return text.replace(/(\*\*[^*]+\*\*)/g, '\n\n$1');
+}
+
+export function extractTitleAndTextFromReasoning(reasoningText: string): { title: string | null; body: string } {
+  const match = reasoningText.match(/^\*\*(.*?)\*\*(.*)$/s);
+
+  if (!match) {
+    return {
+      title: null,
+      body: addNewLineBeforeTitles(reasoningText)
+    };
+  }
+
+  return {
+    title: match[1].trim(),
+    body: addNewLineBeforeTitles(match[2].trim())
+  };
+}

package/package.json

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

package/custom/ConversationArea.vue

@@ -1,198 +0,0 @@
-<template>
-  <button @click="scrollContainer.scrollToBottom()">
-    <IconArrowDownOutline 
-      class="absolute z-10 bottom-32 left-1/2 bg-lightPrimary dark:bg-darkPrimary text-white p-2 w-10 h-10 rounded-full transition-opacity duration-100 ease-in" 
-      :class="showScrollToBottomButton ? 'opacity-100' : 'opacity-0 pointer-events-none'"
-      :disabled="!showScrollToBottomButton"
-    />
-  </button>
-  
-  <SessionsHistory 
-    :class="agentStore.isSessionHistoryOpen ? 'translate-x-0' : '-translate-x-full'"
-  />
-  <div 
-    v-if="agentStore.isSessionHistoryOpen"
-    @click="agentStore.setSessionHistoryOpen(false)"
-    class="absolute bg-black/10 backdrop-blur-md z-10 h-full w-full"
-  >
-
-  </div>
-  <AutoScrollContainer
-    :enabled="!showScrollToBottomButton" 
-    class="relative flex flex-col overflow-y-auto translate-x-[-50%] left-1/2"
-    ref="scrollContainer"
-    :threshold="10"
-    behavior="smooth"
-    :style="{ 
-      maxWidth: agentStore.isFullScreen ? agentStore.MAX_WIDTH+'rem' : '100%',
-      transition: `
-        max-width ${agentTransitions.TRANSITION_DURATION}ms ease-in-out,
-        transform ${agentTransitions.TRANSITION_DURATION}ms ease-in-out
-      `
-    }"
-  > 
-
-    <div 
-      v-for="message in props.messages" :key="message.id"
-      class="flex flex-col w-full"
-      :class="message.role === 'user' ? 'self-end' : 'self-start'"
-    >
-      <template 
-        v-for="(part, index) in getParts(message)"
-        :key="part.type"
-      >
-        <Message
-          v-if="part.type !== 'data-tool-call'"
-          :message="part.text"
-          :role="message.role"
-          :type="part.type"
-          :state="part.state"
-          :data="part.data"
-          @toggle-thoughts="() => clicks++"
-        >
-        </Message>
-        <ToolsGroup v-else :toolGroup="groupToolCallParts(message, index, part)" />
-      </template>
-    </div>
-    <!-- Show a placeholder message if the last message is not of type 'text' or 'reasoning' -->
-    <Message
-      v-if="props.messages.length > 0 && showFakeThinkingMessage"
-      :message="''"
-      :role="props.messages[props.messages.length - 1].role"
-      type="reasoning"
-      state="streaming"
-    />
-    <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"
-    >
-      <p>{{ $t('Start the conversation') }}</p>
-      <p class="tracking-normal text-base text">{{ $t('Give any input to begin') }}</p>
-    </div>
-  </AutoScrollContainer>
-</template>
-
-
-<script setup lang="ts">
-import Message from './Message.vue';
-import type { IMessage, IPart } from './types';
-import { useTemplateRef, ref, defineAsyncComponent, onMounted, onUnmounted, watch, computed } from 'vue';
-import { IconArrowDownOutline } from '@iconify-prerendered/vue-flowbite';
-import SessionsHistory from './SessionsHistory.vue';
-import { useAgentStore } from './composables/useAgentStore';
-import ToolsGroup from './ToolsGroup.vue';
-import { useAgentTransitions } from './composables/useAgentTransitions';
-
-const scrollContainer = useTemplateRef('scrollContainer');
-const showScrollToBottomButton = ref(false);
-const innerScrollContainerRef = ref(null);
-const AutoScrollContainer = defineAsyncComponent(() => import('@incremark/vue').then(module => module.AutoScrollContainer))
-const agentStore = useAgentStore();
-const agentTransitions = useAgentTransitions();
-const clicks = ref(0);
-
-function recalculateScroll() {
-  if (scrollContainer.value) {
-    const isScrolledUp = scrollContainer.value.isUserScrolledUp();
-    showScrollToBottomButton.value = !!isScrolledUp;
-  }
-}
-
-onMounted(async () => {
-  await import('@incremark/theme/styles.css')
-  await agentStore.fetchPlaceholderMessages()
-});
-
-onUnmounted(() => {
-  agentStore.stopPlaceholderAnimation();
-});
-
-watch(scrollContainer, () => {
-  if (scrollContainer.value) {
-    innerScrollContainerRef.value = scrollContainer.value.container;
-
-    innerScrollContainerRef.value.addEventListener('scroll', () => {
-      recalculateScroll();
-    });
-  }
-})
-
-watch(clicks, () => {
-  recalculateScroll();
-})
-
-const showFakeThinkingMessage = computed(() => {
-  const lastMessage = props.messages[props.messages.length - 1];
-  if (!lastMessage) return false;
-  const lastPart = getParts(lastMessage)[getParts(lastMessage).length - 1];
-  return lastPart?.type !== 'text' && lastPart?.type !== 'reasoning';
-})
-
-const getParts = (message: IMessage) => {
-  return message.parts?.length
-    ? message.parts
-    : [{ text: '', type: 'reasoning', state: 'streaming' }];
-};
-
-const formatToolCallTextPart = ((part: IPart, currentMessage: IMessage) => {
-  if (part.type === 'data-tool-call') {
-    if (part.data?.phase === 'start') {
-      const finishedPart = currentMessage.parts?.find(p => p.type === 'data-tool-call' && p.data?.toolCallId === part.data?.toolCallId && p.data?.phase === 'end');
-      return {
-        type: 'text',
-        toolInfo: {
-          toolCallId: part.data!.toolCallId,
-          toolName: part.data!.toolName,
-          phase: finishedPart ? 'end' : 'start',
-          durationMs: finishedPart ? finishedPart.data?.durationMs : undefined,
-          input: part.data!.input,
-          output: finishedPart ? finishedPart.data!.output : undefined,
-        }          
-      }
-    }
-  }
-  return null;  
-});
-
-const groupToolCallParts = (message: IMessage, currentPartIndex: number, currentPart: IPart) => {
-  const groupedParts: { title: string; groupedTools: IPart[] }[] = [];
-  let currentToolName: string | null = null;
-  const parts = getParts(message);
-  if (!parts) return [];
-  const formatedToolParts = parts.map(part => {
-    return formatToolCallTextPart(part as IPart, message)
-  });
-  const currentPartIndexInFormatedParts = formatedToolParts.findIndex(part => part?.toolInfo?.toolCallId === currentPart.data?.toolCallId);
-  if (currentPartIndexInFormatedParts === -1) {
-    return [];
-  }
-  for( const[index, part] of formatedToolParts.entries()){
-    if ( index < currentPartIndexInFormatedParts - 1 ) {
-      continue;
-    }
-    if(!part || !part.toolInfo) {
-      continue;
-    }
-    currentToolName = part.toolInfo.toolName;
-    if (!groupedParts.find(group => group.title === currentToolName)) {
-      groupedParts.push({
-        title: currentToolName,
-        groupedTools: []
-      })
-    }
-    if( formatedToolParts[currentPartIndexInFormatedParts - 1]?.toolInfo.toolName === part.toolInfo.toolName) {
-      continue;
-    } else if ( formatedToolParts[currentPartIndexInFormatedParts + 1]?.toolInfo.toolName === part.toolInfo.toolName) {
-      groupedParts[groupedParts.length - 1].groupedTools.push(formatedToolParts[currentPartIndexInFormatedParts + 1] as IPart);
-    } else {
-      groupedParts[groupedParts.length - 1].groupedTools.push(part);
-    }
-  }  
-  return groupedParts;
-}
-
-const props = defineProps<{
-  messages: IMessage[]
-}>();
-
-</script>

package/custom/ToolsGroup.vue

@@ -1,67 +0,0 @@
-<template>
-  <template v-for="group in props.toolGroup" :key="group.title">
-    <div v-if="group.groupedTools.length > 1" class="flex flex-col">
-      <div class="flex items-center gap-2 px-2 m-2 cursor-pointer hover:opacity-75 break-all font-mono text-sm leading-5 text-lightListTableHeadingText dark:text-darkListTableHeadingText" @click="toggleGroup(group.title)">
-        <IconCheckOutline  class="w-6 h-6 p-1"/> 
-        {{ group.title }} {{ 'x' + group.groupedTools.length }} 
-        <IconAngleDownOutline 
-          class="transition-transform duration-200 hover:scale-105 hover:opacity-75"
-          :class="expandedGroups.includes(group.title) ? 'rotate-180' : 'rotate-0'"
-        />
-      </div>
-      <transition name="expand">
-        <div v-show="expandedGroups.includes(group.title)" class="flex flex-col"> 
-        <ToolRenderer v-for="part in group.groupedTools" :key="part.text + part.type" :data="part" class="ml-8"/>
-        </div>
-      </transition>
-    </div>
-    <ToolRenderer v-else-if="group.groupedTools.length > 0" :data="group.groupedTools[0]" />
-  </template> 
-
-</template>
-
-<script setup lang="ts">
-import ToolRenderer from './ToolRenderer.vue';
-import type { IPart } from './types';
-import { ref } from 'vue';
-import { IconAngleDownOutline, IconCheckOutline } from '@iconify-prerendered/vue-flowbite';
-
-const props = defineProps<{
-  toolGroup: {
-    title: string;
-    groupedTools: IPart[];
-  }[]
-}>();
-
-const expandedGroups = ref<string[]>([]);
-
-function toggleGroup(groupTitle: string) {
-  if (expandedGroups.value.includes(groupTitle)) {
-    expandedGroups.value = expandedGroups.value.filter((title: string) => title !== groupTitle);
-  } else {
-    expandedGroups.value.push(groupTitle);
-  }
-}
-
-</script>
-
-<style scoped>
-
-.expand-enter-active,
-.expand-leave-active {
-  transition: all 0.3s ease;
-}
-
-.expand-enter-from,
-.expand-leave-to {
-  opacity: 0;
-  max-height: 0;
-}
-
-.expand-enter-to,
-.expand-leave-from {
-  opacity: 1;
-  max-height: 288px;
-}
-
-</style>