@jupyterlite/ai 0.11.0 → 0.11.1

package/lib/chat-model-registry.d.ts

@@ -15,6 +15,11 @@ export declare class ChatModelRegistry implements IChatModelRegistry {
     get(name: string): AIChatModel | undefined;
     getAll(): AIChatModel[];
     remove(name: string): void;
+    /**
+     * Getter/setter for the active cell manager.
+     */
+    get activeCellManager(): ActiveCellManager | undefined;
+    set activeCellManager(manager: ActiveCellManager | undefined);
     private _models;
     private _docManager;
     private _agentManagerFactory;
@@ -49,7 +54,7 @@ export declare namespace ChatModelRegistry {
         /**
          * The active cell manager.
          */
-        activeCellManager: ActiveCellManager | undefined;
+        activeCellManager?: ActiveCellManager | undefined;
         /**
          * The application language translation bundle.
          */

package/lib/chat-model-registry.js

@@ -52,6 +52,9 @@ export class ChatModelRegistry {
     add(model) {
         if (!this._models.find(m => m.name === model.name)) {
             this._models.push(model);
+            model.disposed.connect(() => {
+                this.remove(model.name);
+            });
         }
     }
     get(name) {
@@ -66,6 +69,15 @@ export class ChatModelRegistry {
             this._models.splice(index, 1);
         }
     }
+    /**
+     * Getter/setter for the active cell manager.
+     */
+    get activeCellManager() {
+        return this._activeCellManager;
+    }
+    set activeCellManager(manager) {
+        this._activeCellManager = manager;
+    }
     _models = [];
     _docManager;
     _agentManagerFactory;

package/lib/index.js

@@ -105,20 +105,11 @@ const chatModelRegistry = {
     description: 'Registry for the current chat model',
     autoStart: true,
     requires: [IAISettingsModel, IAgentManagerFactory, IDocumentManager],
-    optional: [IProviderRegistry, INotebookTracker, IToolRegistry, ITranslator],
+    optional: [IProviderRegistry, IToolRegistry, ITranslator],
     provides: IChatModelRegistry,
-    activate: (app, settingsModel, agentManagerFactory, docManager, providerRegistry, notebookTracker, toolRegistry, translator) => {
+    activate: (app, settingsModel, agentManagerFactory, docManager, providerRegistry, toolRegistry, translator) => {
         const trans = (translator ?? nullTranslator).load('jupyterlite_ai');
-        // Create ActiveCellManager if notebook tracker is available
-        let activeCellManager;
-        if (notebookTracker) {
-            activeCellManager = new ActiveCellManager({
-                tracker: notebookTracker,
-                shell: app.shell
-            });
-        }
         return new ChatModelRegistry({
-            activeCellManager,
             settingsModel,
             agentManagerFactory,
             docManager,
@@ -141,8 +132,14 @@ const plugin = {
         IChatModelRegistry,
         IAISettingsModel
     ],
-    optional: [IThemeManager, ILayoutRestorer, ILabShell, ITranslator],
-    activate: (app, rmRegistry, inputToolbarFactory, modelRegistry, settingsModel, themeManager, restorer, labShell, translator) => {
+    optional: [
+        IThemeManager,
+        ILayoutRestorer,
+        ILabShell,
+        INotebookTracker,
+        ITranslator
+    ],
+    activate: (app, rmRegistry, inputToolbarFactory, modelRegistry, settingsModel, themeManager, restorer, labShell, notebookTracker, translator) => {
         const trans = (translator ?? nullTranslator).load('jupyterlite_ai');
         // Create attachment opener registry to handle file attachments
         const attachmentOpenerRegistry = new AttachmentOpenerRegistry();
@@ -152,6 +149,16 @@ const plugin = {
         attachmentOpenerRegistry.set('notebook', attachment => {
             app.commands.execute('docmanager:open', { path: attachment.value });
         });
+        // Create ActiveCellManager if notebook tracker is available, and add it to the
+        // model registry.
+        let activeCellManager;
+        if (notebookTracker) {
+            activeCellManager = new ActiveCellManager({
+                tracker: notebookTracker,
+                shell: app.shell
+            });
+        }
+        modelRegistry.activeCellManager = activeCellManager;
         // Create chat panel with drag/drop functionality
         const chatPanel = new MultiChatPanel({
             rmRegistry,

package/lib/tokens.d.ts

@@ -1,3 +1,4 @@
+import { ActiveCellManager } from '@jupyter/chat';
 import { Token } from '@lumino/coreutils';
 import { ISignal } from '@lumino/signaling';
 import type { Tool, LanguageModel } from 'ai';
@@ -194,6 +195,7 @@ export interface IChatModelRegistry {
     getAll(): AIChatModel[];
     remove(name: string): void;
     createModel(name?: string, activeProvider?: string, tokenUsage?: ITokenUsage): AIChatModel;
+    activeCellManager: ActiveCellManager | undefined;
 }
 export declare const IChatModelRegistry: Token<IChatModelRegistry>;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jupyterlite/ai",
-    "version": "0.11.0",
+    "version": "0.11.1",
     "description": "AI code completions and chat for JupyterLite",
     "keywords": [
         "jupyter",

package/src/chat-model-registry.ts

@@ -75,6 +75,9 @@ export class ChatModelRegistry implements IChatModelRegistry {
   add(model: AIChatModel): void {
     if (!this._models.find(m => m.name === model.name)) {
       this._models.push(model);
+      model.disposed.connect(() => {
+        this.remove(model.name);
+      });
     }
   }
 
@@ -93,6 +96,16 @@ export class ChatModelRegistry implements IChatModelRegistry {
     }
   }
 
+  /**
+   * Getter/setter for the active cell manager.
+   */
+  get activeCellManager(): ActiveCellManager | undefined {
+    return this._activeCellManager;
+  }
+  set activeCellManager(manager: ActiveCellManager | undefined) {
+    this._activeCellManager = manager;
+  }
+
   private _models: AIChatModel[] = [];
   private _docManager: IDocumentManager;
   private _agentManagerFactory: AgentManagerFactory;
@@ -128,7 +141,7 @@ export namespace ChatModelRegistry {
     /**
      * The active cell manager.
      */
-    activeCellManager: ActiveCellManager | undefined;
+    activeCellManager?: ActiveCellManager | undefined;
     /**
      * The application language translation bundle.
      */

package/src/index.ts

@@ -191,7 +191,7 @@ const chatModelRegistry: JupyterFrontEndPlugin<IChatModelRegistry> = {
   description: 'Registry for the current chat model',
   autoStart: true,
   requires: [IAISettingsModel, IAgentManagerFactory, IDocumentManager],
-  optional: [IProviderRegistry, INotebookTracker, IToolRegistry, ITranslator],
+  optional: [IProviderRegistry, IToolRegistry, ITranslator],
   provides: IChatModelRegistry,
   activate: (
     app: JupyterFrontEnd,
@@ -199,22 +199,12 @@ const chatModelRegistry: JupyterFrontEndPlugin<IChatModelRegistry> = {
     agentManagerFactory: AgentManagerFactory,
     docManager: IDocumentManager,
     providerRegistry?: IProviderRegistry,
-    notebookTracker?: INotebookTracker,
     toolRegistry?: IToolRegistry,
     translator?: ITranslator
   ): IChatModelRegistry => {
     const trans = (translator ?? nullTranslator).load('jupyterlite_ai');
 
-    // Create ActiveCellManager if notebook tracker is available
-    let activeCellManager: ActiveCellManager | undefined;
-    if (notebookTracker) {
-      activeCellManager = new ActiveCellManager({
-        tracker: notebookTracker,
-        shell: app.shell
-      });
-    }
     return new ChatModelRegistry({
-      activeCellManager,
       settingsModel,
       agentManagerFactory,
       docManager,
@@ -238,7 +228,13 @@ const plugin: JupyterFrontEndPlugin<void> = {
     IChatModelRegistry,
     IAISettingsModel
   ],
-  optional: [IThemeManager, ILayoutRestorer, ILabShell, ITranslator],
+  optional: [
+    IThemeManager,
+    ILayoutRestorer,
+    ILabShell,
+    INotebookTracker,
+    ITranslator
+  ],
   activate: (
     app: JupyterFrontEnd,
     rmRegistry: IRenderMimeRegistry,
@@ -248,6 +244,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
     themeManager?: IThemeManager,
     restorer?: ILayoutRestorer,
     labShell?: ILabShell,
+    notebookTracker?: INotebookTracker,
     translator?: ITranslator
   ): void => {
     const trans = (translator ?? nullTranslator).load('jupyterlite_ai');
@@ -261,6 +258,17 @@ const plugin: JupyterFrontEndPlugin<void> = {
       app.commands.execute('docmanager:open', { path: attachment.value });
     });
 
+    // Create ActiveCellManager if notebook tracker is available, and add it to the
+    // model registry.
+    let activeCellManager: ActiveCellManager | undefined;
+    if (notebookTracker) {
+      activeCellManager = new ActiveCellManager({
+        tracker: notebookTracker,
+        shell: app.shell
+      });
+    }
+    modelRegistry.activeCellManager = activeCellManager;
+
     // Create chat panel with drag/drop functionality
     const chatPanel = new MultiChatPanel({
       rmRegistry,

package/src/tokens.ts

@@ -1,3 +1,4 @@
+import { ActiveCellManager } from '@jupyter/chat';
 import { Token } from '@lumino/coreutils';
 import { ISignal } from '@lumino/signaling';
 import type { Tool, LanguageModel } from 'ai';
@@ -249,6 +250,7 @@ export interface IChatModelRegistry {
     activeProvider?: string,
     tokenUsage?: ITokenUsage
   ): AIChatModel;
+  activeCellManager: ActiveCellManager | undefined;
 }
 
 export const IChatModelRegistry = new Token<IChatModelRegistry>(