feat: add notebook

.gitignore

@@ -94,3 +94,8 @@ iteration-plan.md
 tools/electron/app
 tools/electron/extensions
 tools/workspace
+
+# jupyter
+.ipynb_checkpoints
+
+*.tsbuildinfo

configs/ts/references/tsconfig.notebook.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "rootDir": "../../../packages/notebook/src",
+    "outDir": "../../../packages/notebook/lib"
+  },
+  "include": ["../../../packages/notebook/src"]
+}

configs/ts/tsconfig.base.json

@@ -1,8 +1,8 @@
 {
   "baseUrl": "./",
   "compilerOptions": {
-    "module": "commonjs",
-    "target": "es2017",
+    "module": "nodenext",
+    "target": "es2018",
     "moduleResolution": "nodenext",
     "strict": true,
     "strictPropertyInitialization": false,

configs/ts/tsconfig.build.json

@@ -182,6 +182,9 @@
     },
     {
       "path": "./references/tsconfig.playwright.json"
+    },
+    {
+      "path": "./references/tsconfig.notebook.json"
     }
   ]
 }

configs/ts/tsconfig.resolve.json

@@ -124,7 +124,9 @@
       "@opensumi/ide-design": ["../packages/design/src/index.ts"],
       "@opensumi/ide-design/lib/*": ["../packages/design/src/*"],
       "@opensumi/ide-ai-native": ["../packages/ai-native/src/index.ts"],
-      "@opensumi/ide-ai-native/lib/*": ["../packages/ai-native/src/*"]
+      "@opensumi/ide-ai-native/lib/*": ["../packages/ai-native/src/*"],
+      "@opensumi/ide-notebook": ["../packages/notebook/src/index.ts"],
+      "@opensumi/ide-notebook/lib/*": ["../packages/notebook/src/*"]
     }
   }
 }

configs/vscode-extensions.json

@@ -70,10 +70,6 @@
         "name": "merge-conflict",
         "version": "1.55.2"
       },
-      {
-        "name": "python",
-        "version": "1.55.2"
-      },
       {
         "name": "rust",
         "version": "1.55.2"

package.json

@@ -1,72 +1,75 @@
 {
   "name": "@opensumi/core",
   "private": true,
+  "repository": {
+    "type": "git",
+    "url": "[email protected]:opensumi/core.git"
+  },
   "license": "MIT",
+  "workspaces": [
+    "packages/*",
+    "tools/dev-tool",
+    "tools/playwright",
+    "tools/cli-engine"
+  ],
   "scripts": {
-    "preinstall": "node scripts/preinstall.js && husky install",
-    "clean": "rimraf \"./packages/*/lib\" && lerna run clean",
-    "check:dep": "tsx ./scripts/depcheck",
-    "init": "yarn run clean && yarn run build:all",
-    "start": "yarn run rebuild:node && cross-env HOST=127.0.0.1 WS_PATH=ws://127.0.0.1:8000 NODE_ENV=development tsx ./scripts/start",
-    "start:remote": "yarn run rebuild:node && cross-env NODE_ENV=development tsx ./scripts/start",
-    "start:electron": "cross-env NODE_ENV=development tsx ./scripts/start-electron",
-    "build:components": "cd packages/components && yarn run build:dist",
-    "start:lite": "cross-env NODE_ENV=development tsx ./scripts/start --script=start:lite",
-    "bundle:lite": "tsx ./scripts/start --script=bundle:lite",
-    "bundle:preview": "tsx ./scripts/start --script=bundle:preview",
-    "start:pty-service": "KTLOG_SHOW_DEBUG=1 npx tsx packages/terminal-next/src/node/pty.proxy.remote.exec.ts",
-    "create": "tsx ./scripts/create",
-    "add:node": "tsx ./scripts/add-node",
     "add:browser": "tsx ./scripts/add-browser",
+    "add:node": "tsx ./scripts/add-node",
     "build": "yarn run compile",
     "build:all": "yarn build:webview-prebuilt && yarn run build && yarn run build:worker-host && yarn run build:ext-host && yarn run build:components && yarn build:monaco-worker",
-    "compile": "cross-env NODE_ENV=production tsx ./scripts/build",
-    "build:worker-host": "cd packages/extension && yarn run compile:worker",
-    "build:ext-host": "cd packages/extension && yarn run build:ext-host",
     "build:cli-engine": "cd tools/cli-engine && yarn run build",
+    "build:components": "cd packages/components && yarn run build:dist",
+    "build:ext-host": "cd packages/extension && yarn run build:ext-host",
     "build:monaco-worker": "cd packages/monaco && yarn run build:worker",
     "build:webview-prebuilt": "yarn workspace @opensumi/ide-webview bundle-webview",
-    "watch:ext-host": "cd packages/extension && yarn run watch:ext-host",
-    "watch:worker-host": "cd packages/extension && yarn run watch:worker",
-    "watch": "yarn run rebuild:node && cross-env NODE_ENV=production tsx ./scripts/watch",
-    "publish": "yarn run build:all && tsx ./scripts/publish",
-    "publish:snapshot": "yarn run publish --rollback --type=snapshot",
-    "publish:next": "yarn run publish --rollback --type=next",
-    "update-version": "tsx ./scripts/publish --versionOnly",
-    "update-disttag": "tsx ./scripts/dist-tag",
+    "build:worker-host": "cd packages/extension && yarn run compile:worker",
+    "bundle:lite": "tsx ./scripts/start --script=bundle:lite",
+    "bundle:preview": "tsx ./scripts/start --script=bundle:preview",
+    "changelog": "tsx -P scripts/tsconfig.scripts.json scripts/changelog/index.ts",
+    "changelog-old": "node scripts/changelog/index.js",
+    "check:dep": "tsx ./scripts/depcheck",
+    "ci": "yarn run init && yarn run test:cov",
+    "clean": "rimraf \"./packages/*/lib\" && lerna run clean",
+    "compile": "cross-env NODE_ENV=production tsx ./scripts/build",
+    "create": "tsx ./scripts/create",
+    "download-extension": "cross-env DEBUG=InstallExtension MARKETPLACE=ALI node scripts/download.js",
+    "format": "yarn run lint:fix && prettier \"**/*.{js,jsx,ts,tsx,html,css,less}\" --write",
+    "init": "yarn run clean && yarn run build:all",
+    "preinstall": "node scripts/preinstall.js && husky install",
+    "iteration": "tsx -P scripts/tsconfig.scripts.json scripts/iteration-plan.ts",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "lint:fix": "yarn run lint --fix",
-    "format": "yarn run lint:fix && prettier \"**/*.{js,jsx,ts,tsx,html,css,less}\" --write",
+    "manifest": "tsx ./scripts/generate-manifest-json",
+    "prepare:test": "yarn && yarn run compile && yarn run build:worker-host",
+    "publish": "yarn run build:all && tsx ./scripts/publish",
+    "publish:next": "yarn run publish --rollback --type=next",
+    "publish:snapshot": "yarn run publish --rollback --type=snapshot",
     "rebuild:node": "sumi rebuild",
-    "test:module": "cross-env NODE_OPTIONS=--max-old-space-size=5120 tsx ./scripts/module-jest",
+    "start": "yarn run rebuild:node && cross-env HOST=127.0.0.1 WS_PATH=ws://127.0.0.1:8000 NODE_ENV=development tsx ./scripts/start",
     "start:e2e": "yarn start --script=start:e2e",
+    "start:electron": "cross-env NODE_ENV=development tsx ./scripts/start-electron",
+    "start:lite": "cross-env NODE_ENV=development tsx ./scripts/start --script=start:lite",
+    "start:pty-service": "KTLOG_SHOW_DEBUG=1 npx tsx packages/terminal-next/src/node/pty.proxy.remote.exec.ts",
+    "start:remote": "yarn run rebuild:node && cross-env NODE_ENV=development tsx ./scripts/start",
+    "test": "node --expose-gc ./node_modules/.bin/jest --forceExit --detectOpenHandles",
+    "test:cov": "cross-env NODE_OPTIONS=--max-old-space-size=32768 yarn run test:heap --coverage",
+    "test:heap": "yarn test --logHeapUsage",
+    "test:module": "cross-env NODE_OPTIONS=--max-old-space-size=5120 tsx ./scripts/module-jest",
     "test:ui": "tsx ./scripts/run-ui-tests",
     "test:ui-ci": "tsx ./scripts/run-ui-tests --ci=true",
     "test:ui-headful": "tsx ./scripts/run-ui-tests --headful=true",
     "test:ui-report": "tsx ./scripts/run-ui-tests --report=true",
-    "test": "node --expose-gc ./node_modules/.bin/jest --forceExit --detectOpenHandles",
-    "test:heap": "yarn test --logHeapUsage",
-    "prepare:test": "yarn && yarn run compile && yarn run build:worker-host",
-    "test:cov": "cross-env NODE_OPTIONS=--max-old-space-size=32768 yarn run test:heap --coverage",
-    "ci": "yarn run init && yarn run test:cov",
-    "download-extension": "cross-env DEBUG=InstallExtension node scripts/download.js",
+    "update-disttag": "tsx ./scripts/dist-tag",
+    "update-version": "tsx ./scripts/publish --versionOnly",
     "update:iconfont": "tsx ./scripts/download-iconfont.ts",
-    "changelog-old": "node scripts/changelog/index.js",
-    "changelog": "tsx -P scripts/tsconfig.scripts.json scripts/changelog/index.ts",
-    "iteration": "tsx -P scripts/tsconfig.scripts.json scripts/iteration-plan.ts",
-    "manifest": "tsx ./scripts/generate-manifest-json"
-  },
-  "engines": {
-    "node": ">=18.12.0"
+    "watch": "yarn run rebuild:node && cross-env NODE_ENV=production tsx ./scripts/watch",
+    "watch:ext-host": "cd packages/extension && yarn run watch:ext-host",
+    "watch:worker-host": "cd packages/extension && yarn run watch:worker"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx,md,html,css,less,json,yml}": "prettier --write",
     "*.{js,jsx,ts,tsx}": "eslint --fix --quiet"
   },
-  "repository": {
-    "type": "git",
-    "url": "[email protected]:opensumi/core.git"
-  },
   "devDependencies": {
     "@ast-grep/napi": "^0.17.1",
     "@commitlint/cli": "^19.2.1",
@@ -79,7 +82,7 @@
     "@types/jest": "^29.5.6",
     "@types/jsdom": "^16.2.14",
     "@types/lodash": "^4.14.202",
-    "@types/node": "^20.11.30",
+    "@types/node": "^22.7.6",
     "@types/node-fetch": "^2.6.1",
     "@types/react": "^18.2.0",
     "@types/react-dom": "^18.2.0",
@@ -137,15 +140,12 @@
     "ts-node": "^10.9.1",
     "tslib": "^2.6.2",
     "tsx": "^4.7.1",
-    "typescript": "4.9.3",
+    "typescript": "^5.6.3",
     "webpack": "^5.90.0",
     "webpack-manifest-plugin": "^5.0.0"
   },
-  "workspaces": [
-    "packages/*",
-    "tools/dev-tool",
-    "tools/playwright",
-    "tools/cli-engine"
-  ],
-  "packageManager": "[email protected]"
+  "packageManager": "[email protected]",
+  "engines": {
+    "node": ">=18.12.0"
+  }
 }

packages/ai-native/src/browser/contrib/inline-completions/provider.ts

@@ -23,7 +23,7 @@ export async function getPrefixPrompt(
 
   const { maxPromptTokenSize } = promptConfig;
 
-  const prefixPercent = 1 - promptConfig.wishList.afterCursor.extOption.suffixPercent ?? 0.25;
+  const prefixPercent = 1 - (promptConfig.wishList.afterCursor.extOption.suffixPercent ?? 0.25);
   const beforeCursorMaxTokenSize = Math.ceil(prefixPercent * maxPromptTokenSize);
   const leftTokenSize = beforeCursorMaxTokenSize;
 

packages/comments/src/browser/comments.service.ts

@@ -1104,7 +1104,7 @@ export class CommentsService extends Disposable implements ICommentsService {
   public getProviderIdsByLine(line: number): string[] {
     const result: string[] = [];
     if (this.rangeOwner.size === 1) {
-      return [this.rangeOwner.keys().next().value];
+      return [this.rangeOwner.keys().next().value!];
     }
     for (const rangeOwner of this.rangeOwner) {
       const [id, ranges] = rangeOwner;

packages/components/src/menu/MenuItem.tsx

@@ -21,6 +21,7 @@ export interface MenuItemProps
   onKeyDown?: (e: React.KeyboardEvent<HTMLElement>) => void;
   onMouseEnter?: (e: { key: string; domEvent: React.MouseEvent<HTMLElement> }) => void;
   onMouseLeave?: (e: { key: string; domEvent: React.MouseEvent<HTMLElement> }) => void;
+  ref?: React.Ref<HTMLElement> | undefined;
 }
 
 export default class MenuItem extends React.Component<MenuItemProps> {

packages/components/src/menu/SubMenu.tsx

@@ -19,6 +19,7 @@ export interface SubMenuProps extends RCSubMenuProps {
   onKeyDown?: (e: React.KeyboardEvent<HTMLElement>) => void;
   popupOffset?: [number, number];
   popupClassName?: string;
+  ref?: React.Ref<HTMLLIElement> | undefined;
 }
 
 class SubMenu extends React.Component<SubMenuProps, any> {

packages/core-browser/src/bootstrap/app.view.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import ReactDom from 'react-dom/client';
 
 import { ComponentContextProvider, IIconResourceOptions } from '@opensumi/ide-components';
-import { IEventBus, URI, getDebugLogger, localize } from '@opensumi/ide-core-common';
+import { ContributionProvider, IEventBus, URI, getDebugLogger, localize } from '@opensumi/ide-core-common';
 
 import { IClientApp } from '../browser-module';
 import { DefaultLayout } from '../components/layout/default-layout';
@@ -12,6 +12,8 @@ import { allSlot } from '../react-providers/slot';
 import { LabelService } from '../services';
 import { getIcon } from '../style/icon/icon';
 
+import { ClientAppContextContribution } from './context-contribution';
+
 export interface AppProps {
   app: IClientApp;
   main: React.ComponentType<{ callback?: () => void }>;
@@ -70,7 +72,7 @@ const defaultAppRender =
 const debugLogger = getDebugLogger();
 
 export function renderClientApp(app: IClientApp, container: HTMLElement | IAppRenderer) {
-  const Layout = app.config.layoutComponent || DefaultLayout;
+  let Layout = app.config.layoutComponent || DefaultLayout;
   const overlayComponents = app.browserModules
     .filter((mod) => mod.isOverlay)
     .map((mod) => {
@@ -82,6 +84,12 @@ export function renderClientApp(app: IClientApp, container: HTMLElement | IAppRe
     })
     .filter(Boolean) as React.ComponentType[];
 
+  const injector = app.injector;
+  const clientAppContextContribution: ContributionProvider<ClientAppContextContribution> =
+    injector.get(ClientAppContextContribution);
+  const contextContrib = clientAppContextContribution.getContributions();
+  contextContrib.forEach((contextProvider) => (Layout = contextProvider.registerClientAppContext(Layout, injector)));
+
   const IdeApp = (props) => <App {...props} app={app} main={Layout} overlays={overlayComponents} />;
 
   const render = typeof container === 'function' ? container : defaultAppRender(container);

packages/core-browser/src/bootstrap/context-contribution.tsx

@@ -0,0 +1,7 @@
+import { Injector } from '@opensumi/di';
+
+export const ClientAppContextContribution = Symbol('ClientAppContextContribution');
+
+export interface ClientAppContextContribution {
+  registerClientAppContext: (layout: React.FC, injector: Injector) => React.FC;
+}

packages/core-browser/src/bootstrap/index.ts

@@ -1,3 +1,4 @@
 export * from './app.interface';
 export * from './app.view';
 export * from './connection';
+export * from './context-contribution';

packages/core-browser/src/bootstrap/inner-providers.ts

@@ -80,6 +80,7 @@ import { VariableContribution, VariableRegistry, VariableRegistryImpl } from '..
 import { IWindowService } from '../window';
 import { WindowService } from '../window/window.service';
 
+import { ClientAppContextContribution } from './context-contribution';
 import { AppLifeCycleService } from './lifecycle.service';
 
 export function injectInnerProviders(injector: Injector) {
@@ -96,6 +97,7 @@ export function injectInnerProviders(injector: Injector) {
   createContributionProvider(injector, TabBarToolbarContribution);
   createContributionProvider(injector, ToolBarActionContribution);
   createContributionProvider(injector, StaticResourceContribution);
+  createContributionProvider(injector, ClientAppContextContribution);
 
   // 一些内置抽象实现
   const providers: Provider[] = [

packages/core-browser/src/react-providers/config-provider.tsx

@@ -303,6 +303,11 @@ export interface AppConfig {
    * This is useful when your scenario is one-time use, and you can control the opening of the editor tab yourself.
    */
   disableRestoreEditorGroupState?: boolean;
+  /**
+   * Notebook Server Host
+   * Provide when you want to connect to a notebook server
+   */
+  notebookServerHost?: string;
 }
 
 export interface ICollaborationClientOpts {

packages/core-browser/src/services/label-service.ts

@@ -328,7 +328,7 @@ const getIconClass = (
 };
 
 export function cssEscape(str: string): string {
-  return str.replace(/[\11\12\14\15\40]/g, '/'); // HTML class names can not contain certain whitespace characters, use / instead, which doesn't exist in file names.
+  return str.replace(/[\x09\x0a\x0c\x0d\x20]/g, '/'); // HTML class names can not contain certain whitespace characters, use / instead, which doesn't exist in file names.
 }
 
 export function basenameOrAuthority(resource: URI) {

packages/core-common/src/const/application.ts

@@ -10,4 +10,4 @@ export namespace DEFAULT_ALIPAY_CLOUD_REGISTRY {
   export const MASTER_KEY = 'i6rkupqyvC6Bc6CiO0yVLNqq';
 }
 
-export const DEFAULT_VSCODE_ENGINE_VERSION = '1.68.0';
+export const DEFAULT_VSCODE_ENGINE_VERSION = '1.90.0';

packages/core-common/src/problem-pattern.ts

@@ -15,14 +15,13 @@
  ********************************************************************************/
 // Some code copied and modified from https://github.com/eclipse-theia/theia/tree/v1.14.0/packages/core/src/common/severity.ts
 
-// eslint-disable-next-line import/no-unresolved
-import { Diagnostic } from 'vscode';
-
 import { Injectable } from '@opensumi/di';
 import { Disposable, DisposableCollection, IDisposable, URI, isArray, isString } from '@opensumi/ide-utils';
 
 import { ProblemMatcher } from './problem-matcher';
 
+import type { Diagnostic } from 'vscode';
+
 export enum ApplyToKind {
   allDocuments,
   openDocuments,

packages/editor/src/browser/quick-open/workspace-symbol-quickopen.ts

@@ -221,7 +221,7 @@ export class SymbolInformationQuickOpenItem extends QuickOpenItem {
   }
 
   getIconClass() {
-    return getSymbolIcon(this.symbol.kind);
+    return getSymbolIcon(this.symbol.kind as SymbolKindEnum);
   }
 
   getDescription() {

packages/editor/src/browser/tab.view.tsx

@@ -73,7 +73,7 @@ export const Tabs = ({ group }: ITabsProps) => {
   const tabWrapperRef = useRef<HTMLDivElement | null>();
   const contentRef = useRef<HTMLDivElement | null>();
   const editorActionUpdateTimer = useRef<any>(null);
-  const editorActionRef = useRef<typeof EditorActions>(null);
+  const editorActionRef = useRef<HTMLDivElement>(null);
   const resourceService = useInjectable(ResourceService) as ResourceService;
   const eventBus = useInjectable(IEventBus) as IEventBus;
   const configContext = useContext(ConfigContext);
@@ -210,7 +210,7 @@ export const Tabs = ({ group }: ITabsProps) => {
     }
     editorActionUpdateTimer.current = setTimeout(() => {
       fastdom.measure(() => {
-        const _marginReight = editorActionRef.current?.offsetWidth;
+        const _marginReight = (editorActionRef.current as HTMLDivElement)?.offsetWidth;
         if (_marginReight !== lastMarginRight) {
           setLastMarginRight(_marginReight);
         }
@@ -547,7 +547,7 @@ export interface IEditorActionsBaseProps {
 export type IEditorActionsProps = IEditorActionsBaseProps & HTMLAttributes<HTMLDivElement>;
 
 export const EditorActions = forwardRef<HTMLDivElement, IEditorActionsProps>(
-  (props: IEditorActionsProps, ref: Ref<typeof EditorActions>) => {
+  (props: IEditorActionsProps, ref: React.LegacyRef<HTMLDivElement>) => {
     const styles_editor_actions = useDesignStyles(styles.editor_actions, 'editor_actions');
     const { group, className } = props;