More tweaks

Properly handle cancelling, detect double clicks better

Author: atupem

packages/bytebot-agent/src/agent/agent.processor.ts

@@ -98,6 +98,13 @@ export class AgentProcessor {
     }
   }
 
+  @OnEvent('task.cancel')
+  async handleTaskCancel({ taskId }: { taskId: string }) {
+    this.logger.log(`Task cancel event received for task ID: ${taskId}`);
+
+    await this.stopProcessing();
+  }
+
   processTask(taskId: string) {
     this.logger.log(`Starting processing for task ID: ${taskId}`);
 
@@ -379,12 +386,6 @@ export class AgentProcessor {
     // Signal any in-flight async operations to abort
     this.abortController?.abort();
 
-    if (this.currentTaskId) {
-      await this.tasksService.update(this.currentTaskId, {
-        status: TaskStatus.CANCELLED,
-      });
-    }
-
     this.isProcessing = false;
     this.currentTaskId = null;
   }

packages/bytebot-agent/src/google/google.service.ts

@@ -6,7 +6,6 @@ import {
   TextContentBlock,
   ToolUseContentBlock,
 } from '@bytebot/shared';
-import { AGENT_SYSTEM_PROMPT } from '../agent/agent.constants';
 import {
   BytebotAgentService,
   BytebotAgentInterrupt,

packages/bytebot-agent/src/tasks/tasks.service.ts

@@ -339,20 +339,10 @@ export class TasksService {
       where: { id: taskId },
       data: {
         status: TaskStatus.CANCELLED,
-        control: Role.USER,
       },
     });
 
-    try {
-      await fetch(
-        `${this.configService.get<string>('BYTEBOT_DESKTOP_BASE_URL')}/input-tracking/stop`,
-        { method: 'POST' },
-      );
-    } catch (error) {
-      this.logger.error('Failed to stop input tracking', error as any);
-    }
-
-    // Broadcast cancel event so AgentProcessor can react
+    // Broadcast cancel event so AgentProcessor can cancel processing
     this.eventEmitter.emit('task.cancel', { taskId });
 
     this.logger.log(`Task ${taskId} cancelled and marked as failed`);

packages/bytebotd/src/input-tracking/input-tracking.service.ts

@@ -130,19 +130,14 @@ export class InputTrackingService implements OnModuleDestroy {
       if (this.clickMouseActionTimeout) {
         clearTimeout(this.clickMouseActionTimeout);
       }
+
       this.clickMouseActionTimeout = setTimeout(async () => {
-        if (this.clickMouseActionBuffer.length === 1) {
-          await this.logAction(this.clickMouseActionBuffer[0]);
-        }
+        // pick the event with the largest clickCount in the burst
+        const final = this.clickMouseActionBuffer.reduce((a, b) =>
+          b.clickCount > a.clickCount ? b : a,
+        );
+        await this.logAction(final); // emit exactly once
 
-        if (this.clickMouseActionBuffer.length > 1) {
-          this.clickMouseActionBuffer.forEach(async (action) => {
-            // Skip single click actions
-            if (action.clickCount > 1) {
-              await this.logAction(action);
-            }
-          });
-        }
         this.clickMouseActionTimeout = null;
         this.clickMouseActionBuffer = [];
       }, this.CLICK_DEBOUNCE_MS);