@aaronshaf/ger 0.2.0 → 0.2.1

package/README.md

@@ -199,7 +199,7 @@ ger comments 12345 --pretty
 Extract URLs from change messages and comments for automation and scripting:
 
 ```bash
-# Extract all Jenkins build-summary-report URLs
+# Extract URLs from current HEAD commit's change (auto-detect)
 ger extract-url "build-summary-report"
 
 # Get the latest build URL (using tail)
@@ -208,9 +208,15 @@ ger extract-url "build-summary-report" | tail -1
 # Get the first/oldest build URL (using head)
 ger extract-url "jenkins" | head -1
 
-# For a specific change
+# For a specific change (using change number)
 ger extract-url "build-summary" 12345
 
+# For a specific change (using Change-ID)
+ger extract-url "build-summary" If5a3ae8cb5a107e187447802358417f311d0c4b1
+
+# Chain with other tools for specific change
+ger extract-url "build-summary-report" 12345 | tail -1 | jk failures --smart --xml
+
 # Use regex for precise matching
 ger extract-url "job/Canvas/job/main/\d+/" --regex
 
@@ -225,6 +231,7 @@ ger extract-url "jenkins" --xml
 ```
 
 #### How it works:
+- **Change detection**: Auto-detects Change-ID from HEAD commit if not specified, or accepts explicit change number/Change-ID
 - **Pattern matching**: Substring match by default, regex with `--regex`
 - **Sources**: Searches messages by default, add `--include-comments` to include inline comments
 - **Ordering**: URLs are output in chronological order (oldest first)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aaronshaf/ger",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "module": "index.ts",
   "type": "module",
   "bin": {

package/src/cli/commands/review.ts

@@ -1,22 +1,8 @@
-import { Effect, pipe, Schema, Layer } from 'effect'
-import {
-  ReviewStrategyService,
-  type ReviewStrategy,
-  ReviewStrategyError,
-} from '@/services/review-strategy'
+import { Effect, pipe, Schema } from 'effect'
+import { ReviewStrategyService, ReviewStrategyError } from '@/services/review-strategy'
 import { commentCommandWithInput } from './comment'
 import { Console } from 'effect'
-import { type ApiError, GerritApiService } from '@/api/gerrit'
-import type { CommentInfo } from '@/schemas/gerrit'
-import { sanitizeCDATA, escapeXML } from '@/utils/shell-safety'
-import { formatDiffPretty } from '@/utils/diff-formatters'
-import { formatDate } from '@/utils/formatters'
-import {
-  formatChangeAsXML,
-  formatCommentsAsXML,
-  formatMessagesAsXML,
-  flattenComments,
-} from '@/utils/review-formatters'
+import { GerritApiService } from '@/api/gerrit'
 import { buildEnhancedPrompt } from '@/utils/review-prompt-builder'
 import * as fs from 'node:fs/promises'
 import * as fsSync from 'node:fs'
@@ -25,7 +11,7 @@ import * as path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { dirname } from 'node:path'
 import * as readline from 'node:readline'
-import { GitWorktreeService, GitWorktreeServiceLive } from '@/services/git-worktree'
+import { GitWorktreeService } from '@/services/git-worktree'
 
 // Get the directory of this module
 const __filename = fileURLToPath(import.meta.url)
@@ -126,7 +112,7 @@ const validateAndFixInlineComments = (
     for (const rawComment of rawComments) {
       // Validate comment structure using Effect Schema
       const parseResult = yield* Schema.decodeUnknown(InlineCommentSchema)(rawComment).pipe(
-        Effect.catchTag('ParseError', (parseError) =>
+        Effect.catchTag('ParseError', (_parseError) =>
           Effect.gen(function* () {
             yield* Console.warn('Skipping comment with invalid structure')
             return yield* Effect.succeed(null)
@@ -192,118 +178,6 @@ const validateAndFixInlineComments = (
     return validComments
   })
 
-// Legacy helper for backward compatibility (will be removed)
-const getChangeDataAsXml = (changeId: string): Effect.Effect<string, ApiError, GerritApiService> =>
-  Effect.gen(function* () {
-    const gerritApi = yield* GerritApiService
-
-    // Fetch all data
-    const change = yield* gerritApi.getChange(changeId)
-    const diffResult = yield* gerritApi.getDiff(changeId)
-    const diff = typeof diffResult === 'string' ? diffResult : JSON.stringify(diffResult)
-    const commentsMap = yield* gerritApi.getComments(changeId)
-    const messages = yield* gerritApi.getMessages(changeId)
-
-    const comments = flattenComments(commentsMap)
-
-    // Build XML string using helper functions
-    const xmlLines: string[] = []
-    xmlLines.push(`<?xml version="1.0" encoding="UTF-8"?>`)
-    xmlLines.push(`<show_result>`)
-    xmlLines.push(`  <status>success</status>`)
-    xmlLines.push(...formatChangeAsXML(change))
-    xmlLines.push(`  <diff><![CDATA[${sanitizeCDATA(diff)}]]></diff>`)
-    xmlLines.push(...formatCommentsAsXML(comments))
-    xmlLines.push(...formatMessagesAsXML(messages))
-    xmlLines.push(`</show_result>`)
-
-    return xmlLines.join('\n')
-  })
-
-// Helper to get change data and format as pretty string
-const getChangeDataAsPretty = (
-  changeId: string,
-): Effect.Effect<string, ApiError, GerritApiService> =>
-  Effect.gen(function* () {
-    const gerritApi = yield* GerritApiService
-
-    // Fetch all data
-    const change = yield* gerritApi.getChange(changeId)
-    const diffResult = yield* gerritApi.getDiff(changeId)
-    const diff = typeof diffResult === 'string' ? diffResult : JSON.stringify(diffResult)
-    const commentsMap = yield* gerritApi.getComments(changeId)
-    const messages = yield* gerritApi.getMessages(changeId)
-
-    const comments = flattenComments(commentsMap)
-
-    // Build pretty string
-    const lines: string[] = []
-
-    // Change details header
-    lines.push('━'.repeat(80))
-    lines.push(`📋 Change ${change._number}: ${change.subject}`)
-    lines.push('━'.repeat(80))
-    lines.push('')
-
-    // Metadata
-    lines.push('📝 Details:')
-    lines.push(`   Project: ${change.project}`)
-    lines.push(`   Branch: ${change.branch}`)
-    lines.push(`   Status: ${change.status}`)
-    lines.push(`   Owner: ${change.owner?.name || change.owner?.email || 'Unknown'}`)
-    lines.push(`   Created: ${change.created ? formatDate(change.created) : 'Unknown'}`)
-    lines.push(`   Updated: ${change.updated ? formatDate(change.updated) : 'Unknown'}`)
-    lines.push(`   Change-Id: ${change.change_id}`)
-    lines.push('')
-
-    // Diff section
-    lines.push('🔍 Diff:')
-    lines.push('─'.repeat(40))
-    lines.push(formatDiffPretty(diff))
-    lines.push('')
-
-    // Comments section
-    if (comments.length > 0) {
-      lines.push('💬 Inline Comments:')
-      lines.push('─'.repeat(40))
-      for (const comment of comments) {
-        const author = comment.author?.name || 'Unknown'
-        const date = comment.updated ? formatDate(comment.updated) : 'Unknown'
-        lines.push(`📅 ${date} - ${author}`)
-        if (comment.path) lines.push(`   File: ${comment.path}`)
-        if (comment.line) lines.push(`   Line: ${comment.line}`)
-        lines.push(`   ${comment.message}`)
-        if (comment.unresolved) lines.push(`   ⚠️ Unresolved`)
-        lines.push('')
-      }
-    }
-
-    // Messages section
-    if (messages.length > 0) {
-      lines.push('📝 Review Activity:')
-      lines.push('─'.repeat(40))
-      for (const message of messages) {
-        const author = message.author?.name || 'Unknown'
-        const date = formatDate(message.date)
-        const cleanMessage = message.message.trim()
-
-        // Skip very short automated messages
-        if (
-          cleanMessage.length < 10 &&
-          (cleanMessage.includes('Build') || cleanMessage.includes('Patch'))
-        ) {
-          continue
-        }
-
-        lines.push(`📅 ${date} - ${author}`)
-        lines.push(`   ${cleanMessage}`)
-        lines.push('')
-      }
-    }
-
-    return lines.join('\n')
-  })
-
 // Helper function to prompt user for confirmation
 const promptUser = (message: string): Effect.Effect<boolean, never> =>
   Effect.async<boolean, never>((resume) => {

package/src/cli/commands/setup.ts

@@ -11,6 +11,7 @@ import { AppConfig } from '@/schemas/config'
 import { Schema } from '@effect/schema'
 import { input, password } from '@inquirer/prompts'
 import { spawn } from 'node:child_process'
+import { normalizeGerritHost } from '@/utils/url-parser'
 
 // Check if a command exists on the system
 const checkCommandExists = (command: string): Promise<boolean> =>
@@ -209,7 +210,7 @@ const setupEffect = (configService: ConfigServiceImpl) =>
 
                 // Build flat config
                 const configData = {
-                  host: host.trim().replace(/\/$/, ''), // Remove trailing slash
+                  host: normalizeGerritHost(host),
                   username: username.trim(),
                   password: passwordValue,
                   ...(aiToolCommand && {

package/src/cli/index.ts

@@ -56,7 +56,7 @@ function getVersion(): string {
     const packageJsonPath = join(__dirname, '..', '..', 'package.json')
     const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'))
     return packageJson.version || '0.0.0'
-  } catch (error) {
+  } catch {
     // Fallback version if package.json can't be read
     return '0.0.0'
   }

package/src/services/git-worktree.ts

@@ -156,23 +156,6 @@ const validateGitRepo = (): Effect.Effect<void, NotGitRepoError, never> =>
     Effect.map(() => undefined),
   )
 
-// Check if working directory is clean
-const validateCleanRepo = (): Effect.Effect<void, DirtyRepoError, never> =>
-  pipe(
-    runGitCommand(['status', '--porcelain']),
-    Effect.mapError(() => new DirtyRepoError({ message: 'Failed to check repository status' })),
-    Effect.flatMap((output) =>
-      output.trim() === ''
-        ? Effect.succeed(undefined)
-        : Effect.fail(
-            new DirtyRepoError({
-              message:
-                'Working directory has uncommitted changes. Please commit or stash changes before review.',
-            }),
-          ),
-    ),
-  )
-
 // Generate unique worktree path
 const generateWorktreePath = (changeId: string): string => {
   const timestamp = Date.now()

package/src/utils/review-prompt-builder.ts

@@ -1,6 +1,5 @@
 import { Effect } from 'effect'
 import { type ApiError, GerritApiService } from '@/api/gerrit'
-import type { CommentInfo, MessageInfo } from '@/schemas/gerrit'
 import { flattenComments } from '@/utils/review-formatters'
 
 export const buildEnhancedPrompt = (

package/src/utils/url-parser.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'bun:test'
-import { extractChangeNumber, isValidChangeId } from './url-parser'
+import { extractChangeNumber, isValidChangeId, normalizeGerritHost } from './url-parser'
 
 describe('extractChangeNumber', () => {
   test('extracts change number from standard Gerrit URL', () => {
@@ -121,3 +121,151 @@ describe('isValidChangeId', () => {
     expect(isValidChangeId('-abc')).toBe(false)
   })
 })
+
+describe('normalizeGerritHost', () => {
+  describe('adding protocol', () => {
+    test('adds https:// when no protocol is provided', () => {
+      expect(normalizeGerritHost('gerrit.example.com')).toBe('https://gerrit.example.com')
+    })
+
+    test('adds https:// to hostname with port', () => {
+      expect(normalizeGerritHost('gerrit.example.com:8080')).toBe('https://gerrit.example.com:8080')
+    })
+
+    test('adds https:// to localhost', () => {
+      expect(normalizeGerritHost('localhost:8080')).toBe('https://localhost:8080')
+    })
+
+    test('adds https:// to IP address', () => {
+      expect(normalizeGerritHost('192.168.1.100')).toBe('https://192.168.1.100')
+    })
+
+    test('adds https:// to IP address with port', () => {
+      expect(normalizeGerritHost('192.168.1.100:8080')).toBe('https://192.168.1.100:8080')
+    })
+  })
+
+  describe('preserving existing protocol', () => {
+    test('preserves https:// when already present', () => {
+      expect(normalizeGerritHost('https://gerrit.example.com')).toBe('https://gerrit.example.com')
+    })
+
+    test('preserves http:// when explicitly provided', () => {
+      expect(normalizeGerritHost('http://gerrit.example.com')).toBe('http://gerrit.example.com')
+    })
+
+    test('preserves https:// with port', () => {
+      expect(normalizeGerritHost('https://gerrit.example.com:8080')).toBe(
+        'https://gerrit.example.com:8080',
+      )
+    })
+
+    test('preserves http:// with port', () => {
+      expect(normalizeGerritHost('http://gerrit.example.com:8080')).toBe(
+        'http://gerrit.example.com:8080',
+      )
+    })
+  })
+
+  describe('removing trailing slashes', () => {
+    test('removes single trailing slash', () => {
+      expect(normalizeGerritHost('https://gerrit.example.com/')).toBe('https://gerrit.example.com')
+    })
+
+    test('removes trailing slash from URL without protocol', () => {
+      expect(normalizeGerritHost('gerrit.example.com/')).toBe('https://gerrit.example.com')
+    })
+
+    test('removes trailing slash from URL with port', () => {
+      expect(normalizeGerritHost('https://gerrit.example.com:8080/')).toBe(
+        'https://gerrit.example.com:8080',
+      )
+    })
+
+    test('handles URL without trailing slash', () => {
+      expect(normalizeGerritHost('https://gerrit.example.com')).toBe('https://gerrit.example.com')
+    })
+
+    test('does not remove slash from path', () => {
+      expect(normalizeGerritHost('https://gerrit.example.com/gerrit')).toBe(
+        'https://gerrit.example.com/gerrit',
+      )
+    })
+
+    test('removes trailing slash from path', () => {
+      expect(normalizeGerritHost('https://gerrit.example.com/gerrit/')).toBe(
+        'https://gerrit.example.com/gerrit',
+      )
+    })
+  })
+
+  describe('whitespace handling', () => {
+    test('trims leading whitespace', () => {
+      expect(normalizeGerritHost('  gerrit.example.com')).toBe('https://gerrit.example.com')
+    })
+
+    test('trims trailing whitespace', () => {
+      expect(normalizeGerritHost('gerrit.example.com  ')).toBe('https://gerrit.example.com')
+    })
+
+    test('trims whitespace from URL with protocol', () => {
+      expect(normalizeGerritHost('  https://gerrit.example.com  ')).toBe(
+        'https://gerrit.example.com',
+      )
+    })
+
+    test('trims whitespace and removes trailing slash', () => {
+      expect(normalizeGerritHost('  gerrit.example.com/  ')).toBe('https://gerrit.example.com')
+    })
+  })
+
+  describe('combined scenarios', () => {
+    test('adds protocol and removes trailing slash', () => {
+      expect(normalizeGerritHost('gerrit.example.com/')).toBe('https://gerrit.example.com')
+    })
+
+    test('trims, adds protocol, and removes trailing slash', () => {
+      expect(normalizeGerritHost('  gerrit.example.com/  ')).toBe('https://gerrit.example.com')
+    })
+
+    test('handles subdomain with port', () => {
+      expect(normalizeGerritHost('review.git.example.com:8443')).toBe(
+        'https://review.git.example.com:8443',
+      )
+    })
+
+    test('handles complex URL with path', () => {
+      expect(normalizeGerritHost('gerrit.example.com/gerrit')).toBe(
+        'https://gerrit.example.com/gerrit',
+      )
+    })
+
+    test('normalizes complete real-world example', () => {
+      expect(normalizeGerritHost('gerrit-review.example.org')).toBe(
+        'https://gerrit-review.example.org',
+      )
+    })
+  })
+
+  describe('edge cases', () => {
+    test('handles empty string', () => {
+      // Empty string becomes 'https:/' after normalization (protocol added, then trailing slash removed)
+      expect(normalizeGerritHost('')).toBe('https:/')
+    })
+
+    test('handles whitespace-only string', () => {
+      // Whitespace-only string becomes 'https:/' after normalization
+      expect(normalizeGerritHost('   ')).toBe('https:/')
+    })
+
+    test('handles just a slash', () => {
+      // Just a slash becomes 'https://' (protocol added to '/', then trailing slash removed leaving '//')
+      expect(normalizeGerritHost('/')).toBe('https://')
+    })
+
+    test('handles protocol only', () => {
+      // Protocol only becomes 'https:/' (trailing slash removed)
+      expect(normalizeGerritHost('https://')).toBe('https:/')
+    })
+  })
+})

package/src/utils/url-parser.ts

@@ -53,6 +53,33 @@ export const extractChangeNumber = (input: string): string => {
   }
 }
 
+/**
+ * Normalizes a Gerrit host URL by adding https:// if no protocol is provided
+ * and removing trailing slashes
+ *
+ * @param host - The host URL to normalize (e.g., "gerrit.example.com" or "https://gerrit.example.com")
+ * @returns The normalized URL with protocol and without trailing slash
+ *
+ * @example
+ * normalizeGerritHost("gerrit.example.com") // returns "https://gerrit.example.com"
+ * normalizeGerritHost("gerrit.example.com:8080") // returns "https://gerrit.example.com:8080"
+ * normalizeGerritHost("http://gerrit.example.com") // returns "http://gerrit.example.com"
+ * normalizeGerritHost("https://gerrit.example.com/") // returns "https://gerrit.example.com"
+ */
+export const normalizeGerritHost = (host: string): string => {
+  let normalized = host.trim()
+
+  // Add https:// if no protocol provided
+  if (!normalized.startsWith('http://') && !normalized.startsWith('https://')) {
+    normalized = `https://${normalized}`
+  }
+
+  // Remove trailing slash
+  normalized = normalized.replace(/\/$/, '')
+
+  return normalized
+}
+
 /**
  * Validates if a string is a valid Gerrit change identifier
  *

package/tests/change-id-formats.test.ts

@@ -76,7 +76,7 @@ ${JSON.stringify(mockChange)}`)
     return HttpResponse.text('Not Found', { status: 404 })
   }),
 
-  http.post('*/a/changes/:changeId/revisions/current/review', async ({ params, request }) => {
+  http.post('*/a/changes/:changeId/revisions/current/review', async ({ params }) => {
     const { changeId } = params
     if (changeId === CHANGE_NUMBER || changeId === CHANGE_ID) {
       return HttpResponse.text(`)]}'

package/tests/setup.test.ts

@@ -1,17 +1,13 @@
 import { describe, test, expect } from 'bun:test'
+import { normalizeGerritHost } from '@/utils/url-parser'
 
 describe('Setup Command', () => {
-  describe('URL processing', () => {
-    test('should remove trailing slashes', () => {
-      const url = 'https://gerrit.example.com/'
-      const normalized = url.replace(/\/$/, '')
-      expect(normalized).toBe('https://gerrit.example.com')
-    })
-
-    test('should handle URLs without trailing slashes', () => {
-      const url = 'https://gerrit.example.com'
-      const normalized = url.replace(/\/$/, '')
-      expect(normalized).toBe('https://gerrit.example.com')
+  describe('URL normalization integration', () => {
+    test('should normalize host URL using normalizeGerritHost', () => {
+      // Test that the utility function is working as expected
+      expect(normalizeGerritHost('gerrit.example.com')).toBe('https://gerrit.example.com')
+      expect(normalizeGerritHost('https://gerrit.example.com/')).toBe('https://gerrit.example.com')
+      expect(normalizeGerritHost('gerrit.example.com:8080')).toBe('https://gerrit.example.com:8080')
     })
   })
 

package/tests/unit/git-branch-detection.test.ts

@@ -1,6 +1,6 @@
 import { describe, test, expect } from 'bun:test'
 import { Effect, Layer } from 'effect'
-import { GitWorktreeService, GitWorktreeServiceLive } from '@/services/git-worktree'
+import { GitWorktreeService } from '@/services/git-worktree'
 
 describe('Git Worktree Creation', () => {
   test('should handle commit-based worktree creation in service interface', async () => {
@@ -11,7 +11,6 @@ describe('Git Worktree Creation', () => {
       validatePreconditions: () => Effect.succeed(undefined),
       createWorktree: (changeId: string) => {
         // Simulate commit-based worktree creation (detached HEAD)
-        const currentCommit = 'abc123def456' // Mock commit hash
         return Effect.succeed({
           path: `/tmp/test-worktree-${changeId}`,
           changeId,

package/tests/unit/services/review-strategy.test.ts

@@ -100,7 +100,7 @@ describe('Review Strategy', () => {
       }
     })
 
-    mockChildProcess.stderr.on.mockImplementation((event: string, callback: Function) => {
+    mockChildProcess.stderr.on.mockImplementation((_event: string, _callback: Function) => {
       // No stderr for success
     })
 
@@ -112,7 +112,7 @@ describe('Review Strategy', () => {
   }
 
   const setupFailedExecution = (exitCode = 1, stderr = 'Command failed') => {
-    mockChildProcess.stdout.on.mockImplementation((event: string, callback: Function) => {
+    mockChildProcess.stdout.on.mockImplementation((_event: string, _callback: Function) => {
       // No stdout for failure
     })