@datalayer/jupyter-react 1.2.3 → 2.0.0

package/lib/components/notebook/NotebookAdapter.js

@@ -3,630 +3,686 @@
  *
  * MIT License
  */
-import { WIDGET_MIMETYPE } from '@jupyter-widgets/html-manager/lib/output_renderers';
-import { CodeMirrorEditorFactory, CodeMirrorMimeTypeService, EditorExtensionRegistry, EditorLanguageRegistry, EditorThemeRegistry, ybinding, } from '@jupyterlab/codemirror';
-import { Completer, CompleterModel, CompletionHandler, KernelCompleterProvider, ProviderReconciliator, } from '@jupyterlab/completer';
-import { Context, DocumentRegistry } from '@jupyterlab/docregistry';
-import { rendererFactory as javascriptRendererFactory } from '@jupyterlab/javascript-extension';
-import { rendererFactory as jsonRendererFactory } from '@jupyterlab/json-extension';
-import { MathJaxTypesetter } from '@jupyterlab/mathjax-extension';
-import { NotebookTracker, NotebookWidgetFactory, StaticNotebook, } from '@jupyterlab/notebook';
-import { RenderMimeRegistry, standardRendererFactories, } from '@jupyterlab/rendermime';
-import { find } from '@lumino/algorithm';
-import { CommandRegistry } from '@lumino/commands';
-import { BoxPanel, Widget } from '@lumino/widgets';
-import { WidgetLabRenderer, WidgetManager } from '../../jupyter';
-import { newUuid } from '../../utils';
-import { JupyterReactContentFactory } from './content/JupyterReactContentFactory';
-import { getMarked } from './marked/marked';
-import { JupyterReactNotebookModelFactory } from './model/JupyterReactNotebookModelFactory';
-import { addNotebookCommands, NotebookPanelProvider } from './NotebookCommands';
-const FALLBACK_NOTEBOOK_PATH = '.datalayer/ping.ipynb';
+import { NotebookActions, } from '@jupyterlab/notebook';
+import { NotebookCommandIds } from './NotebookCommands';
+import * as Diff from 'diff';
 export class NotebookAdapter {
-    _boxPanel;
     _commands;
-    _contentFactory;
+    _panel;
+    _notebook;
     _context;
-    _documentRegistry;
-    _iPyWidgetsManager;
-    _id;
-    _kernel;
-    _kernelConnection;
-    _kernelClients;
-    _kernelTransfer;
-    _lite;
-    _mimeTypeService;
-    _nbformat;
-    _notebookModelFactory;
-    _notebookPanel;
-    _onSessionConnection;
-    _panelProvider;
-    _path;
-    _readonly;
-    _renderers;
-    _rendermime;
-    _serverless;
-    _serviceManager;
-    _tracker;
-    _url;
-    _useVSCodeTheme;
-    constructor(props) {
-        console.log('Creating a new Notebook Adapter.');
-        this._id = props.id ?? newUuid();
-        this._kernel = props.kernel;
-        this._kernelClients = props.kernelClients ?? [];
-        this._lite = props.lite;
-        this._nbformat = props.nbformat;
-        this._path = props.path;
-        this._readonly = props.readonly ?? false;
-        this._renderers = props.renderers ?? [];
-        this._serverless = props.serverless ?? false;
-        this._serviceManager = props.serviceManager;
-        this._url = props.url;
-        this._useVSCodeTheme = props.useVSCodeTheme ?? true; // Default to true for backwards compatibility
-        this._kernelTransfer = props.kernelTransfer;
-        this._onSessionConnection = props.onSessionConnection;
-        this._boxPanel = new BoxPanel();
-        this._boxPanel.addClass('dla-Jupyter-Notebook');
-        this._boxPanel.spacing = 0;
-        this._commands = new CommandRegistry();
-        this._panelProvider = new NotebookPanelProvider();
-        if (props.url) {
-            this.loadFromUrl(props.url).then(nbformat => {
-                this._nbformat = nbformat;
-                this.setupAdapter();
-            });
+    _defaultCellType = 'code';
+    constructor(commands, panel, context) {
+        this._commands = commands;
+        this._panel = panel;
+        this._notebook = panel.content;
+        this._context = context;
+    }
+    /**
+     * Get the command registry.
+     */
+    get commands() {
+        return this._commands;
+    }
+    /**
+     * Get the notebook panel.
+     */
+    get panel() {
+        return this._panel;
+    }
+    /**
+     * Get the notebook widget.
+     */
+    get notebook() {
+        return this._notebook;
+    }
+    /**
+     * Get the notebook context.
+     */
+    get context() {
+        return this._context;
+    }
+    /**
+     * Set the default cell type for new cells.
+     */
+    setDefaultCellType(cellType) {
+        this._defaultCellType = cellType;
+    }
+    /**
+     * Get the default cell type for new cells.
+     */
+    get defaultCellType() {
+        return this._defaultCellType;
+    }
+    /**
+     * Insert a new cell above the active cell.
+     */
+    insertAbove(source) {
+        const notebook = this._notebook;
+        // Insert above using NotebookActions
+        NotebookActions.insertAbove(notebook);
+        // Always set the cell type to match _defaultCellType
+        // (NotebookActions may create cells with a different default type)
+        NotebookActions.changeCellType(notebook, this._defaultCellType);
+        // Set the source if provided
+        if (source && notebook.activeCell) {
+            notebook.activeCell.model.sharedModel.setSource(source);
         }
-        else {
-            this.setupAdapter();
+        // Enter edit mode
+        notebook.mode = 'edit';
+    }
+    /**
+     * Insert a new cell below the active cell.
+     */
+    insertBelow(source) {
+        const notebook = this._notebook;
+        // Insert below using NotebookActions
+        NotebookActions.insertBelow(notebook);
+        // Always set the cell type to match _defaultCellType
+        // (NotebookActions may create cells with a different default type)
+        NotebookActions.changeCellType(notebook, this._defaultCellType);
+        // Set the source if provided
+        if (source && notebook.activeCell) {
+            notebook.activeCell.model.sharedModel.setSource(source);
         }
+        // Enter edit mode
+        notebook.mode = 'edit';
     }
-    async loadFromUrl(url) {
-        return fetch(url)
-            .then(response => {
-            return response.text();
-        })
-            .then(nb => {
-            return JSON.parse(nb);
-        });
+    /**
+     * Change the type of the active cell.
+     */
+    changeCellType(cellType) {
+        const notebook = this._notebook;
+        if (notebook.activeCell && notebook.activeCell.model.type !== cellType) {
+            NotebookActions.changeCellType(notebook, cellType);
+        }
     }
-    notebookKeydownListener = (event) => {
-        this._commands?.processKeydownEvent(event);
-    };
-    setupCompleter(notebookPanel) {
-        const editor = notebookPanel.content.activeCell &&
-            notebookPanel.content.activeCell.editor;
-        const sessionContext = notebookPanel.context.sessionContext;
-        const model = new CompleterModel();
-        const completer = new Completer({ editor, model });
-        const timeout = 1000;
-        const provider = new KernelCompleterProvider();
-        const reconciliator = new ProviderReconciliator({
-            context: {
-                widget: notebookPanel,
-                editor,
-                session: sessionContext.session,
-            },
-            providers: [provider],
-            timeout,
-        });
-        const handler = new CompletionHandler({ completer, reconciliator });
-        sessionContext.ready.then(() => {
-            const provider = new KernelCompleterProvider();
-            const reconciliator = new ProviderReconciliator({
-                context: {
-                    widget: this._notebookPanel,
-                    editor,
-                    session: sessionContext.session,
-                },
-                providers: [provider],
-                timeout: timeout,
-            });
-            handler.reconciliator = reconciliator;
-        });
-        handler.editor = editor;
-        notebookPanel.content.activeCellChanged.connect((notebook, cell) => {
-            if (cell) {
-                cell.ready.then(() => {
-                    handler.editor = cell && cell.editor;
-                });
+    /**
+     * Delete the currently selected cells.
+     */
+    deleteCells() {
+        const notebook = this._notebook;
+        NotebookActions.deleteCells(notebook);
+    }
+    /**
+     * Get the notebook model.
+     */
+    get model() {
+        return this._context.model;
+    }
+    /**
+     * Undo the last change in the notebook.
+     *
+     * @remarks
+     * If there is no history to undo (e.g., at the beginning of the undo stack),
+     * this operation will have no effect. The notebook must be available and
+     * properly initialized for this operation to succeed.
+     */
+    undo() {
+        const notebook = this._notebook;
+        // If we're in edit mode and have an active cell with an editor,
+        // try to undo in the cell editor first
+        if (notebook.mode === 'edit' && notebook.activeCell?.editor) {
+            const editor = notebook.activeCell.editor;
+            // CodeMirror editor has an undo method
+            if (editor && typeof editor.undo === 'function') {
+                editor.undo();
+                return;
             }
-        });
-        completer.hide();
-        Widget.attach(completer, document.body);
-        return handler;
+        }
+        // Otherwise, undo at the notebook level (add/remove cells, etc.)
+        NotebookActions.undo(notebook);
     }
-    initializeContext() {
-        const isNbFormat = this._path !== undefined && this._path !== '' ? false : true;
-        this._context = new Context({
-            manager: this._serviceManager,
-            factory: this._notebookModelFactory,
-            path: this._path ?? FALLBACK_NOTEBOOK_PATH,
-            kernelPreference: {
-                id: this._kernel?.id,
-                shouldStart: false,
-                canStart: false,
-                autoStartDefault: false,
-                shutdownOnDispose: false,
-            },
-        });
-        this._iPyWidgetsManager = new WidgetManager(this._context, this._rendermime, { saveState: false });
-        const ipywidgetsRendererFactory = {
-            safe: true,
-            mimeTypes: [WIDGET_MIMETYPE],
-            defaultRank: 1,
-            createRenderer: options => new WidgetLabRenderer(options, this._iPyWidgetsManager),
-        };
-        this._rendermime.addFactory(ipywidgetsRendererFactory, 1);
-        this._kernelClients?.map(kernelClient => {
-            this._iPyWidgetsManager?.registerWithKernel(kernelClient);
-        });
-        // These are fixes on the Context and the SessionContext to have more control on the kernel launch.
-        this._context.sessionContext._initialize =
-            async () => {
-                const manager = this._context.sessionContext
-                    .sessionManager;
-                await manager.ready;
-                await manager.refreshRunning();
-                const model = find(manager.running(), model => {
-                    return model.kernel?.id === this._kernel?.id;
-                });
-                if (model) {
-                    try {
-                        const session = manager.connectTo({
-                            model: {
-                                ...model,
-                                path: this._path ?? model.path,
-                                name: this._path ?? model.name,
-                            },
-                            kernelConnectionOptions: {
-                                handleComms: true,
-                            },
-                        });
-                        this._context.sessionContext._handleNewSession(session);
-                        // Dispose the previous KernelConnection to avoid errors with Comms.
-                        this._kernel?.connection?.dispose();
-                    }
-                    catch (err) {
-                        void this._context.sessionContext._handleSessionError(err);
-                        return Promise.reject(err);
-                    }
-                }
-                return await this._context.sessionContext._startIfNecessary();
-            };
-        if (isNbFormat) {
-            // If nbformat is provided and we don't want to interact with the Content Manager.
-            this._context._populate = async () => {
-                this._context._isPopulated = true;
-                this._context._isReady = true;
-                this._context._populatedPromise.resolve(void 0);
-                // Add a checkpoint if none exists and the file is writable.
-                // Force skip this step for nbformat notebooks.
-                // await (this._context as any)._maybeCheckpoint(false);
-                if (this._context.isDisposed) {
-                    return;
-                }
-                // Update the kernel preference.
-                const name = this._context._model.defaultKernelName ||
-                    this._context.sessionContext.kernelPreference.name;
-                this._context.sessionContext.kernelPreference = {
-                    ...this._context.sessionContext.kernelPreference,
-                    name,
-                    language: this._context._model.defaultKernelLanguage,
+    /**
+     * Redo the last undone change in the notebook.
+     *
+     * @remarks
+     * If there is no history to redo (e.g., no prior undo operations or at the
+     * end of the redo stack), this operation will have no effect. The notebook
+     * must be available and properly initialized for this operation to succeed.
+     */
+    redo() {
+        const notebook = this._notebook;
+        // If we're in edit mode and have an active cell with an editor,
+        // try to redo in the cell editor first
+        if (notebook.mode === 'edit' && notebook.activeCell?.editor) {
+            const editor = notebook.activeCell.editor;
+            // CodeMirror editor has a redo method
+            if (editor && typeof editor.redo === 'function') {
+                editor.redo();
+                return;
+            }
+        }
+        // Otherwise, redo at the notebook level (add/remove cells, etc.)
+        NotebookActions.redo(notebook);
+    }
+    /**
+     * Set the active cell by index.
+     *
+     * @param index - The index of the cell to activate (0-based)
+     *
+     * @remarks
+     * This method programmatically selects a cell at the specified index.
+     * If the index is out of bounds, the operation has no effect.
+     */
+    setActiveCell(index) {
+        const notebook = this._notebook;
+        const cellCount = notebook.model?.cells.length ?? 0;
+        if (index >= 0 && index < cellCount) {
+            notebook.activeCellIndex = index;
+        }
+    }
+    /**
+     * Get all cells from the notebook.
+     *
+     * @returns Array of cell data including type, source, and outputs
+     *
+     * @remarks
+     * This method extracts cell information from the notebook model.
+     * For code cells, outputs are included. Returns an empty array if
+     * the notebook model is not available.
+     */
+    getCells() {
+        console.log('[NotebookAdapter.getCells] Called');
+        const cells = this._notebook.model?.cells;
+        if (!cells) {
+            console.log('[NotebookAdapter.getCells] No cells model, returning empty array');
+            return [];
+        }
+        console.log(`[NotebookAdapter.getCells] Found ${cells.length} cells`);
+        const result = [];
+        for (let i = 0; i < cells.length; i++) {
+            const cell = cells.get(i);
+            if (cell) {
+                const cellData = {
+                    index: i,
+                    type: cell.type,
+                    source: cell.sharedModel.getSource(),
+                    outputs: cell.type === 'code' ? cell.outputs?.toJSON() : undefined,
                 };
-                // Note: we don't wait on the session to initialize
-                // so that the user can be shown the content before
-                // any kernel has started.
-                void this._context.sessionContext
-                    .initialize()
-                    .then((shouldSelect) => {
-                    if (shouldSelect) {
-                        void this._context._dialogs.selectKernel(this._context.sessionContext.sessionContext);
-                    }
+                console.log(`[NotebookAdapter.getCells] Cell ${i}:`, {
+                    type: cellData.type,
+                    sourceLength: cellData.source.length,
                 });
-            };
-            this._context.initialize = async (isNew) => {
-                this._context.model.dirty = false;
-                const now = new Date().toISOString();
-                const model = {
-                    path: this._id,
-                    name: this._id,
-                    type: 'notebook',
-                    content: undefined,
-                    writable: true,
-                    created: now,
-                    last_modified: now,
-                    mimetype: 'application/x-ipynb+json',
-                    format: 'json',
-                };
-                this._context._updateContentsModel(model);
-                await this._context._populate();
-                this._context.model.sharedModel.clearUndoHistory();
-            };
-        }
-        // Setup the context listeners.
-        this._context.sessionContext.sessionChanged.connect((_, args) => {
-            const session = args.newValue;
-            console.log('Current Jupyter Session Connection', session);
-            if (this._onSessionConnection) {
-                if (session) {
-                    this._onSessionConnection(session);
-                    this._iPyWidgetsManager?.registerWithKernel(session.kernel);
-                    const model = this._notebookPanel?.model;
-                    if (model) {
-                        this._iPyWidgetsManager?.restoreWidgets(model);
-                    }
-                }
-            }
-        });
-        this._context.sessionContext.kernelChanged.connect((_, args) => {
-            const kernelConnection = args.newValue;
-            this._kernelConnection = kernelConnection;
-            console.log('Current Jupyter Kernel Connection.', kernelConnection);
-            if (kernelConnection && !kernelConnection.handleComms) {
-                console.log('Updating the current Kernel Connection to enforce Comms support.', kernelConnection.handleComms);
-                kernelConnection.handleComms = true;
-            }
-            /*
-          this._iPyWidgetsManager?.registerWithKernel(kernelConnection);
-          this._iPyWidgetsManager?.restoreWidgets(this._notebookPanel?.model!)
-          if (this._onSessionConnection) {
-            this._onSessionConnection(kernelConnection);
-          }
-          */
-        });
-        this._context.sessionContext.ready.then(() => {
-            if (this._onSessionConnection) {
-                this._onSessionConnection(this._context?.sessionContext.session ?? undefined);
-            }
-            const kernelConnection = this._context?.sessionContext.session?.kernel;
-            this._kernelConnection = kernelConnection;
-            if (this._kernelTransfer) {
-                if (kernelConnection) {
-                    kernelConnection.connectionStatusChanged.connect((_, status) => {
-                        if (status === 'connected') {
-                            this._kernelTransfer.transfer(kernelConnection);
-                        }
-                    });
-                }
+                result.push(cellData);
             }
-        });
-        if (!this._notebookPanel) {
-            // Create the Notebook Panel if not yet done.
-            /*
-            // Option 1 to create the Notebook Panel.
-            const content = new Notebook({
-              rendermime: this._rendermime!,
-              contentFactory: this._contentFactory,
-              mimeTypeService: this._mimeTypeService,
-              notebookConfig: {
-                ...StaticNotebook.defaultNotebookConfig,
-                windowingMode: 'none',
-                recordTiming: true,
-              }
-            });
-            this._notebookPanel = new NotebookPanel({
-              context: this._context,
-              content,
-            });
-            */
-            // Option 2 to create the Notebook Panel.
-            const notebookFactory = this._documentRegistry?.getWidgetFactory('Notebook');
-            this._notebookPanel = notebookFactory?.createNew(this._context);
-            // Update panel provider with persistent references
-            this._panelProvider.setPanel(this._notebookPanel, this._context);
         }
-        const completerHandler = this.setupCompleter(this._notebookPanel);
-        if (!this._readonly) {
-            try {
-                addNotebookCommands(this._commands, completerHandler, this._tracker, this._panelProvider, this._path);
-            }
-            catch {
-                // no-op.
-                // The commands may already be registered...
+        console.log(`[NotebookAdapter.getCells] Returning ${result.length} cells`);
+        return result;
+    }
+    /**
+     * Read all cells from the notebook (alias for getCells).
+     *
+     * @param format - Response format: 'brief' returns preview only, 'detailed' returns full content
+     * @returns Array of cell data - brief or detailed based on format
+     *
+     * @remarks
+     * This method is an alias for getCells() to match the readAllCells tool operation.
+     * Provides a consistent naming convention for read operations.
+     * Supports brief format (index, type, 40-char preview) and detailed format (full content).
+     */
+    readAllCells(format = 'brief') {
+        const cells = this.getCells();
+        return cells.map((cell, index) => {
+            // Get execution count for code cells
+            const cellModel = this._notebook.model?.cells.get(index);
+            const execution_count = cellModel?.type === 'code'
+                ? (cellModel.executionCount ?? null)
+                : null;
+            if (format === 'brief') {
+                // Brief format: index, type, 40-char preview
+                return {
+                    index,
+                    type: cell.type,
+                    preview: cell.source.substring(0, 40),
+                };
             }
-        }
-        this._boxPanel.addWidget(this._notebookPanel);
-        BoxPanel.setStretch(this._notebookPanel, 0);
-        window.addEventListener('resize', () => {
-            this._notebookPanel?.update();
-        });
-        this._context.initialize(isNbFormat).then(() => {
-            if (isNbFormat) {
-                this._notebookPanel?.model?.fromJSON(this._nbformat);
+            else {
+                // Detailed format: full content with source, execution_count, outputs
+                return {
+                    index,
+                    type: cell.type,
+                    source: cell.source,
+                    execution_count,
+                    outputs: cell.outputs,
+                };
             }
         });
     }
-    setupAdapter() {
-        document.addEventListener('keydown', this.notebookKeydownListener, true);
-        const initialFactories = standardRendererFactories.filter(factory => factory.mimeTypes[0] !== 'text/javascript');
-        /*
-        const ipywidgetsRendererFactory: IRenderMime.IRendererFactory =  {
-          safe: true,
-          mimeTypes: [WIDGET_MIMETYPE],
-          defaultRank: 1,
-          createRenderer: options =>
-            new WidgetLabRenderer(options, this._iPyWidgetsManager!),
-        };
-        initialFactories.push(ipywidgetsRendererFactory);
-        */
-        initialFactories.push(jsonRendererFactory);
-        initialFactories.push(javascriptRendererFactory);
-        this._renderers.map(renderer => initialFactories.push(renderer));
-        const languages = new EditorLanguageRegistry();
-        // Register default languages.
-        for (const language of EditorLanguageRegistry.getDefaultLanguages()) {
-            languages.addLanguage(language);
-        }
-        // Add Jupyter Markdown flavor here to support code block highlighting.
-        languages.addLanguage({
-            name: 'ipythongfm',
-            mime: 'text/x-ipythongfm',
-            load: async () => {
-                // TODO: add support for LaTeX.
-                const m = await import('@codemirror/lang-markdown');
-                return m.markdown({
-                    codeLanguages: (info) => languages.findBest(info),
-                });
-            },
+    /**
+     * Get the total number of cells in the notebook.
+     *
+     * @returns The number of cells, or 0 if the notebook model is not available
+     */
+    getCellCount() {
+        return this._notebook.model?.cells.length ?? 0;
+    }
+    /**
+     * Insert a new cell at a specific index.
+     *
+     * @param cellIndex - The index where the cell should be inserted (0-based)
+     * @param source - Optional source code/text for the new cell
+     *
+     * @remarks
+     * This method inserts a cell at the specified position by:
+     * 1. Setting the active cell to cellIndex
+     * 2. Calling insertAbove to insert before that cell
+     *
+     * Note: The cell type is determined by _defaultCellType, which should be set
+     * before calling this method (typically done by the store layer).
+     */
+    insertAt(cellIndex, source) {
+        const cellCount = this.getCellCount();
+        console.log('[NotebookAdapter.insertAt] Called with:', {
+            cellIndex,
+            sourceLength: source?.length || 0,
+            sourcePreview: source?.substring(0, 50),
+            currentActiveCell: this._notebook.activeCellIndex,
+            cellCount,
+            defaultCellType: this._defaultCellType,
         });
-        this._rendermime = new RenderMimeRegistry({
-            initialFactories,
-            latexTypesetter: new MathJaxTypesetter(),
-            markdownParser: getMarked(languages),
+        // Validate cell index is within bounds (matches Jupyter MCP Server)
+        if (cellIndex < -1 || cellIndex > cellCount) {
+            throw new Error(`Index ${cellIndex} is outside valid range [-1, ${cellCount}]. ` +
+                `Use -1 to append at end.`);
+        }
+        // Normalize -1 to append position (matches Jupyter MCP Server)
+        const actualIndex = cellIndex === -1 ? cellCount : cellIndex;
+        console.log('[NotebookAdapter.insertAt] Normalized index:', {
+            originalIndex: cellIndex,
+            actualIndex,
+            cellCount,
         });
-        this._documentRegistry = new DocumentRegistry({});
-        this._mimeTypeService = new CodeMirrorMimeTypeService(languages);
-        const themes = new EditorThemeRegistry();
-        for (const theme of EditorThemeRegistry.getDefaultThemes()) {
-            themes.addTheme(theme);
+        // Insert at the actual index
+        if (actualIndex >= cellCount) {
+            // Append at end
+            console.log('[NotebookAdapter.insertAt] Appending at end');
+            if (cellCount > 0) {
+                this.setActiveCell(cellCount - 1);
+            }
+            this.insertBelow(source);
         }
-        // Store useVSCodeTheme flag on window for the patch to access
-        if (typeof window !== 'undefined') {
-            window.__useVSCodeTheme = this._useVSCodeTheme;
+        else {
+            // Insert at specific position
+            console.log(`[NotebookAdapter.insertAt] Inserting at index ${actualIndex}`);
+            this.setActiveCell(actualIndex);
+            this.insertAbove(source);
         }
-        const editorExtensions = () => {
-            const registry = new EditorExtensionRegistry();
-            for (const extensionFactory of EditorExtensionRegistry.getDefaultExtensions({ themes })) {
-                registry.addExtension(extensionFactory);
-            }
-            registry.addExtension({
-                name: 'shared-model-binding',
-                factory: options => {
-                    const sharedModel = options.model.sharedModel;
-                    return EditorExtensionRegistry.createImmutableExtension(ybinding({
-                        ytext: sharedModel.ysource,
-                        undoManager: sharedModel.undoManager ?? undefined,
-                    }));
-                },
-            });
-            return registry;
-        };
-        const factoryService = new CodeMirrorEditorFactory({
-            extensions: editorExtensions(),
-            languages,
+        console.log('[NotebookAdapter.insertAt] After insertion:', {
+            cellCount: this.getCellCount(),
+            activeCell: this._notebook.activeCellIndex,
         });
-        const editorServices = {
-            factoryService,
-            mimeTypeService: this._mimeTypeService,
-        };
-        const editorFactory = editorServices.factoryService.newInlineEditor;
-        this._contentFactory = new JupyterReactContentFactory({ editorFactory });
-        this._tracker = new NotebookTracker({ namespace: this._id });
-        const notebookWidgetFactory = new NotebookWidgetFactory({
-            name: 'Notebook',
-            label: 'Notebook',
-            modelName: 'notebook',
-            fileTypes: ['notebook'],
-            defaultFor: ['notebook'],
-            preferKernel: true,
-            autoStartDefault: false,
-            canStartKernel: false,
-            shutdownOnClose: false,
-            rendermime: this._rendermime,
-            contentFactory: this._contentFactory,
-            mimeTypeService: editorServices.mimeTypeService,
-            notebookConfig: {
-                ...StaticNotebook.defaultNotebookConfig,
-                recordTiming: true,
-            },
-        });
-        notebookWidgetFactory.widgetCreated.connect((sender, notebookPanel) => {
-            notebookPanel.context.pathChanged.connect(() => {
-                this._tracker?.save(notebookPanel);
-            });
-            this._tracker?.add(notebookPanel);
-        });
-        this._documentRegistry.addWidgetFactory(notebookWidgetFactory);
-        this._notebookModelFactory = new JupyterReactNotebookModelFactory({
-            nbformat: this._nbformat,
-            readonly: this._readonly,
-        });
-        this._documentRegistry.addModelFactory(this._notebookModelFactory);
-        this.initializeContext();
-    }
-    get id() {
-        return this._id;
-    }
-    get readonly() {
-        return this._readonly;
-    }
-    get serverless() {
-        return this._serverless;
-    }
-    get lite() {
-        return this._lite;
-    }
-    get path() {
-        return this._path;
-    }
-    get url() {
-        return this._url;
-    }
-    get nbformat() {
-        return this._nbformat;
     }
-    get kernel() {
-        return this._kernel;
-    }
-    get kernelConnection() {
-        return this._kernelConnection;
-    }
-    get notebookPanel() {
-        return this._notebookPanel;
-    }
-    get context() {
-        return this._context;
-    }
-    set notebookPanel(notebookPanel) {
-        this._notebookPanel = notebookPanel;
-    }
-    get panel() {
-        return this._boxPanel;
-    }
-    get commands() {
-        return this._commands;
+    /**
+     * NEW ALIGNED TOOL METHODS
+     * These methods align 1:1 with tool operation names for seamless integration
+     */
+    /**
+     * Insert a cell at a specific index (aligned with insertCell tool).
+     *
+     * @param cellType - Type of cell to insert (code, markdown, or raw)
+     * @param cellIndex - Index where to insert (0-based). If undefined, inserts at end.
+     * @param source - Optional source code/text for the cell
+     */
+    insertCell(cellType, cellIndex, source) {
+        this.setDefaultCellType(cellType);
+        // Default to cell count (end of notebook) if index not provided
+        const targetIndex = cellIndex ?? this.getCellCount();
+        this.insertAt(targetIndex, source);
     }
-    get serviceManager() {
-        return this._serviceManager;
+    /**
+     * Insert multiple cells at a specific index (aligned with insertCells tool).
+     *
+     * More efficient than calling insertCell multiple times.
+     * Cells are inserted sequentially starting at the given index.
+     *
+     * @param cells - Array of cells to insert (each with type and source)
+     * @param cellIndex - Index where to insert first cell (0-based). Use large number for end.
+     */
+    insertCells(cells, cellIndex) {
+        let currentIndex = cellIndex;
+        for (const cell of cells) {
+            this.setDefaultCellType(cell.type);
+            this.insertAt(currentIndex, cell.source);
+            currentIndex++;
+        }
     }
-    /*
-     * Only use this method to change an adapter with a nbformat.
+    /**
+     * Delete cell(s) at the specified index/indices (aligned with deleteCell tool and Jupyter MCP Server).
+     *
+     * @param index - Single cell index, array of indices, or undefined.
+     *   - Single number: Deletes that cell
+     *   - Array: Deletes all cells at those indices (in reverse order to prevent shifting)
+     *   - Undefined: Deletes the active cell if one exists
+     *
+     * @remarks
+     * This method matches the Jupyter MCP Server behavior:
+     * - Validates ALL indices are in range before deleting any
+     * - Deletes in reverse order (highest to lowest) to prevent index shifting
+     * - Throws error with MCP-compatible message format if any index is out of range
+     *
+     * @throws {Error} If any index is out of range
      */
-    setNbformat(nbformat) {
-        if (!nbformat) {
-            throw new Error('The nbformat should first be set via the constructor of NotebookAdapter');
+    deleteCell(index) {
+        const cells = this._notebook.model?.cells;
+        const cellCount = cells?.length ?? 0;
+        if (index !== undefined) {
+            // Convert single index to array for unified handling
+            const indices = Array.isArray(index) ? index : [index];
+            // Validate ALL indices first (match Jupyter MCP Server error format)
+            for (const idx of indices) {
+                if (idx < 0 || idx >= cellCount) {
+                    console.error(`[NotebookAdapter.deleteCell] Index ${idx} is out of range (cell count: ${cellCount})`);
+                    throw new Error(`Cell index ${idx} is out of range. Notebook has ${cellCount} cells.`);
+                }
+            }
+            // Sort indices in REVERSE order (highest to lowest) to prevent index shifting
+            // This matches the Jupyter MCP Server behavior
+            const sortedIndices = [...indices].sort((a, b) => b - a);
+            console.log(`[NotebookAdapter.deleteCell] Deleting ${sortedIndices.length} cell(s) in reverse order:`, sortedIndices);
+            // Delete each cell in reverse order
+            for (const idx of sortedIndices) {
+                this.setActiveCell(idx);
+                this.deleteCells();
+            }
         }
-        if (this._nbformat !== nbformat) {
-            this._nbformat = nbformat;
-            this._notebookPanel?.model?.fromJSON(nbformat);
+        else {
+            // No index provided: check if there's an active cell to delete
+            const activeCell = this._notebook.activeCell;
+            if (!activeCell) {
+                console.warn('[NotebookAdapter.deleteCell] No active cell to delete');
+                return; // Safely return without deleting
+            }
+            // Active cell exists, safe to delete
+            this.deleteCells();
         }
     }
-    setServiceManager(serviceManager, lite) {
-        this._lite = lite;
-        this._serviceManager = serviceManager;
-        this._nbformat = this._notebookPanel?.model?.toJSON();
-        //    this.initializeContext();
-    }
-    setKernel(kernel) {
-        if (this._kernel === kernel) {
-            return;
+    /**
+     * Updates cell source at the specified index and returns a diff.
+     * Matches MCP server's overwrite_cell_source behavior.
+     *
+     * @param index - Cell index (0-based)
+     * @param source - New cell source content
+     * @returns Diff string showing changes made
+     * @throws Error if cell index is out of range or cell not found
+     */
+    updateCell(index, source) {
+        // Validate cell index
+        const cellCount = this._notebook.model?.sharedModel.cells.length ?? 0;
+        if (index < 0 || index >= cellCount) {
+            throw new Error(`Cell index ${index} is out of range. Notebook has ${cellCount} cells.`);
         }
-        this._kernel = kernel;
-        this.initializeContext();
-    }
-    setReadonly(readonly) {
-        if (this._readonly !== readonly) {
-            this._readonly = readonly;
-            this._notebookPanel?.content.widgets.forEach(cell => {
-                cell.syncEditable = true;
-                cell.model.sharedModel.setMetadata('editable', !readonly);
-            });
-            const cells = this._context?.model.cells;
-            if (cells) {
-                Array.from(cells).forEach(cell => {
-                    cell.setMetadata('editable', !readonly);
-                });
-            }
-            this._notebookPanel?.content.widgets.forEach(cell => {
-                cell.saveEditableState();
-            });
+        // Get the cell at the specified index
+        const cellModel = this._notebook.model?.cells.get(index);
+        if (!cellModel) {
+            throw new Error(`Cell at index ${index} not found.`);
         }
+        // Store old source before updating
+        const oldSource = cellModel.sharedModel.getSource();
+        // Update the cell source
+        cellModel.sharedModel.setSource(source);
+        // Generate diff (matches MCP server behavior)
+        const patch = Diff.createPatch(`cell_${index}`, oldSource, source, 'before', 'after', { context: 3 });
+        return patch;
     }
-    setServerless(serverless) {
-        if (this._serverless !== serverless) {
-            this._serverless = serverless;
-            //      this.initializeContext();
+    /**
+     * Get a cell's content by index or active cell (aligned with getCell tool and MCP Server).
+     *
+     * @param index - Optional cell index (0-based). If not provided, returns active cell.
+     * @param includeOutputs - Whether to include cell outputs (default: true)
+     * @returns Cell data or undefined if not found
+     */
+    getCell(index, includeOutputs = true) {
+        if (index !== undefined) {
+            // Get cell at specific index
+            const cells = this.getCells();
+            const cell = cells[index];
+            if (!cell)
+                return undefined;
+            // Get execution count for code cells
+            const cellModel = this._notebook.model?.cells.get(index);
+            const execution_count = cellModel?.type === 'code'
+                ? (cellModel.executionCount ?? null)
+                : null;
+            return {
+                type: cell.type,
+                source: cell.source,
+                execution_count,
+                outputs: includeOutputs ? cell.outputs : undefined,
+            };
+        }
+        else {
+            // Get active cell
+            const activeCell = this._notebook.activeCell;
+            if (!activeCell)
+                return undefined;
+            const execution_count = activeCell.model.type === 'code'
+                ? (activeCell.model.executionCount ?? null)
+                : null;
+            return {
+                type: activeCell.model.type,
+                source: activeCell.model.sharedModel.getSource(),
+                execution_count,
+                outputs: includeOutputs && activeCell.model.type === 'code'
+                    ? activeCell.model.outputs?.toJSON()
+                    : undefined,
+            };
         }
     }
-    setPath(path) {
-        if (this._path !== path) {
-            this._path = path;
-            this.initializeContext();
+    /**
+     * Run a cell and optionally capture outputs (aligned with runCell tool).
+     *
+     * @param params - Parameters for cell execution
+     * @param params.index - Cell index to run (optional, defaults to active cell)
+     * @param params.timeoutSeconds - Timeout in seconds (optional, for future use)
+     * @param params.stream - Enable streaming progress (optional, for future use)
+     * @param params.progressInterval - Progress update interval (optional, for future use)
+     * @returns Promise resolving to execution result with outputs
+     */
+    async runCell(params) {
+        const { index } = params || {};
+        // Note: timeoutSeconds, stream, progressInterval are accepted for future use
+        // but timeout/streaming logic is handled at the operation layer
+        // Set active cell if index provided
+        if (index !== undefined) {
+            this.setActiveCell(index);
+        }
+        const targetIndex = index ?? this._notebook.activeCellIndex;
+        if (targetIndex === -1) {
+            throw new Error('No active cell to execute');
+        }
+        // Execute the cell using JupyterLab's NotebookActions
+        await NotebookActions.run(this._notebook, this._context.sessionContext);
+        // Wait a brief moment for outputs to be available
+        await new Promise(resolve => setTimeout(resolve, 100));
+        // Capture outputs after execution
+        const cellData = this.getCell(targetIndex, true);
+        if (!cellData) {
+            return {
+                execution_count: null,
+                outputs: [],
+            };
         }
+        // Convert outputs to string array (matching MCP format)
+        const outputs = [];
+        if (cellData.outputs && Array.isArray(cellData.outputs)) {
+            for (const output of cellData.outputs) {
+                if (typeof output === 'string') {
+                    outputs.push(output);
+                }
+                else if (output && typeof output === 'object') {
+                    // Handle different output types
+                    const outputObj = output;
+                    if (outputObj.output_type === 'stream') {
+                        const text = outputObj.text;
+                        if (typeof text === 'string') {
+                            outputs.push(text);
+                        }
+                        else if (Array.isArray(text)) {
+                            outputs.push(text.join(''));
+                        }
+                    }
+                    else if (outputObj.output_type === 'execute_result' ||
+                        outputObj.output_type === 'display_data') {
+                        const data = outputObj.data;
+                        if (data) {
+                            // Prefer text/plain output
+                            if (data['text/plain']) {
+                                const text = data['text/plain'];
+                                if (typeof text === 'string') {
+                                    outputs.push(text);
+                                }
+                                else if (Array.isArray(text)) {
+                                    outputs.push(text.join(''));
+                                }
+                            }
+                        }
+                    }
+                    else if (outputObj.output_type === 'error') {
+                        // Format error output
+                        const ename = outputObj.ename ?? 'Error';
+                        const evalue = outputObj.evalue ?? '';
+                        const traceback = outputObj.traceback;
+                        if (Array.isArray(traceback) && traceback.length > 0) {
+                            outputs.push(`[ERROR: ${ename}: ${evalue}]\n${traceback.join('\n')}`);
+                        }
+                        else {
+                            outputs.push(`[ERROR: ${ename}: ${evalue}]`);
+                        }
+                    }
+                }
+            }
+        }
+        return {
+            execution_count: cellData.execution_count,
+            outputs,
+        };
     }
-    assignKernel(kernel) {
-        this._kernel = kernel;
-        this._context?.sessionContext.changeKernel({
-            id: kernel.id,
-        });
+    /**
+     * Run all cells in the notebook (aligned with runAllCells tool).
+     */
+    runAllCells() {
+        this._commands.execute(NotebookCommandIds.runAll);
     }
-    setDefaultCellType = (cellType) => {
-        this._notebookPanel.content.notebookConfig.defaultCell = cellType;
-    };
-    changeCellType = (cellType) => {
-        // NotebookActions.changeCellType(this._notebookPanel?.content!, cellType);
-        const notebook = this._notebookPanel.content;
-        const notebookSharedModel = notebook.model.sharedModel;
-        notebook.widgets.forEach((child, index) => {
-            if (!notebook.isSelectedOrActive(child)) {
-                return;
-            }
-            if (child.model.type !== cellType) {
-                const raw = child.model.toJSON();
-                notebookSharedModel.transact(() => {
-                    notebookSharedModel.deleteCell(index);
-                    const newCell = notebookSharedModel.insertCell(index, {
-                        cell_type: cellType,
-                        source: raw.source,
-                        metadata: raw.metadata,
+    /**
+     * Clear all outputs from all cells in the notebook.
+     *
+     * @remarks
+     * Removes all execution outputs from all cells. This operation:
+     * - Clears outputs but preserves cell source code
+     * - Resets execution counts
+     * - Cannot be undone
+     */
+    clearAllOutputs() {
+        NotebookActions.clearAllOutputs(this._notebook);
+    }
+    /**
+     * Execute code directly in the kernel without creating a cell.
+     *
+     * This method sends code execution requests directly to the kernel,
+     * bypassing the notebook cell model. Useful for:
+     * - Variable inspection
+     * - Environment setup
+     * - Background tasks
+     * - Tool introspection
+     *
+     * @param code - Code to execute
+     * @param options - Execution options
+     * @returns Promise with execution result including outputs
+     */
+    async executeCode(code, options = {}) {
+        const sessionContext = this._panel.sessionContext;
+        if (!sessionContext || !sessionContext.session?.kernel) {
+            return {
+                success: false,
+                error: 'No active kernel session',
+            };
+        }
+        const kernel = sessionContext.session.kernel;
+        try {
+            const future = kernel.requestExecute({
+                code,
+                stop_on_error: true, // Internal default: stop on error
+                store_history: false, // Internal default: don't store in history
+                silent: false, // Internal default: not silent (show outputs)
+                allow_stdin: false,
+            });
+            const outputs = [];
+            let executionCount;
+            // Collect outputs
+            future.onIOPub = msg => {
+                const msgType = msg.header.msg_type;
+                if (msgType === 'stream') {
+                    outputs.push({
+                        type: 'stream',
+                        content: msg.content,
                     });
-                    if (raw.attachments && ['markdown', 'raw'].includes(cellType)) {
-                        newCell.attachments =
-                            raw.attachments;
-                    }
-                });
-            }
-            if (cellType === 'markdown') {
-                // Fetch the new widget and unrender it.
-                child = notebook.widgets[index];
-                child.rendered = false;
+                }
+                else if (msgType === 'execute_result') {
+                    outputs.push({
+                        type: 'execute_result',
+                        content: msg.content,
+                    });
+                    executionCount = msg.content.execution_count;
+                }
+                else if (msgType === 'display_data') {
+                    outputs.push({
+                        type: 'display_data',
+                        content: msg.content,
+                    });
+                }
+                else if (msgType === 'error') {
+                    outputs.push({
+                        type: 'error',
+                        content: msg.content,
+                    });
+                }
+            };
+            // Handle timeout if specified (default: 30 seconds, max: 60)
+            const timeoutMs = (options.timeout ?? 30) * 1000;
+            const executionPromise = future.done;
+            const timeoutPromise = new Promise((_, reject) => {
+                setTimeout(() => {
+                    reject(new Error(`Execution timeout after ${options.timeout ?? 30} seconds`));
+                }, timeoutMs);
+            });
+            try {
+                await Promise.race([executionPromise, timeoutPromise]);
             }
-        });
-        notebook.deselectAll();
-    };
-    insertAbove = (source) => {
-        const notebook = this._notebookPanel.content;
-        const model = this._notebookPanel.context.model;
-        const newIndex = notebook.activeCell ? notebook.activeCellIndex : 0;
-        model.sharedModel.insertCell(newIndex, {
-            cell_type: notebook.notebookConfig.defaultCell,
-            source,
-            metadata: notebook.notebookConfig.defaultCell === 'code'
-                ? {
-                    // This is an empty cell created by user, thus is trusted
-                    trusted: true,
+            catch (timeoutError) {
+                // Interrupt kernel on timeout
+                try {
+                    await kernel.interrupt();
                 }
-                : {},
-        });
-        // Make the newly inserted cell active.
-        notebook.activeCellIndex = newIndex;
-        notebook.deselectAll();
-    };
-    insertBelow = (source) => {
-        const notebook = this._notebookPanel.content;
-        const model = this._notebookPanel.context.model;
-        const newIndex = notebook.activeCell ? notebook.activeCellIndex + 1 : 0;
-        model.sharedModel.insertCell(newIndex, {
-            cell_type: notebook.notebookConfig.defaultCell,
-            source,
-            metadata: notebook.notebookConfig.defaultCell === 'code'
-                ? {
-                    // This is an empty cell created by user, thus is trusted.
-                    trusted: true,
+                catch (interruptError) {
+                    console.error('Failed to interrupt kernel:', interruptError);
                 }
-                : {},
-        });
-        // Make the newly inserted cell active.
-        notebook.activeCellIndex = newIndex;
-        notebook.deselectAll();
-    };
-    dispose = () => {
-        document.removeEventListener('keydown', this.notebookKeydownListener, true);
-        this._context?.dispose();
-        this._notebookPanel?.dispose();
-        this._boxPanel.dispose();
-    };
+                return {
+                    success: false,
+                    error: `Execution exceeded ${options.timeout ?? 30} seconds and was interrupted`,
+                    outputs,
+                };
+            }
+            return {
+                success: true,
+                outputs,
+                executionCount,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error instanceof Error ? error.message : String(error),
+            };
+        }
+    }
+    /**
+     * Dispose of the adapter.
+     */
+    dispose() {
+        // Clean up any resources if needed
+        // The panel, notebook, and context are managed by NotebookBase
+    }
 }
 export default NotebookAdapter;
 //# sourceMappingURL=NotebookAdapter.js.map