Address code review feedback: enable re-delegation and reduce code duplication

Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>

Author: Copilot

packages/plugins/workflow/src/api.ts

@@ -12,17 +12,20 @@ import type {
     WorkflowQueryOptions,
 } from './types';
 import { WorkflowEngine } from './engine';
+import { ApprovalService } from './approval';
 
 /**
  * Workflow API class
  */
 export class WorkflowAPI {
     private engine: WorkflowEngine;
     private storage: WorkflowStorage;
+    private approvalService: ApprovalService;
 
     constructor(storage: WorkflowStorage, engine?: WorkflowEngine) {
         this.storage = storage;
         this.engine = engine || new WorkflowEngine();
+        this.approvalService = new ApprovalService(storage);
     }
 
     /**
@@ -261,29 +264,12 @@ export class WorkflowAPI {
         delegatedBy: string,
         reason?: string
     ): Promise<WorkflowTask> {
-        const task = await this.storage.getTask(taskId);
-        if (!task) {
-            throw new Error(`Task not found: ${taskId}`);
-        }
-
-        if (task.status !== 'pending') {
-            throw new Error(`Cannot delegate task in status: ${task.status}`);
-        }
-
-        // Store original assignee if not already delegated
-        const originalAssignee = task.originalAssignee || task.assignedTo;
-
-        await this.storage.updateTask(taskId, {
-            status: 'delegated',
-            originalAssignee,
-            delegatedTo: delegateTo,
-            delegatedAt: new Date(),
-            delegationReason: reason,
-            assignedTo: delegateTo,
+        return this.approvalService.delegateTask({
+            taskId,
+            delegateTo,
+            delegatedBy,
+            reason,
         });
-
-        const updatedTask = await this.storage.getTask(taskId);
-        return updatedTask!;
     }
 
     /**
@@ -295,25 +281,12 @@ export class WorkflowAPI {
         reason?: string,
         escalatedBy?: string
     ): Promise<WorkflowTask> {
-        const task = await this.storage.getTask(taskId);
-        if (!task) {
-            throw new Error(`Task not found: ${taskId}`);
-        }
-
-        if (task.status === 'completed' || task.status === 'rejected') {
-            throw new Error(`Cannot escalate task in status: ${task.status}`);
-        }
-
-        await this.storage.updateTask(taskId, {
-            status: 'escalated',
-            escalatedTo: escalateTo,
-            escalatedAt: new Date(),
-            escalationReason: reason,
-            assignedTo: escalateTo,
+        return this.approvalService.escalateTask({
+            taskId,
+            escalateTo,
+            reason,
+            escalatedBy,
         });
-
-        const updatedTask = await this.storage.getTask(taskId);
-        return updatedTask!;
     }
 
     /**

packages/plugins/workflow/src/approval.ts

@@ -29,7 +29,8 @@ export class ApprovalService {
             throw new Error(`Task not found: ${taskId}`);
         }
 
-        if (task.status !== 'pending') {
+        // Allow delegation of pending or already delegated tasks (for re-delegation)
+        if (task.status !== 'pending' && task.status !== 'delegated') {
             throw new Error(`Cannot delegate task in status: ${task.status}`);
         }
 

packages/plugins/workflow/test/api.test.ts

@@ -466,10 +466,7 @@ describe('WorkflowAPI', () => {
                 'First delegation'
             );
 
-            // Update to pending to allow second delegation
-            await storage.updateTask(task.id, { status: 'pending' });
-
-            // Second delegation
+            // Second delegation (should work on delegated task)
             const delegated = await api.delegateTask(
                 task.id,
                 'assistant2@example.com',
@@ -487,7 +484,7 @@ describe('WorkflowAPI', () => {
             ).rejects.toThrow('Task not found');
         });
 
-        it('should throw error when delegating non-pending task', async () => {
+        it('should throw error when delegating completed task', async () => {
             const task = await api.createTask({
                 instanceId,
                 name: 'Approval Task',

packages/plugins/workflow/test/approval.test.ts

@@ -65,10 +65,7 @@ describe('ApprovalService', () => {
                 reason: 'First delegation',
             });
 
-            // Update status back to pending for second delegation
-            await storage.updateTask('task_1', { status: 'pending' });
-
-            // Second delegation
+            // Second delegation (should work on delegated task)
             const delegated = await approvalService.delegateTask({
                 taskId: 'task_1',
                 delegateTo: 'user3@example.com',
@@ -91,7 +88,7 @@ describe('ApprovalService', () => {
             ).rejects.toThrow('Task not found');
         });
 
-        it('should throw error when delegating non-pending task', async () => {
+        it('should throw error when delegating completed task', async () => {
             const task: WorkflowTask = {
                 id: 'task_1',
                 instanceId: 'wf_1',