@opensumi/ide-ai-native 3.8.1-next-1740556231.0 → 3.8.1-next-1740571693.0

package/src/browser/mcp/mcp-server-proxy.service.ts

@@ -4,7 +4,7 @@ import { Autowired, Injectable } from '@opensumi/di';
 import { ILogger } from '@opensumi/ide-core-browser';
 import { Emitter, Event } from '@opensumi/ide-core-common';
 
-import { ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../common';
+import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../common';
 import { IMCPServerProxyService } from '../../common/types';
 import { IMCPServerRegistry, TokenMCPServerRegistry } from '../types';
 
@@ -35,7 +35,7 @@ export class MCPServerProxyService implements IMCPServerProxyService {
         name: tool.name,
         description: tool.description,
         inputSchema: zodToJsonSchema(tool.inputSchema),
-        providerName: 'sumi-builtin',
+        providerName: BUILTIN_MCP_SERVER_NAME,
       }),
     );
 
@@ -52,4 +52,16 @@ export class MCPServerProxyService implements IMCPServerProxyService {
   async getAllMCPTools() {
     return this.sumiMCPServerProxyService.getAllMCPTools();
   }
+
+  async $getServers() {
+    return this.sumiMCPServerProxyService.getServers();
+  }
+
+  async $startServer(serverName: string) {
+    await this.sumiMCPServerProxyService.startServer(serverName);
+  }
+
+  async $stopServer(serverName: string) {
+    await this.sumiMCPServerProxyService.stopServer(serverName);
+  }
 }

package/src/browser/mcp/mcp-server.feature.registry.ts

@@ -2,6 +2,7 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { ILogger } from '@opensumi/ide-core-common';
 
+import { BUILTIN_MCP_SERVER_NAME } from '../../common';
 import { getToolName } from '../../common/utils';
 import { IMCPServerRegistry, IMCPServerToolComponentProps, MCPLogger, MCPToolDefinition } from '../types';
 
@@ -25,7 +26,7 @@ export class MCPServerRegistry implements IMCPServerRegistry {
     return new LoggerAdapter(this.baseLogger);
   }
 
-  getMCPTool(name: string, serverName = 'sumi-builtin'): MCPToolDefinition | undefined {
+  getMCPTool(name: string, serverName = BUILTIN_MCP_SERVER_NAME): MCPToolDefinition | undefined {
     return this.tools.find((tool) => getToolName(tool.name, serverName) === name);
   }
 
@@ -36,7 +37,7 @@ export class MCPServerRegistry implements IMCPServerRegistry {
   registerToolComponent(
     name: string,
     component: React.FC<IMCPServerToolComponentProps>,
-    serverName = 'sumi-builtin',
+    serverName = BUILTIN_MCP_SERVER_NAME,
   ): void {
     this.toolComponents[getToolName(name, serverName)] = component;
   }

package/src/browser/mcp/tools/components/EditFile.tsx

@@ -1,5 +1,5 @@
 import cls from 'classnames';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo } from 'react';
 
 import { Icon, Popover } from '@opensumi/ide-components';
 import {
@@ -10,6 +10,7 @@ import {
   Uri,
   detectModeId,
   path,
+  useAutorun,
   useInjectable,
 } from '@opensumi/ide-core-browser';
 import { Loading } from '@opensumi/ide-core-browser/lib/components/ai-native';
@@ -17,24 +18,61 @@ import { ILanguageService } from '@opensumi/monaco-editor-core/esm/vs/editor/com
 import { IModelService } from '@opensumi/monaco-editor-core/esm/vs/editor/common/services/model';
 import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 
-import { CodeBlockData } from '../../../../common/types';
 import { ChatMarkdown } from '../../../components/ChatMarkdown';
 import { IMCPServerToolComponentProps } from '../../../types';
-import { BaseApplyService } from '../../base-apply.service';
+import { BaseApplyService, CodeBlockData } from '../../base-apply.service';
 
 import styles from './index.module.less';
 
+const renderStatus = (codeBlockData: CodeBlockData) => {
+  const status = codeBlockData.status;
+  switch (status) {
+    case 'generating':
+      return <Loading />;
+    case 'pending':
+      return (
+        <Popover title={status} id={'edit-file-tool-status-pending'}>
+          <Icon iconClass='codicon codicon-circle-large' />
+        </Popover>
+      );
+    case 'success':
+      return (
+        <Popover title={status} id={'edit-file-tool-status-success'}>
+          <Icon iconClass='codicon codicon-check-all' />
+        </Popover>
+      );
+    case 'failed':
+      return (
+        <Popover title={status} id={'edit-file-tool-status-failed'}>
+          <Icon iconClass='codicon codicon-error' color='var(--vscode-input-errorForeground)' />
+        </Popover>
+      );
+    case 'cancelled':
+      return (
+        <Popover title={status} id={'edit-file-tool-status-cancelled'}>
+          <Icon iconClass='codicon codicon-close' color='var(--vscode-input-placeholderForeground)' />
+        </Popover>
+      );
+    default:
+      return null;
+  }
+};
+
 export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
   const { args, messageId, toolCallId } = props;
-  const [mode, setMode] = useState<'code' | 'diff'>('code');
   const labelService = useInjectable(LabelService);
   const appConfig = useInjectable<AppConfig>(AppConfig);
   const applyService = useInjectable<BaseApplyService>(BaseApplyService);
   const { target_file = '', code_edit, instructions } = args || {};
   const absolutePath = path.join(appConfig.workspaceDir, target_file);
-  const [codeBlockData, setCodeBlockData] = useState<CodeBlockData | undefined>(
-    applyService.getCodeBlock(toolCallId, messageId),
-  );
+
+  const codeBlockData = applyService.getCodeBlock(absolutePath, messageId);
+
+  useAutorun(applyService.codeBlockMapObservable);
+
+  if (toolCallId && codeBlockData) {
+    applyService.initToolCallId(codeBlockData.id, toolCallId);
+  }
 
   const icon = useMemo(() => {
     if (!target_file) {
@@ -53,66 +91,40 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
     return detectedModeId;
   }, [target_file, absolutePath]);
 
-  useEffect(() => {
-    const disposable = applyService.onCodeBlockUpdate((codeBlockData) => {
-      setCodeBlockData({ ...codeBlockData });
-    });
-    return () => {
-      disposable.dispose();
-    };
-  }, []);
-
   // 多次迭代时，仅在首处tool组件中展示
-  // FIXME: 这个优化有必要吗？每次都展示也挺好？
-  if (!args || !codeBlockData) {
+  if (!args || !codeBlockData || (toolCallId && toolCallId !== codeBlockData.initToolCallId)) {
     return null;
   }
 
   return [
     instructions && <p>{instructions}</p>,
-    <div className={styles['edit-file-tool']} key={'edit-file-tool'}>
+    <div className={styles['edit-file-tool']} key={`edit-file-tool-${codeBlockData.id}`}>
       <div
         className={cls(styles['edit-file-tool-header'], {
           clickable: codeBlockData.status === 'pending' || codeBlockData.status === 'success',
         })}
         onClick={() => {
           if (codeBlockData.status === 'pending') {
-            applyService.renderApplyResult(codeBlockData, codeBlockData.updatedCode!);
+            applyService.reRenderPendingApply();
           } else if (codeBlockData.status === 'success') {
-            applyService.revealApplyPosition(codeBlockData);
+            applyService.revealApplyPosition(codeBlockData.id);
           }
         }}
       >
-        <div className={styles.left}>
-          {icon && <span className={icon}></span>}
-          <span className={styles['edit-file-tool-file-name']}>{target_file}</span>
-          {codeBlockData.iterationCount > 1 && (
-            <span className={styles['edit-file-tool-iteration-count']}>{codeBlockData.iterationCount}/3</span>
-          )}
-          {renderStatus(codeBlockData)}
-        </div>
-        <div className={styles.right}>
-          <Popover title={'Show Code'} id={'edit-file-tool-show-code'}>
-            <Icon iconClass='codicon codicon-file-code' onClick={() => setMode('code')} />
-          </Popover>
-          {codeBlockData.applyResult?.diff && (
-            <Popover title={'Show Diff'} id={'edit-file-tool-show-diff'}>
-              <Icon iconClass='codicon codicon-diff-multiple' onClick={() => setMode('diff')} />
-            </Popover>
-          )}
-        </div>
+        {icon && <span className={icon}></span>}
+        <span className={styles['edit-file-tool-file-name']}>{target_file}</span>
+        {codeBlockData.iterationCount > 1 && (
+          <span className={styles['edit-file-tool-iteration-count']}>{codeBlockData.iterationCount}/3</span>
+        )}
+        {renderStatus(codeBlockData)}
       </div>
-      <ChatMarkdown
-        markdown={
-          mode === 'code'
-            ? `\`\`\`${languageId || ''}\n${code_edit}\n\`\`\``
-            : `\`\`\`diff\n${codeBlockData.applyResult?.diff}\n\`\`\``
-        }
-        hideInsert={true}
-      />
+      <ChatMarkdown markdown={`\`\`\`${languageId || ''}\n${code_edit}\n\`\`\``} hideInsert={true} />
     </div>,
     codeBlockData.applyResult && codeBlockData.applyResult.diagnosticInfos.length > 0 && (
-      <div className={styles['edit-file-tool-diagnostic-errors']} key={'edit-file-tool-diagnostic-errors'}>
+      <div
+        className={styles['edit-file-tool-diagnostic-errors']}
+        key={`edit-file-tool-diagnostic-errors-${codeBlockData.id}`}
+      >
         <div className={styles['title']}>Found Lints:</div>
         {codeBlockData.applyResult?.diagnosticInfos.map((info) => (
           <div
@@ -130,37 +142,3 @@ export const EditFileToolComponent = (props: IMCPServerToolComponentProps) => {
     ),
   ];
 };
-
-const renderStatus = (codeBlockData: CodeBlockData) => {
-  const status = codeBlockData.status;
-  switch (status) {
-    case 'generating':
-      return <Loading />;
-    case 'pending':
-      return (
-        <Popover title='Pending' id={'edit-file-tool-status-pending'}>
-          <Icon iconClass='codicon codicon-circle-large' />
-        </Popover>
-      );
-    case 'success':
-      return (
-        <Popover title='Success' id={'edit-file-tool-status-success'}>
-          <Icon iconClass='codicon codicon-check-all' />
-        </Popover>
-      );
-    case 'failed':
-      return (
-        <Popover title='Failed' id={'edit-file-tool-status-failed'}>
-          <Icon iconClass='codicon codicon-error' style={{ color: 'var(--debugConsole-errorForeground)' }} />
-        </Popover>
-      );
-    case 'cancelled':
-      return (
-        <Popover title='Cancelled' id={'edit-file-tool-status-cancelled'}>
-          <Icon iconClass='codicon codicon-close' style={{ color: 'var(--input-placeholderForeground)' }} />
-        </Popover>
-      );
-    default:
-      return null;
-  }
-};

package/src/browser/mcp/tools/components/index.module.less

@@ -1,14 +1,15 @@
 .edit-file-tool-header {
   display: flex;
   align-items: center;
-  justify-content: space-between;
   padding: 2px 8px;
   border-bottom: 1px solid var(--vscode-commandCenter-inactiveBorder);
   background-color: var(--design-block-background);
   font-size: 10px;
   margin-bottom: -4px;
   border-radius: 8px 8px 0 0;
-  white-space: nowrap;
+  > span {
+    margin-right: 4px;
+  }
   :global(span.codicon) {
     font-size: 12px;
   }
@@ -17,26 +18,6 @@
     align-items: center;
     justify-content: center;
   }
-  .left,
-  .right {
-    display: flex;
-    align-items: center;
-  }
-  &::after {
-    display: none;
-  }
-  .left {
-    > span {
-      margin-right: 4px;
-    }
-  }
-  .right > div {
-    margin-left: 4px;
-  }
-}
-.edit-file-tool-file-name {
-  text-overflow: ellipsis;
-  overflow: hidden;
 }
 .edit-file-tool {
   border: 1px solid var(--vscode-commandCenter-inactiveBorder);

package/src/browser/mcp/tools/editFile.ts

@@ -69,8 +69,8 @@ You should specify the following arguments before the others: [target_file]`,
     };
   }
 
-  private async handler(args: z.infer<typeof inputSchema> & { toolCallId: string }, logger: MCPLogger) {
-    const result = await this.editFileHandler.handler(args, args.toolCallId);
+  private async handler(args: z.infer<typeof inputSchema>, logger: MCPLogger) {
+    const result = await this.editFileHandler.handler(args.targetFile, args.codeEdit, args.instructions);
     return {
       content: [
         {

package/src/browser/mcp/tools/handlers/EditFile.ts

@@ -12,10 +12,10 @@ export class EditFileHandler {
   @Autowired(BaseApplyService)
   private applyService: BaseApplyService;
 
-  async handler(params: { targetFile: string; codeEdit: string; instructions?: string }, toolCallId: string) {
-    const { targetFile, codeEdit } = params;
-    const block = this.applyService.registerCodeBlock(targetFile, codeEdit, toolCallId);
-    const blockData = await this.applyService.apply(block);
+  async handler(relativePath: string, updateContent: string, instructions?: string) {
+    // TODO: ignore file
+    this.applyService.registerCodeBlock(relativePath, updateContent);
+    const blockData = await this.applyService.apply(relativePath, updateContent, instructions);
     return blockData;
   }
 }

package/src/browser/model/msg-history-manager.ts

@@ -66,11 +66,6 @@ export class MsgHistoryManager extends Disposable {
     return this.startIndex;
   }
 
-  public get lastMessageId(): string | undefined {
-    const list = this.messageList;
-    return list[list.length - 1]?.id;
-  }
-
   public getMessages(maxTokens?: number): IHistoryChatMessage[] {
     if (maxTokens && this.totalTokens > maxTokens) {
       while (this.totalTokens > maxTokens) {
@@ -114,14 +109,9 @@ export class MsgHistoryManager extends Disposable {
       return;
     }
 
-    const oldAdditional = this.messageAdditionalMap.get(id) || {};
-    const newAdditional = {
-      ...oldAdditional,
-      ...additional,
-    };
+    this.messageAdditionalMap.set(id, additional);
 
-    this.messageAdditionalMap.set(id, newAdditional);
-    this._onMessageAdditionalChange.fire(newAdditional);
+    this._onMessageAdditionalChange.fire(additional);
   }
 
   public getMessageAdditional(id: string): Record<string, any> {

package/src/browser/preferences/schema.ts

@@ -108,11 +108,27 @@ export const aiNativePreferenceSchema: PreferenceSchema = {
             type: 'string',
             description: localize('preference.ai.native.mcp.servers.command.description'),
           },
+          type: {
+            type: 'string',
+            enum: ['stdio', 'sse'],
+            enumDescriptions: [
+              localize('preference.ai.native.mcp.servers.type.stdio'),
+              localize('preference.ai.native.mcp.servers.type.sse'),
+            ],
+            description: localize('preference.ai.native.mcp.servers.type.description'),
+            default: 'stdio',
+          },
+          enabled: {
+            type: 'boolean',
+            description: localize('preference.ai.native.mcp.servers.enabled.description'),
+            default: true,
+          },
           args: {
             type: 'array',
             items: {
               type: 'string',
             },
+            default: [],
             description: localize('preference.ai.native.mcp.servers.args.description'),
           },
           env: {

package/src/browser/types.ts

@@ -368,7 +368,7 @@ export interface IMCPServerToolComponentProps {
   result?: any;
   index?: number;
   messageId?: string;
-  toolCallId: string;
+  toolCallId?: string;
 }
 
 export interface IMCPServerRegistry {

package/src/browser/widget/inline-diff/inline-diff-widget.module.less

@@ -19,15 +19,3 @@
   display: flex;
   position: relative;
 }
-
-.inlineDiffManager {
-  display: flex;
-  padding: 12px 16px;
-  justify-content: center;
-  position: absolute;
-  bottom: 0;
-  left: 50%;
-  transform: translateX(-50%);
-  gap: 12px;
-  z-index: 999;
-}

package/src/browser/widget/inline-stream-diff/inline-stream-diff.handler.tsx

@@ -52,9 +52,6 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
   protected readonly _onDidEditChange = this.registerDispose(new Emitter<void>());
   public readonly onDidEditChange: Event<void> = this._onDidEditChange.event;
 
-  protected readonly onDiffFinishedEmitter = this.registerDispose(new Emitter<IComputeDiffData>());
-  public readonly onDiffFinished: Event<IComputeDiffData> = this.onDiffFinishedEmitter.event;
-
   public previewerOptions: IDiffPreviewerOptions;
 
   private originalModel: ITextModel;
@@ -448,8 +445,6 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
           this.diffModel.set(currentDiffModel, tx);
         });
 
-        this.onDiffFinishedEmitter.fire(currentDiffModel);
-
         if (this.originalModel.id === this.monacoEditor.getModel()?.id) {
           this.renderDiffEdits(currentDiffModel);
         }
@@ -476,13 +471,10 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
   }
 
   public pushRateFinallyDiffStack(diffModel: IComputeDiffData): void {
-    transaction((tx) => {
-      this.finallyDiffModel.set(diffModel, tx);
-      // 可能存在 rate editor controller 处理完之后接口层流式才结束
-      if (this.isEditing === false) {
-        this.finallyRender(diffModel);
-      }
-    });
+    // 可能存在 rate editor controller 处理完之后接口层流式才结束
+    if (this.isEditing === false) {
+      this.finallyRender(diffModel);
+    }
   }
 
   public finallyRender(diffModel: IComputeDiffData): void {
@@ -495,7 +487,6 @@ export class InlineStreamDiffHandler extends Disposable implements IInlineDiffPr
       return;
     }
 
-    this.onDiffFinishedEmitter.fire(diffModel);
     this.renderPartialEditWidgets(diffModel);
     this.renderDiffEdits(diffModel);
     this.pushStackElement();

package/src/common/index.ts

@@ -31,6 +31,9 @@ export const AI_CHAT_CONTAINER_ID = 'AI-Chat-Container';
 export const AI_CHAT_LOGO_AVATAR_ID = 'AI-Chat-Logo-Avatar';
 export const AI_MENU_BAR_DEBUG_TOOLBAR = 'AI_MENU_BAR_DEBUG_TOOLBAR';
 
+// 内置 MCP 服务器名称
+export const BUILTIN_MCP_SERVER_NAME = 'sumi-builtin';
+
 /**
  * @deprecated Use {@link DESIGN_MENUBAR_CONTAINER_VIEW_ID} instead
  */
@@ -123,9 +126,12 @@ export const ChatProxyServiceToken = Symbol('ChatProxyServiceToken');
 export const TokenMCPServerProxyService = Symbol('TokenMCPServerProxyService');
 
 export interface ISumiMCPServerBackend {
-  initBuiltinMCPServer(): void;
+  initBuiltinMCPServer(enabled: boolean): void;
   initExternalMCPServers(servers: MCPServerDescription[]): void;
   getAllMCPTools(): Promise<MCPTool[]>;
+  getServers(): Promise<Array<{ name: string; isStarted: boolean }>>;
+  startServer(serverName: string): Promise<void>;
+  stopServer(serverName: string): Promise<void>;
 }
 
 export const SumiMCPServerProxyServicePath = 'SumiMCPServerProxyServicePath';

package/src/common/mcp-server-manager.ts

@@ -1,5 +1,15 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 
+export interface IMCPServer {
+  isStarted(): boolean;
+  start(): Promise<void>;
+  getServerName(): string;
+  callTool(toolName: string, toolCallId: string, arg_string: string): ReturnType<Client['callTool']>;
+  getTools(): ReturnType<Client['listTools']>;
+  update(command: string, args?: string[], env?: { [key: string]: string }): void;
+  stop(): void;
+}
+
 export interface MCPServerManager {
   callTool(
     serverName: string,
@@ -11,7 +21,7 @@ export interface MCPServerManager {
   addOrUpdateServer(description: MCPServerDescription): void;
   // invoke in node.js only
   addOrUpdateServerDirectly(server: any): void;
-  initBuiltinServer(builtinMCPServer: any): void;
+  initBuiltinServer(builtinMCPServer: any, enabled: boolean): void;
   getTools(serverName: string): ReturnType<Client['listTools']>;
   getServerNames(): Promise<string[]>;
   startServer(serverName: string): Promise<void>;
@@ -19,6 +29,7 @@ export interface MCPServerManager {
   getStartedServers(): Promise<string[]>;
   registerTools(serverName: string): Promise<void>;
   addExternalMCPServers(servers: MCPServerDescription[]): void;
+  getServers(): Map<string, IMCPServer>;
 }
 
 export type MCPTool = Awaited<ReturnType<MCPServerManager['getTools']>>['tools'][number];
@@ -45,6 +56,11 @@ export interface MCPServerDescription {
    * Optional environment variables to set when starting the server.
    */
   env?: { [key: string]: string };
+
+  /**
+   * Whether to enable the MCP server.
+   */
+  enabled?: boolean;
 }
 
 export const MCPServerManager = Symbol('MCPServerManager');

package/src/common/tool-invocation-registry.ts

@@ -72,7 +72,7 @@ export interface ToolInvocationRegistry {
    *
    * @param providerName - 要移除其工具的工具提供者名称（在 `ToolRequest` 中指定）
    */
-  unregisterAllTools(providerName: string): void;
+  unregisterProviderTools(providerName: string): void;
 }
 
 export const ToolProvider = Symbol('ToolProvider');
@@ -83,7 +83,7 @@ export interface ToolProvider {
 export class ToolInvocationRegistryImpl implements ToolInvocationRegistry {
   private tools: Map<string, ToolRequest> = new Map<string, ToolRequest>();
 
-  unregisterAllTools(providerName: string): void {
+  unregisterProviderTools(providerName: string): void {
     const toolsToRemove: string[] = [];
     for (const [id, tool] of this.tools.entries()) {
       if (tool.providerName === providerName) {

package/src/common/types.ts

@@ -1,5 +1,3 @@
-import { IMarker } from '@opensumi/ide-core-browser';
-
 export enum NearestCodeBlockType {
   Block = 'block',
   Line = 'line',
@@ -34,6 +32,12 @@ export interface IMCPServerProxyService {
   $getMCPTools(): Promise<MCPTool[]>;
   // 通知前端 MCP 服务注册表发生了变化
   $updateMCPServers(): Promise<void>;
+  // 获取所有 MCP 服务器列表
+  $getServers(): Promise<Array<{ name: string; isStarted: boolean }>>;
+  // 启动指定的 MCP 服务器
+  $startServer(serverName: string): Promise<void>;
+  // 停止指定的 MCP 服务器
+  $stopServer(serverName: string): Promise<void>;
 }
 
 export interface MCPTool {
@@ -42,21 +46,3 @@ export interface MCPTool {
   inputSchema: any;
   providerName: string;
 }
-
-export interface CodeBlockData {
-  toolCallId: string;
-  codeEdit: string;
-  updatedCode?: string;
-  relativePath: string;
-  status: CodeBlockStatus;
-  iterationCount: number;
-  createdAt: number;
-  version: number;
-  instructions?: string;
-  applyResult?: {
-    diff: string;
-    diagnosticInfos: IMarker[];
-  };
-}
-
-export type CodeBlockStatus = 'generating' | 'pending' | 'success' | 'rejected' | 'failed' | 'cancelled';

package/src/common/utils.ts

@@ -1,5 +1,7 @@
 import { IEditorDocumentModel } from '@opensumi/ide-editor';
 
+import { BUILTIN_MCP_SERVER_NAME } from './index';
+
 const BACK_QUOTE_3_SYMBOL = '```';
 const MIN_PROMPT_CHARS = 10;
 
@@ -49,4 +51,4 @@ export const extractCodeBlocks = (content: string): string => {
   return newContents.join('\n');
 };
 
-export const getToolName = (toolName: string, serverName = 'sumi-builtin') => `mcp_${serverName}_${toolName}`;
+export const getToolName = (toolName: string, serverName = BUILTIN_MCP_SERVER_NAME) => `mcp_${serverName}_${toolName}`;