@aaronshaf/ger 2.0.1 → 2.0.3

package/src/cli/register-commands.ts

@@ -9,15 +9,17 @@ import { abandonCommand } from './commands/abandon'
 import { restoreCommand } from './commands/restore'
 import { rebaseCommand } from './commands/rebase'
 import { submitCommand } from './commands/submit'
+import { topicCommand, TOPIC_HELP_TEXT } from './commands/topic'
 import { voteCommand } from './commands/vote'
 import { projectsCommand } from './commands/projects'
 import { buildStatusCommand, BUILD_STATUS_HELP_TEXT } from './commands/build-status'
 import { checkoutCommand, CHECKOUT_HELP_TEXT } from './commands/checkout'
-import { commentCommand } from './commands/comment'
+import { commentCommand, COMMENT_HELP_TEXT } from './commands/comment'
 import { commentsCommand } from './commands/comments'
 import { diffCommand } from './commands/diff'
 import { extractUrlCommand } from './commands/extract-url'
 import { incomingCommand } from './commands/incoming'
+import { installHookCommand } from './commands/install-hook'
 import { mineCommand } from './commands/mine'
 import { openCommand } from './commands/open'
 import { pushCommand, PUSH_HELP_TEXT } from './commands/push'
@@ -106,38 +108,7 @@ export function registerCommands(program: Command): void {
     .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')
-    .addHelpText(
-      'after',
-      `
-Examples:
-  # Post a general comment on a change (using change number)
-  $ ger comment 12345 -m "Looks good to me!"
-
-  # Post a comment using Change-ID
-  $ ger comment If5a3ae8cb5a107e187447802358417f311d0c4b1 -m "LGTM"
-
-  # Post a comment using piped input (useful for multi-line comments or scripts)
-  $ echo "This is a comment from stdin!" | ger comment 12345
-  $ cat review-notes.txt | ger comment 12345
-
-  # Post a line-specific comment (line number from NEW file version)
-  $ ger comment 12345 --file src/main.js --line 42 -m "Consider using const here"
-
-  # Post an unresolved comment requiring human attention
-  $ ger comment 12345 --file src/api.js --line 15 -m "Security concern" --unresolved
-
-  # Post multiple comments using batch mode
-  $ echo '{"message": "Review complete", "comments": [
-      {"file": "src/main.js", "line": 10, "message": "Good refactor"},
-      {"file": "src/api.js", "line": 25, "message": "Check error handling", "unresolved": true}
-    ]}' | ger comment 12345 --batch
-
-Note:
-  - Both change number (e.g., 12345) and Change-ID (e.g., If5a3ae8...) formats are accepted
-  - Line numbers refer to the actual line numbers in the NEW version of the file,
-    NOT the line numbers shown in the diff view. To find the correct line number,
-    look at the file after all changes have been applied.`,
-    )
+    .addHelpText('after', COMMENT_HELP_TEXT)
     .action(async (changeId, options) => {
       await executeEffect(
         commentCommand(changeId, options).pipe(
@@ -316,6 +287,24 @@ Note:
       )
     })
 
+  // topic command
+  program
+    .command('topic [change-id] [topic]')
+    .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')
+    .addHelpText('after', TOPIC_HELP_TEXT)
+    .action(async (changeId, topic, options) => {
+      await executeEffect(
+        topicCommand(changeId, topic, options).pipe(
+          Effect.provide(GerritApiServiceLive),
+          Effect.provide(ConfigServiceLive),
+        ),
+        options,
+        'topic_result',
+      )
+    })
+
   // vote command
   program
     .command('vote <change-id>')
@@ -528,6 +517,39 @@ Note:
       }
     })
 
+  // install-hook command
+  program
+    .command('install-hook')
+    .description('Install the Gerrit commit-msg hook for automatic Change-Id generation')
+    .option('--force', 'Overwrite existing hook')
+    .option('--xml', 'XML output for LLM consumption')
+    .addHelpText(
+      'after',
+      `
+Examples:
+  # Install the commit-msg hook
+  $ ger install-hook
+
+  # Force reinstall (overwrite existing)
+  $ ger install-hook --force
+
+Note:
+  - Downloads hook from your configured Gerrit server
+  - Installs to .git/hooks/commit-msg
+  - Makes hook executable (chmod +x)
+  - Required for commits to have Change-Id footers`,
+    )
+    .action(async (options) => {
+      await executeEffect(
+        installHookCommand(options).pipe(
+          Effect.provide(CommitHookServiceLive),
+          Effect.provide(ConfigServiceLive),
+        ),
+        options,
+        'install_hook_result',
+      )
+    })
+
   // push command
   program
     .command('push')

package/src/schemas/gerrit.ts

@@ -1,6 +1,5 @@
 import { Schema } from '@effect/schema'
 
-// Authentication schemas
 export const GerritCredentials: Schema.Schema<{
   readonly host: string
   readonly username: string
@@ -21,7 +20,6 @@ export const GerritCredentials: Schema.Schema<{
 })
 export type GerritCredentials = Schema.Schema.Type<typeof GerritCredentials>
 
-// Forward declare RevisionInfo type for use in ChangeInfo
 export interface RevisionInfoType {
   readonly kind?: string
   readonly _number: number
@@ -65,7 +63,22 @@ export interface RevisionInfoType {
   >
 }
 
-// Change schemas
+type ChangeReviewerAccount = {
+  readonly _account_id?: number
+  readonly name?: string
+  readonly email?: string
+  readonly username?: string
+}
+const ChangeReviewerAccountInfo: Schema.Schema<ChangeReviewerAccount> = Schema.Struct({
+  _account_id: Schema.optional(Schema.Number),
+  name: Schema.optional(Schema.String),
+  email: Schema.optional(Schema.String),
+  username: Schema.optional(Schema.String),
+})
+type ChangeReviewerMap = Partial<
+  Record<'REVIEWER' | 'CC' | 'REMOVED', ReadonlyArray<ChangeReviewerAccount>>
+>
+
 export const ChangeInfo: Schema.Schema<{
   readonly id: string
   readonly project: string
@@ -118,6 +131,8 @@ export const ChangeInfo: Schema.Schema<{
   readonly work_in_progress?: boolean
   readonly current_revision?: string
   readonly revisions?: Record<string, RevisionInfoType>
+  readonly topic?: string
+  readonly reviewers?: ChangeReviewerMap
 }> = Schema.Struct({
   id: Schema.String,
   project: Schema.String,
@@ -182,10 +197,17 @@ export const ChangeInfo: Schema.Schema<{
   work_in_progress: Schema.optional(Schema.Boolean),
   current_revision: Schema.optional(Schema.String),
   revisions: Schema.optional(Schema.Record({ key: Schema.String, value: Schema.Any })),
+  topic: Schema.optional(Schema.String),
+  reviewers: Schema.optional(
+    Schema.Struct({
+      REVIEWER: Schema.optional(Schema.Array(ChangeReviewerAccountInfo)),
+      CC: Schema.optional(Schema.Array(ChangeReviewerAccountInfo)),
+      REMOVED: Schema.optional(Schema.Array(ChangeReviewerAccountInfo)),
+    }),
+  ),
 })
 export type ChangeInfo = Schema.Schema.Type<typeof ChangeInfo>
 
-// Comment schemas
 export const CommentInput: Schema.Schema<{
   readonly message: string
   readonly unresolved?: boolean
@@ -198,7 +220,6 @@ export const CommentInput: Schema.Schema<{
 })
 export type CommentInput = Schema.Schema.Type<typeof CommentInput>
 
-// Comment info returned from API
 export const CommentInfo: Schema.Schema<{
   readonly id: string
   readonly path?: string
@@ -244,7 +265,6 @@ export const CommentInfo: Schema.Schema<{
 })
 export type CommentInfo = Schema.Schema.Type<typeof CommentInfo>
 
-// Message info for review messages
 export const MessageInfo: Schema.Schema<{
   readonly id: string
   readonly message: string
@@ -317,7 +337,6 @@ export const ReviewInput: Schema.Schema<{
 })
 export type ReviewInput = Schema.Schema.Type<typeof ReviewInput>
 
-// Project schema
 export const ProjectInfo: Schema.Schema<{
   readonly id: string
   readonly name: string
@@ -331,7 +350,6 @@ export const ProjectInfo: Schema.Schema<{
 })
 export type ProjectInfo = Schema.Schema.Type<typeof ProjectInfo>
 
-// File and diff schemas
 export const FileInfo: Schema.Schema<{
   readonly status?: 'A' | 'D' | 'R' | 'C' | 'M'
   readonly lines_inserted?: number

package/tests/show.test.ts

@@ -95,6 +95,27 @@ describe('show command', () => {
       name: 'John Doe',
       email: 'john@example.com',
     },
+    reviewers: {
+      REVIEWER: [
+        {
+          _account_id: 2001,
+          name: 'Jane Reviewer',
+          email: 'jane.reviewer@example.com',
+          username: 'jreviewer',
+        },
+        {
+          email: 'second.reviewer@example.com',
+          username: 'sreviewer',
+        },
+      ],
+      CC: [
+        {
+          _account_id: 2003,
+          name: 'Team Observer',
+          email: 'observer@example.com',
+        },
+      ],
+    },
   })
 
   const mockDiff = `--- a/src/auth.js
@@ -194,6 +215,9 @@ describe('show command', () => {
     expect(output).toContain('Branch: main')
     expect(output).toContain('Status: NEW')
     expect(output).toContain('Owner: John Doe')
+    expect(output).toContain('Reviewers: Jane Reviewer <jane.reviewer@example.com>')
+    expect(output).toContain('second.reviewer@example.com')
+    expect(output).toContain('CCs: Team Observer <observer@example.com>')
     expect(output).toContain('Change-Id: I123abc456def')
     expect(output).toContain('🔍 Diff:')
     expect(output).toContain('💬 Inline Comments:')
@@ -234,6 +258,13 @@ describe('show command', () => {
     expect(output).toContain('<owner>')
     expect(output).toContain('<name><![CDATA[John Doe]]></name>')
     expect(output).toContain('<email>john@example.com</email>')
+    expect(output).toContain('<reviewers>')
+    expect(output).toContain('<count>2</count>')
+    expect(output).toContain('<name><![CDATA[Jane Reviewer]]></name>')
+    expect(output).toContain('<ccs>')
+    expect(output).toContain('<count>1</count>')
+    expect(output).toContain('<name><![CDATA[Team Observer]]></name>')
+    expect(output).not.toContain('<account_id>undefined</account_id>')
     expect(output).toContain('<diff><![CDATA[')
     expect(output).toContain('<comments>')
     expect(output).toContain('<count>3</count>')
@@ -482,6 +513,14 @@ describe('show command', () => {
     expect(parsed.change.branch).toBe('main')
     expect(parsed.change.owner.name).toBe('John Doe')
     expect(parsed.change.owner.email).toBe('john@example.com')
+    expect(Array.isArray(parsed.change.reviewers)).toBe(true)
+    expect(parsed.change.reviewers.length).toBe(2)
+    expect(parsed.change.reviewers[0].name).toBe('Jane Reviewer')
+    expect(parsed.change.reviewers[1].email).toBe('second.reviewer@example.com')
+    expect(parsed.change.reviewers[1].account_id).toBeUndefined()
+    expect(Array.isArray(parsed.change.ccs)).toBe(true)
+    expect(parsed.change.ccs.length).toBe(1)
+    expect(parsed.change.ccs[0].name).toBe('Team Observer')
 
     // Check diff is present
     expect(parsed.diff).toContain('src/auth.js')
@@ -611,6 +650,93 @@ describe('show command', () => {
     expect(parsed.messages[0].revision).toBe(2)
   })
 
+  test('should fetch reviewers from listChanges when getChange lacks reviewer data', async () => {
+    let listChangesOptions: string[] = []
+    let listChangesQuery = ''
+
+    const changeWithoutReviewers = {
+      ...mockChange,
+      reviewers: undefined,
+    }
+
+    server.use(
+      http.get('*/a/changes/:changeId', ({ request }) => {
+        const url = new URL(request.url)
+        if (url.searchParams.get('o') === 'MESSAGES') {
+          return HttpResponse.text(`)]}'\n${JSON.stringify({ messages: [] })}`)
+        }
+        return HttpResponse.text(`)]}'\n${JSON.stringify(changeWithoutReviewers)}`)
+      }),
+      http.get('*/a/changes/', ({ request }) => {
+        const url = new URL(request.url)
+        listChangesOptions = url.searchParams.getAll('o')
+        listChangesQuery = url.searchParams.get('q') || ''
+        return HttpResponse.text(`)]}'\n${JSON.stringify([mockChange])}`)
+      }),
+      http.get('*/a/changes/:changeId/revisions/current/patch', () => {
+        return HttpResponse.text(btoa(mockDiff))
+      }),
+      http.get('*/a/changes/:changeId/revisions/current/comments', () => {
+        return HttpResponse.text(`)]}'\n${JSON.stringify(mockComments)}`)
+      }),
+    )
+
+    const mockConfigLayer = createMockConfigLayer()
+    const program = showCommand('12345', {}).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(mockConfigLayer),
+    )
+
+    await Effect.runPromise(program)
+
+    expect(listChangesQuery).toBe('change:12345')
+    expect(listChangesOptions).toContain('LABELS')
+    expect(listChangesOptions).toContain('DETAILED_LABELS')
+    expect(listChangesOptions).toContain('DETAILED_ACCOUNTS')
+  })
+
+  test('should not fetch listChanges when reviewer data is explicitly present but empty', async () => {
+    let listChangesCalled = false
+
+    const changeWithEmptyReviewerLists = {
+      ...mockChange,
+      reviewers: {
+        REVIEWER: [],
+        CC: [],
+      },
+    }
+
+    server.use(
+      http.get('*/a/changes/:changeId', ({ request }) => {
+        const url = new URL(request.url)
+        if (url.searchParams.get('o') === 'MESSAGES') {
+          return HttpResponse.text(`)]}'\n${JSON.stringify({ messages: [] })}`)
+        }
+        return HttpResponse.text(`)]}'\n${JSON.stringify(changeWithEmptyReviewerLists)}`)
+      }),
+      http.get('*/a/changes/', () => {
+        listChangesCalled = true
+        return HttpResponse.text(`)]}'\n[]`)
+      }),
+      http.get('*/a/changes/:changeId/revisions/current/patch', () => {
+        return HttpResponse.text(btoa(mockDiff))
+      }),
+      http.get('*/a/changes/:changeId/revisions/current/comments', () => {
+        return HttpResponse.text(`)]}'\n${JSON.stringify(mockComments)}`)
+      }),
+    )
+
+    const mockConfigLayer = createMockConfigLayer()
+    const program = showCommand('12345', {}).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(mockConfigLayer),
+    )
+
+    await Effect.runPromise(program)
+
+    expect(listChangesCalled).toBe(false)
+  })
+
   test('should handle large JSON output without truncation', async () => {
     // Create a large diff to simulate output > 64KB
     const largeDiff = '--- a/large-file.js\n+++ b/large-file.js\n' + 'x'.repeat(100000)

package/tests/submit.test.ts

@@ -132,6 +132,34 @@ describe('submit command', () => {
     expect(output).toContain('Status: MERGED')
   })
 
+  it('should fetch change without detailed reviewer options', async () => {
+    let requestedOptions: string[] = []
+
+    server.use(
+      http.get('*/a/changes/12345', ({ request }) => {
+        const url = new URL(request.url)
+        requestedOptions = url.searchParams.getAll('o')
+        return HttpResponse.text(`)]}'\n${JSON.stringify(mockSubmittableChange)}`)
+      }),
+      http.post('*/a/changes/12345/submit', () => {
+        return HttpResponse.text(`)]}'\n${JSON.stringify(mockSubmitResponse)}`)
+      }),
+    )
+
+    const mockConfigLayer = Layer.succeed(ConfigService, createMockConfigService())
+    const program = submitCommand('12345', {}).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(mockConfigLayer),
+    )
+
+    await Effect.runPromise(program)
+
+    expect(requestedOptions).toContain('CURRENT_REVISION')
+    expect(requestedOptions).toContain('CURRENT_COMMIT')
+    expect(requestedOptions).not.toContain('DETAILED_LABELS')
+    expect(requestedOptions).not.toContain('DETAILED_ACCOUNTS')
+  })
+
   it('should output XML format when --xml flag is used', async () => {
     server.use(
       http.get('*/a/changes/12345', () => {