@opensumi/ide-terminal-next 3.5.1-next-1730948411.0 → 3.5.1-next-1730963433.0

package/src/browser/contribution/terminal.command.ts

@@ -114,7 +114,7 @@ export class TerminalCommandContribution implements CommandContribution, ClientA
       },
       {
         execute: () => {
-          const group = this.view.currentGroup;
+          const group = this.view.currentGroup.get();
           if (!group) {
             return;
           }
@@ -161,7 +161,7 @@ export class TerminalCommandContribution implements CommandContribution, ClientA
       },
       {
         execute: async () => {
-          const widgetId = this.view.currentWidgetId;
+          const widgetId = this.view.currentWidgetId.get();
           if (widgetId) {
             this.view.removeWidget(widgetId);
           }
@@ -193,7 +193,7 @@ export class TerminalCommandContribution implements CommandContribution, ClientA
       },
       {
         execute: () => {
-          const widgetId = this.view.currentWidgetId;
+          const widgetId = this.view.currentWidgetId.get();
           const client = this.terminalController.findClientFromWidgetId(widgetId);
           if (client) {
             client.selectAll();
@@ -209,7 +209,7 @@ export class TerminalCommandContribution implements CommandContribution, ClientA
       },
       {
         execute: () => {
-          const current = this.view.currentWidgetId;
+          const current = this.view.currentWidgetId.get();
           const client = this.terminalController.findClientFromWidgetId(current);
           if (client) {
             client.clear();
@@ -267,7 +267,7 @@ export class TerminalCommandContribution implements CommandContribution, ClientA
 
     registry.registerCommand(TERMINAL_COMMANDS.COPY, {
       execute: async () => {
-        const current = this.view.currentWidgetId;
+        const current = this.view.currentWidgetId.get();
         const client = this.terminalController.findClientFromWidgetId(current);
         if (client) {
           await this.clipboardService.writeText(client.getSelection());
@@ -277,7 +277,7 @@ export class TerminalCommandContribution implements CommandContribution, ClientA
 
     registry.registerCommand(TERMINAL_COMMANDS.PASTE, {
       execute: async () => {
-        const current = this.view.currentWidgetId;
+        const current = this.view.currentWidgetId.get();
         const client = this.terminalController.findClientFromWidgetId(current);
         if (client) {
           client.paste(await this.clipboardService.readText());
@@ -287,7 +287,7 @@ export class TerminalCommandContribution implements CommandContribution, ClientA
 
     registry.registerCommand(TERMINAL_COMMANDS.SELECT_ALL, {
       execute: () => {
-        const current = this.view.currentWidgetId;
+        const current = this.view.currentWidgetId.get();
         const client = this.terminalController.findClientFromWidgetId(current);
         if (client) {
           client.selectAll();
@@ -297,9 +297,10 @@ export class TerminalCommandContribution implements CommandContribution, ClientA
 
     registry.registerCommand(TERMINAL_COMMANDS.RE_LAUNCH, {
       execute: () => {
-        const groups = this.view.groups;
+        const groups = this.view.groups.get();
         for (const group of groups) {
-          group.widgets.forEach((widget) => {
+          const widgets = group.widgets.get();
+          widgets.forEach((widget) => {
             const client = this.terminalController.findClientFromWidgetId(widget.id);
             if (client) {
               client.reset();
@@ -318,8 +319,8 @@ export class TerminalCommandContribution implements CommandContribution, ClientA
 
     registry.registerCommand(TERMINAL_COMMANDS.FOCUS_NEXT_TERMINAL, {
       execute: () => {
-        const group = this.view.currentGroup;
-        if (group.widgets.length <= 1) {
+        const group = this.view.currentGroup.get();
+        if (group && group.widgets.get().length <= 1) {
           return;
         }
         const client = this.getNextOrPrevTerminalClient('next');
@@ -329,8 +330,8 @@ export class TerminalCommandContribution implements CommandContribution, ClientA
 
     registry.registerCommand(TERMINAL_COMMANDS.FOCUS_PREVIOUS_TERMINAL, {
       execute: () => {
-        const group = this.view.currentGroup;
-        if (group.widgets.length <= 1) {
+        const group = this.view.currentGroup.get();
+        if (group && group.widgets.get().length <= 1) {
           return;
         }
         const client = this.getNextOrPrevTerminalClient('prev');
@@ -340,7 +341,7 @@ export class TerminalCommandContribution implements CommandContribution, ClientA
 
     registry.registerCommand(TERMINAL_COMMANDS.KILL_PROCESS, {
       execute: async () => {
-        const current = this.view.currentWidgetId;
+        const current = this.view.currentWidgetId.get();
         const client = this.terminalController.findClientFromWidgetId(current);
         if (client) {
           const select = client.getSelection();
@@ -357,17 +358,22 @@ export class TerminalCommandContribution implements CommandContribution, ClientA
   }
 
   private getNextOrPrevTerminalClient(kind: 'next' | 'prev'): ITerminalClient | undefined {
-    const group = this.view.currentGroup;
-    const currentIdx = group.widgets.findIndex((w) => w.id === this.view.currentWidgetId);
+    const group = this.view.currentGroup.get();
+    if (!group) {
+      return;
+    }
+
+    const widgets = group.widgets.get();
+    const currentIdx = widgets.findIndex((w) => w.id === this.view.currentWidgetId.get());
 
-    let index;
+    let index: number;
     if (kind === 'next') {
-      index = currentIdx === group.widgets.length - 1 ? 0 : currentIdx + 1;
+      index = currentIdx === widgets.length - 1 ? 0 : currentIdx + 1;
     } else {
-      index = currentIdx === 0 ? group.widgets.length - 1 : currentIdx - 1;
+      index = currentIdx === 0 ? widgets.length - 1 : currentIdx - 1;
     }
 
-    const widget = group.widgets[index];
+    const widget = widgets[index];
     return this.terminalController.findClientFromWidgetId(widget.id);
   }
 }

package/src/browser/terminal.api.ts

@@ -2,6 +2,7 @@ import capitalize from 'lodash/capitalize';
 
 import { Autowired, Injectable } from '@opensumi/di';
 import { Emitter, Event } from '@opensumi/ide-core-common';
+import { transaction } from '@opensumi/ide-monaco/lib/common/observable';
 
 import {
   ITerminalApiService,
@@ -67,7 +68,7 @@ export class TerminalApiService implements ITerminalApiService {
     return Array.from(this.controller.clients.values()).map((v) => ({
       id: v.id,
       name: v.name,
-      isActive: this.view.currentWidgetId === v.id,
+      isActive: this.view.currentWidgetId.get() === v.id,
     }));
   }
 
@@ -164,7 +165,10 @@ export class TerminalApiService implements ITerminalApiService {
     const groupIndex = this.view.createGroup();
     const group = this.view.getGroup(groupIndex);
     const widget = this.view.createWidget(group, widgetId, false, true);
-    widget.name = capitalize(uniqName);
+    transaction((tx) => {
+      widget.name.set(capitalize(uniqName), tx);
+    });
+
     this.view.selectWidget(widgetId);
 
     widget.onRender(() => {

package/src/browser/terminal.client.ts

@@ -17,6 +17,7 @@ import {
 } from '@opensumi/ide-core-common';
 import { WorkbenchEditorService } from '@opensumi/ide-editor/lib/common';
 import { IFileServiceClient } from '@opensumi/ide-file-service/lib/common';
+import { transaction } from '@opensumi/ide-monaco/lib/common/observable';
 import { IMessageService } from '@opensumi/ide-overlay';
 import { IVariableResolverService } from '@opensumi/ide-variable/lib/common';
 import { IWorkspaceService } from '@opensumi/ide-workspace/lib/common';
@@ -191,7 +192,9 @@ export class TerminalClient extends Disposable implements ITerminalClient {
     this.addDispose(
       this.internalService.onProcessChange((e) => {
         if (e.sessionId === this.id) {
-          this.widget.processName = e.processName;
+          transaction((tx) => {
+            this.widget.processName.set(e.processName, tx);
+          });
         }
       }),
     );
@@ -281,8 +284,9 @@ export class TerminalClient extends Disposable implements ITerminalClient {
     if (!options.cwd) {
       // resolve cwd from the group first widget
       const group = widget.group;
-      if (group.widgets.length > 1 && group.widgets[0]) {
-        const cwd = await this.internalService.getCwd(group.widgets[0].id);
+      const widgets = group.widgets.get();
+      if (widgets.length > 1 && widgets[0]) {
+        const cwd = await this.internalService.getCwd(widgets[0].id);
         if (cwd) {
           options.cwd = cwd;
         }
@@ -755,7 +759,7 @@ export class TerminalClient extends Disposable implements ITerminalClient {
   }
 
   updateTerminalName(options: { name: string }) {
-    if (!this.name && !this._widget.name) {
+    if (!this.name && !this._widget.name.get()) {
       this._widget.rename(options.name || this.name);
     }
   }

package/src/browser/terminal.controller.ts

@@ -321,16 +321,6 @@ export class TerminalController extends WithEventBus implements ITerminalControl
     let firstAvailableId = '';
     const { groups, current } = history;
 
-    // const ids: (string | { client: string })[] = [];
-
-    // groups.forEach((widgets) => ids.push(...widgets.map((widget) => widget.client)));
-
-    // 之前OpenSumi的Check终端活跃机制是有问题的，暂时不启用，这部分逻辑在PtyService会兜住
-    // const checked = await this.service.check(ids.map((id) => (typeof id === 'string' ? id : id.clientId)));
-    // if (!checked) {
-    //   return;
-    // }
-
     for (const widgets of groups) {
       if (!widgets) {
         continue;
@@ -397,7 +387,7 @@ export class TerminalController extends WithEventBus implements ITerminalControl
       await Promise.all(promises);
     }
 
-    const selectedIndex = this.terminalView.groups.findIndex((group) => group.widgetsMap.has(currentWidgetId));
+    const selectedIndex = this.terminalView.groups.get().findIndex((group) => group.widgetsMap.has(currentWidgetId));
 
     if (selectedIndex > -1 && currentWidgetId) {
       this.terminalView.selectWidget(currentWidgetId);
@@ -501,7 +491,7 @@ export class TerminalController extends WithEventBus implements ITerminalControl
             this.terminalView.selectWidget(current.id);
           } else {
             this.terminalView.selectGroup(
-              this.terminalView.currentGroupIndex > -1 ? this.terminalView.currentGroupIndex : 0,
+              this.terminalView.currentGroupIndex.get() > -1 ? this.terminalView.currentGroupIndex.get() : 0,
             );
           }
         }),
@@ -521,7 +511,7 @@ export class TerminalController extends WithEventBus implements ITerminalControl
           this.terminalView.selectWidget(widget.id);
         } else {
           this.terminalView.selectGroup(
-            this.terminalView.currentGroupIndex > -1 ? this.terminalView.currentGroupIndex : 0,
+            this.terminalView.currentGroupIndex.get() > -1 ? this.terminalView.currentGroupIndex.get() : 0,
           );
         }
       }
@@ -569,11 +559,12 @@ export class TerminalController extends WithEventBus implements ITerminalControl
 
   toJSON() {
     const groups: { client: string }[][] = [];
-    let cClient = this._clients.get(this.terminalView.currentWidgetId);
-    this.terminalView.groups.forEach((wGroup) => {
+    let cClient = this._clients.get(this.terminalView.currentWidgetId.get());
+    this.terminalView.groups.get().forEach((wGroup) => {
       const group: { client: string }[] = [];
 
-      wGroup.widgets.forEach((widget) => {
+      const widgets = wGroup.widgets.get();
+      widgets.forEach((widget) => {
         const client = this._clients.get(widget.id);
         const disablePersistence =
           !this.preferenceService.get(CodeTerminalSettingId.EnablePersistentSessions) ||
@@ -723,13 +714,16 @@ export class TerminalController extends WithEventBus implements ITerminalControl
   }
 
   clearCurrentGroup() {
-    this.terminalView.currentGroup &&
-      this.terminalView.currentGroup.widgets.forEach((widget) => {
+    const group = this.terminalView.currentGroup.get();
+    if (group) {
+      const widgets = group.widgets.get();
+      widgets.forEach((widget) => {
         const client = this._clients.get(widget.id);
         if (client) {
           client.clear();
         }
       });
+    }
   }
 
   clearAllGroups() {

package/src/browser/terminal.search.ts

@@ -24,7 +24,7 @@ export class TerminalSearchService implements ITerminalSearchService {
   onVisibleChange: Event<boolean> = this._onVisibleChange.event;
 
   get client(): ITerminalClient | undefined {
-    return this.controller.findClientFromWidgetId(this.terminalView.currentWidget.id);
+    return this.controller.findClientFromWidgetId(this.terminalView.currentWidget.get().id);
   }
 
   open() {