@aaronshaf/ger 0.1.0 → 0.1.3

package/bun.lock

@@ -4,6 +4,7 @@
     "": {
       "name": "ger",
       "dependencies": {
+        "@anthropic-ai/claude-code": "^1.0.102",
         "@effect/platform": "^0.90.6",
         "@effect/platform-node": "^0.94.2",
         "@effect/schema": "^0.75.5",
@@ -11,18 +12,18 @@
         "chalk": "^5.6.0",
         "cli-table3": "^0.6.5",
         "commander": "^14.0.0",
-        "effect": "^3.17.8",
+        "effect": "^3.17.9",
         "signal-exit": "3.0.7",
       },
       "devDependencies": {
-        "@biomejs/biome": "^2.2.0",
+        "@biomejs/biome": "^2.2.2",
         "@types/node": "^24.3.0",
         "ast-grep": "^0.1.0",
-        "bun-types": "^1.2.20",
+        "bun-types": "^1.2.21",
         "husky": "^9.1.7",
         "lint-staged": "^16.1.5",
         "msw": "^2.10.5",
-        "oxlint": "^1.12.0",
+        "oxlint": "^1.13.0",
         "typescript": "^5.9.2",
       },
       "peerDependencies": {
@@ -31,6 +32,8 @@
     },
   },
   "packages": {
+    "@anthropic-ai/claude-code": ["@anthropic-ai/claude-code@1.0.102", "", { "optionalDependencies": { "@img/sharp-darwin-arm64": "^0.33.5", "@img/sharp-darwin-x64": "^0.33.5", "@img/sharp-linux-arm": "^0.33.5", "@img/sharp-linux-arm64": "^0.33.5", "@img/sharp-linux-x64": "^0.33.5", "@img/sharp-win32-x64": "^0.33.5" }, "bin": { "claude": "cli.js" } }, "sha512-UIC6qNgKNZi1nLTf1bQvxNfd74xIAqJjIx6vggh3bJOMtuXBiFwrfPk1Pdf9CayYgwZYXgSmxYYaASt6i6ficQ=="],
+
     "@babel/code-frame": ["@babel/code-frame@7.0.0-beta.37", "", { "dependencies": { "chalk": "^2.0.0", "esutils": "^2.0.2", "js-tokens": "^3.0.0" } }, "sha512-LIpcKm+2otOOvOvhCbD6wkNYi8aUwHk73uWR+hxBdW2EFht5D0QX89n4me8nyeNGWr5zC3Pvmjq+9MvUof+jkg=="],
 
     "@babel/generator": ["@babel/generator@7.28.3", "", { "dependencies": { "@babel/parser": "^7.28.3", "@babel/types": "^7.28.2", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" } }, "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw=="],
@@ -93,6 +96,28 @@
 
     "@effect/workflow": ["@effect/workflow@0.8.3", "", { "peerDependencies": { "@effect/platform": "^0.90.0", "@effect/rpc": "^0.68.3", "effect": "^3.17.6" } }, "sha512-8X5IOemCb6I66GMd84w6NSmaQ+Ya3oXwItCUMelQAEuRtGzwqsw8PNNunQgK/poSRkmpszlsKOb6kEVNjSdFiQ=="],
 
+    "@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.0.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ=="],
+
+    "@img/sharp-darwin-x64": ["@img/sharp-darwin-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-x64": "1.0.4" }, "os": "darwin", "cpu": "x64" }, "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q=="],
+
+    "@img/sharp-libvips-darwin-arm64": ["@img/sharp-libvips-darwin-arm64@1.0.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg=="],
+
+    "@img/sharp-libvips-darwin-x64": ["@img/sharp-libvips-darwin-x64@1.0.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ=="],
+
+    "@img/sharp-libvips-linux-arm": ["@img/sharp-libvips-linux-arm@1.0.5", "", { "os": "linux", "cpu": "arm" }, "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g=="],
+
+    "@img/sharp-libvips-linux-arm64": ["@img/sharp-libvips-linux-arm64@1.0.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA=="],
+
+    "@img/sharp-libvips-linux-x64": ["@img/sharp-libvips-linux-x64@1.0.4", "", { "os": "linux", "cpu": "x64" }, "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw=="],
+
+    "@img/sharp-linux-arm": ["@img/sharp-linux-arm@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm": "1.0.5" }, "os": "linux", "cpu": "arm" }, "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ=="],
+
+    "@img/sharp-linux-arm64": ["@img/sharp-linux-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm64": "1.0.4" }, "os": "linux", "cpu": "arm64" }, "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA=="],
+
+    "@img/sharp-linux-x64": ["@img/sharp-linux-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-x64": "1.0.4" }, "os": "linux", "cpu": "x64" }, "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA=="],
+
+    "@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.33.5", "", { "os": "win32", "cpu": "x64" }, "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg=="],
+
     "@inquirer/checkbox": ["@inquirer/checkbox@4.2.2", "", { "dependencies": { "@inquirer/core": "^10.2.0", "@inquirer/figures": "^1.0.13", "@inquirer/type": "^3.0.8", "ansi-escapes": "^4.3.2", "yoctocolors-cjs": "^2.1.2" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-E+KExNurKcUJJdxmjglTl141EwxWyAHplvsYJQgSwXf8qiNWkTxTuCCqmhFEmbIXd4zLaGMfQFJ6WrZ7fSeV3g=="],
 
     "@inquirer/confirm": ["@inquirer/confirm@5.1.16", "", { "dependencies": { "@inquirer/core": "^10.2.0", "@inquirer/type": "^3.0.8" }, "peerDependencies": { "@types/node": ">=18" }, "optionalPeers": ["@types/node"] }, "sha512-j1a5VstaK5KQy8Mu8cHmuQvN1Zc62TbLhjJxwHvKPPKEoowSF6h/0UdOpA9DNdWZ+9Inq73+puRq1df6OJ8Sag=="],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aaronshaf/ger",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "module": "index.ts",
   "type": "module",
   "bin": {
@@ -29,6 +29,7 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
+    "@anthropic-ai/claude-code": "^1.0.102",
     "@effect/platform": "^0.90.6",
     "@effect/platform-node": "^0.94.2",
     "@effect/schema": "^0.75.5",

package/src/cli/commands/review.ts

@@ -1,5 +1,5 @@
-import { Effect, pipe, Schema } from 'effect'
-import { AiService } from '@/services/ai'
+import { Effect, pipe, Schema, Layer } from 'effect'
+import { ReviewStrategyService, type ReviewStrategy } from '@/services/review-strategy'
 import { commentCommandWithInput } from './comment'
 import { Console } from 'effect'
 import { type ApiError, GerritApiService } from '@/api/gerrit'
@@ -7,6 +7,13 @@ import type { CommentInfo } from '@/schemas/gerrit'
 import { sanitizeCDATA, escapeXML } from '@/utils/shell-safety'
 import { formatDiffPretty } from '@/utils/diff-formatters'
 import { formatDate } from '@/utils/formatters'
+import {
+  formatChangeAsXML,
+  formatCommentsAsXML,
+  formatMessagesAsXML,
+  flattenComments,
+} from '@/utils/review-formatters'
+import { buildEnhancedPrompt } from '@/utils/review-prompt-builder'
 import * as fs from 'node:fs/promises'
 import * as fsSync from 'node:fs'
 import * as os from 'node:os'
@@ -14,6 +21,7 @@ import * as path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { dirname } from 'node:path'
 import * as readline from 'node:readline'
+import { GitWorktreeService, GitWorktreeServiceLive } from '@/services/git-worktree'
 
 // Get the directory of this module
 const __filename = fileURLToPath(import.meta.url)
@@ -81,6 +89,8 @@ interface ReviewOptions {
   comment?: boolean
   yes?: boolean
   prompt?: string
+  provider?: string
+  systemPrompt?: string
 }
 
 // Schema for validating AI-generated inline comments
@@ -178,7 +188,7 @@ const validateAndFixInlineComments = (
     return validComments
   })
 
-// Helper to get change data and format as XML string
+// Legacy helper for backward compatibility (will be removed)
 const getChangeDataAsXml = (changeId: string): Effect.Effect<string, ApiError, GerritApiService> =>
   Effect.gen(function* () {
     const gerritApi = yield* GerritApiService
@@ -190,83 +200,17 @@ const getChangeDataAsXml = (changeId: string): Effect.Effect<string, ApiError, G
     const commentsMap = yield* gerritApi.getComments(changeId)
     const messages = yield* gerritApi.getMessages(changeId)
 
-    // Flatten comments from all files
-    const comments: CommentInfo[] = []
-    for (const [path, fileComments] of Object.entries(commentsMap)) {
-      for (const comment of fileComments) {
-        comments.push({ ...comment, path })
-      }
-    }
+    const comments = flattenComments(commentsMap)
 
-    // Build XML string
+    // Build XML string using helper functions
     const xmlLines: string[] = []
     xmlLines.push(`<?xml version="1.0" encoding="UTF-8"?>`)
     xmlLines.push(`<show_result>`)
     xmlLines.push(`  <status>success</status>`)
-    xmlLines.push(`  <change>`)
-    xmlLines.push(`    <id>${escapeXML(change.change_id)}</id>`)
-    xmlLines.push(`    <number>${change._number}</number>`)
-    xmlLines.push(`    <subject><![CDATA[${sanitizeCDATA(change.subject)}]]></subject>`)
-    xmlLines.push(`    <status>${escapeXML(change.status)}</status>`)
-    xmlLines.push(`    <project>${escapeXML(change.project)}</project>`)
-    xmlLines.push(`    <branch>${escapeXML(change.branch)}</branch>`)
-    xmlLines.push(`    <owner>`)
-    if (change.owner?.name) {
-      xmlLines.push(`      <name><![CDATA[${sanitizeCDATA(change.owner.name)}]]></name>`)
-    }
-    if (change.owner?.email) {
-      xmlLines.push(`      <email>${escapeXML(change.owner.email)}</email>`)
-    }
-    xmlLines.push(`    </owner>`)
-    xmlLines.push(`    <created>${escapeXML(change.created || '')}</created>`)
-    xmlLines.push(`    <updated>${escapeXML(change.updated || '')}</updated>`)
-    xmlLines.push(`  </change>`)
+    xmlLines.push(...formatChangeAsXML(change))
     xmlLines.push(`  <diff><![CDATA[${sanitizeCDATA(diff)}]]></diff>`)
-
-    // Comments section
-    xmlLines.push(`  <comments>`)
-    xmlLines.push(`    <count>${comments.length}</count>`)
-    for (const comment of comments) {
-      xmlLines.push(`    <comment>`)
-      if (comment.id) xmlLines.push(`      <id>${escapeXML(comment.id)}</id>`)
-      if (comment.path)
-        xmlLines.push(`      <path><![CDATA[${sanitizeCDATA(comment.path)}]]></path>`)
-      if (comment.line) xmlLines.push(`      <line>${comment.line}</line>`)
-      if (comment.author?.name) {
-        xmlLines.push(`      <author><![CDATA[${sanitizeCDATA(comment.author.name)}]]></author>`)
-      }
-      if (comment.updated) xmlLines.push(`      <updated>${escapeXML(comment.updated)}</updated>`)
-      if (comment.message) {
-        xmlLines.push(`      <message><![CDATA[${sanitizeCDATA(comment.message)}]]></message>`)
-      }
-      if (comment.unresolved) xmlLines.push(`      <unresolved>true</unresolved>`)
-      xmlLines.push(`    </comment>`)
-    }
-    xmlLines.push(`  </comments>`)
-
-    // Messages section
-    xmlLines.push(`  <messages>`)
-    xmlLines.push(`    <count>${messages.length}</count>`)
-    for (const message of messages) {
-      xmlLines.push(`    <message>`)
-      xmlLines.push(`      <id>${escapeXML(message.id)}</id>`)
-      if (message.author?.name) {
-        xmlLines.push(`      <author><![CDATA[${sanitizeCDATA(message.author.name)}]]></author>`)
-      }
-      if (message.author?._account_id) {
-        xmlLines.push(`      <author_id>${message.author._account_id}</author_id>`)
-      }
-      xmlLines.push(`      <date>${escapeXML(message.date)}</date>`)
-      if (message._revision_number) {
-        xmlLines.push(`      <revision>${message._revision_number}</revision>`)
-      }
-      if (message.tag) {
-        xmlLines.push(`      <tag>${escapeXML(message.tag)}</tag>`)
-      }
-      xmlLines.push(`      <message><![CDATA[${sanitizeCDATA(message.message)}]]></message>`)
-      xmlLines.push(`    </message>`)
-    }
-    xmlLines.push(`  </messages>`)
+    xmlLines.push(...formatCommentsAsXML(comments))
+    xmlLines.push(...formatMessagesAsXML(messages))
     xmlLines.push(`</show_result>`)
 
     return xmlLines.join('\n')
@@ -286,13 +230,7 @@ const getChangeDataAsPretty = (
     const commentsMap = yield* gerritApi.getComments(changeId)
     const messages = yield* gerritApi.getMessages(changeId)
 
-    // Flatten comments from all files
-    const comments: CommentInfo[] = []
-    for (const [path, fileComments] of Object.entries(commentsMap)) {
-      for (const comment of fileComments) {
-        comments.push({ ...comment, path })
-      }
-    }
+    const comments = flattenComments(commentsMap)
 
     // Build pretty string
     const lines: string[] = []
@@ -378,19 +316,30 @@ const promptUser = (message: string): Effect.Effect<boolean, never> =>
 
 export const reviewCommand = (changeId: string, options: ReviewOptions = {}) =>
   Effect.gen(function* () {
-    const aiService = yield* AiService
+    const reviewStrategy = yield* ReviewStrategyService
+    const gitService = yield* GitWorktreeService
 
-    // Load default prompts first
+    // Load default prompts
     const prompts = yield* loadDefaultPrompts
 
-    // Check for AI tool availability first
-    yield* Console.log('→ Checking for AI tool availability...')
-    const aiTool = yield* aiService
-      .detectAiTool()
-      .pipe(Effect.catchTag('NoAiToolFoundError', (error) => Effect.fail(new Error(error.message))))
-    yield* Console.log(`✓ Found AI tool: ${aiTool}`)
+    // Validate preconditions
+    yield* gitService.validatePreconditions()
 
-    // Load custom review prompt if provided via --prompt option
+    // Check for available AI strategies
+    yield* Console.log('→ Checking AI tool availability...')
+    const availableStrategies = yield* reviewStrategy.getAvailableStrategies()
+
+    if (availableStrategies.length === 0) {
+      return yield* Effect.fail(
+        new Error('No AI tools available. Please install claude, gemini, or codex CLI.'),
+      )
+    }
+
+    // Select strategy based on user preference
+    const selectedStrategy = yield* reviewStrategy.selectStrategy(options.provider)
+    yield* Console.log(`✓ Using AI tool: ${selectedStrategy.name}`)
+
+    // Load custom review prompt if provided
     let userReviewPrompt = prompts.defaultReviewPrompt
 
     if (options.prompt) {
@@ -404,81 +353,176 @@ export const reviewCommand = (changeId: string, options: ReviewOptions = {}) =>
       }
     }
 
-    // Combine user prompt with system prompts for each stage
-    const inlinePrompt = `${userReviewPrompt}\n\n${prompts.inlineReviewSystemPrompt}`
-    const overallPrompt = `${userReviewPrompt}\n\n${prompts.overallReviewSystemPrompt}`
+    // Use Effect's resource management for worktree lifecycle
+    yield* Effect.acquireUseRelease(
+      // Acquire: Create worktree and setup
+      Effect.gen(function* () {
+        const worktreeInfo = yield* gitService.createWorktree(changeId)
+        yield* gitService.fetchAndCheckoutPatchset(worktreeInfo)
+        return worktreeInfo
+      }),
+
+      // Use: Run the enhanced review process
+      (worktreeInfo) =>
+        Effect.gen(function* () {
+          // Switch to worktree directory
+          const originalCwd = process.cwd()
+          process.chdir(worktreeInfo.path)
+
+          try {
+            // Get changed files from git
+            const changedFiles = yield* gitService.getChangedFiles()
+
+            yield* Console.log(`→ Found ${changedFiles.length} changed files`)
+            if (options.debug) {
+              yield* Console.log(`[DEBUG] Changed files: ${changedFiles.join(', ')}`)
+            }
+
+            // Stage 1: Generate inline comments
+            yield* Console.log(`→ Generating inline comments for change ${changeId}...`)
+
+            const inlinePrompt = yield* buildEnhancedPrompt(
+              userReviewPrompt,
+              prompts.inlineReviewSystemPrompt,
+              changeId,
+              changedFiles,
+            )
 
-    yield* Console.log(`→ Fetching change data for ${changeId}...`)
+            // Run inline review using selected strategy
+            if (options.debug) {
+              yield* Console.log(`[DEBUG] Running inline review with ${selectedStrategy.name}`)
+              yield* Console.log(`[DEBUG] Working directory: ${worktreeInfo.path}`)
+            }
+
+            const inlineResponse = yield* reviewStrategy
+              .executeWithStrategy(selectedStrategy, inlinePrompt, {
+                cwd: worktreeInfo.path,
+                systemPrompt: options.systemPrompt || prompts.inlineReviewSystemPrompt,
+              })
+              .pipe(
+                Effect.catchTag('ReviewStrategyError', (error) =>
+                  Effect.gen(function* () {
+                    yield* Console.error(`✗ Inline review failed: ${error.message}`)
+                    return yield* Effect.fail(new Error(error.message))
+                  }),
+                ),
+              )
+
+            if (options.debug) {
+              yield* Console.log(`[DEBUG] Inline review completed`)
+              yield* Console.log(`[DEBUG] Response length: ${inlineResponse.length} chars`)
+            }
+
+            // Response content is ready for parsing
+            const extractedInlineResponse = inlineResponse.trim()
+
+            if (options.debug) {
+              yield* Console.log(
+                `[DEBUG] Extracted response for parsing:\n${extractedInlineResponse}`,
+              )
+            }
+
+            // Parse JSON array from response
+            const inlineCommentsArray = yield* Effect.tryPromise({
+              try: () => Promise.resolve(JSON.parse(extractedInlineResponse)),
+              catch: (error) => new Error(`Invalid JSON response: ${error}`),
+            }).pipe(
+              Effect.catchAll((error) =>
+                Effect.gen(function* () {
+                  yield* Console.error(`✗ Failed to parse inline comments JSON: ${error}`)
+                  yield* Console.error(`Raw extracted response: "${extractedInlineResponse}"`)
+                  if (!options.debug) {
+                    yield* Console.error('Run with --debug to see full AI output')
+                  }
+                  return yield* Effect.fail(error)
+                }),
+              ),
+            )
 
-    // Stage 1: Generate inline comments
-    yield* Console.log(`→ Generating inline comments for change ${changeId}...`)
+            // Validate that the response is an array
+            if (!Array.isArray(inlineCommentsArray)) {
+              yield* Console.error('✗ AI response is not an array of comments')
+              return yield* Effect.fail(new Error('Invalid inline comments format'))
+            }
+
+            // Validate and fix inline comments
+            const originalCount = inlineCommentsArray.length
+            const inlineComments = yield* validateAndFixInlineComments(
+              inlineCommentsArray,
+              changedFiles,
+            )
+            const validCount = inlineComments.length
 
-    // Get change data in XML format for inline review
-    const xmlData = yield* getChangeDataAsXml(changeId)
+            if (originalCount > validCount) {
+              yield* Console.log(
+                `→ Filtered ${originalCount - validCount} invalid comments, ${validCount} remain`,
+              )
+            }
 
-    if (options.debug) {
-      yield* Console.log('[DEBUG] Running AI for inline comments...')
-    }
+            // Handle inline comments output/posting
+            yield* handleInlineComments(inlineComments, changeId, options)
 
-    // Run inline review
-    const inlineResponse = yield* aiService.runPrompt(inlinePrompt, xmlData).pipe(
-      Effect.catchTag('AiResponseParseError', (error) =>
-        Effect.gen(function* () {
-          if (options.debug) {
-            yield* Console.error(`[DEBUG] AI output:\n${error.rawOutput}`)
-          }
-          return yield* Effect.fail(error)
-        }),
-      ),
-      Effect.catchTag('AiServiceError', (error) =>
-        Effect.die(new Error(`AI service error: ${error.message}`)),
-      ),
-    )
+            // Stage 2: Generate overall review comment
+            yield* Console.log(`→ Generating overall review comment for change ${changeId}...`)
 
-    if (options.debug) {
-      yield* Console.log(`[DEBUG] Inline response:\n${inlineResponse}`)
-    }
+            const overallPrompt = yield* buildEnhancedPrompt(
+              userReviewPrompt,
+              prompts.overallReviewSystemPrompt,
+              changeId,
+              changedFiles,
+            )
 
-    // Parse JSON array from response using Effect
-    const inlineCommentsArray = yield* Effect.tryPromise({
-      try: () => Promise.resolve(JSON.parse(inlineResponse)),
-      catch: (error) => new Error(`Invalid JSON response: ${error}`),
-    }).pipe(
-      Effect.catchAll((error) =>
-        Effect.gen(function* () {
-          yield* Console.error(`✗ Failed to parse inline comments JSON: ${error}`)
-          if (!options.debug) {
-            yield* Console.error('Run with --debug to see raw AI output')
+            // Run overall review using selected strategy
+            if (options.debug) {
+              yield* Console.log(`[DEBUG] Running overall review with ${selectedStrategy.name}`)
+            }
+
+            const overallResponse = yield* reviewStrategy
+              .executeWithStrategy(selectedStrategy, overallPrompt, {
+                cwd: worktreeInfo.path,
+                systemPrompt: options.systemPrompt || prompts.overallReviewSystemPrompt,
+              })
+              .pipe(
+                Effect.catchTag('ReviewStrategyError', (error) =>
+                  Effect.gen(function* () {
+                    yield* Console.error(`✗ Overall review failed: ${error.message}`)
+                    return yield* Effect.fail(new Error(error.message))
+                  }),
+                ),
+              )
+
+            if (options.debug) {
+              yield* Console.log(`[DEBUG] Overall review completed`)
+              yield* Console.log(`[DEBUG] Response length: ${overallResponse.length} chars`)
+            }
+
+            // Response content is ready for use
+            const extractedOverallResponse = overallResponse.trim()
+
+            // Handle overall review output/posting
+            yield* handleOverallReview(extractedOverallResponse, changeId, options)
+          } finally {
+            // Always restore original working directory
+            process.chdir(originalCwd)
           }
-          return yield* Effect.fail(error)
-        }),
-      ),
-    )
-
-    // Validate that the response is an array
-    if (!Array.isArray(inlineCommentsArray)) {
-      yield* Console.error('✗ AI response is not an array of comments')
-      return yield* Effect.fail(new Error('Invalid inline comments format'))
-    }
 
-    // Get available files for validation
-    const gerritApi = yield* GerritApiService
-    const files = yield* gerritApi.getFiles(changeId)
-    const availableFiles = Object.keys(files)
-
-    // Validate and fix inline comments
-    const originalCount = inlineCommentsArray.length
-    const inlineComments = yield* validateAndFixInlineComments(inlineCommentsArray, availableFiles)
-    const validCount = inlineComments.length
+          yield* Console.log(`✓ Review complete for ${changeId}`)
+        }),
 
-    if (originalCount > validCount) {
-      yield* Console.log(
-        `→ Filtered ${originalCount - validCount} invalid comments, ${validCount} remain`,
-      )
-    }
+      // Release: Always cleanup worktree
+      (worktreeInfo) => gitService.cleanup(worktreeInfo),
+    )
+  })
 
-    // If not in comment mode, just output the inline comments
+// Helper function to handle inline comments output/posting
+const handleInlineComments = (
+  inlineComments: InlineComment[],
+  changeId: string,
+  options: ReviewOptions,
+): Effect.Effect<void, Error, GerritApiService> =>
+  Effect.gen(function* () {
     if (!options.comment) {
+      // Display mode
       if (inlineComments.length > 0) {
         yield* Console.log('\n━━━━━━ INLINE COMMENTS ━━━━━━')
         for (const comment of inlineComments) {
@@ -489,7 +533,7 @@ export const reviewCommand = (changeId: string, options: ReviewOptions = {}) =>
         yield* Console.log('\n→ No inline comments')
       }
     } else {
-      // In comment mode, handle posting
+      // Comment posting mode
       if (inlineComments.length > 0) {
         yield* Console.log('\n━━━━━━ INLINE COMMENTS TO POST ━━━━━━')
         for (const comment of inlineComments) {
@@ -498,82 +542,48 @@ export const reviewCommand = (changeId: string, options: ReviewOptions = {}) =>
         }
         yield* Console.log('\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━')
 
-        // Ask for confirmation unless --yes is provided
-        const shouldPost = options.yes
-          ? true
-          : yield* promptUser('\nPost these inline comments to Gerrit?')
+        const shouldPost =
+          options.yes || (yield* promptUser('\nPost these inline comments to Gerrit?'))
 
         if (shouldPost) {
-          if (inlineComments.length === 0) {
-            yield* Console.log('→ No valid comments to post after validation')
-          } else {
-            // Post inline comments using the new direct input method
-            yield* pipe(
-              commentCommandWithInput(changeId, JSON.stringify(inlineComments), { batch: true }),
-              Effect.catchAll((error) =>
-                Effect.gen(function* () {
-                  yield* Console.error(`✗ Failed to post inline comments: ${error}`)
-                  return yield* Effect.fail(error)
-                }),
-              ),
-            )
-            yield* Console.log(`✓ Inline comments posted for ${changeId}`)
-          }
+          yield* pipe(
+            commentCommandWithInput(changeId, JSON.stringify(inlineComments), { batch: true }),
+            Effect.catchAll((error) =>
+              Effect.gen(function* () {
+                yield* Console.error(`✗ Failed to post inline comments: ${error}`)
+                return yield* Effect.fail(error)
+              }),
+            ),
+          )
+          yield* Console.log(`✓ Inline comments posted for ${changeId}`)
         } else {
           yield* Console.log('→ Inline comments not posted')
         }
-      } else {
-        yield* Console.log('\n→ No valid inline comments to post')
       }
     }
+  })
 
-    // Stage 2: Generate overall review comment
-    yield* Console.log(`→ Generating overall review comment for change ${changeId}...`)
-
-    // Get change data in regular format for overall review
-    const prettyData = yield* getChangeDataAsPretty(changeId)
-
-    if (options.debug) {
-      yield* Console.log('[DEBUG] Running AI for overall review...')
-    }
-
-    // Run overall review
-    const overallResponse = yield* aiService.runPrompt(overallPrompt, prettyData).pipe(
-      Effect.catchTag('AiResponseParseError', (error) =>
-        Effect.gen(function* () {
-          if (options.debug) {
-            yield* Console.error(`[DEBUG] AI output:\n${error.rawOutput}`)
-          }
-          return yield* Effect.fail(error)
-        }),
-      ),
-      Effect.catchTag('AiServiceError', (error) =>
-        Effect.die(new Error(`AI service error: ${error.message}`)),
-      ),
-    )
-
-    if (options.debug) {
-      yield* Console.log(`[DEBUG] Overall response:\n${overallResponse}`)
-    }
-
-    // If not in comment mode, just output the review
+// Helper function to handle overall review output/posting
+const handleOverallReview = (
+  overallResponse: string,
+  changeId: string,
+  options: ReviewOptions,
+): Effect.Effect<void, Error, GerritApiService> =>
+  Effect.gen(function* () {
     if (!options.comment) {
+      // Display mode
       yield* Console.log('\n━━━━━━ OVERALL REVIEW ━━━━━━')
       yield* Console.log(overallResponse)
       yield* Console.log('\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━')
     } else {
-      // In comment mode, handle posting
+      // Comment posting mode
       yield* Console.log('\n━━━━━━ OVERALL REVIEW TO POST ━━━━━━')
       yield* Console.log(overallResponse)
       yield* Console.log('\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━')
 
-      // Ask for confirmation unless --yes is provided
-      const shouldPost = options.yes
-        ? true
-        : yield* promptUser('\nPost this overall review to Gerrit?')
+      const shouldPost = options.yes || (yield* promptUser('\nPost this overall review to Gerrit?'))
 
       if (shouldPost) {
-        // Post overall comment using the new direct input method
         yield* pipe(
           commentCommandWithInput(changeId, overallResponse, {}),
           Effect.catchAll((error) =>
@@ -588,6 +598,4 @@ export const reviewCommand = (changeId: string, options: ReviewOptions = {}) =>
         yield* Console.log('→ Overall review not posted')
       }
     }
-
-    yield* Console.log(`✓ Review complete for ${changeId}`)
   })