activity: fix activity API is active although there is no any user interactions (microsoft#248031)

Fixes microsoft#237386

Author: connor4312

src/vs/workbench/services/progress/browser/progressService.ts

@@ -47,7 +47,7 @@ export class ProgressService extends Disposable implements IProgressService {
 		const { location } = options;
 
 		const task = async (progress: IProgress<IProgressStep>) => {
-			const activeLock = this.userActivityService.markActive({ whenHeldFor: 15_000 });
+			const activeLock = this.userActivityService.markActive({ extendOnly: true, whenHeldFor: 15_000 });
 			try {
 				return await originalTask(progress);
 			} finally {

src/vs/workbench/services/userActivity/common/userActivityService.ts

@@ -12,6 +12,11 @@ import { userActivityRegistry } from './userActivityRegistry.js';
 
 export interface IMarkActiveOptions {
 	whenHeldFor?: number;
+	/**
+	 * Only consider this progress if the state is already active. Used to avoid
+	 * background work from incorrectly marking the user as active (#237386)
+	 */
+	extendOnly?: boolean;
 }
 
 /**
@@ -71,6 +76,10 @@ export class UserActivityService extends Disposable implements IUserActivityServ
 
 	/** @inheritdoc */
 	markActive(opts?: IMarkActiveOptions): IDisposable {
+		if (opts?.extendOnly && !this.isActive) {
+			return Disposable.None;
+		}
+
 		if (opts?.whenHeldFor) {
 			const store = new DisposableStore();
 			store.add(disposableTimeout(() => store.add(this.markActive()), opts.whenHeldFor));

src/vs/workbench/services/userActivity/test/common/userActivityService.test.ts

@@ -71,4 +71,29 @@ suite('UserActivityService', () => {
 		clock.tick(duration + MARK_INACTIVE_DEBOUNCE);
 		assert.strictEqual(userActivityService.isActive, false);
 	});
+
+	test('markActive with extendOnly only extends if already active', () => {
+		// Make user inactive
+		userActivityService.markActive().dispose();
+		clock.tick(MARK_INACTIVE_DEBOUNCE);
+		assert.strictEqual(userActivityService.isActive, false);
+
+		// Should not activate if inactive and extendOnly is true
+		const handle = userActivityService.markActive({ extendOnly: true });
+		assert.strictEqual(userActivityService.isActive, false);
+		handle.dispose();
+
+		// Activate normally
+		const h1 = userActivityService.markActive();
+		assert.strictEqual(userActivityService.isActive, true);
+
+		// Should extend activity if already active
+		const h2 = userActivityService.markActive({ extendOnly: true });
+		h1.dispose();
+		// Still active because h2 is holding
+		assert.strictEqual(userActivityService.isActive, true);
+		h2.dispose();
+		clock.tick(MARK_INACTIVE_DEBOUNCE);
+		assert.strictEqual(userActivityService.isActive, false);
+	});
 });