crewly 1.1.2 → 1.2.0

package/dist/backend/backend/src/controllers/oauth/oauth.routes.js

@@ -1,127 +1,143 @@
 import { Router } from 'express';
+import crypto from 'crypto';
+import { GOOGLE_OAUTH_CONSTANTS } from '../../constants.js';
 import { UserIdentityService } from '../../services/user/user-identity.service.js';
-const router = Router();
-const users = UserIdentityService.getInstance();
-const GOOGLE_AUTH_BASE = 'https://accounts.google.com/o/oauth2/v2/auth';
-const GOOGLE_TOKEN_ENDPOINT = 'https://oauth2.googleapis.com/token';
-const GOOGLE_USERINFO_ENDPOINT = 'https://www.googleapis.com/oauth2/v2/userinfo';
+import { LoggerService } from '../../services/core/logger.service.js';
+/**
+ * Build Google OAuth client config from environment variables.
+ *
+ * @param req - Express request (used to derive the default redirect URI)
+ * @returns Object with clientId, clientSecret, and redirectUri
+ */
 function getGoogleConfig(req) {
     const clientId = process.env.GOOGLE_OAUTH_CLIENT_ID || '';
     const clientSecret = process.env.GOOGLE_OAUTH_CLIENT_SECRET || '';
     const redirectUri = process.env.GOOGLE_OAUTH_REDIRECT_URI || `${req.protocol}://${req.get('host')}/api/oauth/google/callback`;
     return { clientId, clientSecret, redirectUri };
 }
-router.get('/google/start', async (req, res, next) => {
-    try {
-        const { clientId, redirectUri } = getGoogleConfig(req);
-        if (!clientId) {
-            res.status(500).json({ success: false, error: 'GOOGLE_OAUTH_CLIENT_ID is not configured' });
-            return;
-        }
-        const slackUserId = req.query.slackUserId ? String(req.query.slackUserId) : undefined;
-        const statePayload = {
-            slackUserId,
-            t: Date.now(),
-            nonce: Math.random().toString(36).slice(2),
-        };
-        const state = Buffer.from(JSON.stringify(statePayload)).toString('base64url');
-        const scopes = [
-            'openid',
-            'email',
-            'https://www.googleapis.com/auth/gmail.readonly',
-            'https://www.googleapis.com/auth/gmail.send',
-        ];
-        const url = new URL(GOOGLE_AUTH_BASE);
-        url.searchParams.set('client_id', clientId);
-        url.searchParams.set('redirect_uri', redirectUri);
-        url.searchParams.set('response_type', 'code');
-        url.searchParams.set('access_type', 'offline');
-        url.searchParams.set('prompt', 'consent');
-        url.searchParams.set('scope', scopes.join(' '));
-        url.searchParams.set('state', state);
-        res.json({ success: true, data: { authUrl: url.toString(), state } });
-    }
-    catch (error) {
-        next(error);
-    }
-});
-router.get('/google/callback', async (req, res, next) => {
-    try {
-        const code = req.query.code ? String(req.query.code) : '';
-        const state = req.query.state ? String(req.query.state) : '';
-        if (!code) {
-            res.status(400).json({ success: false, error: 'Missing code' });
-            return;
-        }
-        const { clientId, clientSecret, redirectUri } = getGoogleConfig(req);
-        if (!clientId || !clientSecret) {
-            res.status(500).json({ success: false, error: 'Google OAuth credentials are not configured' });
-            return;
-        }
-        const tokenResp = await fetch(GOOGLE_TOKEN_ENDPOINT, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-            body: new URLSearchParams({
-                code,
-                client_id: clientId,
-                client_secret: clientSecret,
-                redirect_uri: redirectUri,
-                grant_type: 'authorization_code',
-            }),
-        });
-        if (!tokenResp.ok) {
-            const details = await tokenResp.text();
-            res.status(400).json({ success: false, error: `Failed to exchange OAuth code: ${details}` });
-            return;
-        }
-        const tokenData = await tokenResp.json();
-        const profileResp = await fetch(GOOGLE_USERINFO_ENDPOINT, {
-            headers: { Authorization: `Bearer ${tokenData.access_token}` },
-        });
-        if (!profileResp.ok) {
-            const details = await profileResp.text();
-            res.status(400).json({ success: false, error: `Failed to load Google profile: ${details}` });
-            return;
+/**
+ * Create the OAuth API router.
+ *
+ * Provides Google OAuth start and callback endpoints for connecting
+ * user accounts to Google services.
+ *
+ * @returns Express Router with OAuth routes
+ */
+export function createOAuthRouter() {
+    const router = Router();
+    const users = UserIdentityService.getInstance();
+    const logger = LoggerService.getInstance().createComponentLogger('OAuthRoutes');
+    router.get('/google/start', async (req, res, next) => {
+        try {
+            const { clientId, redirectUri } = getGoogleConfig(req);
+            if (!clientId) {
+                res.status(500).json({ success: false, error: 'GOOGLE_OAUTH_CLIENT_ID is not configured' });
+                return;
+            }
+            const slackUserId = req.query.slackUserId ? String(req.query.slackUserId) : undefined;
+            const statePayload = {
+                slackUserId,
+                t: Date.now(),
+                nonce: crypto.randomUUID(),
+            };
+            const state = Buffer.from(JSON.stringify(statePayload)).toString('base64url');
+            const url = new URL(GOOGLE_OAUTH_CONSTANTS.AUTH_BASE_URL);
+            url.searchParams.set('client_id', clientId);
+            url.searchParams.set('redirect_uri', redirectUri);
+            url.searchParams.set('response_type', 'code');
+            url.searchParams.set('access_type', 'offline');
+            url.searchParams.set('prompt', 'consent');
+            url.searchParams.set('scope', GOOGLE_OAUTH_CONSTANTS.DEFAULT_SCOPES.join(' '));
+            url.searchParams.set('state', state);
+            res.json({ success: true, data: { authUrl: url.toString(), state } });
         }
-        const profile = await profileResp.json();
-        if (!profile.email) {
-            res.status(400).json({ success: false, error: 'Google profile did not include email' });
-            return;
+        catch (error) {
+            next(error);
         }
-        let statePayload = {};
-        if (state) {
-            try {
-                statePayload = JSON.parse(Buffer.from(state, 'base64url').toString('utf8'));
+    });
+    router.get('/google/callback', async (req, res, next) => {
+        try {
+            const code = req.query.code ? String(req.query.code) : '';
+            const state = req.query.state ? String(req.query.state) : '';
+            if (!code) {
+                res.status(400).json({ success: false, error: 'Missing code' });
+                return;
+            }
+            const { clientId, clientSecret, redirectUri } = getGoogleConfig(req);
+            if (!clientId || !clientSecret) {
+                res.status(500).json({ success: false, error: 'Google OAuth credentials are not configured' });
+                return;
             }
-            catch {
-                // best effort only
+            const tokenResp = await fetch(GOOGLE_OAUTH_CONSTANTS.TOKEN_ENDPOINT, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                body: new URLSearchParams({
+                    code,
+                    client_id: clientId,
+                    client_secret: clientSecret,
+                    redirect_uri: redirectUri,
+                    grant_type: 'authorization_code',
+                }),
+            });
+            if (!tokenResp.ok) {
+                const details = await tokenResp.text();
+                res.status(400).json({ success: false, error: `Failed to exchange OAuth code: ${details}` });
+                return;
             }
+            const tokenData = await tokenResp.json();
+            const profileResp = await fetch(GOOGLE_OAUTH_CONSTANTS.USERINFO_ENDPOINT, {
+                headers: { Authorization: `Bearer ${tokenData.access_token}` },
+            });
+            if (!profileResp.ok) {
+                const details = await profileResp.text();
+                res.status(400).json({ success: false, error: `Failed to load Google profile: ${details}` });
+                return;
+            }
+            const profile = await profileResp.json();
+            if (!profile.email) {
+                res.status(400).json({ success: false, error: 'Google profile did not include email' });
+                return;
+            }
+            let statePayload = {};
+            if (state) {
+                try {
+                    statePayload = JSON.parse(Buffer.from(state, 'base64url').toString('utf8'));
+                }
+                catch (err) {
+                    logger.warn('Failed to parse OAuth state parameter', {
+                        error: err instanceof Error ? err.message : String(err),
+                    });
+                }
+            }
+            const user = await users.createOrUpdateUser({
+                email: profile.email,
+                slackUserId: statePayload.slackUserId,
+            });
+            if (!tokenData.refresh_token) {
+                logger.warn('Google OAuth did not return a refresh_token — using access_token as fallback', {
+                    email: profile.email,
+                });
+            }
+            await users.connectService(user.id, 'google', {
+                refreshToken: tokenData.refresh_token || tokenData.access_token,
+                accessToken: tokenData.access_token,
+                scopes: (tokenData.scope || '').split(' ').filter(Boolean),
+            });
+            res.json({
+                success: true,
+                data: {
+                    userId: user.id,
+                    email: user.email,
+                    connectedProvider: 'google',
+                    slackUserId: user.slackUserId,
+                },
+                message: 'Google OAuth connected successfully',
+            });
         }
-        const user = await users.createOrUpdateUser({
-            email: profile.email,
-            slackUserId: statePayload.slackUserId,
-        });
-        await users.connectService(user.id, 'google', {
-            refreshToken: tokenData.refresh_token || tokenData.access_token,
-            accessToken: tokenData.access_token,
-            scopes: (tokenData.scope || '').split(' ').filter(Boolean),
-        });
-        res.json({
-            success: true,
-            data: {
-                userId: user.id,
-                email: user.email,
-                connectedProvider: 'google',
-                slackUserId: user.slackUserId,
-            },
-            message: 'Google OAuth connected successfully',
-        });
-    }
-    catch (error) {
-        next(error);
-    }
-});
-export function createOAuthRouter() {
+        catch (error) {
+            next(error);
+        }
+    });
     return router;
 }
 //# sourceMappingURL=oauth.routes.js.map

package/dist/backend/backend/src/controllers/oauth/oauth.routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.routes.js","sourceRoot":"","sources":["../../../../../../backend/src/controllers/oauth/oauth.routes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth.routes.js","sourceRoot":"","sources":["../../../../../../backend/src/controllers/oauth/oauth.routes.ts"],"names":[],"mappings":"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"}

package/dist/backend/backend/src/controllers/task-management/task-management.controller.d.ts

@@ -1,6 +1,20 @@
 import { Request, Response } from 'express';
 import type { ApiController } from '../api.controller.js';
 import type { ApiContext } from '../types.js';
+import type { EventBusService } from '../../services/event-bus/event-bus.service.js';
+/**
+ * Set the EventBusService instance for task monitoring cleanup.
+ * Called during server initialization.
+ *
+ * @param service - The EventBusService instance
+ */
+export declare function setEventBusServiceForTaskCleanup(service: EventBusService): void;
+/**
+ * Get the current EventBusService reference (exposed for testing).
+ *
+ * @returns The EventBusService or null
+ */
+export declare function getEventBusServiceForTaskCleanup(): EventBusService | null;
 /**
  * Creates a new task MD file in the project's .crewly/tasks/ directory.
  * Optionally assigns it immediately if a sessionName is provided.
@@ -99,4 +113,24 @@ export declare function getTaskOutput(this: ApiController, req: Request, res: Re
  * @param res - Response with { success, data: { message: string } }
  */
 export declare function requestReview(this: ApiController, req: Request, res: Response): Promise<void>;
+/**
+ * Adds monitoring IDs (schedule and subscription IDs) to tasks for a given agent session.
+ * Called by delegate-task after setting up auto-monitoring to link monitoring resources
+ * to the task for auto-cleanup on completion.
+ *
+ * @param req - Request containing sessionName, scheduleIds, subscriptionIds
+ * @param res - Response with success status
+ */
+export declare function addMonitoring(this: ApiController, req: Request, res: Response): Promise<void>;
+/**
+ * Completes all tasks assigned to a given agent session.
+ *
+ * Called by the report-status skill when an agent reports status=done.
+ * Finds all in-progress/assigned tasks for the session, marks them as
+ * completed in task tracking, and cleans up monitoring resources.
+ *
+ * @param req - Request containing sessionName
+ * @param res - Response with list of completed tasks
+ */
+export declare function completeTasksBySession(this: ApiController, req: Request, res: Response): Promise<void>;
 //# sourceMappingURL=task-management.controller.d.ts.map

package/dist/backend/backend/src/controllers/task-management/task-management.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-management.controller.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/controllers/task-management/task-management.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAa9C;;;;;;GAMG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAsGhG;AAED;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA0HhG;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CACjC,IAAI,EAAE,aAAa,EACnB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACX,OAAO,CAAC,IAAI,CAAC,CAuNf;AAED;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA+D/F;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA4DjG;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CACjC,IAAI,EAAE,aAAa,EACnB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACX,OAAO,CAAC,IAAI,CAAC,CA0Df;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CACnC,IAAI,EAAE,aAAa,EACnB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACX,OAAO,CAAC,IAAI,CAAC,CA+Df;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACpC,IAAI,EAAE,aAAa,EACnB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACX,OAAO,CAAC,IAAI,CAAC,CA4Ff;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACvC,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACX,OAAO,CAAC,IAAI,CAAC,CA+Gf;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA6B3G;AAED,wBAAsB,qBAAqB,CAC1C,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACX,OAAO,CAAC,IAAI,CAAC,CAkIf;AA6ID;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA8C9F;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAkCnG;AAED;;;;;;;;;GASG;AACH,wBAAsB,aAAa,CAClC,IAAI,EAAE,aAAa,EACnB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACX,OAAO,CAAC,IAAI,CAAC,CAoCf"}
+{"version":3,"file":"task-management.controller.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/controllers/task-management/task-management.controller.ts"],"names":[],"mappings":"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"}

package/dist/backend/backend/src/controllers/task-management/task-management.controller.js

@@ -8,6 +8,25 @@ import { LoggerService } from '../../services/core/logger.service.js';
 import { TaskOutputValidatorService } from '../../services/quality/task-output-validator.service.js';
 import { TASK_OUTPUT_CONSTANTS } from '../../types/task-output.types.js';
 const logger = LoggerService.getInstance().createComponentLogger('TaskManagementController');
+/** Module-level reference to EventBusService for auto-cleanup on task completion */
+let eventBusService = null;
+/**
+ * Set the EventBusService instance for task monitoring cleanup.
+ * Called during server initialization.
+ *
+ * @param service - The EventBusService instance
+ */
+export function setEventBusServiceForTaskCleanup(service) {
+    eventBusService = service;
+}
+/**
+ * Get the current EventBusService reference (exposed for testing).
+ *
+ * @returns The EventBusService or null
+ */
+export function getEventBusServiceForTaskCleanup() {
+    return eventBusService;
+}
 /**
  * Creates a new task MD file in the project's .crewly/tasks/ directory.
  * Optionally assigns it immediately if a sessionName is provided.
@@ -351,10 +370,12 @@ export async function completeTask(req, res) {
             const updatedContent = addTaskCompletionInfo(taskContent);
             await writeFile(doneTargetPath, updatedContent, 'utf-8');
             await unlinkFile(taskPath);
-            // Remove from task tracking
+            // Remove from task tracking and clean up monitoring
             const allTasksWithSchema = await this.taskTrackingService.getAllInProgressTasks();
             const taskToRemoveWithSchema = allTasksWithSchema.find(t => t.taskFilePath === taskPath);
+            let cleanupResultSchema = { cancelledSchedules: 0, unsubscribedEvents: 0 };
             if (taskToRemoveWithSchema) {
+                cleanupResultSchema = await cleanupTaskMonitoring(this, taskToRemoveWithSchema);
                 await this.taskTrackingService.removeTask(taskToRemoveWithSchema.id);
             }
             res.json({
@@ -365,6 +386,7 @@ export async function completeTask(req, res) {
                 outputPath: outputFilePath,
                 status: 'done',
                 completedAt: new Date().toISOString(),
+                monitoringCleanup: cleanupResultSchema,
             });
             return;
         }
@@ -378,10 +400,12 @@ export async function completeTask(req, res) {
         const updatedContent = addTaskCompletionInfo(taskContent);
         await writeFile(targetPath, updatedContent, 'utf-8');
         await unlinkFile(taskPath);
-        // Remove from task tracking (find task by file path and remove it)
+        // Remove from task tracking and clean up monitoring
         const allTasks = await this.taskTrackingService.getAllInProgressTasks();
         const taskToRemove = allTasks.find(t => t.taskFilePath === taskPath);
+        let cleanupResult = { cancelledSchedules: 0, unsubscribedEvents: 0 };
         if (taskToRemove) {
+            cleanupResult = await cleanupTaskMonitoring(this, taskToRemove);
             await this.taskTrackingService.removeTask(taskToRemove.id);
         }
         res.json({
@@ -391,6 +415,7 @@ export async function completeTask(req, res) {
             newPath: targetPath,
             status: 'done',
             completedAt: new Date().toISOString(),
+            monitoringCleanup: cleanupResult,
         });
     }
     catch (error) {
@@ -1203,4 +1228,196 @@ export async function requestReview(req, res) {
         });
     }
 }
+/**
+ * Cleans up monitoring resources (scheduled checks and event subscriptions)
+ * linked to a task. Called automatically when a task is completed.
+ *
+ * @param controller - The ApiController instance (for schedulerService access)
+ * @param task - The task whose monitoring to clean up
+ * @returns Object with counts of cancelled schedules and unsubscribed events
+ */
+async function cleanupTaskMonitoring(controller, task) {
+    let cancelledSchedules = 0;
+    let unsubscribedEvents = 0;
+    // Cancel linked schedules
+    if (task.scheduleIds && task.scheduleIds.length > 0) {
+        for (const scheduleId of task.scheduleIds) {
+            try {
+                controller.schedulerService.cancelCheck(scheduleId);
+                cancelledSchedules++;
+            }
+            catch (error) {
+                logger.warn('Failed to cancel schedule during task cleanup', {
+                    scheduleId,
+                    error: error instanceof Error ? error.message : String(error),
+                });
+            }
+        }
+    }
+    // Unsubscribe linked event subscriptions
+    if (task.subscriptionIds && task.subscriptionIds.length > 0 && eventBusService) {
+        for (const subscriptionId of task.subscriptionIds) {
+            try {
+                eventBusService.unsubscribe(subscriptionId);
+                unsubscribedEvents++;
+            }
+            catch (error) {
+                logger.warn('Failed to unsubscribe event during task cleanup', {
+                    subscriptionId,
+                    error: error instanceof Error ? error.message : String(error),
+                });
+            }
+        }
+    }
+    if (cancelledSchedules > 0 || unsubscribedEvents > 0) {
+        logger.info('Task monitoring cleaned up', { cancelledSchedules, unsubscribedEvents });
+    }
+    return { cancelledSchedules, unsubscribedEvents };
+}
+/**
+ * Adds monitoring IDs (schedule and subscription IDs) to tasks for a given agent session.
+ * Called by delegate-task after setting up auto-monitoring to link monitoring resources
+ * to the task for auto-cleanup on completion.
+ *
+ * @param req - Request containing sessionName, scheduleIds, subscriptionIds
+ * @param res - Response with success status
+ */
+export async function addMonitoring(req, res) {
+    try {
+        const { sessionName, scheduleIds = [], subscriptionIds = [] } = req.body;
+        if (!sessionName) {
+            res.status(400).json({ success: false, error: 'sessionName is required' });
+            return;
+        }
+        if (scheduleIds.length === 0 && subscriptionIds.length === 0) {
+            res.status(400).json({ success: false, error: 'At least one scheduleId or subscriptionId is required' });
+            return;
+        }
+        // Find the most recent task assigned to this session
+        const tasks = await this.taskTrackingService.getTasksBySessionName(sessionName);
+        if (tasks.length === 0) {
+            // No tracked task found — store IDs anyway by finding any in_progress_tasks entry
+            logger.warn('No tracked tasks found for session, storing monitoring IDs for session-level cleanup', { sessionName });
+            res.json({
+                success: true,
+                message: 'No tracked task found for session; monitoring IDs noted but not linked to a task',
+                sessionName,
+                scheduleIds,
+                subscriptionIds,
+            });
+            return;
+        }
+        // Link to the most recently assigned task
+        const latestTask = tasks.sort((a, b) => new Date(b.assignedAt).getTime() - new Date(a.assignedAt).getTime())[0];
+        await this.taskTrackingService.addMonitoringIds(latestTask.id, scheduleIds, subscriptionIds);
+        res.json({
+            success: true,
+            message: 'Monitoring IDs linked to task',
+            taskId: latestTask.id,
+            taskName: latestTask.taskName,
+            scheduleIds,
+            subscriptionIds,
+        });
+    }
+    catch (error) {
+        logger.error('Error adding monitoring IDs', { error: error instanceof Error ? error.message : String(error) });
+        res.status(500).json({ success: false, error: 'Failed to add monitoring IDs' });
+    }
+}
+/**
+ * Completes all tasks assigned to a given agent session.
+ *
+ * Called by the report-status skill when an agent reports status=done.
+ * Finds all in-progress/assigned tasks for the session, marks them as
+ * completed in task tracking, and cleans up monitoring resources.
+ *
+ * @param req - Request containing sessionName
+ * @param res - Response with list of completed tasks
+ */
+export async function completeTasksBySession(req, res) {
+    try {
+        const { sessionName } = req.body;
+        if (!sessionName) {
+            res.status(400).json({ success: false, error: 'sessionName is required' });
+            return;
+        }
+        const tasks = await this.taskTrackingService.getTasksBySessionName(sessionName);
+        const activeTasks = tasks.filter(t => t.status === 'assigned' || t.status === 'active');
+        if (activeTasks.length === 0) {
+            res.json({
+                success: true,
+                message: 'No active tasks found for session',
+                sessionName,
+                completedCount: 0,
+                completedTasks: [],
+            });
+            return;
+        }
+        const completedTasks = [];
+        let totalCancelledSchedules = 0;
+        let totalUnsubscribedEvents = 0;
+        for (const task of activeTasks) {
+            try {
+                // Move task file from in_progress/ to done/ if it exists
+                if (task.taskFilePath && task.taskFilePath.includes('/in_progress/') && existsSync(task.taskFilePath)) {
+                    try {
+                        const targetPath = task.taskFilePath.replace('/in_progress/', '/done/');
+                        const targetDir = dirname(targetPath);
+                        await ensureDirectoryExists(targetDir);
+                        const taskContent = await readFile(task.taskFilePath, 'utf-8');
+                        const updatedContent = addTaskCompletionInfo(taskContent);
+                        await writeFile(targetPath, updatedContent, 'utf-8');
+                        await unlink(task.taskFilePath);
+                        logger.debug('Moved task file to done', {
+                            taskId: task.id,
+                            from: task.taskFilePath,
+                            to: targetPath,
+                        });
+                    }
+                    catch (fileError) {
+                        logger.warn('Failed to move task file to done (continuing with tracking cleanup)', {
+                            taskId: task.id,
+                            taskFilePath: task.taskFilePath,
+                            error: fileError instanceof Error ? fileError.message : String(fileError),
+                        });
+                    }
+                }
+                // Clean up monitoring resources
+                const cleanup = await cleanupTaskMonitoring(this, task);
+                totalCancelledSchedules += cleanup.cancelledSchedules;
+                totalUnsubscribedEvents += cleanup.unsubscribedEvents;
+                // Remove from tracking
+                await this.taskTrackingService.removeTask(task.id);
+                completedTasks.push(task.taskName);
+                logger.info('Auto-completed task for session', {
+                    taskId: task.id,
+                    taskName: task.taskName,
+                    sessionName,
+                });
+            }
+            catch (error) {
+                logger.warn('Failed to auto-complete task', {
+                    taskId: task.id,
+                    taskName: task.taskName,
+                    error: error instanceof Error ? error.message : String(error),
+                });
+            }
+        }
+        res.json({
+            success: true,
+            message: `Completed ${completedTasks.length} task(s) for session ${sessionName}`,
+            sessionName,
+            completedCount: completedTasks.length,
+            completedTasks,
+            monitoringCleanup: {
+                cancelledSchedules: totalCancelledSchedules,
+                unsubscribedEvents: totalUnsubscribedEvents,
+            },
+        });
+    }
+    catch (error) {
+        logger.error('Error completing tasks by session', { error: error instanceof Error ? error.message : String(error) });
+        res.status(500).json({ success: false, error: 'Failed to complete tasks by session' });
+    }
+}
 //# sourceMappingURL=task-management.controller.js.map