@lobehub/lobehub 2.0.0-next.293 → 2.0.0-next.295

package/src/app/(backend)/api/workflows/memory-user-memory/pipelines/chat-topic/process-user-topics/route.ts

@@ -1,5 +1,9 @@
+import { MemorySourceType } from '@lobechat/types';
+import { Client } from '@upstash/qstash';
 import { serve } from '@upstash/workflow/nextjs';
+
 import type { ListTopicsForMemoryExtractorCursor } from '@/database/models/topic';
+import { parseMemoryExtractionConfig } from '@/server/globalConfig/parseMemoryExtractionConfig';
 import {
   MemoryExtractionExecutor,
   type MemoryExtractionPayloadInput,
@@ -8,135 +12,143 @@ import {
   normalizeMemoryExtractionPayload,
 } from '@/server/services/memory/userMemory/extract';
 import { forEachBatchSequential } from '@/server/services/memory/userMemory/topicBatching';
-import { MemorySourceType } from '@lobechat/types';
-import { parseMemoryExtractionConfig } from '@/server/globalConfig/parseMemoryExtractionConfig';
-import { Client } from '@upstash/qstash'
 
 const TOPIC_PAGE_SIZE = 50;
 const TOPIC_BATCH_SIZE = 4;
 
 const { upstashWorkflowExtraHeaders } = parseMemoryExtractionConfig();
 
-export const { POST } = serve<MemoryExtractionPayloadInput>(async (context) => {
-  const params = normalizeMemoryExtractionPayload(context.requestPayload || {});
-  if (!params.userIds.length) {
-    return { message: 'No user ids provided for topic processing.' };
-  }
-  if (!params.sources.includes(MemorySourceType.ChatTopic)) {
-    return { message: 'No supported sources requested, skip topic processing.' };
-  }
-
-  const executor = await MemoryExtractionExecutor.create();
-
-  const scheduleNextPage = async (userId: string, cursorCreatedAt: Date, cursorId: string) => {
-    await MemoryExtractionWorkflowService.triggerProcessUserTopics({
-      ...buildWorkflowPayloadInput({
-        ...params,
-        topicCursor: {
-          createdAt: cursorCreatedAt.toISOString(),
-          id: cursorId,
-          userId,
-        },
-        topicIds: [],
-        userId,
-        userIds: [userId],
-      }),
-    }, { extraHeaders: upstashWorkflowExtraHeaders });
-  };
-
-  for (const userId of params.userIds) {
-    const topicCursor =
-      params.topicCursor && params.topicCursor.userId === userId
-        ? {
-            createdAt: new Date(params.topicCursor.createdAt),
-            id: params.topicCursor.id,
-          }
-        : undefined;
+export const { POST } = serve<MemoryExtractionPayloadInput>(
+  async (context) => {
+    const params = normalizeMemoryExtractionPayload(context.requestPayload || {});
+    if (!params.userIds.length) {
+      return { message: 'No user ids provided for topic processing.' };
+    }
+    if (!params.sources.includes(MemorySourceType.ChatTopic)) {
+      return { message: 'No supported sources requested, skip topic processing.' };
+    }
 
-    const topicsFromPayload =
-      params.topicIds && params.topicIds.length > 0
-        ? await context.run(
-            `memory:user-memory:extract:users:${userId}:filter-topic-ids`,
-            async () => {
-              const filtered = await executor.filterTopicIdsForUser(userId, params.topicIds);
-              return filtered.length > 0 ? filtered : undefined;
-            },
-          )
-        : undefined;
+    const executor = await MemoryExtractionExecutor.create();
 
-    const topicBatch = await context.run<{
-      cursor?: ListTopicsForMemoryExtractorCursor;
-      ids: string[];
-    }>(`memory:user-memory:extract:users:${userId}:list-topics:${topicCursor?.id || 'root'}`, () =>
-      topicsFromPayload && topicsFromPayload.length > 0
-        ? Promise.resolve({ ids: topicsFromPayload })
-        : executor.getTopicsForUser(
-            {
-              cursor: topicCursor,
-              forceAll: params.forceAll,
-              forceTopics: params.forceTopics,
-              from: params.from,
-              to: params.to,
+    const scheduleNextPage = async (userId: string, cursorCreatedAt: Date, cursorId: string) => {
+      await MemoryExtractionWorkflowService.triggerProcessUserTopics(
+        {
+          ...buildWorkflowPayloadInput({
+            ...params,
+            topicCursor: {
+              createdAt: cursorCreatedAt.toISOString(),
+              id: cursorId,
               userId,
             },
-            TOPIC_PAGE_SIZE,
-          ),
-    );
+            topicIds: [],
+            userId,
+            userIds: [userId],
+          }),
+        },
+        { extraHeaders: upstashWorkflowExtraHeaders },
+      );
+    };
 
-    const ids = topicBatch.ids;
-    if (!ids.length) {
-      continue;
-    }
+    for (const userId of params.userIds) {
+      const topicCursor =
+        params.topicCursor && params.topicCursor.userId === userId
+          ? {
+              createdAt: new Date(params.topicCursor.createdAt),
+              id: params.topicCursor.id,
+            }
+          : undefined;
 
-    const cursor = 'cursor' in topicBatch ? topicBatch.cursor : undefined;
+      const topicsFromPayload =
+        params.topicIds && params.topicIds.length > 0
+          ? await context.run(
+              `memory:user-memory:extract:users:${userId}:filter-topic-ids`,
+              async () => {
+                const filtered = await executor.filterTopicIdsForUser(userId, params.topicIds);
+                return filtered.length > 0 ? filtered : undefined;
+              },
+            )
+          : undefined;
 
-    await forEachBatchSequential(ids, TOPIC_BATCH_SIZE, async (topicIds, batchIndex) => {
-      // NOTICE: We trigger via QStash instead of context.invoke because invoke only swaps the last path
-      // segment with the workflowId. If we invoked directly from /process-user-topics, child workflow
-      // URLs would inherit that base and lose the desired /process-topics/workflows prefix.
-      await context.run(
-        `memory:user-memory:extract:users:${userId}:process-topics-batch:${batchIndex}`,
+      const topicBatch = await context.run<{
+        cursor?: ListTopicsForMemoryExtractorCursor;
+        ids: string[];
+      }>(
+        `memory:user-memory:extract:users:${userId}:list-topics:${topicCursor?.id || 'root'}`,
         () =>
-          MemoryExtractionWorkflowService.triggerProcessTopics({
-            ...buildWorkflowPayloadInput(params),
-            topicCursor: undefined,
-            topicIds,
-            userId,
-            userIds: [userId],
-          }, { extraHeaders: upstashWorkflowExtraHeaders }),
+          topicsFromPayload && topicsFromPayload.length > 0
+            ? Promise.resolve({ ids: topicsFromPayload })
+            : executor.getTopicsForUser(
+                {
+                  cursor: topicCursor,
+                  forceAll: params.forceAll,
+                  forceTopics: params.forceTopics,
+                  from: params.from,
+                  to: params.to,
+                  userId,
+                },
+                TOPIC_PAGE_SIZE,
+              ),
       );
-    });
 
-    if (!topicsFromPayload && cursor) {
-      await context.run(
-        `memory:user-memory:extract:users:${userId}:topics:${cursor.id}:schedule-next-batch`,
-        () => {
-          // NOTICE: Upstash Workflow only supports serializable data into plain JSON,
-          // this causes the Date object to be converted into string when passed as parameter from
-          // context to child workflow. So we need to convert it back to Date object here.
-          const createdAt = new Date(cursor.createdAt);
-          if (Number.isNaN(createdAt.getTime())) {
-            throw new Error('Invalid cursor date when scheduling next topic page');
-          }
+      const ids = topicBatch.ids;
+      if (!ids.length) {
+        continue;
+      }
 
-          scheduleNextPage(userId, createdAt, cursor.id);
-        },
-      );
+      const cursor = 'cursor' in topicBatch ? topicBatch.cursor : undefined;
+
+      await forEachBatchSequential(ids, TOPIC_BATCH_SIZE, async (topicIds, batchIndex) => {
+        // NOTICE: We trigger via QStash instead of context.invoke because invoke only swaps the last path
+        // segment with the workflowId. If we invoked directly from /process-user-topics, child workflow
+        // URLs would inherit that base and lose the desired /process-topics/workflows prefix.
+        await context.run(
+          `memory:user-memory:extract:users:${userId}:process-topics-batch:${batchIndex}`,
+          () =>
+            MemoryExtractionWorkflowService.triggerProcessTopics(
+              {
+                ...buildWorkflowPayloadInput(params),
+                topicCursor: undefined,
+                topicIds,
+                userId,
+                userIds: [userId],
+              },
+              { extraHeaders: upstashWorkflowExtraHeaders },
+            ),
+        );
+      });
+
+      if (!topicsFromPayload && cursor) {
+        await context.run(
+          `memory:user-memory:extract:users:${userId}:topics:${cursor.id}:schedule-next-batch`,
+          () => {
+            // NOTICE: Upstash Workflow only supports serializable data into plain JSON,
+            // this causes the Date object to be converted into string when passed as parameter from
+            // context to child workflow. So we need to convert it back to Date object here.
+            const createdAt = new Date(cursor.createdAt);
+            if (Number.isNaN(createdAt.getTime())) {
+              throw new Error('Invalid cursor date when scheduling next topic page');
+            }
+
+            scheduleNextPage(userId, createdAt, cursor.id);
+          },
+        );
+      }
     }
-  }
 
-  return { processedUsers: params.userIds.length };
-}, {
-  // NOTICE(@nekomeowww): Here as scenarios like Vercel Deployment Protection,
-  // intermediate context.run(...) won't offer customizable headers like context.trigger(...) / client.trigger(...)
-  // for passing additional headers, we have to provide a custom QStash client with the required headers here.
-  //
-  // Refer to the doc for more details:
-  // https://upstash.com/docs/workflow/troubleshooting/vercel#step-2-pass-header-when-triggering
-  qstashClient: new Client({
-    headers: {
-      ...upstashWorkflowExtraHeaders,
-    },
-    token: process.env.QSTASH_TOKEN!
-  })
-});
+    return { processedUsers: params.userIds.length };
+  },
+  {
+    // NOTICE(@nekomeowww): Here as scenarios like Vercel Deployment Protection,
+    // intermediate context.run(...) won't offer customizable headers like context.trigger(...) / client.trigger(...)
+    // for passing additional headers, we have to provide a custom QStash client with the required headers here.
+    //
+    // Refer to the doc for more details:
+    // https://upstash.com/docs/workflow/troubleshooting/vercel#step-2-pass-header-when-triggering
+    qstashClient: new Client({
+      headers: {
+        ...upstashWorkflowExtraHeaders,
+      },
+      token: process.env.QSTASH_TOKEN!,
+    }),
+  },
+);

package/src/app/(backend)/api/workflows/memory-user-memory/pipelines/chat-topic/process-users/route.ts

@@ -1,7 +1,8 @@
+import { Client } from '@upstash/qstash';
 import { serve } from '@upstash/workflow/nextjs';
 import { chunk } from 'es-toolkit/compat';
-import { Client } from '@upstash/qstash'
 
+import { parseMemoryExtractionConfig } from '@/server/globalConfig/parseMemoryExtractionConfig';
 import {
   MemoryExtractionExecutor,
   type MemoryExtractionPayloadInput,
@@ -9,82 +10,90 @@ import {
   buildWorkflowPayloadInput,
   normalizeMemoryExtractionPayload,
 } from '@/server/services/memory/userMemory/extract';
-import { parseMemoryExtractionConfig } from '@/server/globalConfig/parseMemoryExtractionConfig';
 
 const USER_PAGE_SIZE = 50;
 const USER_BATCH_SIZE = 10;
 
 const { upstashWorkflowExtraHeaders } = parseMemoryExtractionConfig();
 
-export const { POST } = serve<MemoryExtractionPayloadInput>(async (context) => {
-  const params = normalizeMemoryExtractionPayload(context.requestPayload || {});
-  if (params.sources.length === 0) {
-    return { message: 'No sources provided, skip memory extraction.' };
-  }
+export const { POST } = serve<MemoryExtractionPayloadInput>(
+  async (context) => {
+    const params = normalizeMemoryExtractionPayload(context.requestPayload || {});
+    if (params.sources.length === 0) {
+      return { message: 'No sources provided, skip memory extraction.' };
+    }
 
-  const executor = await MemoryExtractionExecutor.create();
+    const executor = await MemoryExtractionExecutor.create();
 
-  // NOTICE: Upstash Workflow only supports serializable data into plain JSON,
-  // this causes the Date object to be converted into string when passed as parameter from
-  // context to child workflow. So we need to convert it back to Date object here.
-  const userCursor = params.userCursor
-    ? { createdAt: new Date(params.userCursor.createdAt), id: params.userCursor.id }
-    : undefined;
+    // NOTICE: Upstash Workflow only supports serializable data into plain JSON,
+    // this causes the Date object to be converted into string when passed as parameter from
+    // context to child workflow. So we need to convert it back to Date object here.
+    const userCursor = params.userCursor
+      ? { createdAt: new Date(params.userCursor.createdAt), id: params.userCursor.id }
+      : undefined;
 
-  const userBatch = await context.run('memory:user-memory:extract:get-users', () =>
-    params.userIds.length > 0
-      ? { ids: params.userIds }
-      : executor.getUsers(USER_PAGE_SIZE, userCursor),
-  );
+    const userBatch = await context.run('memory:user-memory:extract:get-users', () =>
+      params.userIds.length > 0
+        ? { ids: params.userIds }
+        : executor.getUsers(USER_PAGE_SIZE, userCursor),
+    );
 
-  const ids = userBatch.ids;
-  if (ids.length === 0) {
-    return { message: 'No users to process for memory extraction.' };
-  }
+    const ids = userBatch.ids;
+    if (ids.length === 0) {
+      return { message: 'No users to process for memory extraction.' };
+    }
 
-  const cursor = 'cursor' in userBatch ? userBatch.cursor : undefined;
+    const cursor = 'cursor' in userBatch ? userBatch.cursor : undefined;
 
-  const batches = chunk(ids, USER_BATCH_SIZE);
-  await Promise.all(
-    batches.map((userIds) =>
-      context.run(`memory:user-memory:extract:users:process-topic-batches`, () =>
-        MemoryExtractionWorkflowService.triggerProcessUserTopics({
-          ...buildWorkflowPayloadInput(params),
-          topicCursor: undefined,
-          userId: userIds[0],
-          userIds,
-        }, { extraHeaders: upstashWorkflowExtraHeaders},),
+    const batches = chunk(ids, USER_BATCH_SIZE);
+    await Promise.all(
+      batches.map((userIds) =>
+        context.run(`memory:user-memory:extract:users:process-topic-batches`, () =>
+          MemoryExtractionWorkflowService.triggerProcessUserTopics(
+            {
+              ...buildWorkflowPayloadInput(params),
+              topicCursor: undefined,
+              userId: userIds[0],
+              userIds,
+            },
+            { extraHeaders: upstashWorkflowExtraHeaders },
+          ),
+        ),
       ),
-    ),
-  );
-
-  if (params.userIds.length === 0 && cursor) {
-    await context.run('memory:user-memory:extract:users:schedule-next-user-batch', () =>
-      MemoryExtractionWorkflowService.triggerProcessUsers({
-        ...buildWorkflowPayloadInput({
-          ...params,
-          userCursor: { createdAt: cursor.createdAt.toISOString(), id: cursor.id },
-        }),
-      }, { extraHeaders: upstashWorkflowExtraHeaders }),
     );
-  }
 
-  return {
-    batches: batches.length,
-    nextCursor: cursor ? cursor.id : null,
-    processedUsers: ids.length,
-  };
-}, {
-  // NOTICE(@nekomeowww): Here as scenarios like Vercel Deployment Protection,
-  // intermediate context.run(...) won't offer customizable headers like context.trigger(...) / client.trigger(...)
-  // for passing additional headers, we have to provide a custom QStash client with the required headers here.
-  //
-  // Refer to the doc for more details:
-  // https://upstash.com/docs/workflow/troubleshooting/vercel#step-2-pass-header-when-triggering
-  qstashClient: new Client({
-    headers: {
-      ...upstashWorkflowExtraHeaders,
-    },
-    token: process.env.QSTASH_TOKEN!
-  })
-});
+    if (params.userIds.length === 0 && cursor) {
+      await context.run('memory:user-memory:extract:users:schedule-next-user-batch', () =>
+        MemoryExtractionWorkflowService.triggerProcessUsers(
+          {
+            ...buildWorkflowPayloadInput({
+              ...params,
+              userCursor: { createdAt: cursor.createdAt.toISOString(), id: cursor.id },
+            }),
+          },
+          { extraHeaders: upstashWorkflowExtraHeaders },
+        ),
+      );
+    }
+
+    return {
+      batches: batches.length,
+      nextCursor: cursor ? cursor.id : null,
+      processedUsers: ids.length,
+    };
+  },
+  {
+    // NOTICE(@nekomeowww): Here as scenarios like Vercel Deployment Protection,
+    // intermediate context.run(...) won't offer customizable headers like context.trigger(...) / client.trigger(...)
+    // for passing additional headers, we have to provide a custom QStash client with the required headers here.
+    //
+    // Refer to the doc for more details:
+    // https://upstash.com/docs/workflow/troubleshooting/vercel#step-2-pass-header-when-triggering
+    qstashClient: new Client({
+      headers: {
+        ...upstashWorkflowExtraHeaders,
+      },
+      token: process.env.QSTASH_TOKEN!,
+    }),
+  },
+);

package/src/app/[variants]/(auth)/auth-error/page.tsx

@@ -2,7 +2,7 @@
 
 import { SiDiscord } from '@icons-pack/react-simple-icons';
 import { Alert, Button, Flexbox, Icon } from '@lobehub/ui';
-import Link from 'next/link';
+import Link from '@/libs/next/Link';
 import { parseAsString, useQueryState } from 'nuqs';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';

package/src/app/[variants]/(auth)/login/[[...login]]/page.tsx

@@ -1,6 +1,6 @@
 import { SignIn } from '@clerk/nextjs';
 import { BRANDING_NAME } from '@lobechat/business-const';
-import { notFound } from 'next/navigation';
+import { notFound } from '@/libs/next/navigation';
 
 import { enableClerk } from '@/envs/auth';
 import { metadataModule } from '@/server/metadata';

package/src/app/[variants]/(auth)/next-auth/error/AuthErrorPage.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { signIn } from 'next-auth/react';
-import { useSearchParams } from 'next/navigation';
+import { useSearchParams } from '@/libs/next/navigation';
 import { memo } from 'react';
 
 import ErrorCapture from '@/components/Error';

package/src/app/[variants]/(auth)/next-auth/signin/AuthSignInBox.tsx

@@ -8,7 +8,7 @@ import { Col, Flex, Row } from 'antd';
 import { createStaticStyles } from 'antd-style';
 import { AuthError } from 'next-auth';
 import { signIn } from 'next-auth/react';
-import { useRouter, useSearchParams } from 'next/navigation';
+import { useRouter, useSearchParams } from '@/libs/next/navigation';
 import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 

package/src/app/[variants]/(auth)/oauth/callback/error/page.tsx

@@ -2,7 +2,7 @@
 
 import { Button, Flexbox, FluentEmoji, Highlighter, Text } from '@lobehub/ui';
 import { Result } from 'antd';
-import Link from 'next/link';
+import Link from '@/libs/next/Link';
 import { parseAsString, useQueryState } from 'nuqs';
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';

package/src/app/[variants]/(auth)/oauth/callback/success/page.tsx

@@ -2,7 +2,7 @@
 
 import { FluentEmoji, Text } from '@lobehub/ui';
 import { Result } from 'antd';
-import { useSearchParams } from 'next/navigation';
+import { useSearchParams } from '@/libs/next/navigation';
 import React, { memo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 

package/src/app/[variants]/(auth)/oauth/consent/[uid]/page.tsx

@@ -1,4 +1,4 @@
-import { notFound } from 'next/navigation';
+import { notFound } from '@/libs/next/navigation';
 
 import { authEnv } from '@/envs/auth';
 import { defaultClients } from '@/libs/oidc-provider/config';

package/src/app/[variants]/(auth)/reset-password/layout.tsx

@@ -1,4 +1,4 @@
-import { notFound } from 'next/navigation';
+import { notFound } from '@/libs/next/navigation';
 import { type PropsWithChildren } from 'react';
 
 import { enableBetterAuth } from '@/envs/auth';

package/src/app/[variants]/(auth)/reset-password/page.tsx

@@ -2,8 +2,8 @@
 
 import { Button } from '@lobehub/ui';
 import { ChevronLeftIcon } from 'lucide-react';
-import Link from 'next/link';
-import { useRouter, useSearchParams } from 'next/navigation';
+import Link from '@/libs/next/Link';
+import { useRouter, useSearchParams } from '@/libs/next/navigation';
 import { useTranslation } from 'react-i18next';
 
 import AuthCard from '../../../../features/AuthCard';

package/src/app/[variants]/(auth)/signin/layout.tsx

@@ -1,4 +1,4 @@
-import { notFound } from 'next/navigation';
+import { notFound } from '@/libs/next/navigation';
 import { type PropsWithChildren } from 'react';
 
 import { enableBetterAuth } from '@/envs/auth';

package/src/app/[variants]/(auth)/signin/useSignIn.ts

@@ -1,6 +1,6 @@
 import { ENABLE_BUSINESS_FEATURES } from '@lobechat/business-const';
 import { Form } from 'antd';
-import { useRouter, useSearchParams } from 'next/navigation';
+import { useRouter, useSearchParams } from '@/libs/next/navigation';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 

package/src/app/[variants]/(auth)/signup/[[...signup]]/BetterAuthSignUpForm.tsx

@@ -3,8 +3,8 @@
 import { Button, Icon, Text } from '@lobehub/ui';
 import { Form, Input } from 'antd';
 import { Lock, Mail } from 'lucide-react';
-import Link from 'next/link';
-import { useSearchParams } from 'next/navigation';
+import Link from '@/libs/next/Link';
+import { useSearchParams } from '@/libs/next/navigation';
 import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 

package/src/app/[variants]/(auth)/signup/[[...signup]]/page.tsx

@@ -1,5 +1,5 @@
 import { SignUp } from '@clerk/nextjs';
-import { notFound } from 'next/navigation';
+import { notFound } from '@/libs/next/navigation';
 
 import { enableBetterAuth, enableClerk } from '@/envs/auth';
 import { metadataModule } from '@/server/metadata';

package/src/app/[variants]/(auth)/signup/[[...signup]]/useSignUp.tsx

@@ -1,6 +1,6 @@
 import { ENABLE_BUSINESS_FEATURES } from '@lobechat/business-const';
 import { form } from 'motion/react-m';
-import { useRouter, useSearchParams } from 'next/navigation';
+import { useRouter, useSearchParams } from '@/libs/next/navigation';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 

package/src/app/[variants]/(auth)/verify-email/layout.tsx

@@ -1,4 +1,4 @@
-import { notFound } from 'next/navigation';
+import { notFound } from '@/libs/next/navigation';
 import { type PropsWithChildren } from 'react';
 
 import { enableBetterAuth } from '@/envs/auth';

package/src/app/[variants]/(auth)/verify-email/page.tsx

@@ -2,8 +2,8 @@
 
 import { Button } from '@lobehub/ui';
 import { ChevronLeftIcon } from 'lucide-react';
-import Link from 'next/link';
-import { useSearchParams } from 'next/navigation';
+import Link from '@/libs/next/Link';
+import { useSearchParams } from '@/libs/next/navigation';
 import { useTranslation } from 'react-i18next';
 
 import AuthCard from '../../../../features/AuthCard';

package/src/app/[variants]/(main)/_layout/index.tsx

@@ -3,7 +3,6 @@
 import { TITLE_BAR_HEIGHT } from '@lobechat/desktop-bridge';
 import { Flexbox } from '@lobehub/ui';
 import { cx } from 'antd-style';
-import dynamic from 'next/dynamic';
 import { type FC, Suspense, lazy } from 'react';
 import { HotkeysProvider } from 'react-hotkeys-hook';
 import { Outlet } from 'react-router-dom';
@@ -20,6 +19,7 @@ import { useFeedbackModal } from '@/hooks/useFeedbackModal';
 import { usePlatform } from '@/hooks/usePlatform';
 import { MarketAuthProvider } from '@/layout/AuthProvider/MarketAuth';
 import CmdkLazy from '@/layout/GlobalProvider/CmdkLazy';
+import dynamic from '@/libs/next/dynamic';
 import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
 import { HotkeyScopeEnum } from '@/types/hotkey';
 

package/src/app/[variants]/(main)/agent/_layout/AgentIdSync.tsx

@@ -1,4 +1,5 @@
-import { useUnmount } from 'ahooks';
+import { usePrevious, useUnmount } from 'ahooks';
+import { useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 import { createStoreUpdater } from 'zustand-utils';
 
@@ -9,10 +10,20 @@ const AgentIdSync = () => {
   const useStoreUpdater = createStoreUpdater(useAgentStore);
   const useChatStoreUpdater = createStoreUpdater(useChatStore);
   const params = useParams<{ aid?: string }>();
+  const prevAgentId = usePrevious(params.aid);
 
   useStoreUpdater('activeAgentId', params.aid);
   useChatStoreUpdater('activeAgentId', params.aid ?? '');
 
+  // Reset activeTopicId when switching to a different agent
+  // This prevents messages from being saved to the wrong topic bucket
+  useEffect(() => {
+    // Only reset topic when switching between agents (not on initial mount)
+    if (prevAgentId !== undefined && prevAgentId !== params.aid) {
+      useChatStore.getState().switchTopic(null, { skipRefreshMessage: true });
+    }
+  }, [params.aid, prevAgentId]);
+
   // Clear activeAgentId when unmounting (leaving chat page)
   useUnmount(() => {
     useAgentStore.setState({ activeAgentId: undefined });

package/src/app/[variants]/(main)/agent/_layout/Sidebar/Cron/CronTopicGroup.tsx

@@ -6,8 +6,8 @@ import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 
-import { useRouter } from '@/app/[variants]/(main)/hooks/useRouter';
 import type { AgentCronJob } from '@/database/schemas/agentCronJob';
+import { useRouter } from '@/libs/router/navigation';
 
 import Actions from './Actions';
 import CronTopicItem from './CronTopicItem';