@notebook-intelligence/notebook-intelligence 2.2.8 → 2.3.0

package/lib/api.d.ts

@@ -11,6 +11,8 @@ export interface IDeviceVerificationInfo {
     userCode: string;
 }
 export declare class NBIConfig {
+    get userHomeDir(): string;
+    get configFilePath(): string;
     get llmProviders(): [any];
     get chatModels(): [any];
     get inlineCompletionModels(): [any];
@@ -40,6 +42,7 @@ export declare class NBIAPI {
     static fetchCapabilities(): Promise<void>;
     static setConfig(config: any): Promise<void>;
     static updateOllamaModelList(): Promise<void>;
+    static reloadMCPServerList(): Promise<any>;
     static chatRequest(messageId: string, chatId: string, prompt: string, language: string, filename: string, additionalContext: IContextItem[], chatMode: string, toolSelections: IToolSelections, responseEmitter: IChatCompletionResponseEmitter): Promise<void>;
     static generateCode(chatId: string, prompt: string, prefix: string, suffix: string, existingCode: string, language: string, filename: string, responseEmitter: IChatCompletionResponseEmitter): Promise<void>;
     static sendChatUserInput(messageId: string, data: any): Promise<void>;

package/lib/api.js

@@ -20,6 +20,12 @@ export class NBIConfig {
         this.chatParticipants = [];
         this.changed = new Signal(this);
     }
+    get userHomeDir() {
+        return this.capabilities.user_home_dir;
+    }
+    get configFilePath() {
+        return this.capabilities.config_file_path;
+    }
     get llmProviders() {
         return this.capabilities.llm_providers;
     }
@@ -170,6 +176,19 @@ class NBIAPI {
             });
         });
     }
+    static async reloadMCPServerList() {
+        return new Promise((resolve, reject) => {
+            requestAPI('reload-mcp-servers', { method: 'POST' })
+                .then(async (data) => {
+                await NBIAPI.fetchCapabilities();
+                resolve(data);
+            })
+                .catch(reason => {
+                console.error(`Failed to reload MCP server list.\n${reason}`);
+                reject(reason);
+            });
+        });
+    }
     static async chatRequest(messageId, chatId, prompt, language, filename, additionalContext, chatMode, toolSelections, responseEmitter) {
         this._messageReceived.connect((_, msg) => {
             msg = JSON.parse(msg);

package/lib/chat-sidebar.js

@@ -254,17 +254,25 @@ function ChatResponse(props) {
                     case ResponseStreamDataType.Markdown:
                     case ResponseStreamDataType.MarkdownPart:
                         return (React.createElement(React.Fragment, null,
-                            item.reasoningContent && (React.createElement("div", { className: "chat-reasoning-content" },
-                                React.createElement("div", { className: "chat-reasoning-content-title", onClick: (event) => onExpandCollapseClick(event) },
+                            item.reasoningContent && (React.createElement("div", { className: "expandable-content" },
+                                React.createElement("div", { className: "expandable-content-title", onClick: (event) => onExpandCollapseClick(event) },
                                     React.createElement(VscTriangleRight, { className: "collapsed-icon" }),
                                     React.createElement(VscTriangleDown, { className: "expanded-icon" }),
                                     ' ',
                                     item.reasoningFinished
                                         ? 'Thought'
                                         : `Thinking (${Math.floor(item.reasoningTime)} s)`),
-                                React.createElement("div", { className: "chat-reasoning-content-text" },
+                                React.createElement("div", { className: "expandable-content-text" },
                                     React.createElement(MarkdownRenderer, { key: `key-${index}`, getApp: props.getApp, getActiveDocumentInfo: props.getActiveDocumentInfo }, item.reasoningContent)))),
-                            React.createElement(MarkdownRenderer, { key: `key-${index}`, getApp: props.getApp, getActiveDocumentInfo: props.getActiveDocumentInfo }, item.content)));
+                            React.createElement(MarkdownRenderer, { key: `key-${index}`, getApp: props.getApp, getActiveDocumentInfo: props.getActiveDocumentInfo }, item.content),
+                            item.contentDetail ? (React.createElement("div", { className: "expandable-content" },
+                                React.createElement("div", { className: "expandable-content-title", onClick: (event) => onExpandCollapseClick(event) },
+                                    React.createElement(VscTriangleRight, { className: "collapsed-icon" }),
+                                    React.createElement(VscTriangleDown, { className: "expanded-icon" }),
+                                    ' ',
+                                    item.contentDetail.title),
+                                React.createElement("div", { className: "expandable-content-text" },
+                                    React.createElement(MarkdownRenderer, { key: `key-${index}`, getApp: props.getApp, getActiveDocumentInfo: props.getActiveDocumentInfo }, item.contentDetail.content)))) : null));
                     case ResponseStreamDataType.Image:
                         return (React.createElement("div", { className: "chat-response-img", key: `key-${index}` },
                             React.createElement("img", { src: item.content })));
@@ -796,6 +804,7 @@ function SidebarComponent(props) {
                             id: UUID.uuid4(),
                             type: nbiContent.type,
                             content: nbiContent.content,
+                            contentDetail: nbiContent.detail,
                             created: new Date(response.created)
                         });
                     }
@@ -1491,10 +1500,12 @@ function GitHubCopilotLoginDialogBodyComponent(props) {
                 React.createElement("div", { className: "jp-Dialog-buttonLabel" }, "Cancel activation"))))));
 }
 function ConfigurationDialogBodyComponent(props) {
+    var _a;
     const nbiConfig = NBIAPI.config;
     const llmProviders = nbiConfig.llmProviders;
     const [chatModels, setChatModels] = useState([]);
     const [inlineCompletionModels, setInlineCompletionModels] = useState([]);
+    const [mcpServerNames, setMcpServerNames] = useState(((_a = nbiConfig.toolConfig.mcpServers) === null || _a === void 0 ? void 0 : _a.map((server) => server.id)) || []);
     const handleSaveClick = async () => {
         const config = {
             chat_model: {
@@ -1586,6 +1597,11 @@ function ConfigurationDialogBodyComponent(props) {
             setInlineCompletionModelProperties(updatedProperties);
         }
     };
+    const handleReloadMCPServersClick = async () => {
+        var _a;
+        const data = await NBIAPI.reloadMCPServerList();
+        setMcpServerNames(((_a = data.mcpServers) === null || _a === void 0 ? void 0 : _a.map((server) => server.id)) || []);
+    };
     useEffect(() => {
         updateModelOptionsForProvider(chatModelProvider, 'chat');
         updateModelOptionsForProvider(inlineCompletionModelProvider, 'inline-completion');
@@ -1670,7 +1686,32 @@ function ConfigurationDialogBodyComponent(props) {
                                 React.createElement("input", { type: "checkbox", checked: storeGitHubAccessToken, onChange: event => {
                                         setStoreGitHubAccessToken(event.target.checked);
                                     } }),
-                                "Remember my GitHub Copilot access token"))))))),
+                                "Remember my GitHub Copilot access token")))))),
+            React.createElement("div", { className: "model-config-section" },
+                React.createElement("div", { className: "model-config-section-header" },
+                    "MCPServers [",
+                    mcpServerNames.length,
+                    "]"),
+                React.createElement("div", { className: "model-config-section-body" },
+                    React.createElement("div", { className: "model-config-section-row" },
+                        React.createElement("div", { className: "model-config-section-column" },
+                            mcpServerNames.length === 0 && (React.createElement("div", null, "No MCP servers found. Add MCP servers in the configuration file.")),
+                            mcpServerNames.length > 0 && (React.createElement("div", null, mcpServerNames.sort().join(', ')))),
+                        React.createElement("div", { className: "model-config-section-column", style: { flexGrow: 'initial' } },
+                            React.createElement("button", { className: "jp-Dialog-button jp-mod-reject jp-mod-styled", onClick: handleReloadMCPServersClick },
+                                React.createElement("div", { className: "jp-Dialog-buttonLabel" }, "Reload")))))),
+            React.createElement("div", { className: "model-config-section" },
+                React.createElement("div", { className: "model-config-section-header" }, "Config file path"),
+                React.createElement("div", { className: "model-config-section-body" },
+                    React.createElement("div", { className: "model-config-section-row" },
+                        React.createElement("div", { className: "model-config-section-column" },
+                            React.createElement("span", { className: "user-code-span", onClick: () => {
+                                    navigator.clipboard.writeText(NBIAPI.config.configFilePath);
+                                    return true;
+                                } },
+                                NBIAPI.config.configFilePath,
+                                ' ',
+                                React.createElement("span", { className: "copy-icon", dangerouslySetInnerHTML: { __html: copySvgstr } }))))))),
         React.createElement("div", { className: "config-dialog-footer" },
             React.createElement("button", { className: "jp-Dialog-button jp-mod-accept jp-mod-styled", onClick: handleSaveClick },
                 React.createElement("div", { className: "jp-Dialog-buttonLabel" }, "Save")))));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@notebook-intelligence/notebook-intelligence",
-    "version": "2.2.8",
+    "version": "2.3.0",
     "description": "AI coding assistant for JupyterLab",
     "keywords": [
         "AI",

package/src/api.ts

@@ -30,6 +30,14 @@ export interface IDeviceVerificationInfo {
 }
 
 export class NBIConfig {
+  get userHomeDir(): string {
+    return this.capabilities.user_home_dir;
+  }
+
+  get configFilePath(): string {
+    return this.capabilities.config_file_path;
+  }
+
   get llmProviders(): [any] {
     return this.capabilities.llm_providers;
   }
@@ -228,6 +236,20 @@ export class NBIAPI {
     });
   }
 
+  static async reloadMCPServerList(): Promise<any> {
+    return new Promise<any>((resolve, reject) => {
+      requestAPI<any>('reload-mcp-servers', { method: 'POST' })
+        .then(async data => {
+          await NBIAPI.fetchCapabilities();
+          resolve(data);
+        })
+        .catch(reason => {
+          console.error(`Failed to reload MCP server list.\n${reason}`);
+          reject(reason);
+        });
+    });
+  }
+
   static async chatRequest(
     messageId: string,
     chatId: string,

package/src/chat-sidebar.tsx

@@ -281,6 +281,7 @@ interface IChatMessageContent {
   id: string;
   type: ResponseStreamDataType;
   content: any;
+  contentDetail?: any;
   created: Date;
   reasoningContent?: string;
   reasoningFinished?: boolean;
@@ -465,9 +466,9 @@ function ChatResponse(props: any) {
               return (
                 <>
                   {item.reasoningContent && (
-                    <div className="chat-reasoning-content">
+                    <div className="expandable-content">
                       <div
-                        className="chat-reasoning-content-title"
+                        className="expandable-content-title"
                         onClick={(event: any) => onExpandCollapseClick(event)}
                       >
                         <VscTriangleRight className="collapsed-icon"></VscTriangleRight>
@@ -476,7 +477,7 @@ function ChatResponse(props: any) {
                           ? 'Thought'
                           : `Thinking (${Math.floor(item.reasoningTime)} s)`}
                       </div>
-                      <div className="chat-reasoning-content-text">
+                      <div className="expandable-content-text">
                         <MarkdownRenderer
                           key={`key-${index}`}
                           getApp={props.getApp}
@@ -494,6 +495,27 @@ function ChatResponse(props: any) {
                   >
                     {item.content}
                   </MarkdownRenderer>
+                  {item.contentDetail ? (
+                    <div className="expandable-content">
+                      <div
+                        className="expandable-content-title"
+                        onClick={(event: any) => onExpandCollapseClick(event)}
+                      >
+                        <VscTriangleRight className="collapsed-icon"></VscTriangleRight>
+                        <VscTriangleDown className="expanded-icon"></VscTriangleDown>{' '}
+                        {item.contentDetail.title}
+                      </div>
+                      <div className="expandable-content-text">
+                        <MarkdownRenderer
+                          key={`key-${index}`}
+                          getApp={props.getApp}
+                          getActiveDocumentInfo={props.getActiveDocumentInfo}
+                        >
+                          {item.contentDetail.content}
+                        </MarkdownRenderer>
+                      </div>
+                    </div>
+                  ) : null}
                 </>
               );
             case ResponseStreamDataType.Image:
@@ -1278,6 +1300,7 @@ function SidebarComponent(props: any) {
                 id: UUID.uuid4(),
                 type: nbiContent.type,
                 content: nbiContent.content,
+                contentDetail: nbiContent.detail,
                 created: new Date(response.created)
               });
             } else {
@@ -2468,6 +2491,9 @@ function ConfigurationDialogBodyComponent(props: any) {
   const llmProviders = nbiConfig.llmProviders;
   const [chatModels, setChatModels] = useState([]);
   const [inlineCompletionModels, setInlineCompletionModels] = useState([]);
+  const [mcpServerNames, setMcpServerNames] = useState(
+    nbiConfig.toolConfig.mcpServers?.map((server: any) => server.id) || []
+  );
 
   const handleSaveClick = async () => {
     const config: any = {
@@ -2587,6 +2613,11 @@ function ConfigurationDialogBodyComponent(props: any) {
     }
   };
 
+  const handleReloadMCPServersClick = async () => {
+    const data = await NBIAPI.reloadMCPServerList();
+    setMcpServerNames(data.mcpServers?.map((server: any) => server.id) || []);
+  };
+
   useEffect(() => {
     updateModelOptionsForProvider(chatModelProvider, 'chat');
     updateModelOptionsForProvider(
@@ -2855,6 +2886,61 @@ function ConfigurationDialogBodyComponent(props: any) {
             </div>
           </div>
         )}
+
+        <div className="model-config-section">
+          <div className="model-config-section-header">
+            MCPServers [{mcpServerNames.length}]
+          </div>
+          <div className="model-config-section-body">
+            <div className="model-config-section-row">
+              <div className="model-config-section-column">
+                {mcpServerNames.length === 0 && (
+                  <div>
+                    No MCP servers found. Add MCP servers in the configuration
+                    file.
+                  </div>
+                )}
+                {mcpServerNames.length > 0 && (
+                  <div>{mcpServerNames.sort().join(', ')}</div>
+                )}
+              </div>
+              <div
+                className="model-config-section-column"
+                style={{ flexGrow: 'initial' }}
+              >
+                <button
+                  className="jp-Dialog-button jp-mod-reject jp-mod-styled"
+                  onClick={handleReloadMCPServersClick}
+                >
+                  <div className="jp-Dialog-buttonLabel">Reload</div>
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div className="model-config-section">
+          <div className="model-config-section-header">Config file path</div>
+          <div className="model-config-section-body">
+            <div className="model-config-section-row">
+              <div className="model-config-section-column">
+                <span
+                  className="user-code-span"
+                  onClick={() => {
+                    navigator.clipboard.writeText(NBIAPI.config.configFilePath);
+                    return true;
+                  }}
+                >
+                  {NBIAPI.config.configFilePath}{' '}
+                  <span
+                    className="copy-icon"
+                    dangerouslySetInnerHTML={{ __html: copySvgstr }}
+                  ></span>
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
 
       <div className="config-dialog-footer">

package/style/base.css

@@ -585,6 +585,10 @@ body[data-jp-theme-light='false'] .inline-popover {
   height: 100%;
 }
 
+.config-dialog-container .jp-Dialog-content {
+  max-height: 600px;
+}
+
 .config-dialog-container .jp-Dialog-footer {
   display: none;
 }
@@ -711,8 +715,9 @@ body[data-jp-theme-light='false'] .inline-popover {
   line-height: 20px;
 }
 
-.chat-reasoning-content-title {
+.expandable-content-title {
   margin-top: 5px;
+  margin-bottom: 5px;
   display: flex;
   align-items: center;
   gap: 5px;
@@ -720,7 +725,7 @@ body[data-jp-theme-light='false'] .inline-popover {
   color: var(--jp-ui-font-color2);
 }
 
-.chat-reasoning-content-text {
+.expandable-content-text {
   display: none;
   margin: 5px;
   padding: 0 5px;
@@ -728,23 +733,23 @@ body[data-jp-theme-light='false'] .inline-popover {
   border-radius: 5px;
 }
 
-.chat-reasoning-content .collapsed-icon {
+.expandable-content .collapsed-icon {
   display: inline;
 }
 
-.chat-reasoning-content .expanded-icon {
+.expandable-content .expanded-icon {
   display: none;
 }
 
-.chat-reasoning-content.expanded .expanded-icon {
+.expandable-content.expanded .expanded-icon {
   display: inline;
 }
 
-.chat-reasoning-content.expanded .chat-reasoning-content-text {
+.expandable-content.expanded .expandable-content-text {
   display: block;
 }
 
-.chat-reasoning-content.expanded .collapsed-icon {
+.expandable-content.expanded .collapsed-icon {
   display: none;
 }