@theia/ai-ide 1.71.0-next.11 → 1.71.0-next.19

package/lib/browser/workspace-task-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-task-provider.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-task-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAyB,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGlF,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AAGpF,qBACa,gBAAiB,YAAW,YAAY;IAGjD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAE5C,OAAO,IAAI,WAAW;YAgCR,iBAAiB;CAMlC;AAED,qBACa,kBAAmB,YAAW,YAAY;IAGnD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAEpD,OAAO,IAAI,WAAW;YA0BR,aAAa;CA0C9B"}
+{"version":3,"file":"workspace-task-provider.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-task-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAyB,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGlF,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AAGpF,qBACa,gBAAiB,YAAW,YAAY;IAGjD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAE5C,OAAO,IAAI,WAAW;YAgCR,iBAAiB;CAMlC;AAED,qBACa,kBAAmB,YAAW,YAAY;IAGnD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAEpD,OAAO,IAAI,WAAW;YA0BR,aAAa;CA6C9B"}

package/lib/browser/workspace-task-provider.js

@@ -103,7 +103,10 @@ let TaskRunnerProvider = class TaskRunnerProvider {
                 return `Did not find a task for the label: '${args.taskName}'`;
             }
             cancellationToken?.onCancellationRequested(() => {
-                this.taskService.terminateTask(taskInfo);
+                // Only terminate if the task is still running
+                if (this.taskService.isTaskRunning(taskInfo.taskId)) {
+                    this.taskService.terminateTask(taskInfo);
+                }
             });
             if (cancellationToken?.isCancellationRequested) {
                 return JSON.stringify({ error: 'Operation cancelled by user' });

package/lib/browser/workspace-task-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-task-provider.js","sourceRoot":"","sources":["../../src/browser/workspace-task-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-task-provider.js","sourceRoot":"","sources":["../../src/browser/workspace-task-provider.ts"],"names":[],"mappings":"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"}

package/lib/browser/workspace-task-provider.spec.js

@@ -67,7 +67,8 @@ describe('Workspace Task Provider Cancellation Tests', () => {
             terminateTask: async (activeTaskInfo) => {
                 // Track termination
             },
-            getTerminateSignal: async () => 'SIGTERM'
+            getTerminateSignal: async () => 'SIGTERM',
+            isTaskRunning: () => false
         };
         mockTerminalService = {
             getByTerminalId: () => ({
@@ -87,6 +88,94 @@ describe('Workspace Task Provider Cancellation Tests', () => {
     afterEach(() => {
         cancellationTokenSource.dispose();
     });
+    describe('Task cancellation with completed tasks', () => {
+        it('should NOT terminate task if task has already completed (not in runningTasks)', async () => {
+            let terminateTaskCalled = false;
+            mockTaskService.terminateTask = async () => {
+                terminateTaskCalled = true;
+            };
+            // Simulate task already completed (isTaskRunning returns false)
+            mockTaskService.isTaskRunning = () => false;
+            // Mock getTerminateSignal to never resolve (simulates in-flight handler)
+            mockTaskService.getTerminateSignal = () => new Promise(() => { });
+            const taskRunnerProvider = container.get(workspace_task_provider_1.TaskRunnerProvider);
+            const handler = taskRunnerProvider.getTool().handler;
+            // Start task execution (will hang on getTerminateSignal)
+            handler(JSON.stringify({ taskName: 'build' }), mockCtx);
+            // Give time for the handler to register the cancellation listener
+            await new Promise(resolve => setTimeout(resolve, 10));
+            // Cancel while handler is "in-flight"
+            cancellationTokenSource.cancel();
+            // Give time for cancellation to process
+            await new Promise(resolve => setTimeout(resolve, 10));
+            // terminateTask should NOT have been called since isTaskRunning returns false
+            (0, chai_1.expect)(terminateTaskCalled).to.be.false;
+        });
+        it('should terminate task if task is still running', async () => {
+            let terminateTaskCalled = false;
+            mockTaskService.terminateTask = async () => {
+                terminateTaskCalled = true;
+            };
+            // Mock isTaskRunning to return true (task still running)
+            mockTaskService.isTaskRunning = () => true;
+            // Mock getTerminateSignal to never resolve (simulates in-flight task)
+            mockTaskService.getTerminateSignal = () => new Promise(() => { });
+            const taskRunnerProvider = container.get(workspace_task_provider_1.TaskRunnerProvider);
+            const handler = taskRunnerProvider.getTool().handler;
+            // Start task execution (will hang on getTerminateSignal)
+            handler(JSON.stringify({ taskName: 'build' }), mockCtx);
+            // Give time for the handler to register the cancellation listener
+            await new Promise(resolve => setTimeout(resolve, 10));
+            // Cancel while task is "in-flight"
+            cancellationTokenSource.cancel();
+            // Give time for cancellation to process
+            await new Promise(resolve => setTimeout(resolve, 10));
+            // terminateTask SHOULD have been called since isTaskRunning returns true
+            (0, chai_1.expect)(terminateTaskCalled).to.be.true;
+        });
+        it('should handle multiple tasks with shared cancellation token - only terminate running tasks', async () => {
+            const terminatedTasks = [];
+            mockTaskService.terminateTask = async (taskInfo) => {
+                terminatedTasks.push(taskInfo.taskId);
+            };
+            // Mock isTaskRunning to simulate: task 0 completed, tasks 1 & 2 still running
+            mockTaskService.isTaskRunning = (taskId) => taskId !== 0;
+            // Mock getTerminateSignal to never resolve (simulates in-flight handlers)
+            mockTaskService.getTerminateSignal = () => new Promise(() => { });
+            // Mock runTaskByLabel to return different task IDs
+            let taskIdCounter = 0;
+            mockTaskService.runTaskByLabel = async (token, taskLabel) => ({
+                taskId: taskIdCounter++,
+                terminalId: taskIdCounter - 1,
+                config: {
+                    label: taskLabel,
+                    _scope: 'workspace',
+                    type: 'shell'
+                }
+            });
+            const taskRunnerProvider = container.get(workspace_task_provider_1.TaskRunnerProvider);
+            const handler = taskRunnerProvider.getTool().handler;
+            // Use ONE shared CancellationTokenSource (simulates real scenario)
+            const sharedCts = new core_1.CancellationTokenSource();
+            const sharedCtx = { cancellationToken: sharedCts.token };
+            // Call handler three times with the same shared cancellation token
+            handler(JSON.stringify({ taskName: 'build' }), sharedCtx);
+            handler(JSON.stringify({ taskName: 'test' }), sharedCtx);
+            handler(JSON.stringify({ taskName: 'lint' }), sharedCtx);
+            // Give time for handlers to register cancellation listeners
+            await new Promise(resolve => setTimeout(resolve, 10));
+            // Cancel the shared token once - this fires all registered listeners
+            sharedCts.cancel();
+            // Give time for cancellation listeners to fire
+            await new Promise(resolve => setTimeout(resolve, 10));
+            // Only task 1 and 2 should have been terminated (task 0 was completed)
+            (0, chai_1.expect)(terminatedTasks).to.have.lengthOf(2);
+            (0, chai_1.expect)(terminatedTasks).to.include(1);
+            (0, chai_1.expect)(terminatedTasks).to.include(2);
+            (0, chai_1.expect)(terminatedTasks).to.not.include(0);
+            sharedCts.dispose();
+        });
+    });
     it('TaskListProvider should respect cancellation token', async () => {
         const taskListProvider = container.get(workspace_task_provider_1.TaskListProvider);
         cancellationTokenSource.cancel();

package/lib/browser/workspace-task-provider.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-task-provider.spec.js","sourceRoot":"","sources":["../../src/browser/workspace-task-provider.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-task-provider.spec.js","sourceRoot":"","sources":["../../src/browser/workspace-task-provider.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/ai-ide",
-  "version": "1.71.0-next.11+2554837d1",
+  "version": "1.71.0-next.19+ccda46cbe",
   "description": "AI IDE Agents Extension",
   "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
   "repository": {
@@ -15,24 +15,24 @@
     "theia-extension"
   ],
   "dependencies": {
-    "@theia/ai-chat": "1.71.0-next.11+2554837d1",
-    "@theia/ai-chat-ui": "1.71.0-next.11+2554837d1",
-    "@theia/ai-core": "1.71.0-next.11+2554837d1",
-    "@theia/ai-mcp": "1.71.0-next.11+2554837d1",
-    "@theia/ai-terminal": "1.71.0-next.11+2554837d1",
-    "@theia/core": "1.71.0-next.11+2554837d1",
-    "@theia/debug": "1.71.0-next.11+2554837d1",
-    "@theia/editor": "1.71.0-next.11+2554837d1",
-    "@theia/filesystem": "1.71.0-next.11+2554837d1",
-    "@theia/markers": "1.71.0-next.11+2554837d1",
-    "@theia/monaco": "1.71.0-next.11+2554837d1",
-    "@theia/navigator": "1.71.0-next.11+2554837d1",
-    "@theia/preferences": "1.71.0-next.11+2554837d1",
-    "@theia/scm": "1.71.0-next.11+2554837d1",
-    "@theia/search-in-workspace": "1.71.0-next.11+2554837d1",
-    "@theia/task": "1.71.0-next.11+2554837d1",
-    "@theia/terminal": "1.71.0-next.11+2554837d1",
-    "@theia/workspace": "1.71.0-next.11+2554837d1",
+    "@theia/ai-chat": "1.71.0-next.19+ccda46cbe",
+    "@theia/ai-chat-ui": "1.71.0-next.19+ccda46cbe",
+    "@theia/ai-core": "1.71.0-next.19+ccda46cbe",
+    "@theia/ai-mcp": "1.71.0-next.19+ccda46cbe",
+    "@theia/ai-terminal": "1.71.0-next.19+ccda46cbe",
+    "@theia/core": "1.71.0-next.19+ccda46cbe",
+    "@theia/debug": "1.71.0-next.19+ccda46cbe",
+    "@theia/editor": "1.71.0-next.19+ccda46cbe",
+    "@theia/filesystem": "1.71.0-next.19+ccda46cbe",
+    "@theia/markers": "1.71.0-next.19+ccda46cbe",
+    "@theia/monaco": "1.71.0-next.19+ccda46cbe",
+    "@theia/navigator": "1.71.0-next.19+ccda46cbe",
+    "@theia/preferences": "1.71.0-next.19+ccda46cbe",
+    "@theia/scm": "1.71.0-next.19+ccda46cbe",
+    "@theia/search-in-workspace": "1.71.0-next.19+ccda46cbe",
+    "@theia/task": "1.71.0-next.19+ccda46cbe",
+    "@theia/terminal": "1.71.0-next.19+ccda46cbe",
+    "@theia/workspace": "1.71.0-next.19+ccda46cbe",
     "date-fns": "^4.1.0",
     "ignore": "^6.0.0",
     "js-yaml": "^4.1.0",
@@ -44,8 +44,8 @@
     "access": "public"
   },
   "devDependencies": {
-    "@theia/cli": "1.71.0-next.11+2554837d1",
-    "@theia/test": "1.71.0-next.11+2554837d1"
+    "@theia/cli": "1.71.0-next.19+ccda46cbe",
+    "@theia/test": "1.71.0-next.19+ccda46cbe"
   },
   "theiaExtensions": [
     {
@@ -69,5 +69,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "2554837d1cd32aad585887f2ab43bda2a4a8f091"
+  "gitHead": "ccda46cbecbb8184f5b7bd56102472beaf8c2408"
 }

package/src/browser/workspace-task-provider.spec.ts

@@ -74,7 +74,8 @@ describe('Workspace Task Provider Cancellation Tests', () => {
             terminateTask: async (activeTaskInfo: TaskInfo) => {
                 // Track termination
             },
-            getTerminateSignal: async () => 'SIGTERM'
+            getTerminateSignal: async () => 'SIGTERM',
+            isTaskRunning: () => false
         } as unknown as TaskService;
 
         mockTerminalService = {
@@ -98,6 +99,123 @@ describe('Workspace Task Provider Cancellation Tests', () => {
         cancellationTokenSource.dispose();
     });
 
+    describe('Task cancellation with completed tasks', () => {
+        it('should NOT terminate task if task has already completed (not in runningTasks)', async () => {
+            let terminateTaskCalled = false;
+            mockTaskService.terminateTask = async () => {
+                terminateTaskCalled = true;
+            };
+            // Simulate task already completed (isTaskRunning returns false)
+            mockTaskService.isTaskRunning = () => false;
+
+            // Mock getTerminateSignal to never resolve (simulates in-flight handler)
+            mockTaskService.getTerminateSignal = () => new Promise(() => { });
+
+            const taskRunnerProvider = container.get(TaskRunnerProvider);
+            const handler = taskRunnerProvider.getTool().handler;
+
+            // Start task execution (will hang on getTerminateSignal)
+            handler(JSON.stringify({ taskName: 'build' }), mockCtx);
+
+            // Give time for the handler to register the cancellation listener
+            await new Promise(resolve => setTimeout(resolve, 10));
+
+            // Cancel while handler is "in-flight"
+            cancellationTokenSource.cancel();
+
+            // Give time for cancellation to process
+            await new Promise(resolve => setTimeout(resolve, 10));
+
+            // terminateTask should NOT have been called since isTaskRunning returns false
+            expect(terminateTaskCalled).to.be.false;
+        });
+
+        it('should terminate task if task is still running', async () => {
+            let terminateTaskCalled = false;
+            mockTaskService.terminateTask = async () => {
+                terminateTaskCalled = true;
+            };
+
+            // Mock isTaskRunning to return true (task still running)
+            mockTaskService.isTaskRunning = () => true;
+
+            // Mock getTerminateSignal to never resolve (simulates in-flight task)
+            mockTaskService.getTerminateSignal = () => new Promise(() => { });
+
+            const taskRunnerProvider = container.get(TaskRunnerProvider);
+            const handler = taskRunnerProvider.getTool().handler;
+
+            // Start task execution (will hang on getTerminateSignal)
+            handler(JSON.stringify({ taskName: 'build' }), mockCtx);
+
+            // Give time for the handler to register the cancellation listener
+            await new Promise(resolve => setTimeout(resolve, 10));
+
+            // Cancel while task is "in-flight"
+            cancellationTokenSource.cancel();
+
+            // Give time for cancellation to process
+            await new Promise(resolve => setTimeout(resolve, 10));
+
+            // terminateTask SHOULD have been called since isTaskRunning returns true
+            expect(terminateTaskCalled).to.be.true;
+        });
+
+        it('should handle multiple tasks with shared cancellation token - only terminate running tasks', async () => {
+            const terminatedTasks: number[] = [];
+            mockTaskService.terminateTask = async (taskInfo: TaskInfo) => {
+                terminatedTasks.push(taskInfo.taskId);
+            };
+
+            // Mock isTaskRunning to simulate: task 0 completed, tasks 1 & 2 still running
+            mockTaskService.isTaskRunning = (taskId: number) => taskId !== 0;
+
+            // Mock getTerminateSignal to never resolve (simulates in-flight handlers)
+            mockTaskService.getTerminateSignal = () => new Promise(() => { });
+
+            // Mock runTaskByLabel to return different task IDs
+            let taskIdCounter = 0;
+            mockTaskService.runTaskByLabel = async (token: number, taskLabel: string) => ({
+                taskId: taskIdCounter++,
+                terminalId: taskIdCounter - 1,
+                config: {
+                    label: taskLabel,
+                    _scope: 'workspace',
+                    type: 'shell'
+                }
+            } as TaskInfo);
+
+            const taskRunnerProvider = container.get(TaskRunnerProvider);
+            const handler = taskRunnerProvider.getTool().handler;
+
+            // Use ONE shared CancellationTokenSource (simulates real scenario)
+            const sharedCts = new CancellationTokenSource();
+            const sharedCtx: ToolInvocationContext = { cancellationToken: sharedCts.token };
+
+            // Call handler three times with the same shared cancellation token
+            handler(JSON.stringify({ taskName: 'build' }), sharedCtx);
+            handler(JSON.stringify({ taskName: 'test' }), sharedCtx);
+            handler(JSON.stringify({ taskName: 'lint' }), sharedCtx);
+
+            // Give time for handlers to register cancellation listeners
+            await new Promise(resolve => setTimeout(resolve, 10));
+
+            // Cancel the shared token once - this fires all registered listeners
+            sharedCts.cancel();
+
+            // Give time for cancellation listeners to fire
+            await new Promise(resolve => setTimeout(resolve, 10));
+
+            // Only task 1 and 2 should have been terminated (task 0 was completed)
+            expect(terminatedTasks).to.have.lengthOf(2);
+            expect(terminatedTasks).to.include(1);
+            expect(terminatedTasks).to.include(2);
+            expect(terminatedTasks).to.not.include(0);
+
+            sharedCts.dispose();
+        });
+    });
+
     it('TaskListProvider should respect cancellation token', async () => {
         const taskListProvider = container.get(TaskListProvider);
         cancellationTokenSource.cancel();

package/src/browser/workspace-task-provider.ts

@@ -113,7 +113,10 @@ export class TaskRunnerProvider implements ToolProvider {
                 return `Did not find a task for the label: '${args.taskName}'`;
             }
             cancellationToken?.onCancellationRequested(() => {
-                this.taskService.terminateTask(taskInfo);
+                // Only terminate if the task is still running
+                if (this.taskService.isTaskRunning(taskInfo.taskId)) {
+                    this.taskService.terminateTask(taskInfo);
+                }
             });
             if (cancellationToken?.isCancellationRequested) {
                 return JSON.stringify({ error: 'Operation cancelled by user' });