Merge upstream/main into fix/helm-upgrade

Resolve conflicts:
- mysql.yaml: keep secrets in separate secrets.yaml (our refactor)
- install.sh: keep wait_rollout steps for core components
- PortalMenuSettings.tsx: adopt upstream menu ordering
- PortalConfigContext.tsx: adopt upstream menu ordering

Author: lexburner

himarket-server/src/main/java/com/alibaba/himarket/service/hichat/service/AbstractLlmService.java

@@ -176,7 +176,7 @@ protected ModelFeature getOrDefaultModelFeature(ProductResult product) {
 
         return ModelFeature.builder()
                 .model(modelFeature.getModel())
-                .maxTokens(ObjectUtil.defaultIfNull(modelFeature.getMaxTokens(), 5000))
+                .maxTokens(modelFeature.getMaxTokens())
                 .temperature(ObjectUtil.defaultIfNull(modelFeature.getTemperature(), 0.9))
                 .streaming(ObjectUtil.defaultIfNull(modelFeature.getStreaming(), true))
                 .webSearch(ObjectUtil.defaultIfNull(modelFeature.getWebSearch(), false))

himarket-web/himarket-admin/src/components/portal/PortalMenuSettings.tsx

@@ -10,11 +10,11 @@ interface PortalMenuSettingsProps {
 const MENU_ITEMS = [
     {key: "chat", label: "HiChat"},
     {key: "coding", label: "HiCoding"},
-    {key: "models", label: "模型"},
-    {key: "skills", label: "Skills"},
+    {key: "agents", label: "智能体"},
     {key: "mcp", label: "MCP"},
+    {key: "models", label: "模型"},
     {key: "apis", label: "API"},
-    {key: "agents", label: "智能体"},
+    {key: "skills", label: "Skills"},
 ]
 
 export function PortalMenuSettings({portal, onRefresh}: PortalMenuSettingsProps) {

himarket-web/himarket-frontend/src/context/PortalConfigContext.tsx

@@ -10,11 +10,11 @@ export interface TabItem {
 const ALL_TABS: TabItem[] = [
   { key: "chat", path: "/chat", label: "HiChat" },
   { key: "coding", path: "/coding", label: "HiCoding" },
-  { key: "models", path: "/models", label: "模型" },
-  { key: "skills", path: "/skills", label: "Skills" },
+  { key: "agents", path: "/agents", label: "智能体" },
   { key: "mcp", path: "/mcp", label: "MCP" },
+  { key: "models", path: "/models", label: "模型" },
   { key: "apis", path: "/apis", label: "API" },
-  { key: "agents", path: "/agents", label: "智能体" },
+  { key: "skills", path: "/skills", label: "Skills" },
 ];
 
 interface PortalConfigContextValue {