@adminforth/agent 1.21.0 → 1.22.0

package/build.log

@@ -5,11 +5,8 @@
 sending incremental file list
 custom/
 custom/ChatSurface.vue
-custom/ConversationArea.vue
-custom/Message.vue
+custom/CustomAutoScrollContainer.vue
 custom/SessionsHistory.vue
-custom/ToolRenderer.vue
-custom/ToolsGroup.vue
 custom/chat.ts
 custom/package.json
 custom/pnpm-lock.yaml
@@ -19,6 +16,15 @@ custom/utils.ts
 custom/composables/
 custom/composables/useAgentStore.ts
 custom/composables/useAgentTransitions.ts
+custom/conversation_area/
+custom/conversation_area/ConversationArea.vue
+custom/conversation_area/MessageRenderer.vue
+custom/conversation_area/ProcessingTimeline.vue
+custom/conversation_area/ReasoningRenderer.vue
+custom/conversation_area/TextRenderer.vue
+custom/conversation_area/ThreeDotsAnimation.vue
+custom/conversation_area/ToolRenderer.vue
+custom/conversation_area/ToolsGroup.vue
 custom/incremark_code_renderers/
 custom/incremark_code_renderers/IncremarkShikiCodeBlock.vue
 custom/incremark_code_renderers/incremarkCodeHighlight.ts
@@ -32,5 +38,5 @@ custom/skills/fetch_data/SKILL.md
 custom/skills/mutate_data/
 custom/skills/mutate_data/SKILL.md
 
-sent 188,784 bytes  received 451 bytes  378,470.00 bytes/sec
-total size is 186,932  speedup is 0.99
+sent 199,171 bytes  received 562 bytes  399,466.00 bytes/sec
+total size is 196,867  speedup is 0.99

package/custom/ChatSurface.vue

@@ -179,7 +179,7 @@ import { IconChatBubbleLeft20Solid, IconSparklesSolid, IconArrowsPointingOut, Ic
 import { IconCloseOutline, IconBarsOutline, IconArrowUpOutline, IconCloseSidebarSolid, IconOpenSidebarSolid, IconAngleDownOutline } from '@iconify-prerendered/vue-flowbite';
 import { useTemplateRef, onMounted, ref,computed } from 'vue';
 import { onClickOutside } from '@vueuse/core'
-import ConversationArea from './ConversationArea.vue';
+import ConversationArea from './conversation_area/ConversationArea.vue';
 import { useAgentStore } from './composables/useAgentStore';
 import { useAgentTransitions } from './composables/useAgentTransitions';
 import { Button } from '@/afcl';
@@ -246,7 +246,7 @@ onMounted(async () => {
   agentStore.setAvailableModes(props.meta.modes, props.meta.defaultModeName);
   agentStore.regisrerTextInput(textInput.value);
   textInput.value?.focus();
-  const isTeleportedToBodyFromLocalStorage = agentStore.getLocalStorageItem('isTeleportedToBody') === 'true';
+  const isTeleportedToBodyFromLocalStorage = agentStore.getLocalStorageItem('isTeleportedToBody') === 'true' || agentStore.getLocalStorageItem('isTeleportedToBodyBeforeFullScreen') === 'true';
   if( coreStore.isMobile ) {
     agentStore.setIsTeleportedToBody(false);
   } else {

package/custom/CustomAutoScrollContainer.vue

@@ -0,0 +1,127 @@
+<script setup lang="ts">
+import { ref, watch, onMounted, onUnmounted, nextTick } from 'vue'
+import vueCustomScrollbar from 'vue-custom-scrollbar'
+
+const props = withDefaults(defineProps<{
+  enabled?: boolean
+  threshold?: number
+  behavior?: ScrollBehavior
+}>(), {
+  enabled: true,
+  threshold: 50,
+  behavior: 'instant'
+})
+
+const containerRef = ref<HTMLDivElement | null>(null)
+const isUserScrolledUp = ref(false)
+
+let lastScrollTop = 0
+let lastScrollHeight = 0
+
+function isNearBottom(): boolean {
+  const container = containerRef.value
+  if (!container) return true
+  
+  const { scrollTop, scrollHeight, clientHeight } = container
+  return scrollHeight - scrollTop - clientHeight <= props.threshold
+}
+
+function scrollToBottom(force = false): void {
+  const container = containerRef.value
+  if (!container) return
+  
+  if (isUserScrolledUp.value && !force) return
+  
+  container.scrollTo({
+    top: container.scrollHeight,
+    behavior: props.behavior
+  })
+}
+
+
+function hasScrollbar(): boolean {
+  const container = containerRef.value
+  if (!container) return false
+  return container.scrollHeight > container.clientHeight
+}
+
+
+function handleScroll(): void {
+  const container = containerRef.value
+  if (!container) return
+  
+  const { scrollTop, scrollHeight, clientHeight } = container
+  
+  if (scrollHeight <= clientHeight) {
+    isUserScrolledUp.value = false
+    lastScrollTop = 0
+    lastScrollHeight = scrollHeight
+    return
+  }
+  
+  if (isNearBottom()) {
+    isUserScrolledUp.value = false
+  } else {
+    const isScrollingUp = scrollTop < lastScrollTop
+    const isContentUnchanged = scrollHeight === lastScrollHeight
+    
+    if (isScrollingUp && isContentUnchanged) {
+      isUserScrolledUp.value = true
+    }
+  }
+  
+  lastScrollTop = scrollTop
+  lastScrollHeight = scrollHeight
+}
+
+let observer: MutationObserver | null = null
+
+onMounted(() => {
+  if (!containerRef.value) return
+  
+  lastScrollTop = containerRef.value.scrollTop
+  lastScrollHeight = containerRef.value.scrollHeight
+  
+  observer = new MutationObserver(() => {
+    nextTick(() => {
+      if (!containerRef.value) return
+      
+      if (!hasScrollbar()) {
+        isUserScrolledUp.value = false
+      }
+      
+      lastScrollHeight = containerRef.value.scrollHeight
+      
+      if (props.enabled && !isUserScrolledUp.value) {
+        scrollToBottom()
+      }
+    })
+  })
+  
+  observer.observe(containerRef.value, {
+    childList: true,
+    subtree: true,
+    characterData: true
+  })
+})
+
+onUnmounted(() => {
+  observer?.disconnect()
+})
+
+defineExpose({
+  scrollToBottom: () => scrollToBottom(true),
+  isUserScrolledUp: () => isUserScrolledUp.value,
+  container: containerRef
+})
+</script>
+
+<template>
+  <div
+    ref="containerRef"
+    class="auto-scroll-container h-full"
+    @scroll="handleScroll"
+  >
+    <slot />
+  </div>
+</template>

package/custom/composables/useAgentStore.ts

@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia';
-import { IAgentSession, ISessionsListItem, IMessage } from '../types';
+import { IAgentSession, ISessionsListItem, IMessage, IPart } from '../types';
 import { ref, nextTick, computed, watch, onMounted, shallowRef } from 'vue';
 import { callAdminForthApi } from '@/utils';
 import { useAdminforth } from '@/adminforth';
@@ -93,7 +93,9 @@ export const useAgentStore = defineStore('agent', () => {
   })
   onMounted(() => {
     const chatWidthBeforeFullScreen = parseInt(getLocalStorageItem('chatWidthBeforeFullScreen') || '0', 10);
-    if (chatWidthBeforeFullScreen) {
+    if (chatWidthBeforeFullScreen && (chatWidthBeforeFullScreen > MAX_WIDTH || chatWidthBeforeFullScreen < MIN_WIDTH)) {
+      setChatWidth(remToPx(DEFAULT_CHAT_WIDTH));
+    } else if (chatWidthBeforeFullScreen) {
       setChatWidth(remToPx(chatWidthBeforeFullScreen));
     } else {
       const savedChatWidth = parseInt(getLocalStorageItem('chatWidth') || '0', 10);
@@ -105,7 +107,7 @@ export const useAgentStore = defineStore('agent', () => {
         }
       }
     }
-    isTeleportedToBody.value = getLocalStorageItem('isTeleportedToBody') === 'true';
+    setIsTeleportedToBody(getLocalStorageItem('isTeleportedToBody') === 'true' || getLocalStorageItem('isTeleportedToBodyBeforeFullScreen') === 'true');
     lastSessionId.value = getLocalStorageItem('lastSessionId');
     if (lastSessionId.value && lastSessionId.value !== 'pre-session') {
       setActiveSession(lastSessionId.value);
@@ -510,7 +512,7 @@ export const useAgentStore = defineStore('agent', () => {
     if (currentSession.value) {
       currentSession.value.messages = currentChat.value?.messages.map((m: any) => ({
         role: m.role,
-        text: m.parts.map((p: any) => p.text).join(' '),
+        text: m.parts.map((p: IPart) => p.type === 'text' ? p.text : '').join(''),
       })) || [];
       sessions.value[currentSession.value.sessionId] = currentSession.value;
     }
@@ -522,8 +524,10 @@ export const useAgentStore = defineStore('agent', () => {
     if (!sessions.value[sessionId]) {
       await fetchSession(sessionId);    
     }
+    console.log('Set active session from sessions', sessionId, sessions.value[sessionId]);
     currentSession.value = sessions.value[sessionId];
     setCurrentChat(sessionId);
+    console.log('Set active session chat', sessionId, currentSession.value);
     currentChat.value.messages = currentSession.value?.messages.map((m: any) => ({
       role: m.role,
       parts:[{

package/custom/conversation_area/ConversationArea.vue

@@ -0,0 +1,109 @@
+<template>
+  <button @click="scrollContainer.scrollToBottom(); recalculateScroll();">
+    <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>
+  <CustomAutoScrollContainer
+    :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, index) in props.messages" :key="message.id"
+      class="flex flex-col w-full"
+      :class="message.role === 'user' ? 'self-end' : 'self-start'"
+    >
+      <MessageRenderer :message="message" :isLastMessageInChat="index === props.messages.length - 1"/>
+    </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"
+    >
+      <p>{{ $t('Start the conversation') }}</p>
+      <p class="tracking-normal text-base text">{{ $t('Give any input to begin') }}</p>
+    </div>
+  </CustomAutoScrollContainer>
+</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';
+import { getMessageParts } from '../utils';
+import MessageRenderer from './MessageRenderer.vue';
+import CustomAutoScrollContainer from '../CustomAutoScrollContainer.vue';
+
+const scrollContainer = useTemplateRef('scrollContainer');
+const showScrollToBottomButton = ref(false);
+const innerScrollContainerRef = ref(null);
+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 props = defineProps<{
+  messages: IMessage[]
+}>();
+
+</script>

package/custom/conversation_area/MessageRenderer.vue

@@ -0,0 +1,33 @@
+<template>
+  <ProcessingTimeline 
+    :message="message"
+    :isLastMessageInChat="isLastMessageInChat"
+  />
+  <template 
+    v-for="(part, index) in getMessageParts(message)"
+    :key="part.type"
+  > 
+    
+    <TextRenderer 
+      v-if="part.type === 'text'" 
+      :message="part.text" 
+      :role="props.message.role" 
+    />
+  </template>
+
+</template>
+
+
+
+
+<script setup lang="ts">
+  import TextRenderer from './TextRenderer.vue';
+  import type { IMessage } from '../types';
+  import { getMessageParts } from '../utils';
+  import ProcessingTimeline from './ProcessingTimeline.vue';
+
+  const props = defineProps<{ 
+    message: IMessage 
+    isLastMessageInChat: boolean
+  }>();
+</script>

package/custom/conversation_area/ProcessingTimeline.vue

@@ -0,0 +1,190 @@
+<template>
+  <template v-if="ToolOrReasoningParts.length > 0 || isResponseInProgress || showFakeThinkingMessage">
+    <div 
+      class="ml-2 px-4 flex items-center gap-1 cursor-pointer select-none hover:opacity-80 tracking-wide font-medium text-sm"
+      @click="isExpanded = !isExpanded"
+    >
+      Thoughts
+      <span v-if="thinkingDuration > 0">({{ (thinkingDuration/1000).toFixed(2) }} s)</span>
+      <ThreeDotsAnimation v-if="isResponseInProgress || showFakeThinkingMessage" />
+      <IconAngleDownOutline 
+        :class="isExpanded ? 'rotate-180' : 'rotate-0'"
+        class="transition-transform duration-200"
+      />
+    </div>
+    <transition name="expand" class="max-h-96 overflow-y-auto mb-4 pt-1">
+      <CustomAutoScrollContainer
+        :enabled="true"
+        behavior="smooth"
+        v-if="ToolOrReasoningParts.length > 0" 
+        v-show="isExpanded"
+        class="mask-y"
+      >
+        <ol class="ml-8 relative border-l border-l-2 border-black border-default">
+          <li class="mb-6 ms-2 z-50" v-for="(part, index) in ToolOrReasoningParts" :key="index"> 
+            <ReasoningRenderer v-if="part.type === 'reasoning'" :state="part.state" :text="part.text" />
+            <ToolsGroup v-else :toolGroup="groupToolCallParts(message, part)" />
+          </li>      
+        </ol>
+      </CustomAutoScrollContainer>
+    </transition>
+  </template>
+</template>
+
+
+
+<script setup lang="ts">
+  import type { IFormattedToolCallPart, IMessage, IPart, IToolGroup } from '../types';
+  import { ref, computed, watch, defineAsyncComponent, onMounted } from 'vue';
+  import ReasoningRenderer from './ReasoningRenderer.vue';
+  import { IconAngleDownOutline } from '@iconify-prerendered/vue-flowbite';
+  import ThreeDotsAnimation from './ThreeDotsAnimation.vue';
+  import { useAgentStore } from '../composables/useAgentStore';
+  import { getMessageParts } from '../utils';
+  import ToolsGroup from './ToolsGroup.vue';
+  import CustomAutoScrollContainer from '../CustomAutoScrollContainer.vue';
+
+  const props = defineProps<{
+    message: IMessage
+    isLastMessageInChat: boolean
+  }>()
+
+  // const AutoScrollContainer = defineAsyncComponent(() => import('@incremark/vue').then(module => module.AutoScrollContainer))
+  const agentStore = useAgentStore();
+  const thinkingStartTime = ref<number | null>(null);
+  const thinkingDuration = ref(0);
+
+  onMounted(() => {
+    thinkingStartTime.value = Date.now();
+  })
+
+  const ToolOrReasoningParts = computed(() => {
+    return props.message.parts.filter((part: IPart) => part.type === 'data-tool-call' || part.type === 'reasoning');
+  });
+  const isExpanded = ref(true);
+
+  const isResponseInProgress = computed(() =>{
+    return props.isLastMessageInChat && agentStore.isResponseInProgress; 
+  });
+  
+  watch(isResponseInProgress, (newValue: boolean) => {
+    if (!newValue) {
+      isExpanded.value = false;
+      thinkingDuration.value = Date.now() - (thinkingStartTime.value ?? Date.now());
+    }
+  });
+  
+  const showFakeThinkingMessage = computed(() => {
+    if (props.message.parts.length === 0) return true;
+    return false;
+  })
+
+  const formatToolCallPart = (part: IPart, currentMessage: IMessage): IFormattedToolCallPart | null => {
+    if (part.type !== 'data-tool-call' || part.data?.phase !== 'start') {
+      return null;
+    }
+
+    const finishedPart = currentMessage.parts.find(candidate => {
+      return candidate.type === 'data-tool-call'
+        && candidate.data?.toolCallId === part.data?.toolCallId
+        && candidate.data?.phase === 'end';
+    });
+
+    return {
+      type: 'data-tool-call',
+      toolInfo: {
+        toolCallId: part.data.toolCallId,
+        toolName: part.data.toolName,
+        phase: finishedPart ? 'end' : 'start',
+        durationMs: finishedPart?.data?.durationMs,
+        input: part.data.input,
+        output: finishedPart?.data?.output,
+      }
+    };
+  };
+
+  const getVisibleTimelineParts = (message: IMessage) => {
+    return getMessageParts(message).filter(part => {
+      return part.type === 'reasoning' || (part.type === 'data-tool-call' && part.data?.phase === 'start');
+    });
+  };
+
+  const groupToolCallParts = (message: IMessage, currentPart: IPart): IToolGroup[] => {
+    if (currentPart.type !== 'data-tool-call') {
+      return [];
+    }
+
+    const visibleParts = getVisibleTimelineParts(message);
+    const currentPartIndex = visibleParts.findIndex(part => part === currentPart);
+
+    if (currentPartIndex === -1) {
+      return [];
+    }
+
+    if (currentPartIndex > 0 && visibleParts[currentPartIndex - 1]?.type === 'data-tool-call') {
+      return [];
+    }
+
+    const groupedParts: IToolGroup[] = [];
+
+    for (let index = currentPartIndex; index < visibleParts.length; index += 1) {
+      const part = visibleParts[index];
+
+      if (part.type === 'reasoning') {
+        break;
+      }
+
+      const formattedPart = formatToolCallPart(part, message);
+
+      if (!formattedPart) {
+        continue;
+      }
+
+      const lastGroup = groupedParts[groupedParts.length - 1];
+
+      if (lastGroup?.title === formattedPart.toolInfo.toolName) {
+        lastGroup.groupedTools.push(formattedPart);
+        continue;
+      }
+
+      groupedParts.push({
+        title: formattedPart.toolInfo.toolName,
+        groupedTools: [formattedPart],
+      });
+    }
+
+    return groupedParts;
+  };
+
+
+</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: 384px;
+  }
+
+  .mask-y {
+    mask-image: linear-gradient(
+      to bottom,
+      transparent,
+      black 20px,
+      black calc(100% - 20px),
+      transparent
+    );
+  }
+ 
+</style>

package/custom/conversation_area/ReasoningRenderer.vue

@@ -0,0 +1,87 @@
+<template>
+  <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">
+      <IconBrainOutline class="w-4 h-4" />
+    </div>
+  </span>
+  <h3 
+    class="flex items-center mb-1 text-sm my-2 ml-3 gap-1 cursor-pointer select-none hover:opacity-80"      
+    @click="isExpanded = !isExpanded"
+  >
+    <span class="font-semibold">{{ reasoningTitle }}</span>
+    <ThreeDotsAnimation v-if="isStreaming"/>
+    <IconAngleDownOutline           
+      :class="isExpanded ? 'rotate-180' : 'rotate-0'"
+      class="transition-transform duration-200"
+    />
+  </h3>
+  <transition name="expand">
+    <div v-show="isExpanded" class="overflow-hidden mb-4 text-sm mr-48 max-h-64 pl-4 ">
+      <AutoScrollContainer
+        :enabled="true"
+      >
+        <IncremarkContent
+          :content="reasoningText"
+        />
+      </AutoScrollContainer>
+    </div>
+  </transition>    
+</template>
+
+
+
+<script setup lang="ts">
+import { IconBrainOutline, IconAngleDownOutline } from '@iconify-prerendered/vue-flowbite';
+import type { IPart } from '../types';
+import { ref, computed, watch, defineAsyncComponent } from 'vue';
+import ThreeDotsAnimation from './ThreeDotsAnimation.vue';
+import { extractTitleAndTextFromReasoning } from '../utils';
+import { useAgentStore } from '../composables/useAgentStore';
+
+
+const IncremarkContent = defineAsyncComponent(() => import('@incremark/vue').then(module => module.IncremarkContent))
+const AutoScrollContainer = defineAsyncComponent(() => import('@incremark/vue').then(module => module.AutoScrollContainer))
+
+const props = defineProps<{
+  state?: IPart['state']
+  text?: string
+}>();
+
+const agentStore = useAgentStore();
+
+const isStreaming = computed(() => props.state === 'streaming');
+const isExpanded = ref(true);
+const parsedReasoning = computed(() => extractTitleAndTextFromReasoning(props.text ?? ''));
+const reasoningTitle = computed(() => parsedReasoning.value.title ?? '');
+const reasoningText = computed(() => parsedReasoning.value.body);
+
+watch(() => props.state, (newValue: IPart['state']) => {
+  if ( newValue !== 'streaming') {
+    isExpanded.value = false;
+  } 
+});
+
+
+
+</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: 256px;
+}
+
+</style>