@aaronshaf/ger 2.0.3 → 2.0.5

package/src/cli/register-commands.ts

@@ -33,10 +33,16 @@ import { sanitizeCDATA } from '@/utils/shell-safety'
 import { registerGroupCommands } from './register-group-commands'
 import { registerReviewerCommands } from './register-reviewer-commands'
 
-// Helper function to output error in plain text or XML format
-function outputError(error: unknown, options: { xml?: boolean }, resultTag: string): void {
+// Helper function to output error in plain text, JSON, or XML format
+function outputError(
+  error: unknown,
+  options: { xml?: boolean; json?: boolean },
+  resultTag: string,
+): void {
   const errorMessage = error instanceof Error ? error.message : String(error)
-  if (options.xml) {
+  if (options.json) {
+    console.log(JSON.stringify({ status: 'error', error: errorMessage }, null, 2))
+  } else if (options.xml) {
     console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
     console.log(`<${resultTag}>`)
     console.log(`  <status>error</status>`)
@@ -50,9 +56,13 @@ function outputError(error: unknown, options: { xml?: boolean }, resultTag: stri
 // Helper function to execute Effect with standard error handling
 async function executeEffect<E>(
   effect: Effect.Effect<void, E, never>,
-  options: { xml?: boolean },
+  options: { xml?: boolean; json?: boolean },
   resultTag: string,
 ): Promise<void> {
+  if (options.xml && options.json) {
+    outputError(new Error('--xml and --json are mutually exclusive'), options, resultTag)
+    process.exit(1)
+  }
   try {
     await Effect.runPromise(effect)
   } catch (error) {
@@ -83,6 +93,7 @@ export function registerCommands(program: Command): void {
     .command('status')
     .description('Check connection status')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .action(async (options) => {
       await executeEffect(
         statusCommand(options).pipe(
@@ -105,9 +116,14 @@ export function registerCommands(program: Command): void {
       'Line number in the NEW version of the file (not diff line numbers)',
       parseInt,
     )
+    .option(
+      '--reply-to <comment-id>',
+      'Reply to a comment thread (requires --file and --line; resolves thread by default)',
+    )
     .option('--unresolved', 'Mark comment as unresolved (requires human attention)')
     .option('--batch', 'Read batch comments from stdin as JSON (see examples below)')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .addHelpText('after', COMMENT_HELP_TEXT)
     .action(async (changeId, options) => {
       await executeEffect(
@@ -125,6 +141,7 @@ export function registerCommands(program: Command): void {
     .command('diff <change-id>')
     .description('Get diff for a change (accepts change number or Change-ID)')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .option('--file <file>', 'Specific file to diff')
     .option('--files-only', 'List changed files only')
     .option('--format <format>', 'Output format (unified, json, files)')
@@ -144,6 +161,7 @@ export function registerCommands(program: Command): void {
     .command('mine')
     .description('Show your open changes')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .action(async (options) => {
       await executeEffect(
         mineCommand(options).pipe(
@@ -160,6 +178,7 @@ export function registerCommands(program: Command): void {
     .command('search [query]')
     .description('Search changes using Gerrit query syntax')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .option('-n, --limit <number>', 'Limit results (default: 25)')
     .addHelpText('after', SEARCH_HELP_TEXT)
     .action(async (query, options) => {
@@ -168,16 +187,17 @@ export function registerCommands(program: Command): void {
         Effect.provide(ConfigServiceLive),
       )
       await Effect.runPromise(effect).catch((error: unknown) => {
-        if (options.xml) {
+        const errorMessage = error instanceof Error ? error.message : String(error)
+        if (options.json) {
+          console.log(JSON.stringify({ status: 'error', error: errorMessage }, null, 2))
+        } else if (options.xml) {
           console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
           console.log(`<search_result>`)
           console.log(`  <status>error</status>`)
-          console.log(
-            `  <error><![CDATA[${error instanceof Error ? error.message : String(error)}]]></error>`,
-          )
+          console.log(`  <error><![CDATA[${errorMessage}]]></error>`)
           console.log(`</search_result>`)
         } else {
-          console.error('✗ Error:', error instanceof Error ? error.message : String(error))
+          console.error('✗ Error:', errorMessage)
         }
         process.exit(1)
       })
@@ -190,6 +210,7 @@ export function registerCommands(program: Command): void {
       'Create or switch to a git worktree for a Gerrit change (accepts change number or Change-ID)',
     )
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .action(async (changeId, options) => {
       await executeEffect(
         workspaceCommand(changeId, options).pipe(
@@ -206,6 +227,7 @@ export function registerCommands(program: Command): void {
     .command('incoming')
     .description('Show incoming changes for review (where you are a reviewer)')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .option('-i, --interactive', 'Interactive mode with detailed view and diff')
     .action(async (options) => {
       await executeEffect(
@@ -226,6 +248,7 @@ export function registerCommands(program: Command): void {
     )
     .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(
@@ -243,6 +266,7 @@ export function registerCommands(program: Command): void {
     .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(
@@ -260,6 +284,7 @@ export function registerCommands(program: Command): void {
     .description('Rebase a change onto target branch (auto-detects from HEAD if not provided)')
     .option('--base <ref>', 'Base revision to rebase onto (default: target branch HEAD)')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .action(async (changeId, options) => {
       await executeEffect(
         rebaseCommand(changeId, options).pipe(
@@ -276,6 +301,7 @@ export function registerCommands(program: Command): void {
     .command('submit <change-id>')
     .description('Submit a change for merging (accepts change number or Change-ID)')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .action(async (changeId, options) => {
       await executeEffect(
         submitCommand(changeId, options).pipe(
@@ -293,6 +319,7 @@ export function registerCommands(program: Command): void {
     .description('Get, set, or remove topic for a change (auto-detects from HEAD if not specified)')
     .option('--delete', 'Remove the topic from the change')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .addHelpText('after', TOPIC_HELP_TEXT)
     .action(async (changeId, topic, options) => {
       await executeEffect(
@@ -314,6 +341,7 @@ export function registerCommands(program: Command): void {
     .option('--label <name> <value>', 'Custom label vote (can be used multiple times)')
     .option('-m, --message <message>', 'Comment with vote')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .action(async (changeId, options) => {
       await executeEffect(
         voteCommand(changeId, options).pipe(
@@ -334,6 +362,7 @@ export function registerCommands(program: Command): void {
     .description('List Gerrit projects')
     .option('--pattern <regex>', 'Filter projects by name pattern')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .action(async (options) => {
       await executeEffect(
         projectsCommand(options).pipe(
@@ -355,6 +384,7 @@ export function registerCommands(program: Command): void {
       'Show all comments on a change with diff context (accepts change number or Change-ID)',
     )
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .action(async (changeId, options) => {
       await executeEffect(
         commentsCommand(changeId, options).pipe(
@@ -523,6 +553,7 @@ Note:
     .description('Install the Gerrit commit-msg hook for automatic Change-Id generation')
     .option('--force', 'Overwrite existing hook')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .addHelpText(
       'after',
       `
@@ -623,10 +654,8 @@ Note:
       `
 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.
@@ -636,22 +665,11 @@ Requirements:
   - Gerrit credentials must be configured (run 'ger setup' first)
 
 Examples:
-  # Review a change using change number (display only)
   $ ger review 12345
-
-  # Review using Change-ID
   $ ger review If5a3ae8cb5a107e187447802358417f311d0c4b1
-
-  # Review and prompt to post comments
   $ ger review 12345 --comment
-
-  # Review and auto-post comments without prompting
   $ ger review 12345 --comment --yes
-
-  # Use specific AI tool
   $ ger review 12345 --tool gemini
-
-  # Show debug output to troubleshoot issues
   $ ger review 12345 --debug
 
 Note: Both change number (e.g., 12345) and Change-ID (e.g., If5a3ae8...) formats are accepted

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

@@ -9,14 +9,26 @@ import { groupsMembersCommand } from './commands/groups-members'
 // Helper function to execute Effect with standard error handling
 async function executeEffect<E>(
   effect: Effect.Effect<void, E, never>,
-  options: { xml?: boolean },
+  options: { xml?: boolean; json?: boolean },
   resultTag: string,
 ): Promise<void> {
+  if (options.xml && options.json) {
+    console.log(
+      JSON.stringify(
+        { status: 'error', error: '--xml and --json are mutually exclusive' },
+        null,
+        2,
+      ),
+    )
+    process.exit(1)
+  }
   try {
     await Effect.runPromise(effect)
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error)
-    if (options.xml) {
+    if (options.json) {
+      console.log(JSON.stringify({ status: 'error', error: errorMessage }, null, 2))
+    } else if (options.xml) {
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<${resultTag}>`)
       console.log(`  <status>error</status>`)
@@ -43,6 +55,7 @@ export function registerGroupCommands(program: Command): void {
     .option('--user <account>', 'Show groups a user belongs to')
     .option('--limit <n>', 'Maximum number of results (default: 25)')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .action(async (options) => {
       await executeEffect(
         groupsCommand(options).pipe(
@@ -59,6 +72,7 @@ export function registerGroupCommands(program: Command): void {
     .command('groups-show <group-id>')
     .description('Show detailed information about a Gerrit group')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .action(async (groupId, options) => {
       await executeEffect(
         groupsShowCommand(groupId, options).pipe(
@@ -75,6 +89,7 @@ export function registerGroupCommands(program: Command): void {
     .command('groups-members <group-id>')
     .description('List all members of a Gerrit group')
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .action(async (groupId, options) => {
       await executeEffect(
         groupsMembersCommand(groupId, options).pipe(

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

@@ -8,14 +8,26 @@ import { removeReviewerCommand } from './commands/remove-reviewer'
 // Helper function to execute Effect with standard error handling
 async function executeEffect<E>(
   effect: Effect.Effect<void, E, never>,
-  options: { xml?: boolean },
+  options: { xml?: boolean; json?: boolean },
   resultTag: string,
 ): Promise<void> {
+  if (options.xml && options.json) {
+    console.log(
+      JSON.stringify(
+        { status: 'error', error: '--xml and --json are mutually exclusive' },
+        null,
+        2,
+      ),
+    )
+    process.exit(1)
+  }
   try {
     await Effect.runPromise(effect)
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error)
-    if (options.xml) {
+    if (options.json) {
+      console.log(JSON.stringify({ status: 'error', error: errorMessage }, null, 2))
+    } else if (options.xml) {
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<${resultTag}>`)
       console.log(`  <status>error</status>`)
@@ -44,6 +56,7 @@ export function registerReviewerCommands(program: Command): void {
       'Notification level: none, owner, owner_reviewers, all (default: all)',
     )
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .addHelpText(
       'after',
       `
@@ -76,6 +89,7 @@ Examples:
       'Notification level: none, owner, owner_reviewers, all (default: all)',
     )
     .option('--xml', 'XML output for LLM consumption')
+    .option('--json', 'JSON output for programmatic consumption')
     .addHelpText(
       'after',
       `

package/src/schemas/gerrit.ts

@@ -308,6 +308,7 @@ export const ReviewInput: Schema.Schema<{
       readonly message: string
       readonly side?: 'PARENT' | 'REVISION'
       readonly unresolved?: boolean
+      readonly in_reply_to?: string
     }>
   >
 }> = Schema.Struct({
@@ -330,6 +331,7 @@ export const ReviewInput: Schema.Schema<{
           message: Schema.String,
           side: Schema.optional(Schema.Literal('PARENT', 'REVISION')),
           unresolved: Schema.optional(Schema.Boolean),
+          in_reply_to: Schema.optional(Schema.String),
         }),
       ),
     }),
@@ -519,17 +521,14 @@ export type DiffOptions = Schema.Schema.Type<typeof DiffOptions>
 // Command options schemas
 export const DiffCommandOptions: Schema.Schema<{
   readonly xml?: boolean
+  readonly json?: boolean
   readonly file?: string
   readonly filesOnly?: boolean
   readonly format?: 'unified' | 'json' | 'files'
 }> = Schema.Struct({
   xml: Schema.optional(Schema.Boolean),
-  file: Schema.optional(
-    Schema.String.pipe(
-      Schema.minLength(1),
-      Schema.annotations({ description: 'File path for diff (relative to repo root)' }),
-    ),
-  ),
+  json: Schema.optional(Schema.Boolean),
+  file: Schema.optional(Schema.String.pipe(Schema.minLength(1))),
   filesOnly: Schema.optional(Schema.Boolean),
   format: Schema.optional(DiffFormat),
 })

package/src/services/commit-hook.ts

@@ -135,11 +135,9 @@ export const getHooksDir = (): string => {
 export interface CommitHookServiceImpl {
   readonly hasHook: () => Effect.Effect<boolean, NotGitRepoError>
   readonly hasChangeId: (commit?: string) => Effect.Effect<boolean, NotGitRepoError>
-  readonly installHook: () => Effect.Effect<
-    void,
-    HookInstallError | NotGitRepoError,
-    ConfigServiceImpl
-  >
+  readonly installHook: (
+    quiet?: boolean,
+  ) => Effect.Effect<void, HookInstallError | NotGitRepoError, ConfigServiceImpl>
   readonly ensureChangeId: () => Effect.Effect<
     void,
     HookInstallError | MissingChangeIdError | NotGitRepoError,
@@ -161,7 +159,7 @@ const CommitHookServiceImplLive: CommitHookServiceImpl = {
       catch: () => new NotGitRepoError({ message: 'Not in a git repository' }),
     }),
 
-  installHook: () =>
+  installHook: (quiet = false) =>
     Effect.gen(function* () {
       const configService = yield* ConfigService
 
@@ -177,7 +175,7 @@ const CommitHookServiceImplLive: CommitHookServiceImpl = {
       const normalizedHost = config.host.replace(/\/$/, '')
       const hookUrl = `${normalizedHost}/tools/hooks/commit-msg`
 
-      yield* Console.log(`Installing commit-msg hook from ${config.host}...`)
+      if (!quiet) yield* Console.log(`Installing commit-msg hook from ${config.host}...`)
 
       const hookContent = yield* Effect.tryPromise({
         try: async () => {
@@ -236,7 +234,7 @@ const CommitHookServiceImplLive: CommitHookServiceImpl = {
           }),
       })
 
-      yield* Console.log('commit-msg hook installed successfully')
+      if (!quiet) yield* Console.log('commit-msg hook installed successfully')
     }),
 
   ensureChangeId: () =>

package/tests/mine.test.ts

@@ -125,6 +125,62 @@ describe('mine command', () => {
     expect(output).toContain('</changes>')
   })
 
+  test('should include labels in --json output', async () => {
+    const mockChanges: ChangeInfo[] = [
+      generateMockChange({
+        _number: 12345,
+        subject: 'Labeled change',
+        labels: {
+          'Code-Review': { value: 2 },
+          Verified: { value: -1 },
+        },
+      }),
+    ]
+
+    server.use(
+      http.get('*/a/changes/', () => {
+        return HttpResponse.text(`)]}'\n${JSON.stringify(mockChanges)}`)
+      }),
+    )
+
+    const mockConfigLayer = Layer.succeed(ConfigService, createMockConfigService())
+    await Effect.runPromise(
+      mineCommand({ json: true }).pipe(
+        Effect.provide(GerritApiServiceLive),
+        Effect.provide(mockConfigLayer),
+      ),
+    )
+
+    const output = mockConsoleLog.mock.calls.map((call) => call[0]).join('\n')
+    const parsed = JSON.parse(output)
+    const change = parsed.changes[0]
+    expect(change.labels).toBeDefined()
+    expect(change.labels['Code-Review'].value).toBe(2)
+    expect(change.labels['Verified'].value).toBe(-1)
+  })
+
+  test('should omit labels key in --json output when change has no labels', async () => {
+    const mockChanges: ChangeInfo[] = [generateMockChange({ _number: 12345 })]
+
+    server.use(
+      http.get('*/a/changes/', () => {
+        return HttpResponse.text(`)]}'\n${JSON.stringify(mockChanges)}`)
+      }),
+    )
+
+    const mockConfigLayer = Layer.succeed(ConfigService, createMockConfigService())
+    await Effect.runPromise(
+      mineCommand({ json: true }).pipe(
+        Effect.provide(GerritApiServiceLive),
+        Effect.provide(mockConfigLayer),
+      ),
+    )
+
+    const output = mockConsoleLog.mock.calls.map((call) => call[0]).join('\n')
+    const parsed = JSON.parse(output)
+    expect(parsed.changes[0].labels).toBeUndefined()
+  })
+
   test('should handle no changes gracefully', async () => {
     server.use(
       http.get('*/a/changes/', () => {