@jupyterlite/ai 0.9.0-a3 → 0.9.0

package/src/index.ts

@@ -26,6 +26,8 @@ import { ICompletionProviderManager } from '@jupyterlab/completer';
 
 import { IDocumentManager } from '@jupyterlab/docmanager';
 
+import { IEditorTracker } from '@jupyterlab/fileeditor';
+
 import { INotebookTracker } from '@jupyterlab/notebook';
 
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
@@ -34,6 +36,8 @@ import { IKernelSpecManager, KernelSpec } from '@jupyterlab/services';
 
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 
+import { IStatusBar } from '@jupyterlab/statusbar';
+
 import {
   settingsIcon,
   Toolbar,
@@ -61,7 +65,8 @@ import {
   IToolRegistry,
   SECRETS_NAMESPACE,
   IAISettingsModel,
-  IChatModelRegistry
+  IChatModelRegistry,
+  IDiffManager
 } from './tokens';
 
 import {
@@ -69,7 +74,6 @@ import {
   googleProvider,
   mistralProvider,
   openaiProvider,
-  ollamaProvider,
   genericProvider
 } from './providers/built-in-providers';
 
@@ -80,11 +84,14 @@ import {
   createModelSelectItem,
   createToolSelectItem,
   stopItem,
+  CompletionStatusWidget,
   TokenUsageWidget
 } from './components';
 
 import { AISettingsModel } from './models/settings-model';
 
+import { DiffManager } from './diff-manager';
+
 import { ToolRegistry } from './tools/tool-registry';
 
 import {
@@ -102,10 +109,12 @@ import {
 import {
   createCopyFileTool,
   createDeleteFileTool,
+  createGetFileInfoTool,
   createNavigateToDirectoryTool,
   createNewFileTool,
   createOpenFileTool,
-  createRenameFileTool
+  createRenameFileTool,
+  createSetFileContentTool
 } from './tools/file';
 
 import {
@@ -182,19 +191,6 @@ const openaiProviderPlugin: JupyterFrontEndPlugin<void> = {
   }
 };
 
-/**
- * Ollama provider plugin
- */
-const ollamaProviderPlugin: JupyterFrontEndPlugin<void> = {
-  id: '@jupyterlite/ai:ollama-provider',
-  description: 'Register Ollama provider',
-  autoStart: true,
-  requires: [IProviderRegistry],
-  activate: (app: JupyterFrontEnd, providerRegistry: IProviderRegistry) => {
-    providerRegistry.registerProvider(ollamaProvider);
-  }
-};
-
 /**
  * Generic provider plugin
  */
@@ -691,6 +687,7 @@ const agentManagerFactory: JupyterFrontEndPlugin<AgentManagerFactory> =
       });
       settingsWidget.id = 'jupyterlite-ai-settings';
       settingsWidget.title.icon = settingsIcon;
+      settingsWidget.title.iconClass = 'jp-ai-settings-icon';
 
       // Build the completion provider
       if (completionManager) {
@@ -716,6 +713,7 @@ const agentManagerFactory: JupyterFrontEndPlugin<AgentManagerFactory> =
         label: 'AI Settings',
         caption: 'Configure AI providers and behavior',
         icon: settingsIcon,
+        iconClass: 'jp-ai-settings-icon',
         execute: () => {
           // Check if the widget already exists in shell
           let widget = Array.from(app.shell.widgets('main')).find(
@@ -763,21 +761,42 @@ const settingsModel: JupyterFrontEndPlugin<AISettingsModel> = {
   }
 };
 
+/**
+ * Diff manager plugin
+ */
+const diffManager: JupyterFrontEndPlugin<IDiffManager> = {
+  id: '@jupyterlite/ai:diff-manager',
+  description: 'Provide the diff manager for notebook cell diffs',
+  autoStart: true,
+  provides: IDiffManager,
+  requires: [IAISettingsModel],
+  activate: (
+    app: JupyterFrontEnd,
+    settingsModel: AISettingsModel
+  ): IDiffManager => {
+    return new DiffManager({
+      commands: app.commands,
+      settingsModel
+    });
+  }
+};
+
 const toolRegistry: JupyterFrontEndPlugin<IToolRegistry> = {
   id: '@jupyterlite/ai:tool-registry',
   description: 'Provide the AI tool registry',
   autoStart: true,
   requires: [IAISettingsModel, IDocumentManager, IKernelSpecManager],
-  optional: [INotebookTracker],
+  optional: [INotebookTracker, IDiffManager, IEditorTracker],
   provides: IToolRegistry,
   activate: (
     app: JupyterFrontEnd,
     settingsModel: AISettingsModel,
     docManager: IDocumentManager,
     kernelSpecManager: KernelSpec.IManager,
-    notebookTracker?: INotebookTracker
+    notebookTracker?: INotebookTracker,
+    diffManager?: IDiffManager,
+    editorTracker?: IEditorTracker
   ) => {
-    const { commands } = app;
     const toolRegistry = new ToolRegistry();
 
     const notebookCreationTool = createNotebookCreationTool(
@@ -795,8 +814,8 @@ const toolRegistry: JupyterFrontEndPlugin<IToolRegistry> = {
     const getCellInfoTool = createGetCellInfoTool(docManager, notebookTracker);
     const setCellContentTool = createSetCellContentTool(
       docManager,
-      commands,
-      notebookTracker
+      notebookTracker,
+      diffManager
     );
     const runCellTool = createRunCellTool(docManager, notebookTracker);
     const deleteCellTool = createDeleteCellTool(docManager, notebookTracker);
@@ -825,6 +844,11 @@ const toolRegistry: JupyterFrontEndPlugin<IToolRegistry> = {
     const renameFileTool = createRenameFileTool(docManager);
     const copyFileTool = createCopyFileTool(docManager);
     const navigateToDirectoryTool = createNavigateToDirectoryTool(app.commands);
+    const getFileInfoTool = createGetFileInfoTool(docManager, editorTracker);
+    const setFileContentTool = createSetFileContentTool(
+      docManager,
+      diffManager
+    );
 
     toolRegistry.add('create_file', newFileTool);
     toolRegistry.add('open_file', openFileTool);
@@ -832,6 +856,8 @@ const toolRegistry: JupyterFrontEndPlugin<IToolRegistry> = {
     toolRegistry.add('rename_file', renameFileTool);
     toolRegistry.add('copy_file', copyFileTool);
     toolRegistry.add('navigate_to_directory', navigateToDirectoryTool);
+    toolRegistry.add('get_file_info', getFileInfoTool);
+    toolRegistry.add('set_file_content', setFileContentTool);
 
     // Add command operation tools
     const discoverCommandsTool = createDiscoverCommandsTool(app.commands);
@@ -852,7 +878,7 @@ const toolRegistry: JupyterFrontEndPlugin<IToolRegistry> = {
  */
 const inputToolbarFactory: JupyterFrontEndPlugin<IInputToolbarRegistryFactory> =
   {
-    id: 'labai:input-toolbar-factory',
+    id: '@jupyterlite/ai:input-toolbar-factory',
     description: 'The input toolbar registry plugin.',
     autoStart: true,
     provides: IInputToolbarRegistryFactory,
@@ -895,20 +921,44 @@ const inputToolbarFactory: JupyterFrontEndPlugin<IInputToolbarRegistryFactory> =
     }
   };
 
+const completionStatus: JupyterFrontEndPlugin<void> = {
+  id: '@jupyterlite/ai:completion-status',
+  description: 'The completion status displayed in the status bar',
+  autoStart: true,
+  requires: [IAISettingsModel],
+  optional: [IStatusBar],
+  activate: (
+    app: JupyterFrontEnd,
+    settingsModel: AISettingsModel,
+    statusBar: IStatusBar | null
+  ) => {
+    if (!statusBar) {
+      return;
+    }
+    const item = new CompletionStatusWidget({ settingsModel });
+    statusBar?.registerStatusItem('completionState', {
+      item,
+      align: 'right',
+      rank: 10
+    });
+  }
+};
+
 export default [
   providerRegistryPlugin,
   anthropicProviderPlugin,
   googleProviderPlugin,
   mistralProviderPlugin,
   openaiProviderPlugin,
-  ollamaProviderPlugin,
   genericProviderPlugin,
   settingsModel,
+  diffManager,
   chatModelRegistry,
   plugin,
   toolRegistry,
   agentManagerFactory,
-  inputToolbarFactory
+  inputToolbarFactory,
+  completionStatus
 ];
 
 // Export extension points for other extensions to use

package/src/models/settings-model.ts

@@ -48,6 +48,7 @@ export interface IAIConfig {
   contextAwareness: boolean;
   codeExecution: boolean;
   systemPrompt: string;
+  completionSystemPrompt: string;
   toolsEnabled: boolean;
   // Chat behavior settings
   sendWithShiftEnter: boolean;
@@ -55,6 +56,10 @@ export interface IAIConfig {
   showTokenUsage: boolean;
   // Commands that require approval before execution
   commandsRequiringApproval: string[];
+  // Diff display settings
+  showCellDiff: boolean;
+  showFileDiff: boolean;
+  diffDisplayMode: 'split' | 'unified';
 }
 
 export class AISettingsModel extends VDomModel {
@@ -70,6 +75,9 @@ export class AISettingsModel extends VDomModel {
     toolsEnabled: true,
     sendWithShiftEnter: false,
     showTokenUsage: false,
+    showCellDiff: true,
+    showFileDiff: true,
+    diffDisplayMode: 'split',
     commandsRequiringApproval: [
       'notebook:restart-run-all',
       'notebook:run-cell',
@@ -154,7 +162,18 @@ When users request complex tasks that require multiple steps (like "create a not
 
 Always think through multi-step tasks and use tools to fully complete the user's request rather than stopping after just one action.
 
-Ready to help you build something great! What are you working on?`
+Ready to help you build something great! What are you working on?`,
+    // Completion system prompt - also defined in schema/settings-model.json
+    // This serves as a fallback if settings fail to load or are not available
+    completionSystemPrompt: `You are an AI code completion assistant. Complete the given code fragment with appropriate code.
+Rules:
+- Return only the completion text, no explanations or comments
+- Do not include code block markers (\`\`\` or similar)
+- Make completions contextually relevant to the surrounding code and notebook context
+- Follow the language-specific conventions and style guidelines for the detected programming language
+- Keep completions concise but functional
+- Do not repeat the existing code that comes before the cursor
+- Use variables, imports, functions, and other definitions from previous notebook cells when relevant`
   };
 
   private _settingRegistry: ISettingRegistry;
@@ -222,7 +241,7 @@ Ready to help you build something great! What are you working on?`
     }
     return this._config.activeCompleterProvider
       ? this.getProvider(this._config.activeCompleterProvider)
-      : this.getDefaultProvider();
+      : undefined;
   }
 
   async addProvider(
@@ -292,6 +311,11 @@ Ready to help you build something great! What are you working on?`
     }
 
     Object.assign(provider, updates);
+    Object.keys(provider).forEach(key => {
+      if (key !== 'id' && updates[key] === undefined) {
+        delete provider[key];
+      }
+    });
     await this.saveSetting('providers', this._config.providers);
   }
 
@@ -397,6 +421,8 @@ Ready to help you build something great! What are you working on?`
         // Only save the specific setting that changed
         if (value !== undefined) {
           await this._settings.set(key, value as any);
+        } else {
+          await this._settings.remove(key);
         }
       }
     } catch (error) {

package/src/providers/built-in-providers.ts

@@ -2,7 +2,7 @@ import { createAnthropic } from '@ai-sdk/anthropic';
 import { createGoogleGenerativeAI } from '@ai-sdk/google';
 import { createMistral } from '@ai-sdk/mistral';
 import { createOpenAI } from '@ai-sdk/openai';
-import { createOllama } from 'ollama-ai-provider-v2';
+import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
 
 import type { IProviderInfo } from '../tokens';
 import type { IModelOptions } from './models';
@@ -17,6 +17,8 @@ export const anthropicProvider: IProviderInfo = {
   defaultModels: [
     'claude-sonnet-4-5',
     'claude-sonnet-4-5-20250929',
+    'claude-haiku-4-5',
+    'claude-haiku-4-5-20251001',
     'claude-opus-4-1',
     'claude-opus-4-0',
     'claude-sonnet-4-0',
@@ -200,26 +202,6 @@ export const openaiProvider: IProviderInfo = {
   }
 };
 
-/**
- * Ollama provider
- */
-export const ollamaProvider: IProviderInfo = {
-  id: 'ollama',
-  name: 'Ollama',
-  apiKeyRequirement: 'none',
-  defaultModels: [],
-  supportsBaseURL: true,
-  supportsHeaders: true,
-  factory: (options: IModelOptions) => {
-    const ollama = createOllama({
-      baseURL: options.baseURL || 'http://localhost:11434/api',
-      ...(options.headers && { headers: options.headers })
-    });
-    const modelName = options.model || 'phi3';
-    return ollama(modelName);
-  }
-};
-
 /**
  * Generic OpenAI-compatible provider
  */
@@ -232,13 +214,24 @@ export const genericProvider: IProviderInfo = {
   supportsHeaders: true,
   supportsToolCalling: true,
   description: 'Uses /chat/completions endpoint',
+  baseUrls: [
+    {
+      url: 'http://localhost:4000',
+      description: 'Default for local LiteLLM server'
+    },
+    {
+      url: 'http://localhost:11434/v1',
+      description: 'Default for local Ollama server'
+    }
+  ],
   factory: (options: IModelOptions) => {
-    const openai = createOpenAI({
+    const openaiCompatible = createOpenAICompatible({
+      name: options.provider,
       apiKey: options.apiKey || 'dummy',
-      ...(options.baseURL && { baseURL: options.baseURL }),
+      baseURL: options.baseURL ?? '',
       ...(options.headers && { headers: options.headers })
     });
     const modelName = options.model || 'gpt-4o';
-    return openai(modelName);
+    return openaiCompatible(modelName);
   }
 };

package/src/tokens.ts

@@ -159,6 +159,11 @@ export interface IProviderInfo {
    */
   description?: string;
 
+  /**
+   * Optional URL suggestions
+   */
+  baseUrls?: { url: string; description?: string }[];
+
   /**
    * Factory function for creating language models
    */
@@ -250,3 +255,76 @@ export interface IChatModelRegistry {
 export const IChatModelRegistry = new Token<IChatModelRegistry>(
   '@jupyterlite/ai:chat-model-registry'
 );
+
+/**
+ * Parameters for showing cell diff
+ */
+export interface IShowCellDiffParams {
+  /**
+   * Original cell content
+   */
+  original: string;
+  /**
+   * Modified cell content
+   */
+  modified: string;
+  /**
+   * Optional cell ID
+   */
+  cellId?: string;
+  /**
+   * Whether to show action buttons in the diff view
+   */
+  showActionButtons?: boolean;
+  /**
+   * Whether to open the diff view
+   */
+  openDiff?: boolean;
+  /**
+   * Optional path to the notebook
+   */
+  notebookPath?: string;
+}
+
+/**
+ * Parameters for showing file diff
+ */
+export interface IShowFileDiffParams {
+  /**
+   * Original file content
+   */
+  original: string;
+  /**
+   * Modified file content
+   */
+  modified: string;
+  /**
+   * Optional file path
+   */
+  filePath?: string;
+  /**
+   * Whether to show action buttons in the diff view
+   */
+  showActionButtons?: boolean;
+}
+
+/**
+ * Interface for managing diff operations
+ */
+export interface IDiffManager {
+  /**
+   * Show diff between original and modified cell content
+   */
+  showCellDiff(params: IShowCellDiffParams): Promise<void>;
+  /**
+   * Show diff between original and modified file content
+   */
+  showFileDiff(params: IShowFileDiffParams): Promise<void>;
+}
+
+/**
+ * Token for the diff manager.
+ */
+export const IDiffManager = new Token<IDiffManager>(
+  '@jupyterlite/ai:diff-manager'
+);

package/src/tools/commands.ts

@@ -20,51 +20,56 @@ export function createDiscoverCommandsTool(commands: CommandRegistry): ITool {
         .nullable()
         .describe('Optional search query to filter commands')
     }),
-    execute: async () => {
-      try {
-        const commandList: Array<{
-          id: string;
-          label?: string;
-          caption?: string;
-          description?: string;
-          args?: any;
-        }> = [];
+    execute: async (input: { query?: string | null }) => {
+      const { query } = input;
+      const commandList: Array<{
+        id: string;
+        label?: string;
+        caption?: string;
+        description?: string;
+        args?: any;
+      }> = [];
 
-        // Get all command IDs
-        const commandIds = commands.listCommands();
+      // Get all command IDs
+      const commandIds = commands.listCommands();
 
-        for (const id of commandIds) {
-          try {
-            // Get command metadata using various CommandRegistry methods
-            const description = await commands.describedBy(id);
-            const label = commands.label(id);
-            const caption = commands.caption(id);
-            const usage = commands.usage(id);
+      for (const id of commandIds) {
+        // Get command metadata using various CommandRegistry methods
+        const description = await commands.describedBy(id);
+        const label = commands.label(id);
+        const caption = commands.caption(id);
+        const usage = commands.usage(id);
+
+        const command = {
+          id,
+          label: label || undefined,
+          caption: caption || undefined,
+          description: usage || undefined,
+          args: description?.args || undefined
+        };
 
-            commandList.push({
-              id,
-              label: label || undefined,
-              caption: caption || undefined,
-              description: usage || undefined,
-              args: description?.args || undefined
-            });
-          } catch (error) {
-            // Some commands might not have descriptions, skip them
-            commandList.push({ id });
+        // Filter by query if provided
+        if (query) {
+          const searchTerm = query.toLowerCase();
+          const matchesQuery =
+            id.toLowerCase().includes(searchTerm) ||
+            label?.toLowerCase().includes(searchTerm) ||
+            caption?.toLowerCase().includes(searchTerm) ||
+            usage?.toLowerCase().includes(searchTerm);
+
+          if (matchesQuery) {
+            commandList.push(command);
           }
+        } else {
+          commandList.push(command);
         }
-
-        return {
-          success: true,
-          commandCount: commandList.length,
-          commands: commandList
-        };
-      } catch (error) {
-        return {
-          success: false,
-          error: `Failed to discover commands: ${error instanceof Error ? error.message : String(error)}`
-        };
       }
+
+      return {
+        success: true,
+        commandCount: commandList.length,
+        commands: commandList
+      };
     }
   });
 }
@@ -87,7 +92,7 @@ export function createExecuteCommandTool(
         .optional()
         .describe('Optional arguments to pass to the command')
     }),
-    needsApproval: async (_context, { commandId }) => {
+    needsApproval: async (context, { commandId }) => {
       // Use configurable list of commands requiring approval
       const commandsRequiringApproval =
         settingsModel.config.commandsRequiringApproval;