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

package/src/libs/mcp/types.ts

@@ -240,3 +240,34 @@ export function createMCPError(
 
   return error;
 }
+
+/**
+ * STDIO Process Output separator used in enhanced error messages
+ */
+const STDIO_OUTPUT_SEPARATOR = '--- STDIO Process Output ---';
+
+/**
+ * Parse error message to extract STDIO process output logs
+ * The enhanced error format from desktop is:
+ * "Original message\n\n--- STDIO Process Output ---\nlogs..."
+ */
+export interface ParsedStdioError {
+  errorLog?: string;
+  originalMessage: string;
+}
+
+export function parseStdioErrorMessage(errorMessage: string): ParsedStdioError {
+  const separatorIndex = errorMessage.indexOf(STDIO_OUTPUT_SEPARATOR);
+
+  if (separatorIndex === -1) {
+    return { originalMessage: errorMessage };
+  }
+
+  const originalMessage = errorMessage.slice(0, separatorIndex).trim();
+  const errorLog = errorMessage.slice(separatorIndex + STDIO_OUTPUT_SEPARATOR.length).trim();
+
+  return {
+    errorLog: errorLog || undefined,
+    originalMessage: originalMessage || errorMessage,
+  };
+}

package/src/libs/next/Image.tsx

@@ -0,0 +1,13 @@
+/**
+ * Image component wrapper for Next.js Image.
+ * This module provides a unified interface that can be easily replaced
+ * with a generic <img> or custom image component in the future.
+ *
+ * @see Phase 3.4: LOBE-2991
+ */
+
+// Re-export the Image component
+
+// Re-export types
+export type { ImageProps, StaticImageData } from 'next/image';
+export { default } from 'next/image';

package/src/libs/next/Link.tsx

@@ -0,0 +1,13 @@
+/**
+ * Link component wrapper for Next.js Link.
+ * This module provides a unified interface that can be easily replaced
+ * with react-router-dom Link in the future.
+ *
+ * @see Phase 3.2: LOBE-2989
+ */
+
+// Re-export the Link component
+
+// Re-export the type for props
+export type { LinkProps } from 'next/link';
+export { default } from 'next/link';

package/src/libs/next/dynamic.tsx

@@ -0,0 +1,13 @@
+/**
+ * Dynamic import wrapper for Next.js dynamic.
+ * This module provides a unified interface that can be easily replaced
+ * with React.lazy + Suspense in the future.
+ *
+ * @see Phase 3.3: LOBE-2990
+ */
+
+// Re-export the dynamic function
+
+// Re-export types
+export type { DynamicOptions, Loader, LoaderComponent } from 'next/dynamic';
+export { default } from 'next/dynamic';

package/src/libs/next/index.ts

@@ -0,0 +1,22 @@
+/**
+ * Next.js wrapper module
+ *
+ * This module provides unified interfaces for Next.js-specific APIs,
+ * making it easier to migrate from Next.js to other frameworks (e.g., Vite + React Router).
+ *
+ * Usage:
+ * - import { useRouter, usePathname } from '@/libs/next/navigation';
+ * - import Link from '@/libs/next/Link';
+ * - import dynamic from '@/libs/next/dynamic';
+ * - import Image from '@/libs/next/Image';
+ *
+ * @see RFC 147: LOBE-2850 - Phase 3
+ */
+
+// Navigation exports
+export * from './navigation';
+
+// Component exports (re-export as named for convenience)
+export { default as dynamic } from './dynamic';
+export { default as Image } from './Image';
+export { default as Link } from './Link';

package/src/libs/next/navigation.ts

@@ -0,0 +1,22 @@
+/**
+ * Navigation utilities wrapper for Next.js navigation APIs.
+ * This module provides a unified interface that can be easily replaced
+ * with react-router-dom in the future.
+ *
+ * @see Phase 3.1: LOBE-2988
+ */
+
+// Re-export all navigation hooks and utilities from Next.js
+export {
+  notFound,
+  ReadonlyURLSearchParams,
+  redirect,
+  useParams,
+  usePathname,
+  useRouter,
+  useSearchParams,
+  useServerInsertedHTML,
+} from 'next/navigation';
+
+// Re-export types
+export type { RedirectType } from 'next/navigation';

package/src/libs/router/Link.tsx

@@ -0,0 +1,30 @@
+/**
+ * React Router Link component wrapper.
+ * Provides a Next.js-like API (href prop) while using React Router internally.
+ *
+ * @see RFC 147: LOBE-2850 - Phase 3
+ */
+
+import React, { memo } from 'react';
+import { Link as ReactRouterLink, type LinkProps as ReactRouterLinkProps } from 'react-router-dom';
+
+interface LinkProps extends Omit<ReactRouterLinkProps, 'to'> {
+  children?: React.ReactNode;
+  href?: string;
+  to?: string;
+}
+
+/**
+ * Link component for React Router.
+ * Provides a Next.js-like API (href prop) while using React Router internally.
+ */
+const Link = memo<LinkProps>(({ href, to, ...props }) => {
+  const linkTo = href || to || '/';
+  return <ReactRouterLink {...props} to={linkTo} />;
+});
+
+Link.displayName = 'Link';
+
+export default Link;
+
+export type { LinkProps };

package/src/libs/router/index.ts

@@ -0,0 +1,18 @@
+/**
+ * React Router wrapper module for SPA routing.
+ *
+ * This module provides unified interfaces for React Router APIs,
+ * with a Next.js-like API surface for easier migration.
+ *
+ * Usage:
+ * - import { useRouter, usePathname, useSearchParams } from '@/libs/router';
+ * - import Link from '@/libs/router/Link';
+ *
+ * @see RFC 147: LOBE-2850 - Phase 3
+ */
+
+// Navigation exports
+export * from './navigation';
+
+// Component exports
+export { default as Link } from './Link';

package/src/libs/router/navigation.ts

@@ -0,0 +1,72 @@
+/**
+ * React Router navigation hooks wrapper.
+ * This module provides unified navigation hooks for SPA routing.
+ *
+ * Usage:
+ * - import { useRouter, usePathname, useSearchParams, useQuery } from '@/libs/router/navigation';
+ *
+ * @see RFC 147: LOBE-2850 - Phase 3
+ */
+
+import qs from 'query-string';
+import { useMemo } from 'react';
+import {
+  useLocation,
+  useNavigate,
+  useParams as useReactRouterParams,
+  useSearchParams as useReactRouterSearchParams,
+} from 'react-router-dom';
+
+/**
+ * Hook to get router navigation functions.
+ * Provides a Next.js-like API using React Router.
+ */
+export const useRouter = () => {
+  const navigate = useNavigate();
+
+  return useMemo(
+    () => ({
+      back: () => navigate(-1),
+      forward: () => navigate(1),
+      // Note: prefetch is not supported in React Router
+      prefetch: () => {},
+      push: (href: string) => navigate(href),
+      replace: (href: string) => navigate(href, { replace: true }),
+    }),
+    [navigate]
+  );
+};
+
+/**
+ * Hook to get current pathname.
+ */
+export const usePathname = () => {
+  const location = useLocation();
+  return location.pathname;
+};
+
+/**
+ * Hook to get search params.
+ * Returns [searchParams, setSearchParams] tuple similar to React Router.
+ */
+export const useSearchParams = () => {
+  return useReactRouterSearchParams();
+};
+
+/**
+ * Hook to get route params.
+ */
+export const useParams = <T extends Record<string, string | undefined> = Record<string, string | undefined>>() => {
+  return useReactRouterParams<T>();
+};
+
+/**
+ * Hook to get query parameters as a parsed object.
+ */
+export const useQuery = () => {
+  const [searchParams] = useReactRouterSearchParams();
+  return useMemo(() => qs.parse(searchParams.toString()), [searchParams]);
+};
+
+// Re-export types
+export type { Location, NavigateFunction, Params } from 'react-router-dom';

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

@@ -1,4 +1,8 @@
-import { type AgentEvent, type AgentRuntimeContext, type AgentState } from '@lobechat/agent-runtime';
+import {
+  type AgentEvent,
+  type AgentRuntimeContext,
+  type AgentState,
+} from '@lobechat/agent-runtime';
 import debug from 'debug';
 import type { Redis } from 'ioredis';
 

package/src/store/chat/slices/portal/selectors.test.ts

@@ -111,9 +111,7 @@ describe('chatDockSelectors', () => {
 
     it('should return the messageId when ToolUI view is on stack', () => {
       const state = createState({
-        portalStack: [
-          { type: PortalViewType.ToolUI, messageId: 'test-id', identifier: 'test' },
-        ],
+        portalStack: [{ type: PortalViewType.ToolUI, messageId: 'test-id', identifier: 'test' }],
       });
       expect(chatPortalSelectors.toolMessageId(state)).toBe('test-id');
     });
@@ -122,9 +120,7 @@ describe('chatDockSelectors', () => {
   describe('isMessageToolUIOpen', () => {
     it('should return false when id does not match or showDock is false', () => {
       const state = createState({
-        portalStack: [
-          { type: PortalViewType.ToolUI, messageId: 'test-id', identifier: 'test' },
-        ],
+        portalStack: [{ type: PortalViewType.ToolUI, messageId: 'test-id', identifier: 'test' }],
         showPortal: false,
       });
       expect(chatPortalSelectors.isPluginUIOpen('test-id')(state)).toBe(false);
@@ -133,9 +129,7 @@ describe('chatDockSelectors', () => {
 
     it('should return true when id matches and showDock is true', () => {
       const state = createState({
-        portalStack: [
-          { type: PortalViewType.ToolUI, messageId: 'test-id', identifier: 'test' },
-        ],
+        portalStack: [{ type: PortalViewType.ToolUI, messageId: 'test-id', identifier: 'test' }],
         showPortal: true,
       });
       expect(chatPortalSelectors.isPluginUIOpen('test-id')(state)).toBe(true);
@@ -149,9 +143,7 @@ describe('chatDockSelectors', () => {
 
     it('should return true when ToolUI view is on stack', () => {
       const state = createState({
-        portalStack: [
-          { type: PortalViewType.ToolUI, messageId: 'test-id', identifier: 'test' },
-        ],
+        portalStack: [{ type: PortalViewType.ToolUI, messageId: 'test-id', identifier: 'test' }],
       });
       expect(chatPortalSelectors.showPluginUI(state)).toBe(true);
     });
@@ -164,9 +156,7 @@ describe('chatDockSelectors', () => {
 
     it('should return the identifier when ToolUI view is on stack', () => {
       const state = createState({
-        portalStack: [
-          { type: PortalViewType.ToolUI, messageId: 'test-id', identifier: 'test' },
-        ],
+        portalStack: [{ type: PortalViewType.ToolUI, messageId: 'test-id', identifier: 'test' }],
       });
       expect(chatPortalSelectors.toolUIIdentifier(state)).toBe('test');
     });

package/src/store/page/index.ts

@@ -1,2 +1,2 @@
 export * from './selectors';
-export { getPageStoreState, type PageStore,usePageStore } from './store';
+export { getPageStoreState, type PageStore, usePageStore } from './store';

package/src/store/page/slices/crud/index.ts

@@ -1,2 +1,2 @@
 export { createCrudSlice, type CrudAction } from './action';
-export { type CrudState,initialCrudState } from './initialState';
+export { type CrudState, initialCrudState } from './initialState';

package/src/store/tool/slices/mcpStore/action.ts

@@ -9,7 +9,7 @@ import { gt, valid } from 'semver';
 import useSWR, { type SWRResponse } from 'swr';
 import { type StateCreator } from 'zustand/vanilla';
 
-import { type MCPErrorData } from '@/libs/mcp/types';
+import { type MCPErrorData, parseStdioErrorMessage } from '@/libs/mcp/types';
 import { discoverService } from '@/services/discover';
 import { mcpService } from '@/services/mcp';
 import { pluginService } from '@/services/plugin';
@@ -132,6 +132,8 @@ const buildCloudMcpManifest = (params: {
 // Test connection result type
 export interface TestMcpConnectionResult {
   error?: string;
+  /** STDIO process output logs for debugging */
+  errorLog?: string;
   manifest?: LobeChatPluginManifest;
   success: boolean;
 }
@@ -301,8 +303,6 @@ export const createMCPPluginStoreSlice: StateCreator<
         // Check if cloudEndPoint is available: web + stdio type + haveCloudEndpoint exists
         const hasCloudEndpoint = !isDesktop && stdioOption && haveCloudEndpoint;
 
-        console.log('hasCloudEndpoint', hasCloudEndpoint);
-
         let shouldUseHttpDeployment = !!httpOption && (!hasNonHttpDeployment || !isDesktop);
 
         if (hasCloudEndpoint) {
@@ -592,7 +592,7 @@ export const createMCPPluginStoreSlice: StateCreator<
         event: 'install',
         identifier: plugin.identifier,
         source: 'self',
-      })
+      });
 
       discoverService.reportMcpInstallResult({
         identifier: plugin.identifier,
@@ -653,10 +653,22 @@ export const createMCPPluginStoreSlice: StateCreator<
         };
       } else {
         // Fallback handling for normal errors
-        const errorMessage = error instanceof Error ? error.message : String(error);
+        const rawErrorMessage = error instanceof Error ? error.message : String(error);
+
+        // Parse STDIO error message to extract process output logs
+        const { originalMessage, errorLog } = parseStdioErrorMessage(rawErrorMessage);
+
         errorInfo = {
-          message: errorMessage,
+          message: originalMessage,
           metadata: {
+            errorLog,
+            params: connection
+              ? {
+                  args: connection.args,
+                  command: connection.command,
+                  type: connection.type,
+                }
+              : undefined,
             step: 'installation_error',
             timestamp: Date.now(),
           },
@@ -800,7 +812,7 @@ export const createMCPPluginStoreSlice: StateCreator<
         event: 'activate',
         identifier: identifier,
         source: 'self',
-      })
+      });
 
       return { manifest, success: true };
     } catch (error) {
@@ -809,20 +821,23 @@ export const createMCPPluginStoreSlice: StateCreator<
         return { error: 'Test cancelled', success: false };
       }
 
-      const errorMessage = error instanceof Error ? error.message : String(error);
+      const rawErrorMessage = error instanceof Error ? error.message : String(error);
+
+      // Parse STDIO error message to extract process output logs
+      const { originalMessage, errorLog } = parseStdioErrorMessage(rawErrorMessage);
 
       // Set error state
       set(
         produce((draft: MCPStoreState) => {
           draft.mcpTestLoading[identifier] = false;
-          draft.mcpTestErrors[identifier] = errorMessage;
+          draft.mcpTestErrors[identifier] = originalMessage;
           delete draft.mcpTestAbortControllers[identifier];
         }),
         false,
         n('testMcpConnection/error'),
       );
 
-      return { error: errorMessage, success: false };
+      return { error: originalMessage, errorLog, success: false };
     }
   },
 
@@ -834,7 +849,7 @@ export const createMCPPluginStoreSlice: StateCreator<
       event: 'uninstall',
       identifier: identifier,
       source: 'self',
-    })
+    });
   },
 
   updateMCPInstallProgress: (identifier, progress) => {

package/src/app/[variants]/(main)/hooks/usePathname.ts

@@ -1,10 +0,0 @@
-import { useLocation } from 'react-router-dom';
-
-/**
- * Hook to get current pathname
- * React Router version for (main) directory
- */
-export const usePathname = () => {
-  const location = useLocation();
-  return location.pathname;
-};

package/src/app/[variants]/(main)/hooks/useQuery.ts

@@ -1,12 +0,0 @@
-import qs from 'query-string';
-import { useMemo } from 'react';
-import { useSearchParams } from 'react-router-dom';
-
-/**
- * Hook to get query parameters
- * React Router version for (main) directory
- */
-export const useQuery = () => {
-  const [searchParams] = useSearchParams();
-  return useMemo(() => qs.parse(searchParams.toString()), [searchParams]);
-};

package/src/app/[variants]/(main)/hooks/useRouter.ts

@@ -1,22 +0,0 @@
-import { useNavigate } from 'react-router-dom';
-
-/**
- * Hook to get router navigation functions
- * React Router version for (main) directory
- *
- * Provides a Next.js-like API using React Router
- */
-export const useRouter = () => {
-  const navigate = useNavigate();
-
-  return {
-    back: () => navigate(-1),
-    forward: () => navigate(1),
-    // Note: prefetch is not supported in React Router
-    prefetch: () => {},
-
-    push: (href: string) => navigate(href),
-
-    replace: (href: string) => navigate(href, { replace: true }),
-  };
-};

package/src/app/[variants]/(main)/hooks/useSearchParams.ts

@@ -1,11 +0,0 @@
-import { useSearchParams as useReactRouterSearchParams } from 'react-router-dom';
-
-/**
- * Hook to get search params
- * React Router version for (main) directory
- *
- * Returns [searchParams, setSearchParams] tuple similar to React Router
- */
-export const useSearchParams = () => {
-  return useReactRouterSearchParams();
-};