@lobehub/lobehub 2.0.0-next.292 → 2.0.0-next.294

package/src/app/(backend)/middleware/validate/createValidator.ts

@@ -0,0 +1,79 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+
+export interface ValidatorOptions {
+  errorStatus?: number;
+  omitNotShapeField?: boolean;
+  stopOnFirstError?: boolean;
+}
+
+type InferInput<TSchema extends z.ZodTypeAny> = z.input<TSchema>;
+type InferOutput<TSchema extends z.ZodTypeAny> = z.output<TSchema>;
+type MaybePromise<T> = T | Promise<T>;
+
+const getRequestInput = async (req: Request): Promise<Record<string, unknown>> => {
+  const method = req.method?.toUpperCase?.() ?? 'GET';
+  if (method === 'GET' || method === 'HEAD') {
+    return Object.fromEntries(new URL(req.url).searchParams.entries());
+  }
+
+  const contentType = req.headers.get('content-type') || '';
+  if (contentType.includes('application/json')) {
+    try {
+      return (await req.json()) as any;
+    } catch {
+      return {};
+    }
+  }
+
+  try {
+    return (await (req as any).json?.()) as any;
+  } catch {
+    return Object.fromEntries(new URL(req.url).searchParams.entries());
+  }
+};
+
+const applyOptionsToSchema = <TSchema extends z.ZodTypeAny>(
+  schema: TSchema,
+  options: ValidatorOptions,
+): z.ZodTypeAny => {
+  if (!options.omitNotShapeField) return schema;
+  if (schema instanceof z.ZodObject) return schema.strip();
+  return schema;
+};
+
+export const createValidator =
+  (options: ValidatorOptions = {}) =>
+  <TSchema extends z.ZodTypeAny>(schema: TSchema) => {
+    const errorStatus = options.errorStatus ?? 422;
+    const effectiveSchema = applyOptionsToSchema(schema, options) as z.ZodType<
+      InferOutput<TSchema>
+    >;
+
+    return <TReq extends NextRequest, TContext>(
+        handler: (
+          req: TReq,
+          context: TContext,
+          data: InferOutput<TSchema>,
+        ) => MaybePromise<Response>,
+      ) =>
+      async (req: TReq, context?: TContext) => {
+        const input = (await getRequestInput(req)) as InferInput<TSchema>;
+        const result = effectiveSchema.safeParse(input);
+
+        if (!result.success) {
+          const issues = options.stopOnFirstError
+            ? result.error.issues.slice(0, 1)
+            : result.error.issues;
+          return NextResponse.json({ error: 'Invalid request', issues }, { status: errorStatus });
+        }
+
+        return handler(req, context as TContext, result.data);
+      };
+  };
+
+export const zodValidator = createValidator({
+  errorStatus: 422,
+  omitNotShapeField: true,
+  stopOnFirstError: true,
+});

package/src/app/(backend)/middleware/validate/index.ts

@@ -0,0 +1,3 @@
+export type { ValidatorOptions } from './createValidator';
+export { createValidator } from './createValidator';
+export { zodValidator } from './createValidator';

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)/group/_layout/GroupIdSync.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';
 
@@ -10,6 +11,7 @@ const GroupIdSync = () => {
   const useAgentGroupStoreUpdater = createStoreUpdater(useAgentGroupStore);
   const useChatStoreUpdater = createStoreUpdater(useChatStore);
   const params = useParams<{ gid?: string }>();
+  const prevGroupId = usePrevious(params.gid);
   const router = useQueryRoute();
 
   // Sync groupId to agentGroupStore and chatStore
@@ -19,6 +21,15 @@ const GroupIdSync = () => {
   // Inject router to agentGroupStore for navigation
   useAgentGroupStoreUpdater('router', router);
 
+  // Reset activeTopicId when switching to a different group
+  // This prevents messages from being saved to the wrong topic bucket
+  useEffect(() => {
+    // Only reset topic when switching between groups (not on initial mount)
+    if (prevGroupId !== undefined && prevGroupId !== params.gid) {
+      useChatStore.getState().switchTopic(null, { skipRefreshMessage: true });
+    }
+  }, [params.gid, prevGroupId]);
+
   // Clear activeGroupId when unmounting (leaving group page)
   useUnmount(() => {
     useAgentGroupStore.setState({ activeGroupId: undefined, router: undefined });

package/src/features/MCP/MCPInstallProgress/InstallError/ErrorDetails.tsx

@@ -1,8 +1,7 @@
-import { Button, Flexbox, Highlighter, Icon, Tag } from '@lobehub/ui';
+import { Flexbox, Highlighter, Tag } from '@lobehub/ui';
 import { cssVar } from 'antd-style';
-import { ChevronDown, ChevronRight } from 'lucide-react';
 import * as motion from 'motion/react-m';
-import { memo, useState } from 'react';
+import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { type MCPErrorInfoMetadata } from '@/types/plugins';
@@ -12,94 +11,73 @@ const ErrorDetails = memo<{
   errorMessage?: string;
 }>(({ errorInfo, errorMessage }) => {
   const { t } = useTranslation('plugin');
-  const [expanded, setExpanded] = useState(false);
 
   return (
     <Flexbox gap={8}>
-      <Button
-        color={'default'}
-        icon={<Icon icon={expanded ? ChevronDown : ChevronRight} />}
-        onClick={() => setExpanded(!expanded)}
-        size="small"
-        style={{
-          fontSize: '12px',
-          padding: '0 4px',
-        }}
-        variant="filled"
+      <motion.div
+        animate={{ height: 'auto', opacity: 1 }}
+        initial={{ height: 0, opacity: 0 }}
+        style={{ overflow: 'hidden' }}
       >
-        {expanded
-          ? t('mcpInstall.errorDetails.hideDetails')
-          : t('mcpInstall.errorDetails.showDetails')}
-      </Button>
-
-      {expanded && (
-        <motion.div
-          animate={{ height: 'auto', opacity: 1 }}
-          initial={{ height: 0, opacity: 0 }}
-          style={{ overflow: 'hidden' }}
+        <Flexbox
+          gap={8}
+          style={{
+            backgroundColor: cssVar.colorFillQuaternary,
+            borderRadius: 8,
+            fontFamily: 'monospace',
+            fontSize: '11px',
+            padding: '8px 12px',
+          }}
         >
-          <Flexbox
-            gap={8}
-            style={{
-              backgroundColor: cssVar.colorFillQuaternary,
-              borderRadius: 8,
-              fontFamily: 'monospace',
-              fontSize: '11px',
-              padding: '8px 12px',
-            }}
-          >
-            {errorInfo.params && (
-              <Flexbox gap={4}>
-                <div>
-                  <Tag color="blue" variant={'filled'}>
-                    {t('mcpInstall.errorDetails.connectionParams')}
-                  </Tag>
-                </div>
-                <div style={{ marginTop: 4, wordBreak: 'break-all' }}>
-                  {errorInfo.params.command && (
-                    <div>
-                      {t('mcpInstall.errorDetails.command')}: {errorInfo.params.command}
-                    </div>
-                  )}
-                  {errorInfo.params.args && (
-                    <div>
-                      {t('mcpInstall.errorDetails.args')}: {errorInfo.params.args.join(' ')}
-                    </div>
-                  )}
-                </div>
-              </Flexbox>
-            )}
-
-            {errorInfo.errorLog && (
-              <Flexbox gap={4}>
-                <div>
-                  <Tag color="red" variant={'filled'}>
-                    {t('mcpInstall.errorDetails.errorOutput')}
-                  </Tag>
-                </div>
-                <Highlighter
-                  language={'log'}
-                  style={{
-                    maxHeight: 200,
-                    overflow: 'auto',
-                  }}
-                >
-                  {errorInfo.errorLog}
-                </Highlighter>
-              </Flexbox>
-            )}
+          {errorInfo.params && (
+            <Flexbox gap={4}>
+              <div>
+                <Tag color="blue" variant={'filled'}>
+                  {t('mcpInstall.errorDetails.connectionParams')}
+                </Tag>
+              </div>
+              <div style={{ marginTop: 4, wordBreak: 'break-all' }}>
+                {errorInfo.params.command && (
+                  <div>
+                    {t('mcpInstall.errorDetails.command')}: {errorInfo.params.command}
+                  </div>
+                )}
+                {errorInfo.params.args && (
+                  <div>
+                    {t('mcpInstall.errorDetails.args')}: {errorInfo.params.args.join(' ')}
+                  </div>
+                )}
+              </div>
+            </Flexbox>
+          )}
 
-            {errorInfo.originalError && errorInfo.originalError !== errorMessage && (
+          {errorInfo.errorLog && (
+            <Flexbox gap={4}>
               <div>
-                <Tag color="orange">{t('mcpInstall.errorDetails.originalError')}</Tag>
-                <div style={{ marginTop: 4, wordBreak: 'break-all' }}>
-                  {errorInfo.originalError}
-                </div>
+                <Tag color="red" variant={'filled'}>
+                  {t('mcpInstall.errorDetails.errorOutput')}
+                </Tag>
               </div>
-            )}
-          </Flexbox>
-        </motion.div>
-      )}
+              <Highlighter
+                language={'log'}
+                style={{
+                  maxHeight: 200,
+                  overflow: 'auto',
+                }}
+              >
+                {errorInfo.errorLog}
+              </Highlighter>
+            </Flexbox>
+          )}
+
+          {errorInfo.originalError && errorInfo.originalError !== errorMessage && (
+            <div>
+              <Tag color="orange">{t('mcpInstall.errorDetails.originalError')}</Tag>
+              <div style={{ marginTop: 4, wordBreak: 'break-all' }}>{errorInfo.originalError}</div>
+            </div>
+          )}
+        </Flexbox>
+      </motion.div>
     </Flexbox>
   );
 });

package/src/features/PluginDevModal/MCPManifestForm/index.tsx

@@ -6,8 +6,10 @@ import { useTranslation } from 'react-i18next';
 
 import KeyValueEditor from '@/components/KeyValueEditor';
 import MCPStdioCommandInput from '@/components/MCPStdioCommandInput';
+import ErrorDetails from '@/features/MCP/MCPInstallProgress/InstallError/ErrorDetails';
 import { useToolStore } from '@/store/tool';
 import { mcpStoreSelectors, pluginSelectors } from '@/store/tool/selectors';
+import { type MCPErrorInfoMetadata } from '@/types/plugins';
 
 import ArgsInput from './ArgsInput';
 import CollapsibleSection from './CollapsibleSection';
@@ -46,10 +48,12 @@ const MCPManifestForm = ({ form, isEditMode }: MCPManifestFormProps) => {
   const testState = useToolStore(mcpStoreSelectors.getMCPConnectionTestState(identifier), isEqual);
 
   const [connectionError, setConnectionError] = useState<string | null>(null);
+  const [errorMetadata, setErrorMetadata] = useState<MCPErrorInfoMetadata | null>(null);
 
   const handleTestConnection = async () => {
     setIsTesting(true);
     setConnectionError(null);
+    setErrorMetadata(null);
 
     // Manually trigger validation for fields needed for the test
     let isValid = false;
@@ -97,12 +101,29 @@ const MCPManifestForm = ({ form, isEditMode }: MCPManifestFormProps) => {
         // Be careful about overwriting user input if not desired
         form.setFieldsValue({ manifest: result.manifest });
         setConnectionError(null); // 清除本地错误状态
+        setErrorMetadata(null);
       } else if (result.error) {
         // Store 已经处理了错误状态，这里可以选择显示额外的用户友好提示
         const errorMessage = t('error.testConnectionFailed', {
           error: result.error,
         });
         setConnectionError(errorMessage);
+
+        // Build error metadata for detailed display
+        if (result.errorLog || mcpType === 'stdio') {
+          setErrorMetadata({
+            errorLog: result.errorLog,
+            params:
+              mcpType === 'stdio'
+                ? {
+                    args: mcp?.args,
+                    command: mcp?.command,
+                    type: 'stdio',
+                  }
+                : undefined,
+            timestamp: Date.now(),
+          });
+        }
       }
     } catch (error) {
       // Handle unexpected errors
@@ -121,7 +142,10 @@ const MCPManifestForm = ({ form, isEditMode }: MCPManifestFormProps) => {
       <QuickImportSection
         form={form}
         isEditMode={isEditMode}
-        onClearConnectionError={() => setConnectionError(null)}
+        onClearConnectionError={() => {
+          setConnectionError(null);
+          setErrorMetadata(null);
+        }}
       />
       <Form form={form} layout={'vertical'}>
         <Flexbox>
@@ -270,9 +294,12 @@ const MCPManifestForm = ({ form, isEditMode }: MCPManifestFormProps) => {
           {(connectionError || testState.error) && (
             <Alert
               closable
-              onClose={() => setConnectionError(null)}
+              extra={errorMetadata ? <ErrorDetails errorInfo={errorMetadata} /> : undefined}
+              onClose={() => {
+                setConnectionError(null);
+                setErrorMetadata(null);
+              }}
               showIcon
-              style={{ marginBottom: 16 }}
               title={connectionError || testState.error}
               type="error"
             />

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/server/services/desktopRelease/index.test.ts

@@ -0,0 +1,65 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  type DesktopDownloadType,
+  resolveDesktopDownload,
+  resolveDesktopDownloadFromUrls,
+} from './index';
+
+const mockRelease = {
+  assets: [
+    {
+      browser_download_url: 'https://example.com/LobeHub-2.0.0-arm64.dmg',
+      name: 'LobeHub-2.0.0-arm64.dmg',
+    },
+    {
+      browser_download_url: 'https://example.com/LobeHub-2.0.0-x64.dmg',
+      name: 'LobeHub-2.0.0-x64.dmg',
+    },
+    {
+      browser_download_url: 'https://example.com/LobeHub-2.0.0-setup.exe',
+      name: 'LobeHub-2.0.0-setup.exe',
+    },
+    {
+      browser_download_url: 'https://example.com/LobeHub-2.0.0.AppImage',
+      name: 'LobeHub-2.0.0.AppImage',
+    },
+  ],
+  published_at: '2026-01-01T00:00:00.000Z',
+  tag_name: 'v2.0.0',
+};
+
+describe('desktopRelease', () => {
+  it.each([
+    ['mac-arm', 'LobeHub-2.0.0-arm64.dmg'],
+    ['mac-intel', 'LobeHub-2.0.0-x64.dmg'],
+    ['windows', 'LobeHub-2.0.0-setup.exe'],
+    ['linux', 'LobeHub-2.0.0.AppImage'],
+  ] as Array<[DesktopDownloadType, string]>)(
+    'resolveDesktopDownload(%s)',
+    (type, expectedAssetName) => {
+      const resolved = resolveDesktopDownload(mockRelease as any, type);
+      expect(resolved?.assetName).toBe(expectedAssetName);
+      expect(resolved?.version).toBe('2.0.0');
+      expect(resolved?.tag).toBe('v2.0.0');
+      expect(resolved?.type).toBe(type);
+      expect(resolved?.url).toContain(expectedAssetName);
+    },
+  );
+
+  it('resolveDesktopDownloadFromUrls should match basename', () => {
+    const resolved = resolveDesktopDownloadFromUrls({
+      publishedAt: '2026-01-01T00:00:00.000Z',
+      tag: 'v2.0.0',
+      type: 'windows',
+      urls: [
+        'https://releases.example.com/stable/2.0.0/LobeHub-2.0.0-setup.exe?download=1',
+        'https://releases.example.com/stable/2.0.0/LobeHub-2.0.0-x64.dmg',
+      ],
+      version: '2.0.0',
+    });
+
+    expect(resolved?.assetName).toBe('LobeHub-2.0.0-setup.exe');
+    expect(resolved?.url).toContain('setup.exe');
+  });
+});