fix(orchestrator): resolve all M6 remediation issues (#260-#269)

Addresses all 10 quality remediation issues for the orchestrator module:

TypeScript & Type Safety:
- #260: Fix TypeScript compilation errors in tests
- #261: Replace explicit 'any' types with proper typed mocks

Error Handling & Reliability:
- #262: Fix silent cleanup failures - return structured results
- #263: Fix silent Valkey event parsing failures with proper error handling
- #266: Improve error context in Docker operations
- #267: Fix secret scanner false negatives on file read errors
- #268: Fix worktree cleanup error swallowing

Testing & Quality:
- #264: Add queue integration tests (coverage 15% → 85%)
- #265: Fix Prettier formatting violations
- #269: Update outdated TODO comments

All tests passing (406/406), TypeScript compiles cleanly, ESLint clean.

Fixes #260, Fixes #261, Fixes #262, Fixes #263, Fixes #264
Fixes #265, Fixes #266, Fixes #267, Fixes #268, Fixes #269

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

apps/orchestrator/src/git/conflict-detection.service.ts

@@ -27,7 +27,7 @@ export class ConflictDetectionService {
    */
   async checkForConflicts(
     localPath: string,
-    options?: ConflictCheckOptions,
+    options?: ConflictCheckOptions
   ): Promise<ConflictCheckResult> {
     const remote = options?.remote ?? "origin";
     const remoteBranch = options?.remoteBranch ?? "develop";
@@ -35,7 +35,7 @@ export class ConflictDetectionService {
 
     try {
       this.logger.log(
-        `Checking for conflicts in ${localPath} with ${remote}/${remoteBranch} using ${strategy}`,
+        `Checking for conflicts in ${localPath} with ${remote}/${remoteBranch} using ${strategy}`
       );
 
       // Get current branch
@@ -45,12 +45,7 @@ export class ConflictDetectionService {
       await this.fetchRemote(localPath, remote, remoteBranch);
 
       // Attempt test merge/rebase
-      const hasConflicts = await this.attemptMerge(
-        localPath,
-        remote,
-        remoteBranch,
-        strategy,
-      );
+      const hasConflicts = await this.attemptMerge(localPath, remote, remoteBranch, strategy);
 
       if (!hasConflicts) {
         this.logger.log("No conflicts detected");
@@ -70,7 +65,7 @@ export class ConflictDetectionService {
       // Cleanup - abort the merge/rebase
       await this.cleanupMerge(localPath, strategy);
 
-      this.logger.log(`Detected ${conflicts.length} conflicts`);
+      this.logger.log(`Detected ${conflicts.length.toString()} conflicts`);
 
       return {
         hasConflicts: true,
@@ -81,11 +76,11 @@ export class ConflictDetectionService {
         localBranch,
       };
     } catch (error) {
-      this.logger.error(`Failed to check for conflicts: ${error}`);
+      this.logger.error(`Failed to check for conflicts: ${String(error)}`);
       throw new ConflictDetectionError(
         `Failed to check for conflicts in ${localPath}`,
         "checkForConflicts",
-        error as Error,
+        error as Error
       );
     }
   }
@@ -93,22 +88,25 @@ export class ConflictDetectionService {
   /**
    * Fetch latest from remote
    */
-  async fetchRemote(
-    localPath: string,
-    remote: string = "origin",
-    branch?: string,
-  ): Promise<void> {
+  async fetchRemote(localPath: string, remote = "origin", branch?: string): Promise<void> {
     try {
       this.logger.log(`Fetching from ${remote}${branch ? `/${branch}` : ""}`);
       const git = this.getGit(localPath);
-      await git.fetch(remote, branch);
+
+      // Call fetch with appropriate overload based on branch parameter
+      if (branch) {
+        await git.fetch(remote, branch);
+      } else {
+        await git.fetch(remote);
+      }
+
       this.logger.log("Successfully fetched from remote");
     } catch (error) {
-      this.logger.error(`Failed to fetch from remote: ${error}`);
+      this.logger.error(`Failed to fetch from remote: ${String(error)}`);
       throw new ConflictDetectionError(
         `Failed to fetch from ${remote}`,
         "fetchRemote",
-        error as Error,
+        error as Error
       );
     }
   }
@@ -148,11 +146,11 @@ export class ConflictDetectionService {
 
       return conflicts;
     } catch (error) {
-      this.logger.error(`Failed to detect conflicts: ${error}`);
+      this.logger.error(`Failed to detect conflicts: ${String(error)}`);
       throw new ConflictDetectionError(
         `Failed to detect conflicts in ${localPath}`,
         "detectConflicts",
-        error as Error,
+        error as Error
       );
     }
   }
@@ -166,11 +164,11 @@ export class ConflictDetectionService {
       const branch = await git.revparse(["--abbrev-ref", "HEAD"]);
       return branch.trim();
     } catch (error) {
-      this.logger.error(`Failed to get current branch: ${error}`);
+      this.logger.error(`Failed to get current branch: ${String(error)}`);
       throw new ConflictDetectionError(
         `Failed to get current branch in ${localPath}`,
         "getCurrentBranch",
-        error as Error,
+        error as Error
       );
     }
   }
@@ -183,7 +181,7 @@ export class ConflictDetectionService {
     localPath: string,
     remote: string,
     remoteBranch: string,
-    strategy: "merge" | "rebase",
+    strategy: "merge" | "rebase"
   ): Promise<boolean> {
     const git = this.getGit(localPath);
     const remoteRef = `${remote}/${remoteBranch}`;
@@ -202,10 +200,7 @@ export class ConflictDetectionService {
     } catch (error) {
       // Check if error is due to conflicts
       const errorMessage = (error as Error).message || String(error);
-      if (
-        errorMessage.includes("CONFLICT") ||
-        errorMessage.includes("conflict")
-      ) {
+      if (errorMessage.includes("CONFLICT") || errorMessage.includes("conflict")) {
         // Conflicts detected
         return true;
       }
@@ -218,10 +213,7 @@ export class ConflictDetectionService {
   /**
    * Cleanup after test merge/rebase
    */
-  private async cleanupMerge(
-    localPath: string,
-    strategy: "merge" | "rebase",
-  ): Promise<void> {
+  private async cleanupMerge(localPath: string, strategy: "merge" | "rebase"): Promise<void> {
     try {
       const git = this.getGit(localPath);
 
@@ -234,7 +226,7 @@ export class ConflictDetectionService {
       this.logger.log(`Cleaned up ${strategy} operation`);
     } catch (error) {
       // Log warning but don't throw - cleanup is best-effort
-      this.logger.warn(`Failed to cleanup ${strategy}: ${error}`);
+      this.logger.warn(`Failed to cleanup ${strategy}: ${String(error)}`);
     }
   }
 }