code · pull · Oct 14, 2025 · Oct 14, 2025
diff --git a/src/functions/confluence.ts b/src/functions/confluence.ts
@@ -1,9 +1,9 @@
 import { promises as fs } from 'node:fs';
 import { join } from 'node:path';
 import axios, { type AxiosInstance } from 'axios';
-import { getSecretEnvVar } from 'src/config/secretConfig';
 import { llms } from '#agent/agentContextLocalStorage';
 import { agentStorageDir } from '#app/appDirs';
+import { getSecretEnvVar } from '#config/secretConfig';
 import { func, funcClass } from '#functionSchema/functionDecorators';
 import { logger } from '#o11y/logger';
 import { functionConfig } from '#user/userContext';

diff --git a/src/functions/jira.ts b/src/functions/jira.ts
@@ -1,9 +1,9 @@
 import { promises as fs } from 'node:fs';
 import { join } from 'node:path';
 import axios, { type AxiosInstance } from 'axios';
-import { getSecretEnvVar } from 'src/config/secretConfig';
 import { llms } from '#agent/agentContextLocalStorage';
 import { agentStorageDir } from '#app/appDirs';
+import { getSecretEnvVar } from '#config/secretConfig';
 import { func, funcClass } from '#functionSchema/functionDecorators';
 import { getJiraIssueType } from '#functions/jiraIssueType';
 import { logger } from '#o11y/logger';

diff --git a/src/functions/scm/gitlabCodeReview.ts b/src/functions/scm/gitlabCodeReview.ts
@@ -80,7 +80,7 @@ export class GitLabCodeReview {
 	}
 
 	@span()
-	async reviewMergeRequest(gitlabProjectId: string | number, mergeRequestIId: number): Promise<void> {
+	async createMergeRequestReviewTasks(gitlabProjectId: string | number, mergeRequestIId: number): Promise<CodeReviewTask[]> {
 		const mergeRequest: ExpandedMergeRequestSchema = await this.api().MergeRequests.show(gitlabProjectId, mergeRequestIId);
 		const diffs: MergeRequestDiffSchema[] = await this.getDiffs(gitlabProjectId, mergeRequestIId);
 		const codeReviewService = appContext().codeReviewService;
@@ -91,7 +91,9 @@ export class GitLabCodeReview {
 		// Load the hashes of the diffs we've already reviewed
 		const reviewCache: CodeReviewFingerprintCache = await codeReviewService.getMergeRequestReviewCache(gitlabProjectId, mergeRequestIId);
 
-		logger.info(`Reviewing MR "${mergeRequest.title}" in project "${projectPath}" (${mergeRequest.web_url}) with ${codeReviewConfigs.length} configs`);
+		logger.info(
+			`Checking for review tasks for MR "${mergeRequest.title}" in project "${projectPath}" (${mergeRequest.web_url}) with ${codeReviewConfigs.length} configs`,
+		);
 
 		const codeReviewTasks: CodeReviewTask[] = [];
 
@@ -114,6 +116,19 @@ export class GitLabCodeReview {
 			}
 		}
 		logger.info(`Found ${codeReviewTasks.length} review tasks needing LLM analysis.`);
+		return codeReviewTasks;
+	}
+
+	@span()
+	async processMergeRequestCodeReviewTasks(gitlabProjectId: string | number, mergeRequestIId: number, codeReviewTasks: CodeReviewTask[]): Promise<void> {
+		const mergeRequest: ExpandedMergeRequestSchema = await this.api().MergeRequests.show(gitlabProjectId, mergeRequestIId);
+		const codeReviewService = appContext().codeReviewService;
+		const project = await this.gitlabSCM().getProject(gitlabProjectId);
+		const projectPath = project.fullPath;
+		// Load the hashes of the diffs we've already reviewed
+		const reviewCache: CodeReviewFingerprintCache = await codeReviewService.getMergeRequestReviewCache(gitlabProjectId, mergeRequestIId);
+
+		logger.info(`Reviewing MR "${mergeRequest.title}" in project "${projectPath}" (${mergeRequest.web_url}) with ${codeReviewTasks.length} review tasks`);
 		if (!codeReviewTasks.length) return;
 
 		// Perform LLM Reviews

diff --git a/src/modules/slack/slackConfig.ts b/src/modules/slack/slackConfig.ts
@@ -1,4 +1,4 @@
-import { getSecretEnvVar } from 'src/config/secretConfig';
+import { getSecretEnvVar } from '#config/secretConfig';
 import { logger } from '#o11y/logger';
 
 export interface SlackConfig {

diff --git a/src/routes/codeTask/createCodeTaskRoute.ts b/src/routes/codeTask/createCodeTaskRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
 import { sendBadRequest, sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import type { CreateCodeTaskData } from '#shared/codeTask/codeTask.model';
 import { currentUser } from '#user/userContext';
@@ -27,9 +28,7 @@ export async function createCodeTaskRoute(fastify: AppFastifyInstance): Promise<
 
 		if (!effectiveRepositoryPath && repositoryName && (repositorySource === 'github' || repositorySource === 'gitlab')) {
 			effectiveRepositoryPath = repositoryName;
-			fastify.log.info(
-				`Code task creation: repositoryFullPath was not provided for source '${repositorySource}', derived from repositoryName '${repositoryName}'.`,
-			);
+			logger.info(`Code task creation: repositoryFullPath was not provided for source '${repositorySource}', derived from repositoryName '${repositoryName}'.`);
 		}
 
 		if (!effectiveRepositoryPath) {
@@ -54,7 +53,7 @@ export async function createCodeTaskRoute(fastify: AppFastifyInstance): Promise<
 			const newCodeTask = await codeTaskService.createCodeTask(userId, createData);
 			return reply.sendJSON(newCodeTask);
 		} catch (error: any) {
-			fastify.log.error(error, `Error creating Code task for user ${userId}`);
+			logger.error(error, `Error creating Code task for user ${userId}`);
 			return sendServerError(reply, error.message || 'Failed to create Code task');
 		}
 	});

diff --git a/src/routes/codeTask/createPresetRoute.ts b/src/routes/codeTask/createPresetRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
 import { sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import { currentUser } from '#user/userContext';
 import { registerApiRoute } from '../routeUtils';
@@ -15,7 +16,7 @@ export async function createPresetRoute(fastify: AppFastifyInstance): Promise<vo
 			const newPreset = await codeTaskService.saveCodeTaskPreset(userId, name, config);
 			return reply.sendJSON(newPreset);
 		} catch (error: any) {
-			fastify.log.error(error, `Error creating Code task preset for user ${userId}`);
+			logger.error(error, `Error creating Code task preset for user ${userId}`);
 			return sendServerError(reply, error.message || 'Failed to create Code task preset');
 		}
 	});

diff --git a/src/routes/codeTask/deleteCodeTaskRoute.ts b/src/routes/codeTask/deleteCodeTaskRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
 import { sendNotFound, sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import { currentUser } from '#user/userContext';
 import { registerApiRoute } from '../routeUtils';
@@ -18,7 +19,7 @@ export async function deleteCodeTaskRoute(fastify: AppFastifyInstance): Promise<
 			if (error.message?.includes('not found')) {
 				return sendNotFound(reply, `Code task with ID ${codeTaskId} not found for deletion`);
 			}
-			fastify.log.error(error, `Error deleting Code task ${codeTaskId} for user ${userId}`);
+			logger.error(error, `Error deleting Code task ${codeTaskId} for user ${userId}`);
 			return sendServerError(reply, error.message || 'Failed to delete Code task');
 		}
 	});

diff --git a/src/routes/codeTask/deletePresetRoute.ts b/src/routes/codeTask/deletePresetRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
 import { sendNotFound, sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import { currentUser } from '#user/userContext';
 import { registerApiRoute } from '../routeUtils';
@@ -19,7 +20,7 @@ export async function deletePresetRoute(fastify: AppFastifyInstance): Promise<vo
 			if (error.message?.includes('not found')) {
 				return sendNotFound(reply, `Code task preset with ID ${presetId} not found for deletion`);
 			}
-			fastify.log.error(error, `Error deleting Code task preset ${presetId} for user ${userId}`);
+			logger.error(error, `Error deleting Code task preset ${presetId} for user ${userId}`);
 			return sendServerError(reply, error.message || 'Failed to delete Code task preset');
 		}
 	});

diff --git a/src/routes/codeTask/executeDesignRoute.ts b/src/routes/codeTask/executeDesignRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
-import { sendErrorResponse, sendNotFound, sendServerError } from '#fastify/responses';
+import { sendNotFound, sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import { currentUser } from '#user/userContext';
 import { registerApiRoute } from '../routeUtils';
@@ -15,7 +16,7 @@ export async function executeDesignRoute(fastify: AppFastifyInstance): Promise<v
 			await codeTaskService.executeDesign(userId, codeTaskId);
 			return reply.sendJSON({ message: 'Design execution accepted and processing started.' });
 		} catch (error: any) {
-			fastify.log.error(error, `Error triggering design execution for codeTask ${codeTaskId}, user ${userId}`);
+			logger.error(error, `Error triggering design execution for codeTask ${codeTaskId}, user ${userId}`);
 			if (error.message?.includes('not found')) {
 				return sendNotFound(reply, `Code task with ID ${codeTaskId} not found`);
 			}

diff --git a/src/routes/codeTask/generateDesignRoute.ts b/src/routes/codeTask/generateDesignRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
-import { sendErrorResponse, sendNotFound, sendServerError } from '#fastify/responses';
+import { sendNotFound, sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import { currentUser } from '#user/userContext';
 import { registerApiRoute } from '../routeUtils';
@@ -20,7 +21,7 @@ export async function generateDesignRoute(fastify: AppFastifyInstance): Promise<
 		// The service method or API definition should be reconciled.
 		const { instructions } = request.body; // As per CODE_TASK_API.generateDesign schema
 		if (instructions) {
-			fastify.log.warn(
+			logger.warn(
 				`Received 'instructions' for generateDesign API, but the current service method 'generateDetailedDesign' expects 'variations'. Instructions will be ignored. Service or API definition may need an update. Instructions: ${instructions}`,
 			);
 		}
@@ -31,7 +32,7 @@ export async function generateDesignRoute(fastify: AppFastifyInstance): Promise<
 			await codeTaskService.generateDetailedDesign(userId, codeTaskId);
 			return reply.sendJSON({ message: 'Design generation accepted and processing started.' });
 		} catch (error: any) {
-			fastify.log.error(error, `Error triggering design generation for codeTask ${codeTaskId}, user ${userId}`);
+			logger.error(error, `Error triggering design generation for codeTask ${codeTaskId}, user ${userId}`);
 			if (error.message?.includes('not found')) {
 				return sendNotFound(reply, `Code task with ID ${codeTaskId} not found`);
 			}

diff --git a/src/routes/codeTask/getCodeTaskByIdRoute.ts b/src/routes/codeTask/getCodeTaskByIdRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
 import { sendNotFound, sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import { currentUser } from '#user/userContext';
 import { registerApiRoute } from '../routeUtils';
@@ -17,7 +18,7 @@ export async function getCodeTaskByIdRoute(fastify: AppFastifyInstance): Promise
 
 			return reply.sendJSON(codeTask);
 		} catch (error: any) {
-			fastify.log.error(error, `Error getting Code task ${codeTaskId} for user ${userId}`);
+			logger.error(error, `Error getting Code task ${codeTaskId} for user ${userId}`);
 			return sendServerError(reply, error.message || 'Failed to retrieve Code task');
 		}
 	});

diff --git a/src/routes/codeTask/getFileContentRoute.ts b/src/routes/codeTask/getFileContentRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
 import { sendNotFound, sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import { currentUser } from '#user/userContext';
 import { registerApiRoute } from '../routeUtils';
@@ -17,7 +18,7 @@ export async function getFileContentRoute(fastify: AppFastifyInstance): Promise<
 			const content = await codeTaskService.getFileContent(userId, codeTaskId, filePath);
 			return reply.sendJSON({ content });
 		} catch (error: any) {
-			fastify.log.error(error, `Error getting file content for codeTask ${codeTaskId} (path: ${filePath}), user ${userId}`);
+			logger.error(error, `Error getting file content for codeTask ${codeTaskId} (path: ${filePath}), user ${userId}`);
 			if (error.message?.includes('not found') || error.name === 'ENOENT' /* For fs errors */) {
 				return sendNotFound(reply, `File or CodeTask not found: ${filePath}`);
 			}

diff --git a/src/routes/codeTask/getFileSystemTreeRoute.ts b/src/routes/codeTask/getFileSystemTreeRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
 import { sendNotFound, sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import { currentUser } from '#user/userContext';
 import { registerApiRoute } from '../routeUtils';
@@ -22,7 +23,7 @@ export async function getFileSystemTreeRoute(fastify: AppFastifyInstance): Promi
 			}
 			return reply.sendJSON(tree);
 		} catch (error: any) {
-			fastify.log.error(error, `Error getting file system tree for codeTask ${codeTaskId} (path: ${path || '/'}), user ${userId}`);
+			logger.error(error, `Error getting file system tree for codeTask ${codeTaskId} (path: ${path || '/'}), user ${userId}`);
 			if (error.message?.includes('not found')) {
 				return sendNotFound(reply, `Code task or path not found: ${error.message}`);
 			}

diff --git a/src/routes/codeTask/getRepoBranchesRoute.ts b/src/routes/codeTask/getRepoBranchesRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
 import { sendBadRequest, sendNotFound, sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import { currentUser } from '#user/userContext';
 import { registerApiRoute } from '../routeUtils';
@@ -17,7 +18,7 @@ export async function getRepoBranchesRoute(fastify: AppFastifyInstance): Promise
 			const branches = await codeTaskService.getBranchList(userId, codeTaskId, providerType, projectId);
 			return reply.sendJSON(branches);
 		} catch (error: any) {
-			fastify.log.error(error, `Error getting branches for codeTask ${codeTaskId}, repo ${projectId} (provider: ${providerType}), user ${userId}`);
+			logger.error(error, `Error getting branches for codeTask ${codeTaskId}, repo ${projectId} (provider: ${providerType}), user ${userId}`);
 			if (error.message?.includes('not found')) {
 				return sendNotFound(reply, `Code task or repository not found: ${error.message}`);
 			}

diff --git a/src/routes/codeTask/listCodeTasksRoute.ts b/src/routes/codeTask/listCodeTasksRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
 import { sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import { currentUser } from '#user/userContext';
 import { registerApiRoute } from '../routeUtils';
@@ -14,7 +15,7 @@ export async function listCodeTasksRoute(fastify: AppFastifyInstance): Promise<v
 			const codeTasks = await codeTaskService.listCodeTasks(userId);
 			return reply.sendJSON(codeTasks);
 		} catch (error: any) {
-			fastify.log.error(error, `Error listing Code tasks for user ${userId}`);
+			logger.error(error, `Error listing Code tasks for user ${userId}`);
 			return sendServerError(reply, error.message || 'Failed to list Code tasks');
 		}
 	});

diff --git a/src/routes/codeTask/listPresetsRoute.ts b/src/routes/codeTask/listPresetsRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
 import { sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import { currentUser } from '#user/userContext';
 import { registerApiRoute } from '../routeUtils';
@@ -14,7 +15,7 @@ export async function listPresetsRoute(fastify: AppFastifyInstance): Promise<voi
 			const presets = await codeTaskService.listCodeTaskPresets(userId);
 			return reply.sendJSON(presets);
 		} catch (error: any) {
-			fastify.log.error(error, `Error listing Code task presets for user ${userId}`);
+			logger.error(error, `Error listing Code task presets for user ${userId}`);
 			return sendServerError(reply, error.message || 'Failed to list Code task presets');
 		}
 	});

diff --git a/src/routes/codeTask/resetSelectionRoute.ts b/src/routes/codeTask/resetSelectionRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
-import { sendErrorResponse, sendNotFound, sendServerError } from '#fastify/responses';
+import { sendNotFound, sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import { currentUser } from '#user/userContext';
 import { registerApiRoute } from '../routeUtils';
@@ -15,7 +16,7 @@ export async function resetSelectionRoute(fastify: AppFastifyInstance): Promise<
 			await codeTaskService.resetFileSelection(userId, codeTaskId);
 			return reply.sendJSON({ message: 'File selection reset accepted.' });
 		} catch (error: any) {
-			fastify.log.error(error, `Error resetting file selection for codeTask ${codeTaskId}, user ${userId}`);
+			logger.error(error, `Error resetting file selection for codeTask ${codeTaskId}, user ${userId}`);
 			if (error.message?.includes('not found')) {
 				return sendNotFound(reply, error.message);
 			}

diff --git a/src/routes/codeTask/updateCodeRoute.ts b/src/routes/codeTask/updateCodeRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
-import { sendErrorResponse, sendNotFound, sendServerError } from '#fastify/responses';
+import { sendNotFound, sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import { currentUser } from '#user/userContext';
 import { registerApiRoute } from '../routeUtils';
@@ -17,7 +18,7 @@ export async function updateCodeRoute(fastify: AppFastifyInstance): Promise<void
 			await codeTaskService.updateCodeWithComments(userId, codeTaskId, data);
 			return reply.sendJSON({});
 		} catch (error: any) {
-			fastify.log.error(error, `Error triggering code update for codeTask ${codeTaskId}, user ${userId}`);
+			logger.error(error, `Error triggering code update for codeTask ${codeTaskId}, user ${userId}`);
 			if (error.message?.includes('not found')) return sendNotFound(reply, `Code task with ID ${codeTaskId} not found`);
 			return sendServerError(reply, error.message || 'Failed to trigger code update');
 		}

diff --git a/src/routes/codeTask/updateCodeTaskRoute.ts b/src/routes/codeTask/updateCodeTaskRoute.ts
@@ -1,6 +1,7 @@
 import type { AppFastifyInstance } from '#app/applicationTypes';
 import { CodeTaskServiceImpl } from '#codeTask/codeTaskServiceImpl';
 import { sendBadRequest, sendNotFound, sendServerError } from '#fastify/responses';
+import { logger } from '#o11y/logger';
 import { CODE_TASK_API } from '#shared/codeTask/codeTask.api';
 import type { UpdateCodeTaskData } from '#shared/codeTask/codeTask.model';
 import { currentUser } from '#user/userContext';
@@ -26,7 +27,7 @@ export async function updateCodeTaskRoute(fastify: AppFastifyInstance): Promise<
 			if (error.message?.includes('not found')) {
 				return sendNotFound(reply, `Code task with ID ${codeTaskId} not found for update`);
 			}
-			fastify.log.error(error, `Error updating Code task ${codeTaskId} for user ${userId}`);
+			logger.error(error, `Error updating Code task ${codeTaskId} for user ${userId}`);
 			return sendServerError(reply, error.message || 'Failed to update Code task');
 		}
 	});