Merge branch 'v2' into v2

Author: CaralHsi

app/assets/css/main.css

@@ -54,6 +54,14 @@ img[alt="MemOS Banner"] {
   display: none;
 }
 
+.mdc-live p {
+  margin: 6px !important;
+  line-height: 1.5;
+}
+.mdc-live code {
+  word-break: break-word;
+}
+
 html {
   -ms-overflow-style: none;  /* IE and Edge */
   scrollbar-width: none;  /* Firefox */

app/components/AppFooter.vue

@@ -16,7 +16,7 @@ const socialData: SocialLink[] = [
   },
   {
     icon: 'ri:twitter-x-fill',
-    link: 'https://x.com/MemOS_MemTensor'
+    link: 'https://x.com/MemOS_dev'
   },
   {
     icon: 'ri:discord-fill',

app/components/Assistant/Collapse.vue

@@ -1,5 +1,11 @@
 <script setup lang="ts">
 const { toggleOpen } = useAssistant()
+const { trackEvent } = useArms()
+
+function onToggleOpen() {
+  trackEvent('点击Ask AI', '按钮点击')
+  toggleOpen()
+}
 </script>
 
 <template>
@@ -11,7 +17,7 @@ const { toggleOpen } = useAssistant()
       base: 'rounded-lg cursor-pointer',
       leadingIcon: 'size-4'
     }"
-    @click="toggleOpen"
+    @click="onToggleOpen"
   >
     Ask AI
   </UButton>

app/components/Assistant/index.vue

@@ -9,6 +9,7 @@ const {
   sendMessage,
   stopStreaming
 } = useAssistant()
+const { trackEvent } = useArms()
 
 const onEnter = (e: KeyboardEvent) => {
   if (e.isComposing) {
@@ -18,6 +19,7 @@ const onEnter = (e: KeyboardEvent) => {
 }
 
 const handleFormSubmit = async () => {
+  trackEvent('发起对话', '按钮点击')
   try {
     await sendMessage(userInput.value)
   } catch (error) {
@@ -33,22 +35,40 @@ watch([suggestions, status], async () => {
     suggestionsRef.value?.scrollIntoView({ behavior: 'smooth', block: 'end' })
   }
 })
+
+function onClose() {
+  trackEvent('关闭助手面板', '按钮点击')
+  toggleOpen()
+}
+
+function onSuggestionClick(item: string) {
+  trackEvent('参考问题', '按钮点击')
+  sendMessage(item)
+}
+
+function onStopStreaming() {
+  trackEvent('停止对话', '按钮点击')
+  stopStreaming()
+}
 </script>
 
 <template>
   <Transition name="slide">
     <div
       v-if="isOpen"
-      class="h-full shrink-0 overflow-hidden"
+      class="h-screen sticky top-0 shrink-0 overflow-hidden"
     >
       <UDashboardSidebar
         id="assistant"
         class="overflow-y-auto h-full border-l border-default -ml-px"
         side="right"
         resizable
-        :default-size="368"
-        :min-size="368"
+        :default-size="400"
+        :min-size="400"
         :max-size="576"
+        :ui="{
+          body: 'pb-4'
+        }"
       >
         <div class="flex items-center justify-between">
           <div class="flex items-center gap-1.5">
@@ -61,7 +81,7 @@ watch([suggestions, status], async () => {
           <div class="flex items-center gap-2">
             <button
               class="group flex items-center hover:bg-gray-100 dark:hover:bg-white/10 p-1.5 rounded-lg cursor-pointer"
-              @click="toggleOpen"
+              @click="onClose"
             >
               <UIcon
                 name="i-lucide:x"
@@ -73,7 +93,7 @@ watch([suggestions, status], async () => {
 
         <UChatPalette
           :ui="{
-            content: 'scrollbar-hide'
+            content: 'scrollbar-hide pr-px'
           }"
         >
           <UChatMessage
@@ -90,12 +110,12 @@ watch([suggestions, status], async () => {
             :status="status"
             should-auto-scroll
             :ui="{
-              root: 'px-0'
+              root: 'px-0 [&>article]:last-of-type:min-h-auto'
             }"
           >
             <template #content="{ message }">
               <AssistantMDC
-                v-if="message.role === 'assistant'"
+                v-if="message.role === 'assistant' && message.content"
                 :value="message.content"
                 class="text-sm"
               />
@@ -120,7 +140,7 @@ watch([suggestions, status], async () => {
                 v-for="(item, index) in suggestions"
                 :key="index"
                 class="hover:text-primary/80 cursor-pointer"
-                @click="sendMessage(item)"
+                @click="onSuggestionClick(item)"
               >
                 {{ item }}
               </li>
@@ -140,8 +160,10 @@ watch([suggestions, status], async () => {
             >
               <UChatPromptSubmit
                 size="sm"
+                submitted-icon="i-lucide-circle"
+                streaming-icon="i-lucide-circle"
                 :status="status"
-                @stop="stopStreaming"
+                @stop="onStopStreaming"
               />
             </UChatPrompt>
           </template>

app/composables/useAssistant.ts

@@ -121,14 +121,6 @@ export const useAssistant = () => {
       setUserInput('')
     }
 
-    const assistantId = (Date.now() + 1).toString()
-    addMessage({
-      id: assistantId,
-      role: 'assistant',
-      content: '',
-      createAt: new Date()
-    })
-
     status.value = 'submitted'
 
     try {
@@ -147,6 +139,13 @@ export const useAssistant = () => {
       for await (const chunk of stream) {
         if (status.value !== 'streaming') {
           status.value = 'streaming'
+          const assistantId = (Date.now() + 1).toString()
+          addMessage({
+            id: assistantId,
+            role: 'assistant',
+            content: '',
+            createAt: new Date()
+          })
         }
         if (chunk.type === 'text' && chunk.data) {
           assistantContent += chunk.data

app/layouts/default.vue

@@ -1,11 +1,58 @@
+<script setup lang="ts">
+const route = useRoute()
+const nuxtApp = useNuxtApp()
+
+// Handle scroll reset on page navigation finish
+nuxtApp.hook('page:finish', () => {
+  nextTick(() => {
+    // Check if there is a hash
+    if (route.hash) {
+      const el = document.querySelector(route.hash)
+      if (el) {
+        el.scrollIntoView({ behavior: 'smooth' })
+      }
+    } else {
+      // Reset scroll to top if no hash
+      const el = document.getElementById('dashboard-panel-main')
+      if (el) {
+        el.scrollTop = 0
+      }
+    }
+  })
+})
+
+watch(() => route.hash, (hash) => {
+  if (hash) {
+    nextTick(() => {
+      const el = document.querySelector(hash)
+      if (el) {
+        el.scrollIntoView({ behavior: 'smooth' })
+      }
+    })
+  }
+})
+
+onMounted(() => {
+  if (route.hash) {
+    nextTick(() => {
+      const el = document.querySelector(route.hash)
+      if (el) {
+        el.scrollIntoView({ behavior: 'smooth' })
+      }
+    })
+  }
+})
+</script>
+
 <template>
   <UDashboardGroup
     :persistent="false"
     unit="px"
+    class="h-screen overflow-hidden"
   >
     <UDashboardPanel
       id="main"
-      class="overflow-y-auto scrollbar-hide"
+      class="h-full overflow-y-auto scrollbar-hide "
     >
       <slot />
     </UDashboardPanel>

app/utils/oas.ts

@@ -225,7 +225,10 @@ function generateSampleFromSchema(schema: SchemaObject, api: OASDocument): unkno
         Object.entries(schema.properties).forEach(([key, propSchema]) => {
           obj[key] = generateSampleFromSchema(propSchema as SchemaObject, api)
         })
+      } else if ('items' in schema) {
+        return generateSampleFromSchema((schema as any).items as SchemaObject, api)
       }
+
       return obj
     }