Merge branch 'main' of https://github.com/devforth/adminforth-agent

Author: ivictbor

agent/simpleAgent.ts

@@ -165,7 +165,6 @@ function createAgentLlmMetricsLogger() {
 export function createAgentChatModel(params: {
   adapter: CompletionAdapter;
   maxTokens: number;
-  modelName?: string;
 }) {
   const adapter = params.adapter as OpenAIBackedCompletionAdapter;
   const options = adapter.options ?? {};
@@ -176,7 +175,7 @@ export function createAgentChatModel(params: {
     );
   }
 
-  const model = params.modelName ?? options.model ?? "gpt-5-nano";
+  const model = options.model ?? "gpt-5-nano";
   const baseURL = options.baseURL ?? options.baseUrl;
   const reasoning = options.extraRequestBodyParameters
     ?.reasoning as OpenAiReasoningConfig | undefined;
@@ -195,8 +194,8 @@ export function createAgentChatModel(params: {
     useResponsesApi: true,
     outputVersion: "v1",
     streaming: true,
-    promptCacheKey: `adminforth-agent:${model}:system-v1:tools-v1`,
 
+    promptCacheKey: `adminforth-agent:${model}:system-v1:tools-v1`,
     promptCacheRetention: "in_memory", 
 
     ...(reasoningConfig ? { reasoning: reasoningConfig } : {}),

custom/ChatSurface.vue

@@ -26,7 +26,7 @@
       :style="{ width: agentStore.chatWidth + 'rem' }"
     > 
       <div 
-        v-if="!coreStore.isMobile"
+        v-if="!(coreStore.isMobile || agentStore.isFullScreen)"
         class="w-2 cursor-ew-resize absolute left-0 top-0 h-full z-30"
         @mousedown="startResize"
       ></div>
@@ -36,7 +36,6 @@
       >
         <div 
           class="flex items-center justify-between h-14 border-b border-gray-200 dark:border-gray-700"         
-          :class="{ 'pl-4': agentStore.isFullScreen }"
         >
           <div 
             class="flex items-center"
@@ -248,8 +247,11 @@ onMounted(async () => {
   agentStore.regisrerTextInput(textInput.value);
   textInput.value?.focus();
   const isTeleportedToBodyFromLocalStorage = agentStore.getLocalStorageItem('isTeleportedToBody') === 'true';
-
-  agentStore.setIsTeleportedToBody(isTeleportedToBodyFromLocalStorage || props.meta.stickByDefault);
+  if( coreStore.isMobile ) {
+    agentStore.setIsTeleportedToBody(false);
+  } else {
+    agentStore.setIsTeleportedToBody(isTeleportedToBodyFromLocalStorage || props.meta.stickByDefault);
+  }
   await agentStore.fetchSessionsList();
 });
 

custom/ConversationArea.vue

@@ -37,9 +37,8 @@
       class="flex flex-col w-full"
       :class="message.role === 'user' ? 'self-end' : 'self-start'"
     >
-      <ToolsGroup :toolGroup="groupToolCallParts(message)" />
       <template 
-        v-for="part in getParts(message)"
+        v-for="(part, index) in getParts(message)"
         :key="part.type"
       >
         <Message
@@ -52,6 +51,7 @@
           @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' -->
@@ -154,27 +154,39 @@ const formatToolCallTextPart = ((part: IPart, currentMessage: IMessage) => {
   return null;  
 });
 
-const groupToolCallParts = (message: IMessage) => {
-  const groupedParts = [];
-  let currentToolName = 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(!part?.toolInfo) {
+    if ( index < currentPartIndexInFormatedParts - 1 ) {
       continue;
     }
-    if (part.toolInfo.toolName === currentToolName) {
-      groupedParts[groupedParts.length - 1].groupedTools.push(part);
+    if(!part || !part.toolInfo) {
       continue;
     }
     currentToolName = part.toolInfo.toolName;
-    groupedParts.push({
-      title: currentToolName,
-      groupedTools: [part]
-    });
+    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;
 }

custom/Message.vue

@@ -58,10 +58,13 @@
   import { useRouter } from 'vue-router';
   import { IconAngleDownOutline } from '@iconify-prerendered/vue-flowbite';
   import { useAgentStore } from './composables/useAgentStore';
+  import { useCoreStore } from '@/stores/core';
+
   const IncremarkContent = defineAsyncComponent(() => import('@incremark/vue').then(module => module.IncremarkContent))
   const ShikiCodeBlock = defineAsyncComponent(() => import('./incremark_code_renderers/IncremarkShikiCodeBlock.vue'))
 
   const agentStore = useAgentStore();
+  const coreStore = useCoreStore();
 
   const incremarkComponents = {
     code: ShikiCodeBlock,
@@ -134,8 +137,10 @@
 
     const internalRoute = resolveInternalRoute(href);
     if (internalRoute !== null) {
-      if (agentStore.isFullScreen) {
+      if (agentStore.isFullScreen && !coreStore.isMobile) {
         agentStore.setFullScreen(false);
+      } else if (coreStore.isMobile) {
+        agentStore.setIsChatOpen(false);
       }
       void router.push(internalRoute);
       return;

custom/SessionsHistory.vue

@@ -33,7 +33,6 @@
         :class="{
           'bg-lightPrimary/20 hover:bg-lightPrimary/20 dark:bg-darkPrimary/20 dark:hover:bg-darkPrimary/20': agentStore.activeSessionId === session.sessionId, 
           'cursor-default opacity-50 pointer-events-none': agentStore.isResponseInProgress,
-          'pl-8': agentStore.isFullScreen
          }"
         @click="agentStore.setActiveSession(session.sessionId); agentStore.setSessionHistoryOpen(false);"
         :disabled="agentStore.isResponseInProgress"

custom/ToolRenderer.vue

@@ -31,12 +31,12 @@
           :key="section.label"
           class="overflow-hidden rounded-xl border border-black/5 bg-white/70 shadow-sm backdrop-blur-sm dark:border-white/10 dark:bg-slate-900/50"
         >
-          <header class="border-b border-black/5 px-3 py-2 text-[11px] font-semibold uppercase tracking-[0.22em] text-gray-500 dark:border-white/10 dark:text-gray-400">
+          <header class="border-b border-black/5 px-3 py-2 text-[0.7rem] font-semibold uppercase tracking-[0.22em] text-gray-500 dark:border-white/10 dark:text-gray-400">
             {{ section.label }}
           </header>
           <div class="grid grid-cols-[auto,1fr] gap-x-3 gap-y-1 px-3 py-3 font-mono text-xs leading-5 text-gray-700 dark:text-gray-200">
             <template v-for="line in section.lines" :key="`${section.label}-${line.number}`">
-              <span class="select-none text-[11px] text-gray-400 dark:text-gray-500">{{ line.number }}</span>
+              <span class="select-none text-[0.7rem] text-gray-400 dark:text-gray-500">{{ line.number }}</span>
               <span class="whitespace-pre-wrap break-words">{{ line.content || ' ' }}</span>
             </template>
           </div>

custom/ToolsGroup.vue

@@ -15,7 +15,7 @@
         </div>
       </transition>
     </div>
-    <ToolRenderer v-else :data="group.groupedTools[0]" />
+    <ToolRenderer v-else-if="group.groupedTools.length > 0" :data="group.groupedTools[0]" />
   </template> 
 
 </template>

custom/composables/useAgentStore.ts

@@ -129,12 +129,14 @@ export const useAgentStore = defineStore('agent', () => {
   function setFullScreen(fullScreen: boolean) {
     isFullScreen.value = fullScreen;
     if (fullScreen) {
+      document.body.style.overflow = 'hidden';
       setLocalStorageItem('chatWidthBeforeFullScreen', chatWidth.value.toString());
       setLocalStorageItem('isTeleportedToBodyBeforeFullScreen', isTeleportedToBody.value ? 'true' : 'false');
       setIsTeleportedToBody(false);
       useAgentTransitions().setChatSurfaceTransition(false);
       setChatWidth(window.innerWidth, false);
     } else {
+      document.body.style.overflow = '';
       const lastChatWidth = parseInt(getLocalStorageItem('chatWidthBeforeFullScreen') || DEFAULT_CHAT_WIDTH.toString(), 10);
       const isTeleportedBeforeFullScreen = getLocalStorageItem('isTeleportedToBodyBeforeFullScreen') === 'true';
       agentTransitions.setAppRootTransition(true);
@@ -315,6 +317,9 @@ export const useAgentStore = defineStore('agent', () => {
   }
 
   function closeChat() {
+    if(isFullScreen.value) {
+      document.body.style.overflow = '';
+    }
     if (blockCloseOfChat.value) {
       return;
     }
@@ -323,6 +328,12 @@ export const useAgentStore = defineStore('agent', () => {
   }
 
   function openChat() {
+    if (isFullScreen.value) {
+      document.body.style.overflow = 'hidden';
+    }
+    if (coreStore.isMobile) {
+      setFullScreen(true);
+    }
     isChatOpen.value = true;
     nextTick(() => {
       focusTextInput();

custom/skills/fetch_data/SKILL.md

@@ -10,6 +10,18 @@ You can use tool `get_resource_data` it returns one or more records and is capab
 
 To find specific data record you should use filters. ILIKE filters are preferred when we are unsure the input is clear.You can combine filters with OR if you want to search multiple fields.If user queries one record you should try to fetch up to 5 records and if more then one returned return output them all to user and ask to select one. When you communicate about record with user, show its several most important fields.
 
+Every record summary must be based on one exact row returned by `get_resource_data`.
+
+Never combine model/title/name, `_label`, primary key, link, or any field values from different rows.
+
+Never combine fields from different resources in one candidate.
+
+If results come from multiple resources, present them as separate groups with the resource label or resourceId.
+
+If several rows look similar, do not guess which one is "the same" record. Show them separately and ask user to choose.
+
 For long texts show only several first words and add "..." at the end (only if user did not request this field specifically).
 
 Also when you communicate with user about record, add related link to this record. Build it as `{ADMIN_BASE_PATH}resource/{resourceId}/show/{primary key}`. Use _label from `get_resource_data` as anchor text for link (use markdown link). Links should always be relative paths and must start with `ADMIN_BASE_PATH`. Do not add an extra slash after `ADMIN_BASE_PATH`.
+
+Before sending the link, verify that the `resourceId`, `{primary key}`, `_label`, and shown fields come from the same exact returned row.

custom/skills/mutate_data/SKILL.md

@@ -20,9 +20,13 @@ Use `start_custom_action` and `start_custom_bulk_action` for resource actions.
 
 Before performing any state mutation including action calls edit/delete please fetch record which is going to be edited/deleted and show user record in format field → value (show several most important fields which can help user to understand what exactly record he is going to edit or delete). 
 
+Every confirmation must describe one exact fetched row. Never combine `_label`, primary key, link, or field values from different rows or different resources in one confirmation.
+
 For field values with long texts show only several first words and add "..." at the end.
 Also please add related link to record with will be changed. Build it as `{ADMIN_BASE_PATH}resource/{resourceId}/show/{primary key}`. Use _label from `get_resource_data` as anchor text for link (use markdown link). Links should always be relative paths and must start with `ADMIN_BASE_PATH`. Do not add an extra slash after `ADMIN_BASE_PATH`.
 
+Before sending the confirmation, verify that the `resourceId`, `{primary key}`, `_label`, and all shown fields come from the same exact fetched row.
+
 And in the same message ask user for final confirmation.
 
 When creating new record, show user all data which you gona create and in same message ask for confirmation.