@jupyterlite/ai 0.18.0 → 0.19.0

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,
@@ -68,43 +94,23 @@ import { IComponentsRendererFactory } from 'jupyter-chat-components';
 
 import { ISecretsManager, SecretsManager } from 'jupyter-secrets-manager';
 
-import { AgentManagerFactory } from './agent';
-
 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 {
@@ -118,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';
@@ -679,18 +672,44 @@ const plugin: JupyterFrontEndPlugin<IChatTracker> = {
     }
 
     if (chatComponentsFactory) {
-      chatComponentsFactory.toolCallPermissionDecision =
-        toolCallPermissionDecision;
+      chatComponentsFactory.groupedToolCallCallbacks = {
+        ...chatComponentsFactory.groupedToolCallCallbacks,
+        toolCallPermissionDecision
+      };
 
-      chatComponentsFactory.removeQueuedMessage = (
-        targetId: string,
-        messageId: string
-      ) => {
-        const model = tracker.find(chat => chat.model.name === targetId)?.model;
-        if (!model) {
-          return;
+      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);
         }
-        (model as IAIChatModel).removeQueuedMessage(messageId);
       };
     }
 
@@ -1729,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';