@lobehub/lobehub 2.0.0-next.312 → 2.0.0-next.313

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

@@ -2,6 +2,7 @@
 
 import { memo, useEffect } from 'react';
 
+import { getDesktopOnboardingCompleted } from '@/app/[variants]/(desktop)/desktop-onboarding/storage';
 import { useElectronStore } from '@/store/electron';
 import {
   getDesktopAutoOidcFirstOpenHandled,
@@ -28,6 +29,9 @@ const DesktopAutoOidcOnFirstOpen = memo(() => {
   useEffect(() => {
     if (!isInitRemoteServerConfig) return;
 
+    // Don't auto-trigger during onboarding flow.
+    if (!getDesktopOnboardingCompleted()) return;
+
     // If already connected or not in cloud mode, don't auto-trigger.
     if (dataSyncConfig.active) return;
     if (dataSyncConfig.storageMode !== 'cloud') return;

package/src/business/server/user.ts

@@ -13,6 +13,10 @@ export async function getIsInWaitList(userId: string): Promise<boolean> {
   return false;
 }
 
+export async function getIsInviteCodeRequired(userId: string): Promise<boolean> {
+  return false;
+}
+
 export async function initNewUserForBusiness(
   userId: string,
   createdAt: Date | null | undefined,

package/src/features/Conversation/Messages/Task/Actions/index.tsx

@@ -128,8 +128,6 @@ export const AssistantActionsBar = memo<AssistantActionsBarProps>(
         defaultActions.edit,
         defaultActions.copy,
         collapseAction,
-        defaultActions.divider,
-
         defaultActions.divider,
         defaultActions.share,
         defaultActions.divider,

package/src/features/Conversation/Messages/Task/index.tsx

@@ -43,7 +43,7 @@ const TaskMessage = memo<TaskMessageProps>(({ id, index, disableEditing, isLates
   const editing = useConversationStore(messageStateSelectors.isMessageEditing(id));
   const generating = useConversationStore(messageStateSelectors.isMessageGenerating(id));
   const creating = useConversationStore(messageStateSelectors.isMessageCreating(id));
-  const newScreen = useNewScreen({ creating, isLatestItem });
+  const newScreen = useNewScreen({ creating: generating || creating, isLatestItem });
 
   const errorContent = useErrorContent(error);
 

package/src/features/Conversation/Messages/Tasks/shared/ProcessingState.tsx

@@ -28,9 +28,7 @@ const styles = createStaticStyles(({ css, cssVar }) => ({
     display: flex;
     gap: 8px;
     align-items: center;
-
     padding-block: 8px;
-    padding-inline: 16px;
   `,
   footer: css`
     padding-block-start: 8px;

package/src/features/NavPanel/components/NavPanelDraggable.tsx

@@ -13,7 +13,6 @@ import { systemStatusSelectors } from '@/store/global/selectors';
 import { isMacOS } from '@/utils/platform';
 
 import { useNavPanelSizeChangeHandler } from '../hooks/useNavPanel';
-import { BACK_BUTTON_ID } from './BackButton';
 
 const motionVariants = {
   animate: { opacity: 1, x: 0 },
@@ -78,12 +77,6 @@ const draggableStyles = createStaticStyles(({ css, cssVar }) => ({
         width 0.2s ${cssVar.motionEaseOut};
     }
 
-    #${BACK_BUTTON_ID} {
-      width: 0 !important;
-      opacity: 0;
-      transition: all 0.2s ${cssVar.motionEaseOut};
-    }
-
     &:hover {
       #${TOGGLE_BUTTON_ID} {
         width: 32px !important;
@@ -94,13 +87,6 @@ const draggableStyles = createStaticStyles(({ css, cssVar }) => ({
         width: 14px !important;
         opacity: 1;
       }
-
-      &:hover {
-        #${BACK_BUTTON_ID} {
-          width: 24px !important;
-          opacity: 1;
-        }
-      }
     }
   `,
 }));

package/src/features/ResourceManager/components/Explorer/ItemDropdown/useFileItemDropdown.tsx

@@ -17,6 +17,7 @@ import { shallow } from 'zustand/shallow';
 import RepoIcon from '@/components/LibIcon';
 import { clearTreeFolderCache } from '@/features/ResourceManager/components/LibraryHierarchy';
 import { PAGE_FILE_TYPE } from '@/features/ResourceManager/constants';
+import { useAppOrigin } from '@/hooks/useAppOrigin';
 import { documentService } from '@/services/document';
 import { useFileStore } from '@/store/file';
 import { useKnowledgeBaseStore } from '@/store/library';
@@ -53,6 +54,7 @@ export const useFileItemDropdown = ({
 }: UseFileItemDropdownParams): UseFileItemDropdownReturn => {
   const { t } = useTranslation(['components', 'common', 'knowledgeBase']);
   const { message, modal } = App.useApp();
+  const appOrigin = useAppOrigin();
 
   const { deleteResource, refreshFileList } = useFileStore(
     (s) => ({
@@ -184,11 +186,10 @@ export const useFileItemDropdown = ({
             // For pages, use the route path instead of the storage URL
             let urlToCopy = url;
             if (isPage) {
-              const baseUrl = window.location.origin;
               if (libraryId) {
-                urlToCopy = `${baseUrl}/resource/library/${libraryId}?file=${id}`;
+                urlToCopy = `${appOrigin}/resource/library/${libraryId}?file=${id}`;
               } else {
-                urlToCopy = `${baseUrl}/resource?file=${id}`;
+                urlToCopy = `${appOrigin}/resource?file=${id}`;
               }
             }
 

package/src/features/SharePopover/index.tsx

@@ -2,11 +2,12 @@
 
 import { Button, Flexbox, Popover, copyToClipboard, usePopoverContext } from '@lobehub/ui';
 import { App, Divider, Select, Skeleton, Typography } from 'antd';
-import { CopyIcon, ExternalLinkIcon, LinkIcon, LockIcon } from 'lucide-react';
+import { ExternalLinkIcon, LinkIcon, LockIcon } from 'lucide-react';
 import { type ReactNode, memo, useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import useSWR from 'swr';
 
+import { useAppOrigin } from '@/hooks/useAppOrigin';
 import { useIsMobile } from '@/hooks/useIsMobile';
 import { topicService } from '@/services/topic';
 import { useChatStore } from '@/store/chat';
@@ -26,6 +27,7 @@ const SharePopoverContent = memo<SharePopoverContentProps>(({ onOpenModal }) =>
   const [updating, setUpdating] = useState(false);
   const { close } = usePopoverContext();
   const containerRef = useRef<HTMLDivElement>(null);
+  const appOrigin = useAppOrigin();
 
   const activeTopicId = useChatStore((s) => s.activeTopicId);
 
@@ -46,7 +48,7 @@ const SharePopoverContent = memo<SharePopoverContentProps>(({ onOpenModal }) =>
     }
   }, [isLoading, shareInfo, activeTopicId, mutate]);
 
-  const shareUrl = shareInfo?.id ? `${window.location.origin}/share/t/${shareInfo.id}` : '';
+  const shareUrl = shareInfo?.id ? `${appOrigin}/share/t/${shareInfo.id}` : '';
   const currentVisibility = (shareInfo?.visibility as Visibility) || 'private';
 
   const updateVisibility = useCallback(
@@ -178,7 +180,7 @@ const SharePopoverContent = memo<SharePopoverContentProps>(({ onOpenModal }) =>
         >
           {t('shareModal.popover.moreOptions')}
         </Button>
-        <Button icon={CopyIcon} onClick={handleCopyLink} size="small" type="primary">
+        <Button icon={LinkIcon} onClick={handleCopyLink} size="small" type="primary">
           {t('shareModal.copyLink')}
         </Button>
       </Flexbox>

package/src/hooks/useAppOrigin.ts

@@ -0,0 +1,16 @@
+'use client';
+
+import { isDesktop } from '@lobechat/const';
+
+import { useElectronStore } from '@/store/electron';
+import { electronSyncSelectors } from '@/store/electron/selectors';
+
+/**
+ * Returns the correct app origin URL for sharing/linking.
+ * - Web: uses window.location.origin
+ * - Desktop: uses remoteServerUrl from electron store
+ */
+export const useAppOrigin = () => {
+  const remoteServerUrl = useElectronStore(electronSyncSelectors.remoteServerUrl);
+  return isDesktop ? remoteServerUrl : window.location.origin;
+};

package/src/layout/GlobalProvider/useUserStateRedirect.ts

@@ -20,43 +20,51 @@ export const useDesktopUserStateRedirect = () => {
   const dataSyncConfig = useElectronStore((s) => s.dataSyncConfig);
   const logout = useUserStore((s) => s.logout);
 
-  const handleDesktopWaitlist = useCallback(async () => {
-    const waitlistBaseUrl = dataSyncConfig.remoteServerUrl || OFFICIAL_URL;
-    let waitlistUrl = waitlistBaseUrl;
-    try {
-      waitlistUrl = new URL('/waitlist', waitlistBaseUrl).toString();
-    } catch {
-      // Ignore: keep fallback URL for external open attempt.
-    }
+  const openExternalAndLogout = useCallback(
+    async (path: string) => {
+      const baseUrl = dataSyncConfig.remoteServerUrl || OFFICIAL_URL;
+      let targetUrl = baseUrl;
+      try {
+        targetUrl = new URL(path, baseUrl).toString();
+      } catch {
+        // Ignore: keep fallback URL for external open attempt.
+      }
 
-    try {
-      const { electronSystemService } = await import('@/services/electron/system');
-      await electronSystemService.openExternalLink(waitlistUrl);
-    } catch {
-      // Ignore: fallback to logout flow even if IPC is unavailable.
-    }
+      try {
+        const { electronSystemService } = await import('@/services/electron/system');
+        await electronSystemService.openExternalLink(targetUrl);
+      } catch {
+        // Ignore: fallback to logout flow even if IPC is unavailable.
+      }
 
-    try {
-      const { remoteServerService } = await import('@/services/electron/remoteServer');
-      await remoteServerService.clearRemoteServerConfig();
-    } catch {
-      // Ignore: fallback to logout flow even if IPC is unavailable.
-    }
+      try {
+        const { remoteServerService } = await import('@/services/electron/remoteServer');
+        await remoteServerService.clearRemoteServerConfig();
+      } catch {
+        // Ignore: fallback to logout flow even if IPC is unavailable.
+      }
 
-    await logout();
-  }, [dataSyncConfig.remoteServerUrl, logout]);
+      await logout();
+    },
+    [dataSyncConfig.remoteServerUrl, logout],
+  );
 
   return useCallback(
     (state: UserInitializationState) => {
       if (state.isInWaitList === true) {
-        void handleDesktopWaitlist();
+        void openExternalAndLogout('/waitlist');
+        return;
+      }
+
+      if (state.isInviteCodeRequired === true) {
+        void openExternalAndLogout('/invite-code');
         return;
       }
 
       if (!getDesktopOnboardingCompleted()) return;
       // Desktop onboarding is handled by desktop-only flow.
     },
-    [handleDesktopWaitlist],
+    [openExternalAndLogout],
   );
 };
 
@@ -68,6 +76,11 @@ export const useWebUserStateRedirect = () =>
       return;
     }
 
+    if (state.isInviteCodeRequired === true) {
+      redirectIfNotOn(pathname, '/invite-code');
+      return;
+    }
+
     if (!onboardingSelectors.needsOnboarding(state)) return;
 
     redirectIfNotOn(pathname, '/onboarding');

package/src/libs/trusted-client/index.ts

@@ -31,14 +31,11 @@ export const generateTrustedClientToken = (userInfo: TrustedClientUserInfo): str
     return undefined;
   }
 
-  if (!userInfo.email) {
-    return undefined;
-  }
-
   try {
     const payload = buildTrustedClientPayload({
       clientId: MARKET_TRUSTED_CLIENT_ID,
-      email: userInfo.email,
+      // TODO: remove '' when sdk update
+      email: userInfo.email || '',
       name: userInfo.name,
       userId: userInfo.userId,
     });

package/src/locales/default/desktop-onboarding.ts

@@ -73,6 +73,7 @@ export default {
   'screen4.title2': 'Your choice helps us improve',
   'screen4.title3': 'You can change this anytime in settings',
 
+  'screen5.actions.cancel': 'Cancel',
   'screen5.actions.connectToServer': 'Connect to Server',
   'screen5.actions.connecting': 'Connecting...',
   'screen5.actions.signInCloud': 'Sign in to LobeHub Cloud',
@@ -80,6 +81,10 @@ export default {
   'screen5.actions.signingIn': 'Signing in...',
   'screen5.actions.signingOut': 'Signing out...',
   'screen5.actions.tryAgain': 'Try Again',
+  'screen5.auth.phase.browserOpened': 'Browser opened, please sign in...',
+  'screen5.auth.phase.verifying': 'Verifying credentials...',
+  'screen5.auth.phase.waitingForAuth': 'Waiting for authorization...',
+  'screen5.auth.remaining': 'Remaining: {{time}}s',
   'screen5.badge': 'Sign in',
   'screen5.description':
     'Sign in to sync Agents, Groups, settings, and Context across all devices.',

package/src/locales/default/error.ts

@@ -16,6 +16,12 @@ export default {
   'import.incompatible.description':
     'This file was exported from a higher version. Please try upgrading to the latest version and then re-importing.',
   'import.incompatible.title': 'Current application does not support importing this file',
+  'inviteCode.currentEmail': 'Current account: {{email}}',
+  'inviteCode.desc':
+    'An invite code is required to access LobeHub. Please enter a valid invite code to continue.',
+  'inviteCode.friends': 'Friends',
+  'inviteCode.getCodeHint': 'Get an invite code from:',
+  'inviteCode.title': 'Invite Code Required',
   'loginRequired.desc': 'You will be redirected to the login page shortly',
   'loginRequired.title': 'Please log in to use this feature',
   'notFound.backHome': 'Back to Home',
@@ -238,5 +244,10 @@ export default {
   'upload.title': 'File upload failed. Please check your network connection or try again later',
   'upload.unknownError': 'Error reason: {{reason}}',
   'upload.uploadFailed': 'File upload failed.',
+  'waitlist.currentEmail': 'Current account: {{email}}',
+  'waitlist.desc':
+    'Your account is not on the whitelist. Please contact the administrator to request access.',
+  'waitlist.switchAccount': 'Switch Account',
+  'waitlist.title': 'Access Restricted',
   ...businessErrorsLocales,
 };

package/src/locales/default/subscription.ts

@@ -328,7 +328,7 @@ export default {
   'referral.rules.backfill.expiredTip':
     'Backfill period has expired. Cannot backfill after 3 days of registration',
   'referral.rules.backfill.link': 'Backfill Invite Code',
-  'referral.rules.backfill.placeholder': 'Enter invite code',
+  'referral.rules.backfill.placeholder': 'Enter invite code or link',
   'referral.rules.backfill.submit': 'Confirm Binding',
   'referral.rules.backfill.success': 'Invite code bound successfully',
   'referral.rules.backfill.title': 'Backfill Invite Code',

package/src/server/modules/AgentRuntime/RuntimeExecutors.ts

@@ -36,6 +36,7 @@ export interface RuntimeExecutorContext {
   stepIndex: number;
   streamManager: IStreamEventManager;
   toolExecutionService: ToolExecutionService;
+  topicId?: string;
   userId?: string;
 }
 
@@ -475,6 +476,7 @@ export const createRuntimeExecutors = (
       const executionResult = await toolExecutionService.executeTool(chatToolPayload, {
         serverDB: ctx.serverDB,
         toolManifestMap: state.toolManifestMap,
+        topicId: ctx.topicId,
         userId: ctx.userId,
       });
 

package/src/server/routers/lambda/user.ts

@@ -16,7 +16,12 @@ import { after } from 'next/server';
 import { v4 as uuidv4 } from 'uuid';
 import { z } from 'zod';
 
-import { getIsInWaitList, getReferralStatus, getSubscriptionPlan } from '@/business/server/user';
+import {
+  getIsInviteCodeRequired,
+  getIsInWaitList,
+  getReferralStatus,
+  getSubscriptionPlan,
+} from '@/business/server/user';
 import { MessageModel } from '@/database/models/message';
 import { SessionModel } from '@/database/models/session';
 import { UserModel, UserNotFoundError } from '@/database/models/user';
@@ -129,15 +134,23 @@ export const userRouter = router({
     };
 
     // Run user state fetch and count queries in parallel
-    const [state, messageCount, hasExtraSession, referralStatus, subscriptionPlan, isInWaitList] =
-      await Promise.all([
-        getOrCreateUserState(),
-        ctx.messageModel.countUpTo(5),
-        ctx.sessionModel.hasMoreThanN(1),
-        getReferralStatus(ctx.userId),
-        getSubscriptionPlan(ctx.userId),
-        getIsInWaitList(ctx.userId),
-      ]);
+    const [
+      state,
+      messageCount,
+      hasExtraSession,
+      referralStatus,
+      subscriptionPlan,
+      isInWaitList,
+      isInviteCodeRequired,
+    ] = await Promise.all([
+      getOrCreateUserState(),
+      ctx.messageModel.countUpTo(5),
+      ctx.sessionModel.hasMoreThanN(1),
+      getReferralStatus(ctx.userId),
+      getSubscriptionPlan(ctx.userId),
+      getIsInWaitList(ctx.userId),
+      getIsInviteCodeRequired(ctx.userId),
+    ]);
 
     const hasMoreThan4Messages = messageCount > 4;
     const hasAnyMessages = messageCount > 0;
@@ -168,6 +181,7 @@ export const userRouter = router({
       referralStatus,
       subscriptionPlan,
       isInWaitList,
+      isInviteCodeRequired,
       isFreePlan: !subscriptionPlan || subscriptionPlan === Plans.Free,
     } satisfies UserInitializationState;
     /* eslint-enable sort-keys-fix/sort-keys-fix */

package/src/server/services/agentRuntime/AgentRuntimeService.test.ts

@@ -40,6 +40,9 @@ vi.mock('@/server/modules/ModelRuntime', () => ({
 
 // Mock search service to avoid server-side env access
 vi.mock('@/server/services/search', () => ({
+  SearchService: vi.fn().mockImplementation(() => ({
+    search: vi.fn(),
+  })),
   searchService: {
     search: vi.fn(),
   },

package/src/server/services/agentRuntime/AgentRuntimeService.ts

@@ -233,6 +233,7 @@ export class AgentRuntimeService {
       toolManifestMap,
       toolSourceMap,
       stepCallbacks,
+      userInterventionConfig,
     } = params;
 
     try {
@@ -261,6 +262,8 @@ export class AgentRuntimeService {
         toolManifestMap,
         toolSourceMap,
         tools,
+        // User intervention config for headless mode in async tasks
+        userInterventionConfig,
       } as Partial<AgentState>;
 
       // Use coordinator to create operation, automatically sends initialization event
@@ -329,10 +332,7 @@ export class AgentRuntimeService {
       });
 
       // Get operation state and metadata
-      const [agentState, operationMetadata] = await Promise.all([
-        this.coordinator.loadAgentState(operationId),
-        this.coordinator.getOperationMetadata(operationId),
-      ]);
+      const agentState = await this.coordinator.loadAgentState(operationId);
 
       if (!agentState) {
         throw new Error(`Agent state not found for operation ${operationId}`);
@@ -353,8 +353,10 @@ export class AgentRuntimeService {
       }
 
       // Create Agent and Runtime instances
+      // Use agentState.metadata which contains the full app context (topicId, agentId, etc.)
+      // operationMetadata only contains basic fields (agentConfig, modelRuntimeConfig, userId)
       const { runtime } = await this.createAgentRuntime({
-        metadata: operationMetadata,
+        metadata: agentState?.metadata,
         operationId,
         stepIndex,
       });
@@ -850,6 +852,7 @@ export class AgentRuntimeService {
       stepIndex,
       streamManager: this.streamManager,
       toolExecutionService: this.toolExecutionService,
+      topicId: metadata?.topicId,
       userId: metadata?.userId,
     };
 

package/src/server/services/agentRuntime/types.ts

@@ -1,5 +1,6 @@
 import { type AgentRuntimeContext, type AgentState } from '@lobechat/agent-runtime';
 import { type LobeToolManifest } from '@lobechat/context-engine';
+import type { UserInterventionConfig } from '@lobechat/types';
 
 // ==================== Step Lifecycle Callbacks ====================
 
@@ -90,6 +91,12 @@ export interface OperationCreationParams {
   toolSourceMap?: Record<string, 'builtin' | 'plugin' | 'mcp' | 'klavis' | 'lobehubSkill'>;
   tools?: any[];
   userId?: string;
+  /**
+   * User intervention configuration
+   * Controls how tools requiring approval are handled
+   * Use { approvalMode: 'headless' } for async tasks that should never wait for human approval
+   */
+  userInterventionConfig?: UserInterventionConfig;
 }
 
 export interface OperationCreationResult {

package/src/server/services/aiAgent/__tests__/execGroupSubAgentTask.test.ts

@@ -185,6 +185,9 @@ describe('AiAgentService.execSubAgentTask', () => {
           onAfterStep: expect.any(Function),
           onComplete: expect.any(Function),
         }),
+        userInterventionConfig: {
+          approvalMode: 'headless',
+        },
       });
     });
 

package/src/server/services/aiAgent/index.ts

@@ -8,6 +8,7 @@ import type {
   ExecGroupAgentResult,
   ExecSubAgentTaskParams,
   ExecSubAgentTaskResult,
+  UserInterventionConfig,
 } from '@lobechat/types';
 import { ThreadStatus, ThreadType } from '@lobechat/types';
 import { nanoid } from '@lobechat/utils';
@@ -66,6 +67,11 @@ interface InternalExecAgentParams extends ExecAgentParams {
   stepCallbacks?: StepLifecycleCallbacks;
   /** Topic creation trigger source ('cron' | 'chat' | 'api') */
   trigger?: string;
+  /**
+   * User intervention configuration
+   * Use { approvalMode: 'headless' } for async tasks that should never wait for human approval
+   */
+  userInterventionConfig?: UserInterventionConfig;
 }
 
 /**
@@ -125,6 +131,7 @@ export class AiAgentService {
       stepCallbacks,
       trigger,
       cronJobId,
+      userInterventionConfig,
     } = params;
 
     // Validate that either agentId or slug is provided
@@ -231,10 +238,6 @@ export class AiAgentService {
 
     const tools = toolsResult.tools;
 
-    // Log detailed tools generation result
-    if (toolsResult.filteredTools && toolsResult.filteredTools.length > 0) {
-      log('execAgent: filtered tools: %O', toolsResult.filteredTools);
-    }
     log('execAgent: enabled tool ids: %O', toolsResult.enabledToolIds);
 
     // Get manifest map and convert from Map to Record
@@ -396,6 +399,7 @@ export class AiAgentService {
         toolSourceMap,
         tools,
         userId: this.userId,
+        userInterventionConfig,
       });
 
       log('execAgent: created operation %s (autoStarted: %s)', operationId, result.autoStarted);
@@ -572,12 +576,14 @@ export class AiAgentService {
 
     // 4. Delegate to execAgent with threadId in appContext and callbacks
     // The instruction will be created as user message in the Thread
+    // Use headless mode to skip human approval in async task execution
     const result = await this.execAgent({
       agentId,
       appContext: { groupId, threadId: thread.id, topicId },
       autoStart: true,
       prompt: instruction,
       stepCallbacks,
+      userInterventionConfig: { approvalMode: 'headless' },
     });
 
     log(

package/src/server/services/market/index.ts

@@ -368,6 +368,13 @@ export class MarketService {
     return this.market.user.getUserInfo(username, options);
   }
 
+  /**
+   * Register user on market and optionally follow another user
+   */
+  async registerUser(params: { followUserId?: string; registerUserId: string }): Promise<void> {
+    await this.market.user.register(params);
+  }
+
   // ============================== Skills Methods ==============================
 
   /**