@aaronshaf/ger 2.0.3 → 2.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aaronshaf/ger",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "Gerrit CLI and SDK - A modern CLI tool and TypeScript SDK for Gerrit Code Review, built with Effect-TS",
   "keywords": [
     "gerrit",

package/src/cli/commands/abandon.ts

@@ -4,6 +4,7 @@ import { type ApiError, GerritApiService } from '@/api/gerrit'
 interface AbandonOptions {
   message?: string
   xml?: boolean
+  json?: boolean
 }
 
 export const abandonCommand = (
@@ -26,7 +27,20 @@ export const abandonCommand = (
       // Perform the abandon
       yield* gerritApi.abandonChange(changeId, options.message)
 
-      if (options.xml) {
+      if (options.json) {
+        console.log(
+          JSON.stringify(
+            {
+              status: 'success',
+              change_number: change._number,
+              subject: change.subject,
+              ...(options.message ? { message: options.message } : {}),
+            },
+            null,
+            2,
+          ),
+        )
+      } else if (options.xml) {
         console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
         console.log(`<abandon_result>`)
         console.log(`  <status>success</status>`)
@@ -46,7 +60,19 @@ export const abandonCommand = (
       // If we can't get change details, still try to abandon with just the ID
       yield* gerritApi.abandonChange(changeId, options.message)
 
-      if (options.xml) {
+      if (options.json) {
+        console.log(
+          JSON.stringify(
+            {
+              status: 'success',
+              change_id: changeId,
+              ...(options.message ? { message: options.message } : {}),
+            },
+            null,
+            2,
+          ),
+        )
+      } else if (options.xml) {
         console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
         console.log(`<abandon_result>`)
         console.log(`  <status>success</status>`)

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

@@ -6,6 +6,7 @@ interface AddReviewerOptions {
   cc?: boolean
   notify?: string
   xml?: boolean
+  json?: boolean
   group?: boolean
 }
 
@@ -24,6 +25,10 @@ const outputXmlError = (message: string): void => {
   console.log(`</add_reviewer_result>`)
 }
 
+const outputJsonError = (message: string): void => {
+  console.log(JSON.stringify({ status: 'error', error: message }, null, 2))
+}
+
 class ValidationError extends Error {
   readonly _tag = 'ValidationError'
 }
@@ -40,7 +45,9 @@ export const addReviewerCommand = (
     if (!changeId) {
       const message =
         'Change ID is required. Use -c <change-id> or run from a branch with an active change.'
-      if (options.xml) {
+      if (options.json) {
+        outputJsonError(message)
+      } else if (options.xml) {
         outputXmlError(message)
       } else {
         console.error(`✗ ${message}`)
@@ -51,7 +58,9 @@ export const addReviewerCommand = (
     if (reviewers.length === 0) {
       const entityType = options.group ? 'group' : 'reviewer'
       const message = `At least one ${entityType} is required.`
-      if (options.xml) {
+      if (options.json) {
+        outputJsonError(message)
+      } else if (options.xml) {
         outputXmlError(message)
       } else {
         console.error(`✗ ${message}`)
@@ -67,7 +76,9 @@ export const addReviewerCommand = (
       const emailLikeInputs = reviewers.filter((r) => r.includes('@'))
       if (emailLikeInputs.length > 0) {
         const message = `The --group flag expects group identifiers, but received email-like input: ${emailLikeInputs.join(', ')}. Did you mean to omit --group?`
-        if (options.xml) {
+        if (options.json) {
+          outputJsonError(message)
+        } else if (options.xml) {
           outputXmlError(message)
         } else {
           console.error(`✗ ${message}`)
@@ -85,7 +96,9 @@ export const addReviewerCommand = (
       const upperNotify = options.notify.toUpperCase()
       if (!VALID_NOTIFY_LEVELS.includes(upperNotify as NotifyLevel)) {
         const message = `Invalid notify level: ${options.notify}. Valid values: none, owner, owner_reviewers, all`
-        if (options.xml) {
+        if (options.json) {
+          outputJsonError(message)
+        } else if (options.xml) {
           outputXmlError(message)
         } else {
           console.error(`✗ ${message}`)
@@ -120,7 +133,26 @@ export const addReviewerCommand = (
       }
     }
 
-    if (options.xml) {
+    if (options.json) {
+      const allSuccess = results.every((r) => r.success)
+      console.log(
+        JSON.stringify(
+          {
+            status: allSuccess ? 'success' : 'partial_failure',
+            change_id: changeId,
+            state,
+            entity_type: entityType,
+            reviewers: results.map((r) =>
+              r.success
+                ? { input: r.reviewer, name: r.name, status: 'added' }
+                : { input: r.reviewer, error: r.error, status: 'failed' },
+            ),
+          },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<add_reviewer_result>`)
       console.log(`  <change_id>${escapeXml(changeId)}</change_id>`)

package/src/cli/commands/comment.ts

@@ -14,18 +14,27 @@ Examples:
   # Post a line-specific comment
   $ ger comment 12345 --file src/main.js --line 42 -m "Consider using const here"
 
+  # Reply to a specific comment thread (resolves the thread by default)
+  $ ger comment 12345 --file src/main.js --line 42 --reply-to 37935b71_9e79a76c -m "Done, fixed"
+
+  # Reply but keep the thread unresolved
+  $ ger comment 12345 --file src/main.js --line 42 --reply-to 37935b71_9e79a76c --unresolved -m "What do you think?"
+
   # Post multiple comments using batch mode
   $ echo '{"message": "Review complete", "comments": [
       {"file": "src/main.js", "line": 10, "message": "Good refactor"}
     ]}' | ger comment 12345 --batch
 
-Note: Line numbers refer to the NEW version of the file, not diff line numbers.`
+Note: Line numbers refer to the NEW version of the file, not diff line numbers.
+Note: Comment IDs for --reply-to can be found in \`ger comments --xml\` or \`ger comments --json\` output (<id> / "id" field).`
 
 interface CommentOptions {
   message?: string
   xml?: boolean
+  json?: boolean
   file?: string
   line?: number
+  replyTo?: string
   unresolved?: boolean
   batch?: boolean
 }
@@ -185,6 +194,21 @@ export const createReviewInputFromString = (
 }
 
 const createReviewInput = (options: CommentOptions): Effect.Effect<ReviewInput, Error> => {
+  // Validate --reply-to constraints early
+  if (options.replyTo !== undefined) {
+    if (options.batch) {
+      return Effect.fail(new Error('--reply-to cannot be used with --batch'))
+    }
+    if (!(options.file && options.line)) {
+      return Effect.fail(new Error('--reply-to requires --file and --line'))
+    }
+    if (options.replyTo.trim().length === 0) {
+      return Effect.fail(new Error('--reply-to comment ID cannot be empty'))
+    }
+    // Normalize to trimmed value so the payload never contains leading/trailing whitespace
+    options = { ...options, replyTo: options.replyTo.trim() }
+  }
+
   // Batch mode
   if (options.batch) {
     return pipe(
@@ -226,7 +250,13 @@ const createReviewInput = (options: CommentOptions): Effect.Effect<ReviewInput,
               {
                 line: options.line,
                 message: options.message,
-                unresolved: options.unresolved,
+                ...(options.replyTo !== undefined ? { in_reply_to: options.replyTo } : {}),
+                // When replying, default unresolved to false (resolves the thread) unless explicitly set
+                ...(options.replyTo !== undefined
+                  ? { unresolved: options.unresolved ?? false }
+                  : options.unresolved !== undefined
+                    ? { unresolved: options.unresolved }
+                    : {}),
               },
             ],
           },
@@ -428,8 +458,14 @@ const formatXmlOutput = (
       lines.push(`  <comment>`)
       lines.push(`    <file>${options.file}</file>`)
       lines.push(`    <line>${options.line}</line>`)
+      if (options.replyTo) lines.push(`    <in_reply_to>${options.replyTo}</in_reply_to>`)
       lines.push(`    <message><![CDATA[${options.message}]]></message>`)
-      if (options.unresolved) lines.push(`    <unresolved>true</unresolved>`)
+      // Always emit unresolved when replying so callers know thread resolution state
+      if (options.replyTo !== undefined) {
+        lines.push(`    <unresolved>${(options.unresolved ?? false).toString()}</unresolved>`)
+      } else if (options.unresolved) {
+        lines.push(`    <unresolved>true</unresolved>`)
+      }
       lines.push(`  </comment>`)
     } else {
       lines.push(`  <message><![CDATA[${options.message}]]></message>`)
@@ -459,6 +495,10 @@ const formatHumanOutput = (
       console.log(`Posted ${totalComments} line comment(s)`)
     } else if (options.file && options.line) {
       console.log(`File: ${options.file}, Line: ${options.line}`)
+      if (options.replyTo) {
+        const resolved = !(options.unresolved ?? false)
+        console.log(`Reply to: ${options.replyTo} (thread ${resolved ? 'resolved' : 'unresolved'})`)
+      }
       console.log(`Message: ${options.message}`)
       if (options.unresolved) console.log(`Status: Unresolved`)
     }
@@ -466,6 +506,51 @@ const formatHumanOutput = (
     // since it was already shown in the "OVERALL REVIEW TO POST" section
   })
 
+// Helper to format JSON output
+const formatJsonOutput = (
+  change: ChangeInfo,
+  review: ReviewInput,
+  options: CommentOptions,
+  changeId: string,
+): Effect.Effect<void> =>
+  Effect.sync(() => {
+    const output: Record<string, unknown> = {
+      status: 'success',
+      change_id: changeId,
+      change_number: change._number,
+      change_subject: change.subject,
+      change_status: change.status,
+    }
+
+    if (options.batch && review.comments) {
+      output.comments = Object.entries(review.comments).flatMap(([file, comments]) =>
+        comments.map((comment) => ({
+          file,
+          ...(comment.line ? { line: comment.line } : {}),
+          message: comment.message,
+          ...(comment.unresolved ? { unresolved: true } : {}),
+        })),
+      )
+    } else if (options.file && options.line) {
+      output.comment = {
+        file: options.file,
+        line: options.line,
+        ...(options.replyTo ? { in_reply_to: options.replyTo } : {}),
+        message: options.message,
+        // Always include unresolved when replying so callers know thread resolution state
+        ...(options.replyTo !== undefined
+          ? { unresolved: options.unresolved ?? false }
+          : options.unresolved
+            ? { unresolved: true }
+            : {}),
+      }
+    } else {
+      output.message = options.message
+    }
+
+    console.log(JSON.stringify(output, null, 2))
+  })
+
 // Main output formatter
 const formatOutput = (
   change: ChangeInfo,
@@ -473,6 +558,8 @@ const formatOutput = (
   options: CommentOptions,
   changeId: string,
 ): Effect.Effect<void> =>
-  options.xml
-    ? formatXmlOutput(change, review, options, changeId)
-    : formatHumanOutput(change, review, options)
+  options.json
+    ? formatJsonOutput(change, review, options, changeId)
+    : options.xml
+      ? formatXmlOutput(change, review, options, changeId)
+      : formatHumanOutput(change, review, options)

package/src/cli/commands/comments.ts

@@ -6,6 +6,7 @@ import { getDiffContext } from '@/utils/diff-context'
 
 interface CommentsOptions {
   xml?: boolean
+  json?: boolean
 }
 
 const getCommentsForChange = (
@@ -63,7 +64,36 @@ export const commentsCommand = (
     })
 
     // Format output
-    if (options.xml) {
+    if (options.json) {
+      const jsonOutput = {
+        status: 'success',
+        change_id: changeId,
+        comment_count: commentsWithContext.length,
+        comments: commentsWithContext.map(({ comment, context }) => ({
+          id: comment.id,
+          ...(comment.path ? { path: comment.path } : {}),
+          ...(comment.line ? { line: comment.line } : {}),
+          ...(comment.range ? { range: comment.range } : {}),
+          ...(comment.author
+            ? {
+                author: {
+                  ...(comment.author.name ? { name: comment.author.name } : {}),
+                  ...(comment.author.email ? { email: comment.author.email } : {}),
+                  ...(comment.author._account_id !== undefined
+                    ? { account_id: comment.author._account_id }
+                    : {}),
+                },
+              }
+            : {}),
+          ...(comment.updated ? { updated: comment.updated } : {}),
+          ...(comment.unresolved !== undefined ? { unresolved: comment.unresolved } : {}),
+          ...(comment.in_reply_to ? { in_reply_to: comment.in_reply_to } : {}),
+          message: comment.message,
+          ...(context ? { diff_context: context } : {}),
+        })),
+      }
+      console.log(JSON.stringify(jsonOutput, null, 2))
+    } else if (options.xml) {
       formatCommentsXml(changeId, commentsWithContext)
     } else {
       formatCommentsPretty(commentsWithContext)
@@ -71,7 +101,9 @@ export const commentsCommand = (
   }).pipe(
     // Regional error boundary for the entire command
     Effect.catchTag('ApiError', (error) => {
-      if (options.xml) {
+      if (options.json) {
+        console.log(JSON.stringify({ status: 'error', error: error.message }, null, 2))
+      } else if (options.xml) {
         console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
         console.log(`<comments_result>`)
         console.log(`  <status>error</status>`)

package/src/cli/commands/diff.ts

@@ -35,7 +35,19 @@ export const diffCommand = (
         ),
       )
 
-    if (validatedOptions.xml) {
+    if (validatedOptions.json) {
+      // JSON output
+      const jsonOutput: Record<string, unknown> = {
+        status: 'success',
+        change_id: changeId,
+      }
+      if (Array.isArray(diff)) {
+        jsonOutput.files = diff
+      } else {
+        jsonOutput.content = diff
+      }
+      console.log(JSON.stringify(jsonOutput, null, 2))
+    } else if (validatedOptions.xml) {
       // XML output for LLM consumption
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<diff_result>`)

package/src/cli/commands/groups-members.ts

@@ -4,6 +4,7 @@ import { sanitizeCDATA } from '@/utils/shell-safety'
 
 interface GroupsMembersOptions {
   xml?: boolean
+  json?: boolean
 }
 
 /**
@@ -25,7 +26,9 @@ export const groupsMembersCommand = (
     const members = yield* gerritApi.getGroupMembers(groupId).pipe(
       Effect.catchTag('ApiError', (error) =>
         Effect.gen(function* () {
-          if (options.xml) {
+          if (options.json) {
+            console.log(JSON.stringify({ status: 'error', error: error.message }, null, 2))
+          } else if (options.xml) {
             console.log('<?xml version="1.0" encoding="UTF-8"?>')
             console.log('<group_members_result>')
             console.log('  <status>error</status>')
@@ -47,7 +50,11 @@ export const groupsMembersCommand = (
 
     // Handle empty results
     if (members.length === 0) {
-      if (options.xml) {
+      if (options.json) {
+        console.log(
+          JSON.stringify({ status: 'success', group_id: groupId, count: 0, members: [] }, null, 2),
+        )
+      } else if (options.xml) {
         console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
         console.log(`<group_members_result>`)
         console.log(`  <status>success</status>`)
@@ -62,7 +69,25 @@ export const groupsMembersCommand = (
     }
 
     // Output results
-    if (options.xml) {
+    if (options.json) {
+      console.log(
+        JSON.stringify(
+          {
+            status: 'success',
+            group_id: groupId,
+            count: members.length,
+            members: members.map((member) => ({
+              account_id: member._account_id,
+              ...(member.name ? { name: member.name } : {}),
+              ...(member.email ? { email: member.email } : {}),
+              ...(member.username ? { username: member.username } : {}),
+            })),
+          },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<group_members_result>`)
       console.log(`  <status>success</status>`)

package/src/cli/commands/groups-show.ts

@@ -4,6 +4,7 @@ import { sanitizeCDATA } from '@/utils/shell-safety'
 
 interface GroupsShowOptions {
   xml?: boolean
+  json?: boolean
 }
 
 /**
@@ -25,7 +26,9 @@ export const groupsShowCommand = (
     const group = yield* gerritApi.getGroupDetail(groupId).pipe(
       Effect.catchTag('ApiError', (error) =>
         Effect.gen(function* () {
-          if (options.xml) {
+          if (options.json) {
+            console.log(JSON.stringify({ status: 'error', error: error.message }, null, 2))
+          } else if (options.xml) {
             console.log('<?xml version="1.0" encoding="UTF-8"?>')
             console.log('<group_detail_result>')
             console.log('  <status>error</status>')
@@ -46,7 +49,40 @@ export const groupsShowCommand = (
     )
 
     // Output results
-    if (options.xml) {
+    if (options.json) {
+      console.log(
+        JSON.stringify(
+          {
+            status: 'success',
+            group: {
+              id: group.id,
+              ...(group.name ? { name: group.name } : {}),
+              ...(group.description ? { description: group.description } : {}),
+              ...(group.owner ? { owner: group.owner } : {}),
+              ...(group.owner_id ? { owner_id: group.owner_id } : {}),
+              ...(group.group_id !== undefined ? { group_id: group.group_id } : {}),
+              ...(group.options?.visible_to_all !== undefined
+                ? { visible_to_all: group.options.visible_to_all }
+                : {}),
+              ...(group.created_on ? { created_on: group.created_on } : {}),
+              ...(group.url ? { url: group.url } : {}),
+              members: (group.members ?? []).map((member) => ({
+                account_id: member._account_id,
+                ...(member.name ? { name: member.name } : {}),
+                ...(member.email ? { email: member.email } : {}),
+                ...(member.username ? { username: member.username } : {}),
+              })),
+              subgroups: (group.includes ?? []).map((subgroup) => ({
+                id: subgroup.id,
+                ...(subgroup.name ? { name: subgroup.name } : {}),
+              })),
+            },
+          },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<group_detail_result>`)
       console.log(`  <status>success</status>`)

package/src/cli/commands/groups.ts

@@ -9,6 +9,7 @@ interface GroupsOptions {
   user?: string
   limit?: string
   xml?: boolean
+  json?: boolean
 }
 
 /**
@@ -44,7 +45,9 @@ export const groupsCommand = (
       .pipe(
         Effect.catchTag('ApiError', (error) =>
           Effect.gen(function* () {
-            if (options.xml) {
+            if (options.json) {
+              console.log(JSON.stringify({ status: 'error', error: error.message }, null, 2))
+            } else if (options.xml) {
               console.log('<?xml version="1.0" encoding="UTF-8"?>')
               console.log('<groups_result>')
               console.log('  <status>error</status>')
@@ -64,7 +67,9 @@ export const groupsCommand = (
 
     // Handle empty results
     if (groups.length === 0) {
-      if (options.xml) {
+      if (options.json) {
+        console.log(JSON.stringify({ status: 'success', count: 0, groups: [] }, null, 2))
+      } else if (options.xml) {
         console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
         console.log(`<groups_result>`)
         console.log(`  <status>success</status>`)
@@ -78,7 +83,31 @@ export const groupsCommand = (
     }
 
     // Output results
-    if (options.xml) {
+    if (options.json) {
+      console.log(
+        JSON.stringify(
+          {
+            status: 'success',
+            count: groups.length,
+            groups: groups.map((group) => ({
+              id: group.id,
+              ...(group.name ? { name: group.name } : {}),
+              ...(group.description ? { description: group.description } : {}),
+              ...(group.owner ? { owner: group.owner } : {}),
+              ...(group.owner_id ? { owner_id: group.owner_id } : {}),
+              ...(group.group_id !== undefined ? { group_id: group.group_id } : {}),
+              ...(group.options?.visible_to_all !== undefined
+                ? { visible_to_all: group.options.visible_to_all }
+                : {}),
+              ...(group.created_on ? { created_on: group.created_on } : {}),
+              ...(group.url ? { url: group.url } : {}),
+            })),
+          },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<groups_result>`)
       console.log(`  <status>success</status>`)

package/src/cli/commands/incoming.ts

@@ -13,6 +13,7 @@ const execAsync = promisify(exec)
 
 interface IncomingOptions {
   xml?: boolean
+  json?: boolean
   interactive?: boolean
 }
 
@@ -161,7 +162,26 @@ export const incomingCommand = (
       return
     }
 
-    if (options.xml) {
+    if (options.json) {
+      // JSON output
+      const groupedChanges = groupChangesByProject(changes)
+      const jsonOutput = {
+        status: 'success',
+        count: changes.length,
+        changes: groupedChanges.flatMap(({ project, changes: projectChanges }) =>
+          projectChanges.map((change) => ({
+            number: change._number,
+            subject: change.subject,
+            status: change.status,
+            project,
+            owner: change.owner?.name ?? 'Unknown',
+            ...(change.owner?.email ? { owner_email: change.owner.email } : {}),
+            ...(change.updated ? { updated: change.updated } : {}),
+          })),
+        ),
+      }
+      console.log(JSON.stringify(jsonOutput, null, 2))
+    } else if (options.xml) {
       // XML output
       const xmlOutput = [
         '<?xml version="1.0" encoding="UTF-8"?>',

package/src/cli/commands/install-hook.ts

@@ -11,6 +11,7 @@ import { type ConfigError, type ConfigServiceImpl } from '@/services/config'
 export interface InstallHookOptions {
   force?: boolean
   xml?: boolean
+  json?: boolean
 }
 
 export type InstallHookErrors = ConfigError | HookInstallError | NotGitRepoError
@@ -25,7 +26,19 @@ export const installHookCommand = (
     const hookExists = yield* commitHookService.hasHook()
 
     if (hookExists && !options.force) {
-      if (options.xml) {
+      if (options.json) {
+        yield* Console.log(
+          JSON.stringify(
+            {
+              status: 'skipped',
+              message: 'commit-msg hook already installed',
+              hint: 'Use --force to overwrite',
+            },
+            null,
+            2,
+          ),
+        )
+      } else if (options.xml) {
         yield* Console.log('<?xml version="1.0" encoding="UTF-8"?>')
         yield* Console.log('<install_hook_result>')
         yield* Console.log('  <status>skipped</status>')
@@ -40,16 +53,24 @@ export const installHookCommand = (
     }
 
     if (hookExists && options.force) {
-      if (!options.xml) {
+      if (!options.xml && !options.json) {
         yield* Console.log(chalk.yellow('Overwriting existing commit-msg hook...'))
       }
     }
 
-    // Install the hook (service logs progress messages in non-XML mode)
-    yield* commitHookService.installHook()
+    const quiet = options.xml === true || options.json === true
+    yield* commitHookService.installHook(quiet)
 
-    // Only output XML here - service already logs success message for non-XML mode
-    if (options.xml) {
+    // Only output JSON/XML here - service already logs success message for plain mode
+    if (options.json) {
+      yield* Console.log(
+        JSON.stringify(
+          { status: 'success', message: 'commit-msg hook installed successfully' },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
       yield* Console.log('<?xml version="1.0" encoding="UTF-8"?>')
       yield* Console.log('<install_hook_result>')
       yield* Console.log('  <status>success</status>')