@codingame/monaco-vscode-base-service-override 23.3.0 → 24.1.0

package/index.js

@@ -27,16 +27,18 @@ import { AbstractPathService } from './vscode/src/vs/workbench/services/path/com
 import { UserActivityService } from './vscode/src/vs/workbench/services/userActivity/common/userActivityService.js';
 import { WorkingCopyFileService } from './vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileService.js';
 import { ITrustedDomainService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/browser/trustedDomainService.service';
-import { TrustedDomainService } from '@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
+import { TrustedDomainService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
 import { LabelService } from './vscode/src/vs/workbench/services/label/common/labelService.js';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
-import { WorkbenchEditorWorkerService } from './vscode/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.js';
 import { getEnvironmentOverride } from '@codingame/monaco-vscode-api/workbench';
 import { IInlineCompletionsUnificationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.service';
 import { InlineCompletionsUnificationImpl } from './vscode/src/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.js';
 import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
 import { MarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer';
+import { IUserAttentionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userAttention/common/userAttentionService.service';
+import { UserAttentionService } from './vscode/src/vs/workbench/services/userAttention/browser/userAttentionBrowser.js';
+import { EditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/editorWorkerService';
 
 let BrowserPathServiceOverride = class BrowserPathServiceOverride extends AbstractPathService {
     constructor(remoteAgentService, environmentService, contextService) {
@@ -62,9 +64,10 @@ function getServiceOverride() {
         [IPathService.toString()]: new SyncDescriptor(BrowserPathServiceOverride, [], true),
         [ITrustedDomainService.toString()]: new SyncDescriptor(TrustedDomainService, [], true),
         [ILabelService.toString()]: new SyncDescriptor(LabelService, [], true),
-        [IEditorWorkerService.toString()]: new SyncDescriptor(WorkbenchEditorWorkerService, [], true),
+        [IEditorWorkerService.toString()]: new SyncDescriptor(EditorWorkerService, [], true),
         [IInlineCompletionsUnificationService.toString()]: new SyncDescriptor(InlineCompletionsUnificationImpl, [], true),
-        [IMarkdownRendererService.toString()]: new SyncDescriptor(MarkdownRendererService, [], true)
+        [IMarkdownRendererService.toString()]: new SyncDescriptor(MarkdownRendererService, [], true),
+        [IUserAttentionService.toString()]: new SyncDescriptor(UserAttentionService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-base-service-override",
-  "version": "23.3.0",
+  "version": "24.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - base service-override",
   "keywords": [],
@@ -15,13 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "23.3.0",
-    "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common": "23.3.0",
-    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "23.3.0",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.3.0",
-    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "23.3.0",
-    "@codingame/monaco-vscode-api": "23.3.0",
-    "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common": "23.3.0"
+    "@codingame/monaco-vscode-api": "24.1.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/base/common/observableInternal/experimental/time.d.ts

@@ -0,0 +1,23 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base";
+import { DisposableStore, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/commonFacade/deps";
+/** Measures the total time an observable had the value "true". */
+export declare class TotalTrueTimeObservable extends Disposable {
+    private readonly value;
+    private _totalTime;
+    private _startTime;
+    constructor(value: IObservable<boolean>);
+    /**
+     * Reports the total time the observable has been true in milliseconds.
+     * E.g. `true` for 100ms, then `false` for 50ms, then `true` for 200ms results in 300ms.
+    */
+    totalTimeMs(): number;
+    /**
+     * Runs the callback when the total time the observable has been true increased by the given delta in milliseconds.
+    */
+    fireWhenTimeIncreasedBy(deltaTimeMs: number, callback: () => void): IDisposable;
+}
+/**
+ * Returns an observable that is true when the input observable was true within the last `timeMs` milliseconds.
+ */
+export declare function wasTrueRecently(obs: IObservable<boolean>, timeMs: number, store: DisposableStore): IObservable<boolean>;

package/vscode/src/vs/base/common/observableInternal/experimental/time.js

@@ -0,0 +1,94 @@
+
+import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+
+class TotalTrueTimeObservable extends Disposable {
+    constructor(value) {
+        super();
+        this.value = value;
+        this._totalTime = 0;
+        this._startTime = undefined;
+        this._register(autorun(reader => {
+            const isTrue = this.value.read(reader);
+            if (isTrue) {
+                this._startTime = Date.now();
+            }
+            else {
+                if (this._startTime !== undefined) {
+                    const delta = Date.now() - this._startTime;
+                    this._totalTime += delta;
+                    this._startTime = undefined;
+                }
+            }
+        }));
+    }
+    totalTimeMs() {
+        if (this._startTime !== undefined) {
+            return this._totalTime + (Date.now() - this._startTime);
+        }
+        return this._totalTime;
+    }
+    fireWhenTimeIncreasedBy(deltaTimeMs, callback) {
+        const store = ( new DisposableStore());
+        let accumulatedTime = 0;
+        let startTime = undefined;
+        store.add(autorun(reader => {
+            const isTrue = this.value.read(reader);
+            if (isTrue) {
+                startTime = Date.now();
+                const remainingTime = deltaTimeMs - accumulatedTime;
+                if (remainingTime <= 0) {
+                    callback();
+                    store.dispose();
+                    return;
+                }
+                const handle = setTimeout(() => {
+                    accumulatedTime += (Date.now() - startTime);
+                    startTime = undefined;
+                    callback();
+                    store.dispose();
+                }, remainingTime);
+                reader.store.add(toDisposable(() => {
+                    clearTimeout(handle);
+                    if (startTime !== undefined) {
+                        accumulatedTime += (Date.now() - startTime);
+                        startTime = undefined;
+                    }
+                }));
+            }
+        }));
+        return store;
+    }
+}
+function wasTrueRecently(obs, timeMs, store) {
+    const result = observableValue('wasTrueRecently', false);
+    let timeout;
+    store.add(autorun(reader => {
+        const value = obs.read(reader);
+        if (value) {
+            result.set(true, undefined);
+            if (timeout !== undefined) {
+                clearTimeout(timeout);
+                timeout = undefined;
+            }
+        }
+        else {
+            timeout = setTimeout(() => {
+                result.set(false, undefined);
+                timeout = undefined;
+            }, timeMs);
+        }
+    }));
+    store.add(toDisposable(() => {
+        if (timeout !== undefined) {
+            clearTimeout(timeout);
+        }
+    }));
+    return result;
+}
+
+export { TotalTrueTimeObservable, wasTrueRecently };

package/vscode/src/vs/base/parts/request/common/requestImpl.d.ts

@@ -1,3 +1,3 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { IRequestContext, IRequestOptions } from "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common/vscode/vs/base/parts/request/common/request";
+import { IRequestContext, IRequestOptions } from "@codingame/monaco-vscode-api/vscode/vs/base/parts/request/common/request";
 export declare function request(options: IRequestOptions, token: CancellationToken, isOnline?: () => boolean): Promise<IRequestContext>;

package/vscode/src/vs/base/parts/request/common/requestImpl.js

@@ -1,7 +1,7 @@
 
 import { bufferToStream, VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { canceled } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { OfflineError } from '@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common/vscode/vs/base/parts/request/common/request';
+import { OfflineError } from '@codingame/monaco-vscode-api/vscode/vs/base/parts/request/common/request';
 
 async function request(options, token, isOnline) {
     if (token.isCancellationRequested) {

package/vscode/src/vs/platform/request/common/requestIpc.d.ts

@@ -1,7 +1,7 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { IChannel, IServerChannel } from "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc";
-import { IRequestContext, IRequestOptions } from "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common/vscode/vs/base/parts/request/common/request";
+import { IChannel, IServerChannel } from "@codingame/monaco-vscode-api/vscode/vs/base/parts/ipc/common/ipc";
+import { IRequestContext, IRequestOptions } from "@codingame/monaco-vscode-api/vscode/vs/base/parts/request/common/request";
 import { AuthInfo, Credentials } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request";
 import { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
 export declare class RequestChannel implements IServerChannel {

package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.d.ts

@@ -2,7 +2,7 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
-import { IJSONValue } from "@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common/vscode/vs/workbench/services/configuration/common/jsonEditing";
+import { IJSONValue } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/jsonEditing";
 import { IJSONEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/jsonEditing.service";
 import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
 export declare class JSONEditingService implements IJSONEditingService {

package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
-import { setProperty } from '@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common/vscode/vs/base/common/jsonEdit';
+import { setProperty } from '@codingame/monaco-vscode-api/vscode/vs/base/common/jsonEdit';
 import { Queue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
@@ -10,7 +10,7 @@ import { Selection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
-import { JSONEditingErrorCode, JSONEditingError } from '@codingame/monaco-vscode-d987325e-3e05-53aa-b9ff-6f97476f64db-common/vscode/vs/workbench/services/configuration/common/jsonEditing';
+import { JSONEditingErrorCode, JSONEditingError } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/jsonEditing';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { IFilesConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
@@ -51,6 +51,7 @@ let JSONEditingService = class JSONEditingService {
         finally {
             disposable?.dispose();
         }
+        return undefined;
     }
     applyEditsToBuffer(edit, model) {
         const startPosition = model.getPositionAt(edit.offset);
@@ -117,7 +118,7 @@ let JSONEditingService = class JSONEditingService {
         switch (error) {
             case JSONEditingErrorCode.ERROR_INVALID_FILE: {
                 return localize(
-                    13602,
+                    13744,
                     "Unable to write into the file. Please open the file to correct errors/warnings in the file and try again."
                 );
             }

package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js

@@ -161,7 +161,7 @@ class DecorationStyles {
         const strikethrough = ( data.some(d => d.strikethrough));
         if (onlyChildren) {
             badgeClassName = rule.bubbleBadgeClassName;
-            tooltip = ( localize(13641, "Contains emphasized items"));
+            tooltip = ( localize(13783, "Contains emphasized items"));
         }
         return {
             labelClassName,

package/vscode/src/vs/workbench/services/label/common/labelService.d.ts

@@ -3,7 +3,7 @@ import { IDisposable, Disposable } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { IWorkspace, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
-import { ResourceLabelFormatter, ResourceLabelFormatting, IFormatterChangeEvent, Verbosity } from "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common/vscode/vs/platform/label/common/label";
+import { ResourceLabelFormatter, ResourceLabelFormatting, IFormatterChangeEvent, Verbosity } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";

package/vscode/src/vs/workbench/services/label/common/labelService.js

@@ -12,7 +12,7 @@ import { isWorkspace, toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier,
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { basenameOrAuthority, basename, joinPath, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { getPathLabel, tildify } from '@codingame/monaco-vscode-api/vscode/vs/base/common/labels';
-import { Verbosity } from '@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common/vscode/vs/platform/label/common/label';
+import { Verbosity } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { match } from '@codingame/monaco-vscode-api/vscode/vs/base/common/glob';
@@ -26,12 +26,12 @@ import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { Memento } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/common/memento';
+import { Memento } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/memento';
 
 const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'resourceLabelFormatters',
     jsonSchema: {
-        description: ( localize(13945, 'Contributes resource label formatting rules.')),
+        description: ( localize(14086, 'Contributes resource label formatting rules.')),
         type: 'array',
         items: {
             type: 'object',
@@ -40,52 +40,52 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin
                 scheme: {
                     type: 'string',
                     description: ( localize(
-                        13946,
+                        14087,
                         'URI scheme on which to match the formatter on. For example "file". Simple glob patterns are supported.'
                     )),
                 },
                 authority: {
                     type: 'string',
                     description: ( localize(
-                        13947,
+                        14088,
                         'URI authority on which to match the formatter on. Simple glob patterns are supported.'
                     )),
                 },
                 formatting: {
-                    description: ( localize(13948, "Rules for formatting uri resource labels.")),
+                    description: ( localize(14089, "Rules for formatting uri resource labels.")),
                     type: 'object',
                     properties: {
                         label: {
                             type: 'string',
                             description: ( localize(
-                                13949,
+                                14090,
                                 "Label rules to display. For example: myLabel:/${path}. ${path}, ${scheme}, ${authority} and ${authoritySuffix} are supported as variables."
                             ))
                         },
                         separator: {
                             type: 'string',
                             description: ( localize(
-                                13950,
+                                14091,
                                 "Separator to be used in the uri label display. '/' or '\' as an example."
                             ))
                         },
                         stripPathStartingSeparator: {
                             type: 'boolean',
                             description: ( localize(
-                                13951,
+                                14092,
                                 "Controls whether `${path}` substitutions should have starting separator characters stripped."
                             ))
                         },
                         tildify: {
                             type: 'boolean',
                             description: ( localize(
-                                13952,
+                                14093,
                                 "Controls if the start of the uri label should be tildified when possible."
                             ))
                         },
                         workspaceSuffix: {
                             type: 'string',
-                            description: ( localize(13953, "Suffix appended to the workspace label."))
+                            description: ( localize(14094, "Suffix appended to the workspace label."))
                         }
                     }
                 }
@@ -267,10 +267,10 @@ let LabelService = class LabelService extends Disposable {
     }
     doGetWorkspaceLabel(workspaceUri, options) {
         if (isUntitledWorkspace(workspaceUri, this.environmentService)) {
-            return localize(13954, "Untitled (Workspace)");
+            return localize(14095, "Untitled (Workspace)");
         }
         if (isTemporaryWorkspace(workspaceUri)) {
-            return localize(13955, "Workspace");
+            return localize(14096, "Workspace");
         }
         let filename = basename(workspaceUri);
         if (filename.endsWith(WORKSPACE_EXTENSION)) {
@@ -283,14 +283,14 @@ let LabelService = class LabelService extends Disposable {
                 break;
             case Verbosity.LONG:
                 label = ( localize(
-                    13956,
+                    14097,
                     "{0} (Workspace)",
                     this.getUriLabel(joinPath(dirname(workspaceUri), filename))
                 ));
                 break;
             case Verbosity.MEDIUM:
             default:
-                label = ( localize(13957, "{0} (Workspace)", filename));
+                label = ( localize(14098, "{0} (Workspace)", filename));
                 break;
         }
         if (options?.verbose === Verbosity.SHORT) {

package/vscode/src/vs/workbench/services/request/browser/requestService.d.ts

@@ -1,4 +1,4 @@
-import { IRequestOptions, IRequestContext } from "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common/vscode/vs/base/parts/request/common/request";
+import { IRequestOptions, IRequestContext } from "@codingame/monaco-vscode-api/vscode/vs/base/parts/request/common/request";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";

package/vscode/src/vs/workbench/services/request/browser/requestService.js

@@ -14,7 +14,7 @@ import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/
 
 let BrowserRequestService = class BrowserRequestService extends AbstractRequestService {
     constructor(remoteAgentService, configurationService, loggerService) {
-        const logger = loggerService.createLogger(`network`, { name: ( localize(14063, "Network")), group: windowLogGroup });
+        const logger = loggerService.createLogger(`network`, { name: ( localize(14204, "Network")), group: windowLogGroup });
         const logService = ( new LogService(logger));
         super(logService);
         this.remoteAgentService = remoteAgentService;

package/vscode/src/vs/workbench/services/url/browser/urlService.d.ts

@@ -1,7 +1,7 @@
 import { URI, UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { AbstractURLService } from "../../../../platform/url/common/urlService.js";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 export interface IURLCallbackProvider {

package/vscode/src/vs/workbench/services/url/browser/urlService.js

@@ -4,7 +4,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ins
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { AbstractURLService } from '../../../../platform/url/common/urlService.js';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { matchesScheme } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';

package/vscode/src/vs/workbench/services/userActivity/common/userActivityRegistry.d.ts

@@ -3,7 +3,7 @@ import { IUserActivityService } from "@codingame/monaco-vscode-api/vscode/vs/wor
 declare class UserActivityRegistry {
     private todo;
     add: (ctor: {
-        new (s: IUserActivityService, ...args: any[]): unknown;
+        new (s: IUserActivityService, ...args: unknown[]): unknown;
     }) => void;
     take(userActivityService: IUserActivityService, instantiation: IInstantiationService): void;
 }

package/vscode/src/vs/workbench/services/userAttention/browser/userAttentionBrowser.d.ts

@@ -0,0 +1,28 @@
+import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
+import { IUserAttentionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userAttention/common/userAttentionService.service";
+export declare class UserAttentionService extends Disposable implements IUserAttentionService {
+    private readonly _logService;
+    readonly _serviceBrand: undefined;
+    private readonly _isTracingEnabled;
+    private readonly _timeKeeper;
+    readonly isVsCodeFocused: IObservable<boolean>;
+    readonly hasUserAttention: IObservable<boolean>;
+    readonly isUserActive: IObservable<boolean>;
+    constructor(instantiationService: IInstantiationService, _logService: ILogService);
+    fireAfterGivenFocusTimePassed(focusTimeMs: number, callback: () => void): IDisposable;
+    get totalFocusTimeMs(): number;
+}
+export declare class UserAttentionServiceEnv extends Disposable {
+    private readonly _hostService;
+    private readonly _logService;
+    readonly isVsCodeFocused: IObservable<boolean>;
+    readonly isUserActive: IObservable<boolean>;
+    private readonly _isUserActive;
+    private _activityDebounceTimeout;
+    constructor(_hostService: IHostService, _logService: ILogService);
+    private _markUserActivity;
+}

package/vscode/src/vs/workbench/services/userAttention/browser/userAttentionBrowser.js

@@ -0,0 +1,102 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { onDidRegisterWindow, addDisposableListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { wasTrueRecently, TotalTrueTimeObservable } from '../../../../base/common/observableInternal/experimental/time.js';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import { LogLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+
+const USER_ATTENTION_TIMEOUT_MS = 60_000;
+let UserAttentionService = class UserAttentionService extends Disposable {
+    constructor(instantiationService, _logService) {
+        super();
+        this._logService = _logService;
+        const hostAdapter = this._register(instantiationService.createInstance(UserAttentionServiceEnv));
+        this.isVsCodeFocused = hostAdapter.isVsCodeFocused;
+        this.isUserActive = hostAdapter.isUserActive;
+        this._isTracingEnabled = observableFromEvent(this, this._logService.onDidChangeLogLevel, () => this._logService.getLevel() === LogLevel.Trace);
+        const hadRecentActivity = wasTrueRecently(this.isUserActive, USER_ATTENTION_TIMEOUT_MS, this._store);
+        this.hasUserAttention = derived(this, reader => {
+            return hadRecentActivity.read(reader);
+        });
+        this._timeKeeper = this._register(( new TotalTrueTimeObservable(this.hasUserAttention)));
+        this._register(autorun(reader => {
+            if (!this._isTracingEnabled.read(reader)) {
+                return;
+            }
+            reader.store.add(autorun(innerReader => {
+                const focused = this.isVsCodeFocused.read(innerReader);
+                this._logService.trace(`[UserAttentionService] VS Code focus changed: ${focused}`);
+            }));
+            reader.store.add(autorun(innerReader => {
+                const hasAttention = this.hasUserAttention.read(innerReader);
+                this._logService.trace(`[UserAttentionService] User attention changed: ${hasAttention}`);
+            }));
+        }));
+    }
+    fireAfterGivenFocusTimePassed(focusTimeMs, callback) {
+        return this._timeKeeper.fireWhenTimeIncreasedBy(focusTimeMs, callback);
+    }
+    get totalFocusTimeMs() {
+        return this._timeKeeper.totalTimeMs();
+    }
+};
+UserAttentionService = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, ILogService))
+], UserAttentionService));
+let UserAttentionServiceEnv = class UserAttentionServiceEnv extends Disposable {
+    constructor(_hostService, _logService) {
+        super();
+        this._hostService = _hostService;
+        this._logService = _logService;
+        this._isUserActive = observableValue(this, false);
+        this.isVsCodeFocused = observableFromEvent(this, this._hostService.onDidChangeFocus, () => this._hostService.hasFocus);
+        this.isUserActive = this._isUserActive;
+        const onActivity = () => {
+            this._markUserActivity();
+        };
+        this._register(Event.runAndSubscribe(onDidRegisterWindow, ({ window, disposables }) => {
+            disposables.add(addDisposableListener(window.document, 'keydown', onActivity, eventListenerOptions));
+            disposables.add(addDisposableListener(window.document, 'mousemove', onActivity, eventListenerOptions));
+            disposables.add(addDisposableListener(window.document, 'mousedown', onActivity, eventListenerOptions));
+            disposables.add(addDisposableListener(window.document, 'touchstart', onActivity, eventListenerOptions));
+        }, { window: mainWindow, disposables: this._store }));
+        if (this._hostService.hasFocus) {
+            this._markUserActivity();
+        }
+    }
+    _markUserActivity() {
+        if (this._activityDebounceTimeout !== undefined) {
+            clearTimeout(this._activityDebounceTimeout);
+        }
+        else {
+            this._logService.trace('[UserAttentionService] User activity detected');
+            this._isUserActive.set(true, undefined);
+        }
+        this._activityDebounceTimeout = setTimeout(() => {
+            this._isUserActive.set(false, undefined);
+            this._activityDebounceTimeout = undefined;
+        }, 500);
+    }
+};
+UserAttentionServiceEnv = ( __decorate([
+    ( __param(0, IHostService)),
+    ( __param(1, ILogService))
+], UserAttentionServiceEnv));
+const eventListenerOptions = {
+    passive: true,
+    capture: true,
+};
+
+export { UserAttentionService, UserAttentionServiceEnv };

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.d.ts

@@ -4,7 +4,7 @@ import { IProgress, IProgressStep } from "@codingame/monaco-vscode-api/vscode/vs
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
 import { IDisposable, Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IStoredFileWorkingCopySaveParticipant, IStoredFileWorkingCopySaveParticipantContext } from "./workingCopyFileService.js";
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
 export declare class StoredFileWorkingCopySaveParticipant extends Disposable {
     private readonly logService;
     private readonly progressService;

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.js

@@ -27,13 +27,13 @@ let StoredFileWorkingCopySaveParticipant = class StoredFileWorkingCopySavePartic
         const cts = ( new CancellationTokenSource(token));
         workingCopy.model?.pushStackElement();
         progress.report({
-            message: ( localize(14453, "Running Code Actions and Formatters..."))
+            message: ( localize(14594, "Running Code Actions and Formatters..."))
         });
         let bubbleCancel = false;
         await this.progressService.withProgress({
             priority: NotificationPriority.URGENT,
             location: ProgressLocation.Notification,
-            cancellable: ( localize(14454, "Skip")),
+            cancellable: ( localize(14595, "Skip")),
             delay: workingCopy.isDirty() ? 5000 : 3000
         }, async (progress) => {
             const participants = Array.from(this.saveParticipants).sort((a, b) => {

package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileService.d.ts

@@ -6,12 +6,12 @@ import { FileOperation, IFileStatWithMetadata } from "@codingame/monaco-vscode-a
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { IWorkingCopyService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service";
-import { IWorkingCopy } from "@codingame/monaco-vscode-1f37b5fb-f500-54d2-b98a-d12d100cafca-common/vscode/vs/workbench/services/workingCopy/common/workingCopy";
+import { IWorkingCopy } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopy";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
 import { SaveReason } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { IProgress, IProgressStep } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress";
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
 import { IWorkingCopyFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service";
 export interface SourceTargetPair {
     /**

package/vscode/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.d.ts

@@ -1,9 +0,0 @@
-import { EditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/editorWorkerService";
-import { ILanguageConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry.service";
-import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
-import { ITextResourceConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service";
-import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-export declare class WorkbenchEditorWorkerService extends EditorWorkerService {
-    constructor(modelService: IModelService, configurationService: ITextResourceConfigurationService, logService: ILogService, languageConfigurationService: ILanguageConfigurationService, languageFeaturesService: ILanguageFeaturesService);
-}

package/vscode/src/vs/workbench/contrib/codeEditor/browser/workbenchEditorWorkerService.js

@@ -1,26 +0,0 @@
-
-import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { WebWorkerDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/webWorkerFactory';
-import { FileAccess } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { EditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/editorWorkerService';
-import { ILanguageConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry.service';
-import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
-import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service';
-import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-
-let WorkbenchEditorWorkerService = class WorkbenchEditorWorkerService extends EditorWorkerService {
-    constructor(modelService, configurationService, logService, languageConfigurationService, languageFeaturesService) {
-        const workerDescriptor = ( new WebWorkerDescriptor(( FileAccess.asBrowserUri('vs/editor/common/services/editorWebWorkerMain.js')), 'TextEditorWorker'));
-        super(workerDescriptor, modelService, configurationService, logService, languageConfigurationService, languageFeaturesService);
-    }
-};
-WorkbenchEditorWorkerService = ( __decorate([
-    ( __param(0, IModelService)),
-    ( __param(1, ITextResourceConfigurationService)),
-    ( __param(2, ILogService)),
-    ( __param(3, ILanguageConfigurationService)),
-    ( __param(4, ILanguageFeaturesService))
-], WorkbenchEditorWorkerService));
-
-export { WorkbenchEditorWorkerService };