@aaronshaf/ger 2.0.2 → 2.0.4

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>')

package/src/cli/commands/mine.ts

@@ -5,6 +5,7 @@ import { colors } from '@/utils/formatters'
 
 interface MineOptions {
   xml?: boolean
+  json?: boolean
 }
 
 // ANSI color codes
@@ -17,7 +18,23 @@ export const mineCommand = (
 
     const changes = yield* gerritApi.listChanges('owner:self status:open')
 
-    if (options.xml) {
+    if (options.json) {
+      const jsonOutput = {
+        status: 'success',
+        count: changes.length,
+        changes: changes.map((change) => ({
+          number: change._number,
+          subject: change.subject,
+          project: change.project,
+          branch: change.branch,
+          status: change.status,
+          change_id: change.change_id,
+          ...(change.updated ? { updated: change.updated } : {}),
+          ...(change.owner?.name ? { owner: change.owner.name } : {}),
+        })),
+      }
+      console.log(JSON.stringify(jsonOutput, null, 2))
+    } else if (options.xml) {
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<changes count="${changes.length}">`)
 

package/src/cli/commands/projects.ts

@@ -4,6 +4,7 @@ import { type ApiError, GerritApiService } from '@/api/gerrit'
 interface ProjectsOptions {
   pattern?: string
   xml?: boolean
+  json?: boolean
 }
 
 /**
@@ -27,7 +28,9 @@ export const projectsCommand = (
 
     // Handle empty results
     if (projects.length === 0) {
-      if (options.xml) {
+      if (options.json) {
+        console.log(JSON.stringify({ status: 'success', projects: [] }, null, 2))
+      } else if (options.xml) {
         console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
         console.log(`<projects_result>`)
         console.log(`  <status>success</status>`)
@@ -40,7 +43,24 @@ export const projectsCommand = (
     }
 
     // Output results
-    if (options.xml) {
+    if (options.json) {
+      console.log(
+        JSON.stringify(
+          {
+            status: 'success',
+            count: projects.length,
+            projects: projects.map((project) => ({
+              id: project.id,
+              name: project.name,
+              ...(project.parent ? { parent: project.parent } : {}),
+              ...(project.state ? { state: project.state } : {}),
+            })),
+          },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<projects_result>`)
       console.log(`  <status>success</status>`)

package/src/cli/commands/rebase.ts

@@ -6,6 +6,7 @@ import { escapeXML, sanitizeCDATA } from '@/utils/shell-safety'
 interface RebaseOptions {
   base?: string
   xml?: boolean
+  json?: boolean
 }
 
 /**
@@ -30,7 +31,21 @@ export const rebaseCommand = (
     // Perform the rebase - this returns the rebased change info
     const change = yield* gerritApi.rebaseChange(resolvedChangeId, { base: options.base })
 
-    if (options.xml) {
+    if (options.json) {
+      console.log(
+        JSON.stringify(
+          {
+            status: 'success',
+            change_number: change._number,
+            subject: change.subject,
+            branch: change.branch,
+            ...(options.base ? { base: options.base } : {}),
+          },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<rebase_result>`)
       console.log(`  <status>success</status>`)
@@ -57,7 +72,9 @@ export const rebaseCommand = (
             ? 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(`<rebase_result>`)
           console.log(`  <status>error</status>`)

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

@@ -6,6 +6,7 @@ interface RemoveReviewerOptions {
   change?: string
   notify?: string
   xml?: boolean
+  json?: boolean
 }
 
 type NotifyLevel = 'NONE' | 'OWNER' | 'OWNER_REVIEWERS' | 'ALL'
@@ -23,6 +24,10 @@ const outputXmlError = (message: string): void => {
   console.log(`</remove_reviewer_result>`)
 }
 
+const outputJsonError = (message: string): void => {
+  console.log(JSON.stringify({ status: 'error', error: message }, null, 2))
+}
+
 class ValidationError extends Error {
   readonly _tag = 'ValidationError'
 }
@@ -39,7 +44,9 @@ export const removeReviewerCommand = (
     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}`)
@@ -49,7 +56,9 @@ export const removeReviewerCommand = (
 
     if (reviewers.length === 0) {
       const message = 'At least one reviewer is required.'
-      if (options.xml) {
+      if (options.json) {
+        outputJsonError(message)
+      } else if (options.xml) {
         outputXmlError(message)
       } else {
         console.error(`✗ ${message}`)
@@ -62,7 +71,9 @@ export const removeReviewerCommand = (
       const upperNotify = options.notify.toUpperCase()
       if (!isValidNotifyLevel(upperNotify)) {
         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}`)
@@ -90,7 +101,24 @@ export const removeReviewerCommand = (
       results.push({ reviewer, success: true })
     }
 
-    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,
+            reviewers: results.map((r) =>
+              r.success
+                ? { input: r.reviewer, status: 'removed' }
+                : { 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(`<remove_reviewer_result>`)
       console.log(`  <change_id>${escapeXML(changeId)}</change_id>`)

package/src/cli/commands/restore.ts

@@ -4,6 +4,7 @@ import { type ApiError, GerritApiService } from '@/api/gerrit'
 interface RestoreOptions {
   message?: string
   xml?: boolean
+  json?: boolean
 }
 
 /**
@@ -31,7 +32,20 @@ export const restoreCommand = (
     // Perform the restore - this returns the restored change info
     const change = yield* gerritApi.restoreChange(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(`<restore_result>`)
       console.log(`  <status>success</status>`)

package/src/cli/commands/search.ts

@@ -46,6 +46,7 @@ Full query syntax: https://gerrit-review.googlesource.com/Documentation/user-sea
 
 interface SearchOptions {
   xml?: boolean
+  json?: boolean
   limit?: string
 }
 
@@ -93,7 +94,27 @@ export const searchCommand = (
     // Group changes by project (used by both output formats)
     const groupedChanges = changes.length > 0 ? groupChangesByProject(changes) : []
 
-    if (options.xml) {
+    if (options.json) {
+      // JSON output
+      const jsonOutput = {
+        status: 'success',
+        query: finalQuery,
+        count: changes.length,
+        changes: groupedChanges.flatMap(({ project, changes: projectChanges }) =>
+          projectChanges.map((change) => ({
+            number: change._number,
+            subject: change.subject,
+            status: change.status,
+            project,
+            branch: change.branch,
+            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/show.ts

@@ -7,7 +7,6 @@ import { formatDiffPretty } from '@/utils/diff-formatters'
 import { sanitizeCDATA, escapeXML } from '@/utils/shell-safety'
 import { formatDate } from '@/utils/formatters'
 import { getChangeIdFromHead, GitError, NoChangeIdError } from '@/utils/git-commit'
-import { writeFileSync } from 'node:fs'
 
 export const SHOW_HELP_TEXT = `
 Examples:
@@ -34,6 +33,13 @@ interface ShowOptions {
   json?: boolean
 }
 
+interface ReviewerIdentity {
+  accountId?: number
+  name?: string
+  email?: string
+  username?: string
+}
+
 interface ChangeDetails {
   id: string
   number: number
@@ -49,6 +55,24 @@ interface ChangeDetails {
   updated?: string
   commitMessage: string
   topic?: string
+  reviewers: ReviewerIdentity[]
+  ccs: ReviewerIdentity[]
+}
+
+const formatReviewerLabel = (reviewer: ReviewerIdentity): string => {
+  const preferredIdentity = reviewer.name || reviewer.email || reviewer.username
+  if (!preferredIdentity) {
+    if (reviewer.accountId !== undefined) {
+      return `Account ${reviewer.accountId}`
+    }
+    return 'Unknown Reviewer'
+  }
+
+  if (reviewer.email && reviewer.name && reviewer.name !== reviewer.email) {
+    return `${reviewer.name} <${reviewer.email}>`
+  }
+
+  return preferredIdentity
 }
 
 const getChangeDetails = (
@@ -58,6 +82,21 @@ const getChangeDetails = (
     const gerritApi = yield* GerritApiService
     const change = yield* gerritApi.getChange(changeId)
 
+    let reviewerMap = change.reviewers
+    const shouldFetchReviewerFallback =
+      reviewerMap === undefined ||
+      (reviewerMap.REVIEWER === undefined && reviewerMap.CC === undefined)
+
+    if (shouldFetchReviewerFallback) {
+      const detailedChanges = yield* gerritApi
+        .listChanges(`change:${change._number}`)
+        .pipe(Effect.catchAll(() => Effect.succeed([])))
+      const detailedChange =
+        detailedChanges.find((candidate) => candidate._number === change._number) ||
+        detailedChanges[0]
+      reviewerMap = detailedChange?.reviewers
+    }
+
     return {
       id: change.change_id,
       number: change._number,
@@ -73,6 +112,18 @@ const getChangeDetails = (
       updated: change.updated,
       commitMessage: change.subject, // For now, using subject as commit message
       topic: change.topic,
+      reviewers: (reviewerMap?.REVIEWER ?? []).map((reviewer) => ({
+        accountId: reviewer._account_id,
+        name: reviewer.name,
+        email: reviewer.email,
+        username: reviewer.username,
+      })),
+      ccs: (reviewerMap?.CC ?? []).map((cc) => ({
+        accountId: cc._account_id,
+        name: cc.name,
+        email: cc.email,
+        username: cc.username,
+      })),
     }
   })
 
@@ -154,6 +205,14 @@ const formatShowPretty = (
   console.log(
     `   Updated: ${changeDetails.updated ? formatDate(changeDetails.updated) : 'Unknown'}`,
   )
+  if (changeDetails.reviewers.length > 0) {
+    console.log(
+      `   Reviewers: ${changeDetails.reviewers.map((reviewer) => formatReviewerLabel(reviewer)).join(', ')}`,
+    )
+  }
+  if (changeDetails.ccs.length > 0) {
+    console.log(`   CCs: ${changeDetails.ccs.map((cc) => formatReviewerLabel(cc)).join(', ')}`)
+  }
   console.log(`   Change-Id: ${changeDetails.id}`)
   console.log()
 
@@ -227,6 +286,22 @@ const formatShowJson = async (
       branch: changeDetails.branch,
       topic: changeDetails.topic,
       owner: removeUndefined(changeDetails.owner),
+      reviewers: changeDetails.reviewers.map((reviewer) =>
+        removeUndefined({
+          account_id: reviewer.accountId,
+          name: reviewer.name,
+          email: reviewer.email,
+          username: reviewer.username,
+        }),
+      ),
+      ccs: changeDetails.ccs.map((cc) =>
+        removeUndefined({
+          account_id: cc.accountId,
+          name: cc.name,
+          email: cc.email,
+          username: cc.username,
+        }),
+      ),
       created: changeDetails.created,
       updated: changeDetails.updated,
     }),
@@ -318,6 +393,44 @@ const formatShowXml = async (
     xmlParts.push(`      <email>${escapeXML(changeDetails.owner.email)}</email>`)
   }
   xmlParts.push(`    </owner>`)
+  xmlParts.push(`    <reviewers>`)
+  xmlParts.push(`      <count>${changeDetails.reviewers.length}</count>`)
+  for (const reviewer of changeDetails.reviewers) {
+    xmlParts.push(`      <reviewer>`)
+    if (reviewer.accountId !== undefined) {
+      xmlParts.push(`        <account_id>${reviewer.accountId}</account_id>`)
+    }
+    if (reviewer.name) {
+      xmlParts.push(`        <name><![CDATA[${sanitizeCDATA(reviewer.name)}]]></name>`)
+    }
+    if (reviewer.email) {
+      xmlParts.push(`        <email>${escapeXML(reviewer.email)}</email>`)
+    }
+    if (reviewer.username) {
+      xmlParts.push(`        <username>${escapeXML(reviewer.username)}</username>`)
+    }
+    xmlParts.push(`      </reviewer>`)
+  }
+  xmlParts.push(`    </reviewers>`)
+  xmlParts.push(`    <ccs>`)
+  xmlParts.push(`      <count>${changeDetails.ccs.length}</count>`)
+  for (const cc of changeDetails.ccs) {
+    xmlParts.push(`      <cc>`)
+    if (cc.accountId !== undefined) {
+      xmlParts.push(`        <account_id>${cc.accountId}</account_id>`)
+    }
+    if (cc.name) {
+      xmlParts.push(`        <name><![CDATA[${sanitizeCDATA(cc.name)}]]></name>`)
+    }
+    if (cc.email) {
+      xmlParts.push(`        <email>${escapeXML(cc.email)}</email>`)
+    }
+    if (cc.username) {
+      xmlParts.push(`        <username>${escapeXML(cc.username)}</username>`)
+    }
+    xmlParts.push(`      </cc>`)
+  }
+  xmlParts.push(`    </ccs>`)
   xmlParts.push(`    <created>${escapeXML(changeDetails.created || '')}</created>`)
   xmlParts.push(`    <updated>${escapeXML(changeDetails.updated || '')}</updated>`)
   xmlParts.push(`  </change>`)

package/src/cli/commands/status.ts

@@ -3,6 +3,7 @@ import { GerritApiService } from '@/api/gerrit'
 
 interface StatusOptions {
   xml?: boolean
+  json?: boolean
 }
 
 export const statusCommand = (
@@ -13,7 +14,16 @@ export const statusCommand = (
 
     const isConnected = yield* apiService.testConnection
 
-    if (options.xml) {
+    if (options.json) {
+      // JSON output
+      console.log(
+        JSON.stringify(
+          { status: isConnected ? 'success' : 'error', connected: isConnected },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
       // XML output for LLM consumption
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<status_result>`)

package/src/cli/commands/submit.ts

@@ -3,6 +3,7 @@ import { type ApiError, GerritApiService } from '@/api/gerrit'
 
 interface SubmitOptions {
   xml?: boolean
+  json?: boolean
 }
 
 /**
@@ -65,7 +66,21 @@ export const submitCommand = (
         reasons.push('Change does not meet submit requirements')
       }
 
-      if (options.xml) {
+      if (options.json) {
+        console.log(
+          JSON.stringify(
+            {
+              status: 'error',
+              change_number: change._number,
+              subject: change.subject,
+              submittable: false,
+              reasons,
+            },
+            null,
+            2,
+          ),
+        )
+      } else if (options.xml) {
         console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
         console.log(`<submit_result>`)
         console.log(`  <status>error</status>`)
@@ -93,7 +108,20 @@ export const submitCommand = (
     // Change is submittable, proceed with submission
     const result = yield* gerritApi.submitChange(changeId)
 
-    if (options.xml) {
+    if (options.json) {
+      console.log(
+        JSON.stringify(
+          {
+            status: 'success',
+            change_number: change._number,
+            subject: change.subject,
+            submit_status: result.status,
+          },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<submit_result>`)
       console.log(`  <status>success</status>`)

package/src/cli/commands/topic.ts

@@ -22,6 +22,7 @@ Note: When no change-id is provided, it will be auto-detected from the HEAD comm
 
 interface TopicOptions {
   xml?: boolean
+  json?: boolean
   delete?: boolean
 }
 
@@ -52,7 +53,15 @@ export const topicCommand = (
     if (options.delete) {
       yield* gerritApi.deleteTopic(resolvedChangeId)
 
-      if (options.xml) {
+      if (options.json) {
+        console.log(
+          JSON.stringify(
+            { status: 'success', action: 'deleted', change_id: resolvedChangeId },
+            null,
+            2,
+          ),
+        )
+      } else if (options.xml) {
         console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
         console.log(`<topic_result>`)
         console.log(`  <status>success</status>`)
@@ -69,7 +78,15 @@ export const topicCommand = (
     if (topic !== undefined && topic.trim() !== '') {
       const newTopic = yield* gerritApi.setTopic(resolvedChangeId, topic)
 
-      if (options.xml) {
+      if (options.json) {
+        console.log(
+          JSON.stringify(
+            { status: 'success', action: 'set', change_id: resolvedChangeId, topic: newTopic },
+            null,
+            2,
+          ),
+        )
+      } else if (options.xml) {
         console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
         console.log(`<topic_result>`)
         console.log(`  <status>success</status>`)
@@ -86,7 +103,20 @@ export const topicCommand = (
     // Handle get operation (default)
     const currentTopic = yield* gerritApi.getTopic(resolvedChangeId)
 
-    if (options.xml) {
+    if (options.json) {
+      console.log(
+        JSON.stringify(
+          {
+            status: 'success',
+            action: 'get',
+            change_id: resolvedChangeId,
+            topic: currentTopic || null,
+          },
+          null,
+          2,
+        ),
+      )
+    } else if (options.xml) {
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<topic_result>`)
       console.log(`  <status>success</status>`)