@jupyterlite/ai 0.17.0 → 0.19.0

package/src/completion/completion-provider.ts

@@ -1,3 +1,8 @@
+import {
+  createCompletionModel,
+  IProviderRegistry,
+  SECRETS_NAMESPACE
+} from '@jupyternaut/agent';
 import {
   CompletionHandler,
   IInlineCompletionContext,
@@ -8,12 +13,7 @@ import { NotebookPanel } from '@jupyterlab/notebook';
 import { generateText, type LanguageModel } from 'ai';
 import { ISecretsManager } from 'jupyter-secrets-manager';
 
-import { createCompletionModel } from '../providers/models';
-import {
-  type IAISettingsModel,
-  SECRETS_NAMESPACE,
-  type IProviderRegistry
-} from '../tokens';
+import type { IAISettingsModel } from '../tokens';
 
 /**
  * Configuration interface for provider-specific completion behavior

package/src/components/clear-button.tsx

@@ -4,8 +4,6 @@ import type { TranslationBundle } from '@jupyterlab/translation';
 
 import ClearIcon from '@mui/icons-material/Clear';
 
-import React from 'react';
-
 import { AIChatModel } from '../chat-model';
 
 /**

package/src/components/completion-status.tsx

@@ -1,7 +1,7 @@
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { ReactWidget } from '@jupyterlab/ui-components';
 import type { TranslationBundle } from '@jupyterlab/translation';
-import { jupyternautIcon } from '../icons';
+import { jupyternautIcon } from '@jupyternaut/agent';
 import type { IAISettingsModel } from '../tokens';
 
 const COMPLETION_STATUS_CLASS = 'jp-ai-completion-status';

package/src/components/model-select.tsx

@@ -2,7 +2,7 @@ import { InputToolbarRegistry, TooltippedButton } from '@jupyter/chat';
 import type { TranslationBundle } from '@jupyterlab/translation';
 import CheckIcon from '@mui/icons-material/Check';
 import { Menu, MenuItem, Typography } from '@mui/material';
-import React, { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { AIChatModel } from '../chat-model';
 import type { IAISettingsModel } from '../tokens';
 

package/src/components/save-button.tsx

@@ -7,7 +7,7 @@ import {
 import type { TranslationBundle } from '@jupyterlab/translation';
 import React, { useEffect, useState } from 'react';
 
-import { AIChatModel } from '../chat-model';
+import { IAIChatModel } from '../tokens';
 
 const COMPONENT_CLASS = 'jp-ai-SaveButton';
 const AUTOSAVE_BUTTON_CLASS = 'jp-ai-AutoSaveButton';
@@ -19,7 +19,7 @@ export interface ISaveButtonProps {
   /**
    * The chat model, used to listen for message changes for auto-save.
    */
-  model: AIChatModel;
+  model: IAIChatModel;
   /**
    * The application language translator.
    */
@@ -40,7 +40,7 @@ export function SaveComponent(props: ISaveButtonProps): JSX.Element {
    * Effect that update the autosave state when it is updated on the model.
    */
   useEffect(() => {
-    const updateAutosave = (_: AIChatModel, value: boolean) => {
+    const updateAutosave = (_: IAIChatModel, value: boolean) => {
       setAutosave(value);
     };
 

package/src/components/stop-button.tsx

@@ -4,8 +4,6 @@ import type { TranslationBundle } from '@jupyterlab/translation';
 
 import StopIcon from '@mui/icons-material/Stop';
 
-import React from 'react';
-
 import { AIChatModel } from '../chat-model';
 
 /**

package/src/components/tool-select.tsx

@@ -1,3 +1,11 @@
+import { createProviderTools } from '@jupyternaut/agent';
+
+import type {
+  INamedTool,
+  IProviderRegistry,
+  IToolRegistry
+} from '@jupyternaut/agent';
+
 import { InputToolbarRegistry, TooltippedButton } from '@jupyter/chat';
 
 import type { TranslationBundle } from '@jupyterlab/translation';
@@ -8,18 +16,11 @@ import CheckIcon from '@mui/icons-material/Check';
 
 import { Divider, Menu, MenuItem, Tooltip, Typography } from '@mui/material';
 
-import React, { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 
 import { AIChatModel } from '../chat-model';
 
-import { createProviderTools } from '../providers/provider-tools';
-
-import type {
-  IAISettingsModel,
-  INamedTool,
-  IProviderRegistry,
-  IToolRegistry
-} from '../tokens';
+import type { IAISettingsModel } from '../tokens';
 
 const SELECT_ITEM_CLASS = 'jp-AIToolSelect-item';
 

package/src/components/usage-display.tsx

@@ -1,8 +1,10 @@
+import type { ITokenUsage } from '@jupyternaut/agent';
 import { ReactWidget, UseSignal } from '@jupyterlab/ui-components';
 import type { TranslationBundle } from '@jupyterlab/translation';
-import React from 'react';
 import { ISignal } from '@lumino/signaling';
-import type { IAISettingsModel, ITokenUsage } from '../tokens';
+import React from 'react';
+
+import type { IAISettingsModel } from '../tokens';
 
 /**
  * Props for the UsageDisplay component.

package/src/diff-manager.ts

@@ -1,10 +1,11 @@
-import { CommandRegistry } from '@lumino/commands';
 import type {
-  IAISettingsModel,
   IDiffManager,
   IShowCellDiffParams,
   IShowFileDiffParams
-} from './tokens';
+} from '@jupyternaut/agent';
+import { CommandRegistry } from '@lumino/commands';
+
+import type { IAISettingsModel } from './tokens';
 
 /**
  * Command IDs for unified cell diffs

package/src/index.ts

@@ -1,3 +1,29 @@
+import {
+  anthropicProvider,
+  createBrowserFetchTool,
+  createDiscoverCommandsTool,
+  createDiscoverSkillsTool,
+  createExecuteCommandTool,
+  createLoadSkillTool,
+  genericProvider,
+  googleProvider,
+  loadSkillsFromPaths,
+  mistralProvider,
+  openaiProvider,
+  AgentManagerFactory,
+  IAgentManagerFactory,
+  IDiffManager,
+  IProviderRegistry,
+  IToolRegistry,
+  ISkillRegistry,
+  ProviderRegistry,
+  SECRETS_NAMESPACE,
+  SkillRegistry,
+  ToolRegistry
+} from '@jupyternaut/agent';
+
+import type { IAISecretsAccess, IProviderConfig } from '@jupyternaut/agent';
+
 import {
   ILabShell,
   ILayoutRestorer,
@@ -58,7 +84,7 @@ import {
   ToolbarButton
 } from '@jupyterlab/ui-components';
 
-import { PromiseDelegate, UUID } from '@lumino/coreutils';
+import { UUID } from '@lumino/coreutils';
 
 import { DisposableSet } from '@lumino/disposable';
 
@@ -68,44 +94,23 @@ import { IComponentsRendererFactory } from 'jupyter-chat-components';
 
 import { ISecretsManager, SecretsManager } from 'jupyter-secrets-manager';
 
-import { AgentManagerFactory } from './agent';
-
-import { AIChatModel } from './chat-model';
-
 import { RenderedMessageOutputAreaCompat } from './rendered-message-outputarea';
 
 import { ClearCommandProvider } from './chat-commands/clear';
 
 import { SkillsCommandProvider } from './chat-commands/skills';
 
-import { ProviderRegistry } from './providers/provider-registry';
-
 import { SaveComponentWidget } from './components/save-button';
 
 import { ChatModelHandler } from './chat-model-handler';
 
 import {
   CommandIds,
-  IAgentManagerFactory,
-  type IAISecretsAccess,
   IAISettingsModel,
   IChatModelHandler,
-  IDiffManager,
-  type IProviderConfig,
-  IProviderRegistry,
-  IToolRegistry,
-  ISkillRegistry,
-  SECRETS_NAMESPACE
+  IAIChatModel
 } from './tokens';
 
-import {
-  anthropicProvider,
-  googleProvider,
-  mistralProvider,
-  openaiProvider,
-  genericProvider
-} from './providers/built-in-providers';
-
 import { AICompletionProvider } from './completion';
 
 import {
@@ -119,21 +124,8 @@ import {
 
 import { AISettingsModel } from './models/settings-model';
 
-import { loadSkillsFromPaths, SkillRegistry } from './skills';
-
 import { DiffManager } from './diff-manager';
 
-import { ToolRegistry } from './tools/tool-registry';
-
-import {
-  createDiscoverCommandsTool,
-  createExecuteCommandTool
-} from './tools/commands';
-
-import { createDiscoverSkillsTool, createLoadSkillTool } from './tools/skills';
-
-import { createBrowserFetchTool } from './tools/web';
-
 import { AISettingsWidget } from './widgets/ai-settings';
 
 import { MainAreaChat } from './widgets/main-area-chat';
@@ -526,7 +518,7 @@ const plugin: JupyterFrontEndPlugin<IChatTracker> = {
 
     let usageWidget: UsageWidget | null = null;
     chatPanel.chatOpened.connect((_, widget) => {
-      const model = widget.model as AIChatModel;
+      const model = widget.model as IAIChatModel;
 
       // Add the widget to the tracker.
       tracker.add(widget);
@@ -585,11 +577,9 @@ const plugin: JupyterFrontEndPlugin<IChatTracker> = {
         );
 
         if (aiWriting) {
-          widget.inputToolbarRegistry?.hide('send');
           widget.inputToolbarRegistry?.show('stop');
         } else {
           widget.inputToolbarRegistry?.hide('stop');
-          widget.inputToolbarRegistry?.show('send');
         }
       }
 
@@ -628,7 +618,7 @@ const plugin: JupyterFrontEndPlugin<IChatTracker> = {
         args: widget => ({
           name: widget.model.name,
           area: widget instanceof MainAreaChat ? 'main' : 'side',
-          provider: (widget.model as AIChatModel).agentManager.activeProvider
+          provider: (widget.model as IAIChatModel).agentManager.activeProvider
         }),
         name: widget => {
           const area = widget instanceof MainAreaChat ? 'main' : 'side';
@@ -662,24 +652,65 @@ const plugin: JupyterFrontEndPlugin<IChatTracker> = {
     );
 
     /**
-     * The callback to approve or reject a tool.
+     * The callback for grouped tool calls permission decisions.
      */
-    function toolCallApproval(
-      targetId: string,
-      approvalId: string,
-      isApproved: boolean
+    function toolCallPermissionDecision(
+      sessionId: string,
+      toolCallId: string,
+      optionId: string
     ) {
-      const model = tracker.find(chat => chat.model.name === targetId)?.model;
+      const model = tracker.find(chat => chat.model.name === sessionId)
+        ?.model as IAIChatModel;
       if (!model) {
         return;
       }
+
+      const isApproved = optionId === 'approve';
       isApproved
-        ? (model as AIChatModel).agentManager.approveToolCall(approvalId)
-        : (model as AIChatModel).agentManager.rejectToolCall(approvalId);
+        ? model.agentManager.approveToolCall(toolCallId)
+        : model.agentManager.rejectToolCall(toolCallId);
     }
 
     if (chatComponentsFactory) {
-      chatComponentsFactory.toolCallApproval = toolCallApproval;
+      chatComponentsFactory.groupedToolCallCallbacks = {
+        ...chatComponentsFactory.groupedToolCallCallbacks,
+        toolCallPermissionDecision
+      };
+
+      chatComponentsFactory.queueMessageCallbacks = {
+        ...chatComponentsFactory.queueMessageCallbacks,
+        removeQueuedMessage: (targetId: string, messageId: string) => {
+          const model = tracker.find(
+            chat => chat.model.name === targetId
+          )?.model;
+          if (!model) {
+            return;
+          }
+          (model as IAIChatModel).removeQueuedMessage(messageId);
+        },
+        reorderQueuedMessages: (targetId: string, messageIds: string[]) => {
+          const model = tracker.find(
+            chat => chat.model.name === targetId
+          )?.model;
+          if (!model) {
+            return;
+          }
+          (model as IAIChatModel).reorderQueuedMessages(messageIds);
+        },
+        editQueuedMessage: (
+          targetId: string,
+          messageId: string,
+          newBody: string
+        ) => {
+          const model = tracker.find(
+            chat => chat.model.name === targetId
+          )?.model;
+          if (!model) {
+            return;
+          }
+          (model as IAIChatModel).editQueuedMessage(messageId, newBody);
+        }
+      };
     }
 
     return tracker;
@@ -755,12 +786,13 @@ function registerCommands(
       }
     });
 
-    const openInMain = (model: AIChatModel): MainAreaChat => {
+    const openInMain = (model: IAIChatModel): MainAreaChat => {
+      const inputToolbarRegistry = inputToolbarFactory.create();
       const content = new ChatWidget({
         model,
         rmRegistry,
         themeManager: themeManager ?? null,
-        inputToolbarRegistry: inputToolbarFactory.create(),
+        inputToolbarRegistry,
         attachmentOpenerRegistry,
         chatCommandRegistry
       });
@@ -827,7 +859,7 @@ function registerCommands(
         return;
       }
       return tracker.find(widget => {
-        const model = widget.model as AIChatModel;
+        const model = widget.model as IAIChatModel;
         return (
           (!name || widget.model.name === name) &&
           (!provider || model.agentManager.activeProvider === provider)
@@ -1064,11 +1096,11 @@ function registerCommands(
           return false;
         }
         let previousWidget: ChatWidget | MainAreaChat | undefined;
-        let previousModel: AIChatModel | undefined;
+        let previousModel: IAIChatModel | undefined;
         tracker.forEach(widget => {
           if (widget.model.name === args.name) {
             previousWidget = widget;
-            previousModel = widget.model as AIChatModel;
+            previousModel = widget.model as IAIChatModel;
           }
         });
 
@@ -1079,61 +1111,26 @@ function registerCommands(
           return false;
         }
 
-        // Listen for the widget updated in tracker, to ensure the previous model name
-        // has been updated. This is required to remove the widget from the restorer
-        // when the previous widget is disposed.
-        const trackerUpdated = new PromiseDelegate<boolean>();
-        const widgetUpdated = (_: any, widget: ChatWidget | MainAreaChat) => {
-          if (widget.model === previousModel) {
-            trackerUpdated.resolve(true);
-          }
-        };
-        tracker.widgetUpdated.connect(widgetUpdated);
-
-        // Rename temporary the previous model to be able to reuse this name for the new
-        // model. The previous is intended to be disposed anyway.
-        previousModel.name = UUID.uuid4();
-
-        // Create a new model by duplicating the previous model attributes.
-        const model = modelRegistry.createModel({
-          name: args.name as string,
-          activeProvider: previousModel.agentManager.activeProvider,
-          tokenUsage: previousModel.agentManager.tokenUsage,
-          messages: previousModel.messages,
-          autosave: previousModel.autosave,
-          title: previousModel.title
-        });
-
-        // Wait (with timeout) for the tracker to have updated the previous widget.
-        const status = await Promise.any([
-          trackerUpdated.promise,
-          new Promise<boolean>(r =>
-            setTimeout(() => {
-              r(false);
-            }, 2000)
-          )
-        ]);
-        tracker.widgetUpdated.disconnect(widgetUpdated);
-
-        if (!status) {
-          return false;
-        }
-
         if (area === 'main') {
-          openInMain(model);
+          // Temporarily bypass model disposal to transport model to main view
+          // to keep the conversation when switching views
+          // TODO: Remove this code when jupyter-chat PR #423 is merged and released
+          const originalDispose = previousModel.dispose.bind(previousModel);
+          previousModel.dispose = () => {};
 
           if (previousWidget instanceof ChatWidget) {
-            // Clean up the side-panel model entry before disposing the previous
-            // widget/model state.
             if (!disposeSideChatModel(previousModel)) {
               previousWidget.dispose();
-              previousModel.dispose();
             }
           }
+
+          // Restore model disposal and transport to main view
+          previousModel.dispose = originalDispose;
+          openInMain(previousModel);
         } else {
+          // MainAreaChat disposal does not dispose the model internally, so this is safe.
           previousWidget?.dispose();
-          previousModel.dispose();
-          chatPanel.open({ model });
+          chatPanel.open({ model: previousModel });
         }
 
         return true;
@@ -1162,15 +1159,15 @@ function registerCommands(
       caption: trans.__('Save the chat as local file'),
       icon: saveIcon,
       execute: async (args): Promise<boolean> => {
-        let model: AIChatModel | null = null;
+        let model: IAIChatModel | null = null;
         if (args.name) {
           tracker.forEach(widget => {
             if (widget.model.name === args.name) {
-              model = widget.model as AIChatModel;
+              model = widget.model as IAIChatModel;
             }
           });
         } else {
-          model = (tracker.currentWidget?.model as AIChatModel) ?? null;
+          model = (tracker.currentWidget?.model as IAIChatModel) ?? null;
         }
         if (model === null) {
           console.log('No chat to save');
@@ -1207,15 +1204,15 @@ function registerCommands(
           console.warn('The restoration is not possible');
           return false;
         }
-        let model: AIChatModel | null = null;
+        let model: IAIChatModel | null = null;
         if (args.name) {
           tracker.forEach(widget => {
             if (widget.model.name === args.name) {
-              model = widget.model as AIChatModel;
+              model = widget.model as IAIChatModel;
             }
           });
         } else {
-          model = (tracker.currentWidget?.model as AIChatModel) ?? null;
+          model = (tracker.currentWidget?.model as IAIChatModel) ?? null;
         }
         if (model === null) {
           console.warn('There is no chat to restore');
@@ -1751,4 +1748,3 @@ export default [
 
 // Export extension points for other extensions to use
 export * from './tokens';
-export * from './icons';

package/src/models/settings-model.ts

@@ -1,12 +1,12 @@
-import { VDomModel } from '@jupyterlab/ui-components';
-import { ISettingRegistry } from '@jupyterlab/settingregistry';
-
-import {
+import type {
   IAIConfig,
-  IAISettingsModel,
   IMCPServerConfig,
   IProviderConfig
-} from '../tokens';
+} from '@jupyternaut/agent';
+import { VDomModel } from '@jupyterlab/ui-components';
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
+
+import type { IAISettingsModel } from '../tokens';
 
 const PLUGIN_ID = '@jupyterlite/ai:settings-model';
 
@@ -29,6 +29,7 @@ export class AISettingsModel extends VDomModel implements IAISettingsModel {
     diffDisplayMode: 'split',
     skillsPaths: ['.agents/skills', '_agents/skills'],
     chatBackupDirectory: '',
+    autoTitle: false,
     commandsRequiringApproval: [
       'notebook:restart-run-all',
       'notebook:run-cell',