Merge PR darrenhinde#296: fix(plugin): register skills/commands and harden plugin-abilities

Author: MomePP

packages/plugin-abilities/bun.lock

@@ -3,14 +3,17 @@ import { executeAbility } from './index.js'
 
 /**
  * Minimal ExecutionManager
- * 
+ *
  * Simplified to track SINGLE execution at a time.
  * No session management, no cleanup timers, no multi-execution.
- * 
+ *
  * This is the bare minimum to test the core concept.
  */
 export class ExecutionManager {
   private activeExecution: AbilityExecution | null = null
+  private executionHistory: AbilityExecution[] = []
+  private maxHistory = 50
+  private abortController: AbortController | null = null
 
   async execute(
     ability: Ability,
@@ -23,10 +26,33 @@ export class ExecutionManager {
     }
 
     console.log(`[abilities] Starting execution: ${ability.name}`)
-    
-    const execution = await executeAbility(ability, inputs, ctx)
+
+    this.abortController = new AbortController()
+
+    // Set activeExecution BEFORE awaiting so getActive() returns a live
+    // reference during execution (needed for chat-context injection and
+    // concurrent-execution guards).
+    this.activeExecution = {
+      id: `exec_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
+      ability,
+      inputs,
+      status: 'running',
+      currentStep: null,
+      currentStepIndex: -1,
+      completedSteps: [],
+      pendingSteps: [...ability.steps],
+      startedAt: Date.now(),
+    }
+
+    const execution = await executeAbility(ability, inputs, ctx, this.abortController.signal)
     this.activeExecution = execution
 
+    // Track in history
+    this.executionHistory.push(execution)
+    if (this.executionHistory.length > this.maxHistory) {
+      this.executionHistory = this.executionHistory.slice(-this.maxHistory)
+    }
+
     // Clear active if completed/failed
     if (execution.status !== 'running') {
       this.activeExecution = null
@@ -35,14 +61,24 @@ export class ExecutionManager {
     return execution
   }
 
+  get(id: string): AbilityExecution | undefined {
+    return this.executionHistory.find((e) => e.id === id)
+  }
+
+  list(): AbilityExecution[] {
+    return [...this.executionHistory]
+  }
+
   getActive(): AbilityExecution | null {
     return this.activeExecution
   }
 
   cancel(): boolean {
     if (!this.activeExecution) return false
-    
+
     if (this.activeExecution.status === 'running') {
+      this.abortController?.abort()
+      this.abortController = null
       this.activeExecution.status = 'failed'
       this.activeExecution.error = 'Cancelled by user'
       this.activeExecution.completedAt = Date.now()
@@ -53,7 +89,24 @@ export class ExecutionManager {
     return false
   }
 
+  cancelActive(): boolean {
+    return this.cancel()
+  }
+
+  onSessionDeleted(sessionId: string): void {
+    if (this.activeExecution && this.activeExecution.status === 'running') {
+      this.abortController?.abort()
+      this.abortController = null
+      this.activeExecution.status = 'failed'
+      this.activeExecution.error = `Session ${sessionId} deleted`
+      this.activeExecution.completedAt = Date.now()
+      this.activeExecution = null
+    }
+  }
+
   cleanup(): void {
+    this.abortController?.abort()
+    this.abortController = null
     this.activeExecution = null
   }
 }