Merge branch 'main' into tyriar/274723_platform_terminal__api

Author: Tyriar

eslint.config.js

@@ -338,23 +338,8 @@ export default tseslint.config(
 			'src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts',
 			'src/vs/workbench/contrib/tasks/browser/taskTerminalStatus.ts',
 			'src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts',
-			'src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts',
-			'src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts',
-			'src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution.ts',
-			'src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts',
-			'src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandLineAutoApprover.ts',
 			'src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.ts',
-			'src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/toolTerminalCreator.ts',
 			'src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/monitoring/outputMonitor.ts',
-			'src/vs/workbench/contrib/terminalContrib/commandGuide/browser/terminal.commandGuide.contribution.ts',
-			'src/vs/workbench/contrib/terminalContrib/history/browser/terminalRunRecentQuickPick.ts',
-			'src/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkQuickpick.ts',
-			'src/vs/workbench/contrib/terminalContrib/links/test/browser/linkTestUtils.ts',
-			'src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFixAddon.ts',
-			'src/vs/workbench/contrib/terminalContrib/sendSequence/browser/terminal.sendSequence.contribution.ts',
-			'src/vs/workbench/contrib/terminalContrib/sendSignal/browser/terminal.sendSignal.contribution.ts',
-			'src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts',
-			'src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts',
 			'src/vs/workbench/contrib/testing/browser/explorerProjections/listProjection.ts',
 			'src/vs/workbench/contrib/testing/browser/explorerProjections/treeProjection.ts',
 			'src/vs/workbench/contrib/testing/browser/testCoverageBars.ts',
@@ -493,9 +478,6 @@ export default tseslint.config(
 			// Platform
 			'src/vs/platform/accessibility/browser/accessibleView.ts',
 			'src/vs/platform/accessibility/common/accessibility.ts',
-			'src/vs/platform/action/common/action.ts',
-			'src/vs/platform/actions/common/actions.ts',
-			'src/vs/platform/assignment/common/assignment.ts',
 			'src/vs/platform/browserElements/electron-main/nativeBrowserElementsMainService.ts',
 			'src/vs/platform/commands/common/commands.ts',
 			'src/vs/platform/configuration/common/configuration.ts',
@@ -530,7 +512,6 @@ export default tseslint.config(
 			'src/vs/platform/extensions/common/extensionValidator.ts',
 			'src/vs/platform/extensions/common/extensions.ts',
 			'src/vs/platform/extensions/electron-main/extensionHostStarter.ts',
-			'src/vs/platform/externalTerminal/node/externalTerminalService.ts',
 			'src/vs/platform/instantiation/common/descriptors.ts',
 			'src/vs/platform/instantiation/common/extensions.ts',
 			'src/vs/platform/instantiation/common/instantiation.ts',
@@ -607,7 +588,6 @@ export default tseslint.config(
 			'src/vs/platform/userDataSync/common/userDataSyncService.ts',
 			'src/vs/platform/userDataSync/common/userDataSyncServiceIpc.ts',
 			'src/vs/platform/userDataSync/common/userDataSyncStoreService.ts',
-			'src/vs/platform/webContentExtractor/electron-main/cdpAccessibilityDomain.ts',
 			'src/vs/platform/webview/common/webviewManagerService.ts',
 			'src/vs/platform/configuration/test/common/testConfigurationService.ts',
 			'src/vs/platform/instantiation/test/common/instantiationServiceMock.ts',
@@ -722,8 +702,6 @@ export default tseslint.config(
 			'src/vs/workbench/contrib/bulkEdit/browser/opaqueEdits.ts',
 			'src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts',
 			'src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.ts',
-			'src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts',
-			'src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts',
 			'src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts',
 			'src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts',
 			'src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts',
@@ -799,12 +777,10 @@ export default tseslint.config(
 			'src/vs/workbench/contrib/extensions/common/extensions.ts',
 			'src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts',
 			'src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts',
-			'src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts',
 			'src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts',
 			'src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts',
 			'src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts',
 			'src/vs/workbench/contrib/issue/browser/issueReporterModel.ts',
-			'src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.ts',
 			'src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts',
 			'src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts',
 			'src/vs/workbench/contrib/markers/browser/markers.contribution.ts',
@@ -917,7 +893,6 @@ export default tseslint.config(
 			'src/vs/workbench/contrib/testing/common/storedValue.ts',
 			'src/vs/workbench/contrib/testing/common/testItemCollection.ts',
 			'src/vs/workbench/contrib/testing/test/browser/testObjectTree.ts',
-			'src/vs/workbench/contrib/timeline/browser/timelinePane.ts',
 			'src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.ts',
 			'src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.ts',
 			'src/vs/workbench/contrib/update/browser/update.ts',

src/vs/platform/assignment/common/assignment.ts

@@ -136,8 +136,8 @@ export class AssignmentFilterProvider implements IExperimentationFilterProvider
 		}
 	}
 
-	getFilters(): Map<string, any> {
-		const filters: Map<string, any> = new Map<string, any>();
+	getFilters(): Map<string, unknown> {
+		const filters: Map<string, unknown> = new Map<string, unknown>();
 		const filterValues = Object.values(Filters);
 		for (const value of filterValues) {
 			filters.set(value, this.getFilterValue(value));

src/vs/platform/externalTerminal/node/externalTerminalService.ts

@@ -89,7 +89,7 @@ export class WindowsExternalTerminalService extends ExternalTerminalService impl
 			// delete environment variables that have a null value
 			Object.keys(env).filter(v => env[v] === null).forEach(key => delete env[key]);
 
-			const options: any = {
+			const options = {
 				cwd: dir,
 				env: env,
 				windowsVerbatimArguments: true
@@ -267,7 +267,7 @@ export class LinuxExternalTerminalService extends ExternalTerminalService implem
 				// delete environment variables that have a null value
 				Object.keys(env).filter(v => env[v] === null).forEach(key => delete env[key]);
 
-				const options: any = {
+				const options = {
 					cwd: dir,
 					env: env
 				};

src/vs/platform/terminal/node/ptyService.ts

@@ -37,13 +37,18 @@ import { hasKey } from '../../../base/common/types.js';
 type XtermTerminal = pkg.Terminal;
 const { Terminal: XtermTerminal } = pkg;
 
+interface ITraceRpcArgs {
+	logService: ILogService;
+	simulatedLatency: number;
+}
+
 export function traceRpc(_target: Object, key: string, descriptor: PropertyDescriptor) {
 	if (typeof descriptor.value !== 'function') {
 		throw new Error('not supported');
 	}
 	const fnKey = 'value';
 	const fn = descriptor.value;
-	descriptor[fnKey] = async function <TThis extends { traceRpcArgs: { logService: ILogService; simulatedLatency: number } }>(this: TThis, ...args: unknown[]) {
+	descriptor[fnKey] = async function <TThis extends { traceRpcArgs: ITraceRpcArgs }>(this: TThis, ...args: unknown[]) {
 		if (this.traceRpcArgs.logService.getLevel() === LogLevel.Trace) {
 			this.traceRpcArgs.logService.trace(`[RPC Request] PtyService#${fn.name}(${args.map(e => JSON.stringify(e)).join(', ')})`);
 		}
@@ -123,7 +128,7 @@ export class PtyService extends Disposable implements IPtyService {
 	}
 
 	@memoize
-	get traceRpcArgs(): { logService: ILogService; simulatedLatency: number } {
+	get traceRpcArgs(): ITraceRpcArgs {
 		return {
 			logService: this._logService,
 			simulatedLatency: this._simulatedLatency

src/vs/platform/webContentExtractor/electron-main/cdpAccessibilityDomain.ts

@@ -9,7 +9,7 @@ import { URI } from '../../../base/common/uri.js';
 
 export interface AXValue {
 	type: AXValueType;
-	value?: any;
+	value?: unknown;
 	relatedNodes?: AXNode[];
 	sources?: AXValueSource[];
 }

src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.ts

@@ -65,7 +65,7 @@ class CallHierarchyController implements IEditorContribution {
 		this._ctxIsVisible = _ctxCallHierarchyVisible.bindTo(this._contextKeyService);
 		this._ctxHasProvider = _ctxHasCallHierarchyProvider.bindTo(this._contextKeyService);
 		this._ctxDirection = _ctxCallHierarchyDirection.bindTo(this._contextKeyService);
-		this._dispoables.add(Event.any<any>(_editor.onDidChangeModel, _editor.onDidChangeModelLanguage, CallHierarchyProviderRegistry.onDidChange)(() => {
+		this._dispoables.add(Event.any<unknown>(_editor.onDidChangeModel, _editor.onDidChangeModelLanguage, CallHierarchyProviderRegistry.onDidChange)(() => {
 			this._ctxHasProvider.set(_editor.hasModel() && CallHierarchyProviderRegistry.has(_editor.getModel()));
 		}));
 		this._dispoables.add(this._sessionDisposables);
@@ -125,7 +125,7 @@ class CallHierarchyController implements IEditorContribution {
 
 		this._ctxIsVisible.set(true);
 		this._ctxDirection.set(direction);
-		Event.any<any>(this._editor.onDidChangeModel, this._editor.onDidChangeModelLanguage)(this.endCallHierarchy, this, this._sessionDisposables);
+		Event.any<unknown>(this._editor.onDidChangeModel, this._editor.onDidChangeModelLanguage)(this.endCallHierarchy, this, this._sessionDisposables);
 		this._widget = this._instantiationService.createInstance(CallHierarchyTreePeekWidget, this._editor, position, direction);
 		this._widget.showLoading();
 		this._sessionDisposables.add(this._widget.onDidClose(() => {

src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts

@@ -164,7 +164,7 @@ CommandsRegistry.registerCommand('_executePrepareCallHierarchy', async (accessor
 	}
 });
 
-function isCallHierarchyItemDto(obj: any): obj is CallHierarchyItem {
+function isCallHierarchyItemDto(obj: unknown): obj is CallHierarchyItem {
 	return true;
 }
 

src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionViewModel.ts

@@ -182,7 +182,7 @@ export class AgentSessionsViewModel extends Disposable implements IAgentSessions
 						break;
 					case AgentSessionProviders.Background:
 						providerLabel = localize('chat.session.providerLabel.background', "Background");
-						icon = Codicon.layers;
+						icon = Codicon.serverProcess;
 						break;
 					case AgentSessionProviders.Cloud:
 						providerLabel = localize('chat.session.providerLabel.cloud', "Cloud");

src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts

@@ -45,10 +45,12 @@ interface IAgentSessionItemTemplate {
 	// Column 2 Row 1
 	readonly title: IconLabel;
 
-	// Column 2 Row 2
-	readonly description: HTMLElement;
+	readonly diffFiles: HTMLElement;
 	readonly diffAdded: HTMLElement;
 	readonly diffRemoved: HTMLElement;
+
+	// Column 2 Row 2
+	readonly description: HTMLElement;
 	readonly status: HTMLElement;
 
 	readonly elementDisposable: DisposableStore;
@@ -86,13 +88,14 @@ export class AgentSessionRenderer implements ICompressibleTreeRenderer<IAgentSes
 				h('div.agent-session-main-col', [
 					h('div.agent-session-title-row', [
 						h('div.agent-session-title@title'),
-					]),
-					h('div.agent-session-details-row', [
-						h('div.agent-session-description@description'),
 						h('div.agent-session-diff', [
+							h('span.agent-session-diff-files@diffFiles'),
 							h('span.agent-session-diff-added@diffAdded'),
 							h('span.agent-session-diff-removed@diffRemoved')
 						]),
+					]),
+					h('div.agent-session-details-row', [
+						h('div.agent-session-description@description'),
 						h('div.agent-session-status@status')
 					])
 				])
@@ -106,6 +109,7 @@ export class AgentSessionRenderer implements ICompressibleTreeRenderer<IAgentSes
 			icon: elements.icon,
 			title: disposables.add(new IconLabel(elements.title, { supportHighlights: true, supportIcons: true })),
 			description: elements.description,
+			diffFiles: elements.diffFiles,
 			diffAdded: elements.diffAdded,
 			diffRemoved: elements.diffRemoved,
 			status: elements.status,
@@ -125,8 +129,9 @@ export class AgentSessionRenderer implements ICompressibleTreeRenderer<IAgentSes
 
 		// Diff
 		const { statistics: diff } = session.element;
-		template.diffAdded.textContent = diff ? `+${diff.insertions}` : '';
-		template.diffRemoved.textContent = diff ? `-${diff.deletions}` : '';
+		template.diffFiles.textContent = diff?.files && diff.files > 0 ? `${diff.files}` : '';
+		template.diffAdded.textContent = diff?.insertions && diff.insertions > 0 ? `+${diff.insertions}` : '';
+		template.diffRemoved.textContent = diff?.deletions && diff.deletions > 0 ? `-${diff.deletions}` : '';
 
 		// Description
 		if (typeof session.element.description === 'string') {

src/vs/workbench/contrib/chat/browser/agentSessions/media/agentsessionsview.css

@@ -14,7 +14,7 @@
 	}
 
 	.agent-sessions-new-session-container {
-		padding: 5px 12px;
+		padding: 6px 12px;
 		flex: 0 0 auto !important;
 	}