@lobehub/chat 1.134.7 → 1.135.1

package/packages/model-runtime/src/providers/newapi/index.ts

@@ -20,41 +20,21 @@ export interface NewAPIPricing {
   model_name: string;
   model_price?: number;
   model_ratio?: number;
-  quota_type: number; // 0: 按量计费, 1: 按次计费
+  /** 0: Pay-per-token, 1: Pay-per-call */
+  quota_type: number;
   supported_endpoint_types?: string[];
 }
 
 const handlePayload = (payload: ChatStreamPayload) => {
-  // 处理 OpenAI responses API 模式
+  // Handle OpenAI responses API mode
   if (
     responsesAPIModels.has(payload.model) ||
     payload.model.includes('gpt-') ||
     /^o\d/.test(payload.model)
   ) {
-    return { ...payload, apiMode: 'responses' } as any;
+    return { ...payload, apiMode: 'responses' };
   }
-  return payload as any;
-};
-
-// 根据 owned_by 字段判断提供商（基于 NewAPI 的 channel name）
-const getProviderFromOwnedBy = (ownedBy: string): string => {
-  const normalizedOwnedBy = ownedBy.toLowerCase();
-
-  if (normalizedOwnedBy.includes('claude') || normalizedOwnedBy.includes('anthropic')) {
-    return 'anthropic';
-  }
-  if (normalizedOwnedBy.includes('google') || normalizedOwnedBy.includes('gemini')) {
-    return 'google';
-  }
-  if (normalizedOwnedBy.includes('xai') || normalizedOwnedBy.includes('grok')) {
-    return 'xai';
-  }
-  if (normalizedOwnedBy.includes('ali') || normalizedOwnedBy.includes('qwen')) {
-    return 'qwen';
-  }
-
-  // 默认为 openai
-  return 'openai';
+  return payload;
 };
 
 export const LobeNewAPIAI = createRouterRuntime({
@@ -66,16 +46,16 @@ export const LobeNewAPIAI = createRouterRuntime({
   },
   id: ModelProvider.NewAPI,
   models: async ({ client: openAIClient }) => {
-    // 获取基础 URL（移除末尾的 API 版本路径如 /v1、/v1beta 等）
+    // Get base URL (remove trailing API version paths like /v1, /v1beta, etc.)
     const baseURL = openAIClient.baseURL.replace(/\/v\d+[a-z]*\/?$/, '');
 
     const modelsPage = (await openAIClient.models.list()) as any;
     const modelList: NewAPIModelCard[] = modelsPage.data || [];
 
-    // 尝试获取 pricing 信息以补充模型详细信息
+    // Try to get pricing information to enrich model details
     let pricingMap: Map<string, NewAPIPricing> = new Map();
     try {
-      // 使用保存的 baseURL
+      // Use saved baseURL
       const pricingResponse = await fetch(`${baseURL}/api/pricing`, {
         headers: {
           Authorization: `Bearer ${openAIClient.apiKey}`,
@@ -99,22 +79,22 @@ export const LobeNewAPIAI = createRouterRuntime({
     const enrichedModelList = modelList.map((model) => {
       let enhancedModel: any = { ...model };
 
-      // 1. 添加 pricing 信息
+      // add pricing info
       const pricing = pricingMap.get(model.id);
       if (pricing) {
-        // NewAPI 的价格计算逻辑：
-        // - quota_type: 0 表示按量计费（按 token），1 表示按次计费
-        // - model_ratio: 相对于基础价格的倍率（基础价格 = $0.002/1K tokens）
-        // - model_price: 直接指定的价格（优先使用）
-        // - completion_ratio: 输出价格相对于输入价格的倍率
+        // NewAPI pricing calculation logic:
+        // - quota_type: 0 means pay-per-token, 1 means pay-per-call
+        // - model_ratio: multiplier relative to base price (base price = $0.002/1K tokens)
+        // - model_price: directly specified price (takes priority)
+        // - completion_ratio: output price multiplier relative to input price
         //
-        // LobeChat 需要的格式：美元/百万 token
+        // LobeChat required format: USD per million tokens
 
         let inputPrice: number | undefined;
         let outputPrice: number | undefined;
 
         if (pricing.quota_type === 0) {
-          // 按量计费
+          // Pay-per-token
           if (pricing.model_price && pricing.model_price > 0) {
             // model_price is a direct price value; need to confirm its unit.
             // Assumption: model_price is the price per 1,000 tokens (i.e., $/1K tokens).
@@ -124,62 +104,38 @@ export const LobeNewAPIAI = createRouterRuntime({
             inputPrice = pricing.model_price * 2;
           } else if (pricing.model_ratio) {
             // model_ratio × $0.002/1K = model_ratio × $2/1M
-            inputPrice = pricing.model_ratio * 2; // 转换为 $/1M tokens
+            inputPrice = pricing.model_ratio * 2; // Convert to $/1M tokens
           }
 
           if (inputPrice !== undefined) {
-            // 计算输出价格
+            // Calculate output price
             outputPrice = inputPrice * (pricing.completion_ratio || 1);
 
             enhancedModel.pricing = {
-              input: inputPrice,
-              output: outputPrice,
+              units: [
+                {
+                  name: 'textInput',
+                  rate: inputPrice,
+                  strategy: 'fixed',
+                  unit: 'millionTokens',
+                },
+                {
+                  name: 'textOutput',
+                  rate: outputPrice,
+                  strategy: 'fixed',
+                  unit: 'millionTokens',
+                },
+              ],
             };
           }
         }
-        // quota_type === 1 按次计费暂不支持
-      }
-
-      // 2. 根据优先级处理 provider 信息并缓存路由
-      let detectedProvider = 'openai'; // 默认
-
-      // 优先级1：使用 supported_endpoint_types
-      if (model.supported_endpoint_types && model.supported_endpoint_types.length > 0) {
-        if (model.supported_endpoint_types.includes('anthropic')) {
-          detectedProvider = 'anthropic';
-        } else if (model.supported_endpoint_types.includes('gemini')) {
-          detectedProvider = 'google';
-        } else if (model.supported_endpoint_types.includes('xai')) {
-          detectedProvider = 'xai';
-        } else if (model.supported_endpoint_types.includes('qwen')) {
-          detectedProvider = 'qwen';
-        }
-      }
-      // 优先级2：使用 owned_by 字段
-      else if (model.owned_by) {
-        detectedProvider = getProviderFromOwnedBy(model.owned_by);
-      }
-      // 优先级3：基于模型名称检测
-      else {
-        detectedProvider = detectModelProvider(model.id);
+        // quota_type === 1 pay-per-call is not currently supported
       }
 
-      // 将检测到的 provider 信息附加到模型上
-      enhancedModel._detectedProvider = detectedProvider;
-
       return enhancedModel;
     });
 
-    // 使用 processMultiProviderModelList 处理模型能力
-    const processedModels = await processMultiProviderModelList(enrichedModelList, 'newapi');
-
-    // 清理临时字段
-    return processedModels.map((model: any) => {
-      if (model._detectedProvider) {
-        delete model._detectedProvider;
-      }
-      return model;
-    });
+    return processMultiProviderModelList(enrichedModelList, 'newapi');
   },
   routers: (options) => {
     const userBaseURL = options.baseURL?.replace(/\/v\d+[a-z]*\/?$/, '') || '';
@@ -215,16 +171,6 @@ export const LobeNewAPIAI = createRouterRuntime({
           baseURL: urlJoin(userBaseURL, '/v1'),
         },
       },
-      {
-        apiType: 'qwen',
-        models: LOBE_DEFAULT_MODEL_LIST.map((m) => m.id).filter(
-          (id) => detectModelProvider(id) === 'qwen',
-        ),
-        options: {
-          ...options,
-          baseURL: urlJoin(userBaseURL, '/v1'),
-        },
-      },
       {
         apiType: 'openai',
         options: {

package/packages/model-runtime/src/types/index.ts

@@ -8,4 +8,3 @@ export * from './textToImage';
 export * from './toolsCalling';
 export * from './tts';
 export * from './type';
-export * from './usage';

package/packages/types/src/message/base.ts

@@ -61,6 +61,7 @@ export interface ModelTokensUsage {
   rejectedPredictionTokens?: number;
 
   // Total tokens
+  // TODO: make all following fields required
   totalInputTokens?: number;
   totalOutputTokens?: number;
   totalTokens?: number;

package/packages/utils/package.json

@@ -5,7 +5,8 @@
   "exports": {
     ".": "./src/index.ts",
     "./server": "./src/server/index.ts",
-    "./client": "./src/client/index.ts"
+    "./client": "./src/client/index.ts",
+    "./object": "./src/object.ts"
   },
   "scripts": {
     "test": "vitest",

package/src/app/[variants]/(main)/chat/(workspace)/@conversation/features/ChatList/WelcomeChatItem/index.tsx

@@ -1,17 +1 @@
-import React, { memo } from 'react';
-
-import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
-
-import InboxWelcome from './InboxWelcome';
-import WelcomeMessage from './WelcomeMessage';
-
-const WelcomeChatItem = memo(() => {
-  const showInboxWelcome = useChatStore(chatSelectors.showInboxWelcome);
-
-  if (showInboxWelcome) return <InboxWelcome />;
-
-  return <WelcomeMessage />;
-});
-
-export default WelcomeChatItem;
+export { default } from './WelcomeMessage';

package/src/app/[variants]/(main)/chat/(workspace)/@conversation/features/ChatMinimap/index.tsx

@@ -3,6 +3,7 @@
 import { Icon } from '@lobehub/ui';
 import { Tooltip } from 'antd';
 import { createStyles, useTheme } from 'antd-style';
+import debug from 'debug';
 import { ChevronDown, ChevronUp } from 'lucide-react';
 import { memo, useCallback, useMemo, useState, useSyncExternalStore } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -17,10 +18,12 @@ import {
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
 
+const log = debug('lobe-react:chat-minimap');
+
 const MIN_WIDTH = 16;
 const MAX_WIDTH = 30;
 const MAX_CONTENT_LENGTH = 320;
-const MIN_MESSAGES = 6;
+const MIN_MESSAGES = 4;
 
 const useStyles = createStyles(({ css, token }) => ({
   arrow: css`
@@ -219,8 +222,8 @@ const ChatMinimap = () => {
   const activeIndicatorPosition = useMemo(() => {
     if (activeIndex === null) return null;
 
-    console.log('> activeIndex', activeIndex);
-    console.log('> indicatorIndexMap', indicatorIndexMap);
+    log('> activeIndex', activeIndex);
+    log('> indicatorIndexMap', indicatorIndexMap);
 
     return indicatorIndexMap.get(activeIndex) ?? null;
   }, [activeIndex, indicatorIndexMap]);
@@ -246,7 +249,7 @@ const ChatMinimap = () => {
       let targetPosition: number;
 
       if (activeIndicatorPosition !== null) {
-        console.log('activeIndicatorPosition', activeIndicatorPosition);
+        log('activeIndicatorPosition', activeIndicatorPosition);
         // We're on an indicator, move to prev/next
         const delta = direction === 'prev' ? -1 : 1;
         targetPosition = Math.min(

package/src/app/[variants]/(main)/chat/@session/features/SessionListContent/List/Item/index.tsx

@@ -31,22 +31,21 @@ const SessionItem = memo<SessionItemProps>(({ id }) => {
   const [active] = useSessionStore((s) => [s.activeId === id]);
   const [loading] = useChatStore((s) => [chatSelectors.isAIGenerating(s) && id === s.activeId]);
 
-  const [pin, title, description, avatar, avatarBackground, updateAt, model, group] =
-    useSessionStore((s) => {
-      const session = sessionSelectors.getSessionById(id)(s);
-      const meta = session.meta;
-
-      return [
-        sessionHelpers.getSessionPinned(session),
-        sessionMetaSelectors.getTitle(meta),
-        sessionMetaSelectors.getDescription(meta),
-        sessionMetaSelectors.getAvatar(meta),
-        meta.backgroundColor,
-        session?.updatedAt,
-        session.model,
-        session?.group,
-      ];
-    });
+  const [pin, title, avatar, avatarBackground, updateAt, model, group] = useSessionStore((s) => {
+    const session = sessionSelectors.getSessionById(id)(s);
+    const meta = session.meta;
+
+    return [
+      sessionHelpers.getSessionPinned(session),
+      sessionMetaSelectors.getTitle(meta),
+      sessionMetaSelectors.getAvatar(meta),
+      meta.backgroundColor,
+      session?.updatedAt,
+      session.model,
+      session?.group,
+      // sessionMetaSelectors.getDescription(meta),
+    ];
+  });
 
   const showModel = model !== defaultModel;
 
@@ -99,7 +98,7 @@ const SessionItem = memo<SessionItemProps>(({ id }) => {
         avatar={avatar}
         avatarBackground={avatarBackground}
         date={updateAt?.valueOf()}
-        description={description}
+        // description={description}
         draggable={isDesktop}
         key={id}
         loading={loading}

package/src/app/[variants]/(main)/chat/@session/features/SessionListContent/ListItem/index.tsx

@@ -12,7 +12,7 @@ const useStyles = createStyles(({ css, token }) => {
     container: css`
       position: relative;
       margin-block: 2px;
-      padding-inline: 8px 16px;
+      padding-inline: 12px 16px;
       border-radius: ${token.borderRadius}px;
     `,
     mobile: css`
@@ -40,7 +40,7 @@ const ListItem = memo<ListItemProps & { avatar: string; avatarBackground?: strin
           avatar={avatar}
           background={avatarBackground}
           shape="circle"
-          size={40}
+          size={32}
         />
       ),
       [isHovering, avatar, avatarBackground],

package/src/app/[variants]/(main)/image/@menu/components/SizeSelect/index.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { Block, Grid, GridProps, Text } from '@lobehub/ui';
+import { Block, Grid, GridProps, Select, Text } from '@lobehub/ui';
 import { useTheme } from 'antd-style';
 import { ReactNode, memo } from 'react';
 import { Center } from 'react-layout-kit';
@@ -13,6 +13,19 @@ export interface SizeSelectProps extends Omit<GridProps, 'children' | 'onChange'
   value?: 'auto' | string;
 }
 
+/**
+ * Check if a size value can be parsed as valid aspect ratio
+ */
+const canParseAsRatio = (value: string): boolean => {
+  if (value === 'auto') return true;
+
+  const parts = value.split('x');
+  if (parts.length !== 2) return false;
+
+  const [width, height] = parts.map(Number);
+  return !isNaN(width) && !isNaN(height) && width > 0 && height > 0;
+};
+
 const SizeSelect = memo<SizeSelectProps>(({ options, onChange, value, defaultValue, ...rest }) => {
   const theme = useTheme();
   const [active, setActive] = useMergeState('auto', {
@@ -20,6 +33,16 @@ const SizeSelect = memo<SizeSelectProps>(({ options, onChange, value, defaultVal
     onChange,
     value,
   });
+
+  // Check if all options can be parsed as valid ratios
+  const hasInvalidRatio = options?.some((item) => !canParseAsRatio(item.value));
+
+  // If any option cannot be parsed as ratio, fallback to regular Select
+  if (hasInvalidRatio) {
+    return (
+      <Select onChange={onChange} options={options} style={{ width: '100%' }} value={active} />
+    );
+  }
   return (
     <Block padding={4} variant={'filled'} {...rest}>
       <Grid gap={4} maxItemWidth={72} rows={16}>

package/src/features/Conversation/Messages/Assistant/Tool/Inspector/BuiltinPluginTitle.tsx

@@ -1,8 +1,9 @@
+import { Icon } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
+import { ChevronRight } from 'lucide-react';
 import { ReactNode, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import Loader from '@/components/CircleLoader';
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
 import { shinyTextStylish } from '@/styles/loading';
@@ -32,21 +33,18 @@ interface BuiltinPluginTitleProps {
   toolCallId: string;
 }
 
-const BuiltinPluginTitle = memo<BuiltinPluginTitleProps>(
-  ({ messageId, index, apiName, icon, title }) => {
-    const { styles } = useStyles();
-
-    const isLoading = useChatStore(chatSelectors.isInToolsCalling(messageId, index));
-
-    return (
-      <Flexbox align={'center'} className={isLoading ? styles.shinyText : ''} gap={4} horizontal>
-        {isLoading ? <Loader /> : icon}
-        <Flexbox align={'baseline'} gap={4} horizontal>
-          <div>{title}</div>/<span className={styles.apiName}>{apiName}</span>
-        </Flexbox>
-      </Flexbox>
-    );
-  },
-);
+const BuiltinPluginTitle = memo<BuiltinPluginTitleProps>(({ messageId, index, apiName, title }) => {
+  const { styles } = useStyles();
+
+  const isLoading = useChatStore(chatSelectors.isInToolsCalling(messageId, index));
+
+  return (
+    <Flexbox align={'center'} className={isLoading ? styles.shinyText : ''} gap={4} horizontal>
+      <div>{title}</div>
+      <Icon icon={ChevronRight} />
+      <span className={styles.apiName}>{apiName}</span>
+    </Flexbox>
+  );
+});
 
 export default BuiltinPluginTitle;

package/src/features/Conversation/Messages/Assistant/Tool/Inspector/ToolTitle.tsx

@@ -1,13 +1,11 @@
 import { Icon } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
 import isEqual from 'fast-deep-equal';
-import { Globe, Laptop } from 'lucide-react';
+import { ChevronRight } from 'lucide-react';
 import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import Loader from '@/components/CircleLoader';
-import PluginAvatar from '@/features/PluginAvatar';
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
 import { pluginHelpers, useToolStore } from '@/store/tool';
@@ -60,13 +58,13 @@ const ToolTitle = memo<ToolTitleProps>(({ identifier, messageId, index, apiName,
     () => [
       {
         apiName: t(`search.apiName.${apiName}`, apiName),
-        icon: <Icon icon={Globe} size={13} />,
+        // icon: <Icon icon={Globe} size={13} />,
         id: WebBrowsingManifest.identifier,
         title: t('search.title'),
       },
       {
         apiName: t(`localSystem.apiName.${apiName}`, apiName),
-        icon: <Icon icon={Laptop} size={13} />,
+        // icon: <Icon icon={Laptop} size={13} />,
         id: LocalSystemManifest.identifier,
         title: t('localSystem.title'),
       },
@@ -92,8 +90,8 @@ const ToolTitle = memo<ToolTitleProps>(({ identifier, messageId, index, apiName,
 
   return (
     <Flexbox align={'center'} className={isLoading ? styles.shinyText : ''} gap={6} horizontal>
-      {isLoading ? <Loader /> : <PluginAvatar identifier={identifier} size={18} />}
-      <div>{pluginTitle}</div>/<span className={styles.apiName}>{apiName}</span>
+      <div>{pluginTitle}</div> <Icon icon={ChevronRight} />
+      <span className={styles.apiName}>{apiName}</span>
     </Flexbox>
   );
 });

package/src/features/Conversation/Messages/Assistant/Tool/Render/Arguments/index.tsx

@@ -116,14 +116,7 @@ const Arguments = memo<ArgumentsProps>(({ arguments: args = '', shine, actions }
         </Flexbox>
       )}
       {args.length > 100 ? (
-        <Highlighter
-          language={'json'}
-          showLanguage={false}
-          style={{ padding: 8 }}
-          variant={'borderless'}
-        >
-          {JSON.stringify(displayArgs, null, 2)}
-        </Highlighter>
+        <pre style={{ padding: 8 }}>{JSON.stringify(displayArgs, null, 2)}</pre>
       ) : (
         Object.entries(displayArgs).map(([key, value]) => {
           return (

package/src/locales/default/chat.ts

@@ -4,8 +4,8 @@ export default {
   },
   agentDefaultMessage:
     '你好，我是 **{{name}}**，你可以立即与我开始对话，也可以前往 [助手设置]({{url}}) 完善我的信息。',
-  agentDefaultMessageWithSystemRole: '你好，我是 **{{name}}**，{{systemRole}}，让我们开始对话吧！',
-  agentDefaultMessageWithoutEdit: '你好，我是 **{{name}}**，让我们开始对话吧！',
+  agentDefaultMessageWithSystemRole: '你好，我是 **{{name}}**，有什么我可以帮忙的吗？',
+  agentDefaultMessageWithoutEdit: '你好，我是 **{{name}}**，有什么我可以帮忙的吗？',
   agents: '助手',
   artifact: {
     generating: '生成中',

package/src/server/modules/EdgeConfig/index.ts

@@ -3,22 +3,9 @@ import createDebug from 'debug';
 
 import { appEnv } from '@/envs/app';
 
-const debug = createDebug('lobe-server:edge-config');
+import { EdgeConfigData, EdgeConfigKeys } from './types';
 
-const EdgeConfigKeys = {
-  /**
-   * Assistant whitelist
-   */
-  AssistantBlacklist: 'assistant_blacklist',
-  /**
-   * Assistant whitelist
-   */
-  AssistantWhitelist: 'assistant_whitelist',
-  /**
-   * Feature flags configuration
-   */
-  FeatureFlags: 'feature_flags',
-};
+const debug = createDebug('lobe-server:edge-config');
 
 export class EdgeConfig {
   get client(): EdgeConfigClient {
@@ -38,29 +25,24 @@ export class EdgeConfig {
     return isEnabled;
   }
 
-  getAgentRestrictions = async () => {
-    const { assistant_blacklist: blacklist, assistant_whitelist: whitelist } =
-      await this.client.getAll([
-        EdgeConfigKeys.AssistantWhitelist,
-        EdgeConfigKeys.AssistantBlacklist,
-      ]);
+  private async getValue<K extends EdgeConfigKeys>(key: K) {
+    return this.client.get<EdgeConfigData[K]>(key);
+  }
 
-    return { blacklist, whitelist } as {
-      blacklist: string[] | undefined;
-      whitelist: string[] | undefined;
-    };
-  };
+  private async getValues<const K extends EdgeConfigKeys>(keys: K[]) {
+    return this.client.getAll<Pick<EdgeConfigData, K>>(keys);
+  }
 
-  getFlagByKey = async (key: string) => {
-    const value = await this.client.get(key);
-    return value;
+  getAgentRestrictions = async () => {
+    const { assistant_blacklist: blacklist, assistant_whitelist: whitelist } = await this.getValues(
+      ['assistant_blacklist', 'assistant_whitelist'],
+    );
+    return { blacklist, whitelist };
   };
 
   getFeatureFlags = async () => {
-    const featureFlags = await this.client.get(EdgeConfigKeys.FeatureFlags);
+    const featureFlags = await this.getValue('feature_flags');
     debug('Feature flags retrieved: %O', featureFlags);
-    return featureFlags as Record<string, boolean | string[]> | undefined;
+    return featureFlags;
   };
 }
-
-export { EdgeConfigKeys };

package/src/server/modules/EdgeConfig/types.ts

@@ -4,6 +4,19 @@
  * EdgeConfig 完整配置类型
  */
 export interface EdgeConfigData {
+  /**
+   * Assistant blacklist
+   */
   assistant_blacklist?: string[];
+  /**
+   * Assistant whitelist
+   */
   assistant_whitelist?: string[];
+
+  /**
+   * Feature flags configuration
+   */
+  feature_flags?: Record<string, boolean | string[]>;
 }
+
+export type EdgeConfigKeys = keyof EdgeConfigData;

package/packages/model-runtime/src/types/usage.ts

@@ -1,27 +0,0 @@
-export interface ModelTokensUsage {
-  acceptedPredictionTokens?: number;
-  inputAudioTokens?: number;
-  inputCacheMissTokens?: number;
-  inputCachedTokens?: number;
-  /**
-   * currently only pplx has citation_tokens
-   */
-  inputCitationTokens?: number;
-  /**
-   * user prompt image
-   */
-  inputImageTokens?: number;
-  /**
-   * user prompt input
-   */
-  inputTextTokens?: number;
-  inputWriteCacheTokens?: number;
-  outputAudioTokens?: number;
-  outputImageTokens?: number;
-  outputReasoningTokens?: number;
-  outputTextTokens?: number;
-  rejectedPredictionTokens?: number;
-  totalInputTokens?: number;
-  totalOutputTokens?: number;
-  totalTokens?: number;
-}