@aaronshaf/ger 2.0.9 → 3.0.1

package/src/cli/register-commands.ts

@@ -2,11 +2,8 @@ import type { Command } from 'commander'
 import { Effect } from 'effect'
 import { GerritApiServiceLive } from '@/api/gerrit'
 import { ConfigServiceLive } from '@/services/config'
-import { ReviewStrategyServiceLive } from '@/services/review-strategy'
-import { GitWorktreeServiceLive } from '@/services/git-worktree'
 import { CommitHookServiceLive } from '@/services/commit-hook'
-import { abandonCommand } from './commands/abandon'
-import { restoreCommand } from './commands/restore'
+import { registerStateCommands } from './register-state-commands'
 import { rebaseCommand } from './commands/rebase'
 import { submitCommand } from './commands/submit'
 import { topicCommand, TOPIC_HELP_TEXT } from './commands/topic'
@@ -23,7 +20,6 @@ import { installHookCommand } from './commands/install-hook'
 import { mineCommand } from './commands/mine'
 import { openCommand } from './commands/open'
 import { pushCommand, PUSH_HELP_TEXT } from './commands/push'
-import { reviewCommand } from './commands/review'
 import { searchCommand, SEARCH_HELP_TEXT } from './commands/search'
 import { setup } from './commands/setup'
 import { showCommand, SHOW_HELP_TEXT } from './commands/show'
@@ -240,43 +236,8 @@ export function registerCommands(program: Command): void {
       )
     })
 
-  // abandon command
-  program
-    .command('abandon [change-id]')
-    .description(
-      'Abandon a change (interactive mode if no change-id provided; accepts change number or Change-ID)',
-    )
-    .option('-m, --message <message>', 'Abandon message')
-    .option('--xml', 'XML output for LLM consumption')
-    .option('--json', 'JSON output for programmatic consumption')
-    .action(async (changeId, options) => {
-      await executeEffect(
-        abandonCommand(changeId, options).pipe(
-          Effect.provide(GerritApiServiceLive),
-          Effect.provide(ConfigServiceLive),
-        ),
-        options,
-        'abandon_result',
-      )
-    })
-
-  // restore command
-  program
-    .command('restore <change-id>')
-    .description('Restore an abandoned change (accepts change number or Change-ID)')
-    .option('-m, --message <message>', 'Restoration message')
-    .option('--xml', 'XML output for LLM consumption')
-    .option('--json', 'JSON output for programmatic consumption')
-    .action(async (changeId, options) => {
-      await executeEffect(
-        restoreCommand(changeId, options).pipe(
-          Effect.provide(GerritApiServiceLive),
-          Effect.provide(ConfigServiceLive),
-        ),
-        options,
-        'restore_result',
-      )
-    })
+  // abandon / restore / set-ready / set-wip commands
+  registerStateCommands(program)
 
   // rebase command
   program
@@ -636,64 +597,4 @@ Note:
         process.exit(1)
       }
     })
-
-  // review command
-  program
-    .command('review <change-id>')
-    .description(
-      'AI-powered code review that analyzes changes and optionally posts comments (accepts change number or Change-ID)',
-    )
-    .option('--comment', 'Post the review as comments (prompts for confirmation)')
-    .option('-y, --yes', 'Skip confirmation prompts when posting comments')
-    .option('--debug', 'Show debug output including AI responses')
-    .option('--prompt <file>', 'Path to custom review prompt file (e.g., ~/prompts/review.md)')
-    .option('--tool <tool>', 'Preferred AI tool (claude, gemini, opencode)')
-    .option('--system-prompt <prompt>', 'Custom system prompt for the AI')
-    .addHelpText(
-      'after',
-      `
-This command uses AI (claude CLI, gemini CLI, or opencode CLI) to review a Gerrit change.
-It performs a two-stage review process:
-1. Generates inline comments for specific code issues
-2. Generates an overall review comment
-By default, the review is only displayed in the terminal.
-Use --comment to post the review to Gerrit (with confirmation prompts).
-Use --comment --yes to post without confirmation.
-
-Requirements:
-  - One of these AI tools must be available: claude CLI, gemini CLI, or opencode CLI
-  - Gerrit credentials must be configured (run 'ger setup' first)
-
-Examples:
-  $ ger review 12345
-  $ ger review If5a3ae8cb5a107e187447802358417f311d0c4b1
-  $ ger review 12345 --comment
-  $ ger review 12345 --comment --yes
-  $ ger review 12345 --tool gemini
-  $ ger review 12345 --debug
-
-Note: Both change number (e.g., 12345) and Change-ID (e.g., If5a3ae8...) formats are accepted
-`,
-    )
-    .action(async (changeId, options) => {
-      try {
-        const effect = reviewCommand(changeId, {
-          comment: options.comment,
-          yes: options.yes,
-          debug: options.debug,
-          prompt: options.prompt,
-          tool: options.tool,
-          systemPrompt: options.systemPrompt,
-        }).pipe(
-          Effect.provide(ReviewStrategyServiceLive),
-          Effect.provide(GerritApiServiceLive),
-          Effect.provide(ConfigServiceLive),
-          Effect.provide(GitWorktreeServiceLive),
-        )
-        await Effect.runPromise(effect)
-      } catch (error) {
-        console.error('✗ Error:', error instanceof Error ? error.message : String(error))
-        process.exit(1)
-      }
-    })
 }

package/src/cli/register-state-commands.ts

@@ -0,0 +1,106 @@
+import type { Command } from 'commander'
+import { Effect } from 'effect'
+import { GerritApiServiceLive } from '@/api/gerrit'
+import { ConfigServiceLive } from '@/services/config'
+import { abandonCommand } from './commands/abandon'
+import { restoreCommand } from './commands/restore'
+import { setReadyCommand } from './commands/set-ready'
+import { setWipCommand } from './commands/set-wip'
+
+type StateOptions = { message?: string; xml?: boolean; json?: boolean }
+
+async function executeStateEffect(
+  effect: Effect.Effect<void, unknown, never>,
+  options: StateOptions,
+  resultTag: string,
+): Promise<void> {
+  try {
+    await Effect.runPromise(effect)
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error)
+    if (options.xml) {
+      console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+      console.log(`<${resultTag}>`)
+      console.log(`  <status>error</status>`)
+      console.log(`  <error><![CDATA[${errorMessage}]]></error>`)
+      console.log(`</${resultTag}>`)
+    } else if (options.json) {
+      console.log(JSON.stringify({ status: 'error', error: errorMessage }, null, 2))
+    } else {
+      console.error('✗ Error:', errorMessage)
+    }
+    process.exit(1)
+  }
+}
+
+export function registerStateCommands(program: Command): void {
+  program
+    .command('abandon [change-id]')
+    .description(
+      'Abandon a change (interactive mode if no change-id provided; accepts change number or Change-ID)',
+    )
+    .option('-m, --message <message>', 'Abandon message')
+    .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
+    .action(async (changeId, options) => {
+      await executeStateEffect(
+        abandonCommand(changeId, options).pipe(
+          Effect.provide(GerritApiServiceLive),
+          Effect.provide(ConfigServiceLive),
+        ),
+        options,
+        'abandon_result',
+      )
+    })
+
+  program
+    .command('restore <change-id>')
+    .description('Restore an abandoned change (accepts change number or Change-ID)')
+    .option('-m, --message <message>', 'Restoration message')
+    .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
+    .action(async (changeId, options) => {
+      await executeStateEffect(
+        restoreCommand(changeId, options).pipe(
+          Effect.provide(GerritApiServiceLive),
+          Effect.provide(ConfigServiceLive),
+        ),
+        options,
+        'restore_result',
+      )
+    })
+
+  program
+    .command('set-ready <change-id>')
+    .description('Mark a WIP change as ready for review (accepts change number or Change-ID)')
+    .option('-m, --message <message>', 'Message to include with the status change')
+    .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
+    .action(async (changeId, options) => {
+      await executeStateEffect(
+        setReadyCommand(changeId, options).pipe(
+          Effect.provide(GerritApiServiceLive),
+          Effect.provide(ConfigServiceLive),
+        ),
+        options,
+        'set_ready_result',
+      )
+    })
+
+  program
+    .command('set-wip <change-id>')
+    .description('Mark a change as work-in-progress (accepts change number or Change-ID)')
+    .option('-m, --message <message>', 'Message to include with the status change')
+    .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
+    .action(async (changeId, options) => {
+      await executeStateEffect(
+        setWipCommand(changeId, options).pipe(
+          Effect.provide(GerritApiServiceLive),
+          Effect.provide(ConfigServiceLive),
+        ),
+        options,
+        'set_wip_result',
+      )
+    })
+}

package/src/utils/diff-formatters.ts

@@ -1,4 +1,5 @@
 import { colors } from './formatters'
+import type { FileDiffContent } from '@/schemas/gerrit'
 
 interface DiffStats {
   additions: number
@@ -139,3 +140,34 @@ export const extractDiffStats = (diffContent: string): DiffStats => {
 
   return { additions, deletions, files }
 }
+
+export const convertToUnifiedDiff = (diff: FileDiffContent, filePath: string): string => {
+  const lines: string[] = []
+
+  if (diff.diff_header) {
+    lines.push(...diff.diff_header)
+  } else {
+    lines.push(`--- a/${filePath}`)
+    lines.push(`+++ b/${filePath}`)
+  }
+
+  for (const section of diff.content) {
+    if (section.ab) {
+      for (const line of section.ab) {
+        lines.push(` ${line}`)
+      }
+    }
+    if (section.a) {
+      for (const line of section.a) {
+        lines.push(`-${line}`)
+      }
+    }
+    if (section.b) {
+      for (const line of section.b) {
+        lines.push(`+${line}`)
+      }
+    }
+  }
+
+  return lines.join('\n')
+}