@aaronshaf/ger 2.0.0 → 2.0.1

package/docs/prd/commands.md

@@ -283,10 +283,18 @@ ger push --wip
 Rebase a change on target branch.
 
 ```bash
-ger rebase <change-id>
-ger rebase <change-id> --base <ref>
+ger rebase [change-id]
+ger rebase 12345
+ger rebase If5a3ae8...  # Change-ID format
+ger rebase              # Auto-detect from HEAD
+ger rebase --base <ref> # Rebase onto specific ref
 ```
 
+| Option | Description |
+|--------|-------------|
+| `--base <ref>` | Base revision to rebase onto |
+| `--xml` | Output as XML for LLM consumption |
+
 ### submit
 
 Submit a change for merge.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aaronshaf/ger",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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/rebase.ts

@@ -1,5 +1,7 @@
 import { Effect } from 'effect'
 import { type ApiError, GerritApiService } from '@/api/gerrit'
+import { GitError, NoChangeIdError, getChangeIdFromHead } from '@/utils/git-commit'
+import { escapeXML, sanitizeCDATA } from '@/utils/shell-safety'
 
 interface RebaseOptions {
   base?: string
@@ -9,7 +11,7 @@ interface RebaseOptions {
 /**
  * Rebases a Gerrit change onto the target branch or specified base.
  *
- * @param changeId - Change number or Change-ID to rebase
+ * @param changeId - Change number or Change-ID to rebase (optional, auto-detects from HEAD if not provided)
  * @param options - Configuration options
  * @param options.base - Optional base revision to rebase onto (default: target branch HEAD)
  * @param options.xml - Whether to output in XML format for LLM consumption
@@ -18,28 +20,25 @@ interface RebaseOptions {
 export const rebaseCommand = (
   changeId?: string,
   options: RebaseOptions = {},
-): Effect.Effect<void, ApiError, GerritApiService> =>
+): Effect.Effect<void, never, GerritApiService> =>
   Effect.gen(function* () {
     const gerritApi = yield* GerritApiService
 
-    if (!changeId || changeId.trim() === '') {
-      console.error('✗ Change ID is required')
-      console.error('  Usage: ger rebase <change-id> [--base <ref>]')
-      return
-    }
+    // Auto-detect Change-ID from HEAD commit if not provided
+    const resolvedChangeId = changeId || (yield* getChangeIdFromHead())
 
     // Perform the rebase - this returns the rebased change info
-    const change = yield* gerritApi.rebaseChange(changeId, { base: options.base })
+    const change = yield* gerritApi.rebaseChange(resolvedChangeId, { base: options.base })
 
     if (options.xml) {
       console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
       console.log(`<rebase_result>`)
       console.log(`  <status>success</status>`)
       console.log(`  <change_number>${change._number}</change_number>`)
-      console.log(`  <subject><![CDATA[${change.subject}]]></subject>`)
-      console.log(`  <branch>${change.branch}</branch>`)
+      console.log(`  <subject><![CDATA[${sanitizeCDATA(change.subject)}]]></subject>`)
+      console.log(`  <branch>${escapeXML(change.branch)}</branch>`)
       if (options.base) {
-        console.log(`  <base><![CDATA[${options.base}]]></base>`)
+        console.log(`  <base><![CDATA[${sanitizeCDATA(options.base)}]]></base>`)
       }
       console.log(`</rebase_result>`)
     } else {
@@ -49,4 +48,24 @@ export const rebaseCommand = (
         console.log(`  Base: ${options.base}`)
       }
     }
-  })
+  }).pipe(
+    // Regional error boundary for the entire command
+    Effect.catchAll((error: ApiError | GitError | NoChangeIdError) =>
+      Effect.sync(() => {
+        const errorMessage =
+          error instanceof GitError || error instanceof NoChangeIdError || error instanceof Error
+            ? error.message
+            : String(error)
+
+        if (options.xml) {
+          console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+          console.log(`<rebase_result>`)
+          console.log(`  <status>error</status>`)
+          console.log(`  <error><![CDATA[${sanitizeCDATA(errorMessage)}]]></error>`)
+          console.log(`</rebase_result>`)
+        } else {
+          console.error(`✗ Error: ${errorMessage}`)
+        }
+      }),
+    ),
+  )

package/src/cli/register-commands.ts

@@ -285,8 +285,8 @@ Note:
 
   // rebase command
   program
-    .command('rebase <change-id>')
-    .description('Rebase a change onto target branch (accepts change number or Change-ID)')
+    .command('rebase [change-id]')
+    .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')
     .action(async (changeId, options) => {

package/tests/rebase.test.ts

@@ -170,7 +170,7 @@ describe('rebase command', () => {
     expect(output).toContain('</rebase_result>')
   })
 
-  it('should handle not found errors gracefully', async () => {
+  it('should handle not found errors gracefully with pretty output', async () => {
     server.use(
       http.post('*/a/changes/99999/revisions/current/rebase', () => {
         return HttpResponse.text('Change not found', { status: 404 })
@@ -183,25 +183,86 @@ describe('rebase command', () => {
       Effect.provide(mockConfigLayer),
     )
 
-    // Should fail when change is not found
-    await expect(Effect.runPromise(program)).rejects.toThrow()
+    // Error boundary catches and outputs to console.error
+    await Effect.runPromise(program)
+
+    const errorOutput = mockConsoleError.mock.calls.map((call) => call[0]).join('\n')
+    expect(errorOutput).toContain('Error:')
   })
 
-  it('should show error when change ID is not provided', async () => {
+  it('should handle not found errors with XML output when --xml flag is used', async () => {
+    server.use(
+      http.post('*/a/changes/99999/revisions/current/rebase', () => {
+        return HttpResponse.text('Change not found', { status: 404 })
+      }),
+    )
+
+    const mockConfigLayer = Layer.succeed(ConfigService, createMockConfigService())
+    const program = rebaseCommand('99999', { xml: true }).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(mockConfigLayer),
+    )
+
+    // Error boundary catches and outputs XML error
+    await Effect.runPromise(program)
+
+    const output = mockConsoleLog.mock.calls.map((call) => call[0]).join('\n')
+    expect(output).toContain('<?xml version="1.0" encoding="UTF-8"?>')
+    expect(output).toContain('<rebase_result>')
+    expect(output).toContain('<status>error</status>')
+    expect(output).toContain('<error><![CDATA[')
+    expect(output).toContain('</rebase_result>')
+  })
+
+  it('should output error to console.error when no change ID and HEAD has no Change-Id', async () => {
     const mockConfigLayer = Layer.succeed(ConfigService, createMockConfigService())
     const program = rebaseCommand(undefined, {}).pipe(
       Effect.provide(GerritApiServiceLive),
       Effect.provide(mockConfigLayer),
     )
 
+    // Error boundary catches NoChangeIdError and outputs to console.error
     await Effect.runPromise(program)
 
     const errorOutput = mockConsoleError.mock.calls.map((call) => call[0]).join('\n')
-    expect(errorOutput).toContain('Change ID is required')
-    expect(errorOutput).toContain('Usage: ger rebase <change-id>')
+    expect(errorOutput).toContain('Error:')
+    expect(errorOutput).toContain('No Change-ID found in HEAD commit')
   })
 
-  it('should handle rebase conflicts', async () => {
+  it('should output XML error when no change ID and HEAD has no Change-Id with --xml flag', async () => {
+    const mockConfigLayer = Layer.succeed(ConfigService, createMockConfigService())
+    const program = rebaseCommand(undefined, { xml: true }).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(mockConfigLayer),
+    )
+
+    // Error boundary catches NoChangeIdError and outputs XML error
+    await Effect.runPromise(program)
+
+    const output = mockConsoleLog.mock.calls.map((call) => call[0]).join('\n')
+    expect(output).toContain('<?xml version="1.0" encoding="UTF-8"?>')
+    expect(output).toContain('<rebase_result>')
+    expect(output).toContain('<status>error</status>')
+    expect(output).toContain('No Change-ID found in HEAD commit')
+    expect(output).toContain('</rebase_result>')
+  })
+
+  it('should treat empty string as missing change ID and auto-detect', async () => {
+    const mockConfigLayer = Layer.succeed(ConfigService, createMockConfigService())
+    const program = rebaseCommand('', {}).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(mockConfigLayer),
+    )
+
+    // Empty string triggers auto-detection, which fails with NoChangeIdError
+    await Effect.runPromise(program)
+
+    const errorOutput = mockConsoleError.mock.calls.map((call) => call[0]).join('\n')
+    expect(errorOutput).toContain('Error:')
+    expect(errorOutput).toContain('No Change-ID found in HEAD commit')
+  })
+
+  it('should handle rebase conflicts gracefully', async () => {
     server.use(
       http.post('*/a/changes/12345/revisions/current/rebase', () => {
         return HttpResponse.text('Rebase conflict detected', { status: 409 })
@@ -214,11 +275,14 @@ describe('rebase command', () => {
       Effect.provide(mockConfigLayer),
     )
 
-    // Should throw/fail
-    await expect(Effect.runPromise(program)).rejects.toThrow()
+    // Error boundary catches and outputs to console.error
+    await Effect.runPromise(program)
+
+    const errorOutput = mockConsoleError.mock.calls.map((call) => call[0]).join('\n')
+    expect(errorOutput).toContain('Error:')
   })
 
-  it('should handle API errors', async () => {
+  it('should handle API errors gracefully', async () => {
     server.use(
       http.post('*/a/changes/12345/revisions/current/rebase', () => {
         return HttpResponse.text('Forbidden', { status: 403 })
@@ -231,8 +295,11 @@ describe('rebase command', () => {
       Effect.provide(mockConfigLayer),
     )
 
-    // Should throw/fail
-    await expect(Effect.runPromise(program)).rejects.toThrow()
+    // Error boundary catches and outputs to console.error
+    await Effect.runPromise(program)
+
+    const errorOutput = mockConsoleError.mock.calls.map((call) => call[0]).join('\n')
+    expect(errorOutput).toContain('Error:')
   })
 
   it('should handle changes that are already up to date', async () => {
@@ -248,11 +315,14 @@ describe('rebase command', () => {
       Effect.provide(mockConfigLayer),
     )
 
-    // Should throw/fail
-    await expect(Effect.runPromise(program)).rejects.toThrow()
+    // Error boundary catches and outputs to console.error
+    await Effect.runPromise(program)
+
+    const errorOutput = mockConsoleError.mock.calls.map((call) => call[0]).join('\n')
+    expect(errorOutput).toContain('Error:')
   })
 
-  it('should handle network errors', async () => {
+  it('should handle network errors gracefully', async () => {
     server.use(
       http.post('*/a/changes/12345/revisions/current/rebase', () => {
         return HttpResponse.error()
@@ -265,7 +335,34 @@ describe('rebase command', () => {
       Effect.provide(mockConfigLayer),
     )
 
-    // Should throw/fail
-    await expect(Effect.runPromise(program)).rejects.toThrow()
+    // Error boundary catches and outputs to console.error
+    await Effect.runPromise(program)
+
+    const errorOutput = mockConsoleError.mock.calls.map((call) => call[0]).join('\n')
+    expect(errorOutput).toContain('Error:')
+  })
+
+  it('should handle network errors with XML output', async () => {
+    server.use(
+      http.post('*/a/changes/12345/revisions/current/rebase', () => {
+        return HttpResponse.error()
+      }),
+    )
+
+    const mockConfigLayer = Layer.succeed(ConfigService, createMockConfigService())
+    const program = rebaseCommand('12345', { xml: true }).pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(mockConfigLayer),
+    )
+
+    // Error boundary catches and outputs XML error
+    await Effect.runPromise(program)
+
+    const output = mockConsoleLog.mock.calls.map((call) => call[0]).join('\n')
+    expect(output).toContain('<?xml version="1.0" encoding="UTF-8"?>')
+    expect(output).toContain('<rebase_result>')
+    expect(output).toContain('<status>error</status>')
+    expect(output).toContain('<error><![CDATA[')
+    expect(output).toContain('</rebase_result>')
   })
 })