@aaronshaf/ger 0.3.1 → 0.3.3

package/EXAMPLES.md

@@ -117,6 +117,54 @@ const program = pipe(
 Effect.runPromise(program).catch(console.error)
 ```
 
+### 2b. Search Changes with Query Syntax
+
+```typescript
+import { Effect, pipe } from 'effect'
+import {
+  GerritApiService,
+  GerritApiServiceLive,
+  ConfigServiceLive,
+} from '@aaronshaf/ger'
+
+const searchChanges = (query: string, limit = 25) =>
+  Effect.gen(function* () {
+    const api = yield* GerritApiService
+
+    // Use Gerrit query syntax to search changes
+    const fullQuery = query.includes('limit:') ? query : `${query} limit:${limit}`
+    const changes = yield* api.listChanges(fullQuery)
+
+    // Group by project for organized output
+    const byProject = new Map<string, typeof changes>()
+    for (const change of changes) {
+      const existing = byProject.get(change.project) ?? []
+      existing.push(change)
+      byProject.set(change.project, existing)
+    }
+
+    console.log(`Found ${changes.length} changes:`)
+    for (const [project, projectChanges] of byProject) {
+      console.log(`\n${project}:`)
+      for (const change of projectChanges) {
+        console.log(`  #${change._number} - ${change.subject} (${change.status})`)
+      }
+    }
+
+    return changes
+  })
+
+// Example queries
+const program = pipe(
+  // Search for merged changes in the last week
+  searchChanges('status:merged age:7d', 10),
+  Effect.provide(GerritApiServiceLive),
+  Effect.provide(ConfigServiceLive)
+)
+
+Effect.runPromise(program).catch(console.error)
+```
+
 ### 3. Post a Comment
 
 ```typescript

package/README.md

@@ -49,9 +49,16 @@ ger show 12345
 # Add a comment
 ger comment 12345 -m "LGTM"
 
+# Add reviewers to a change
+ger add-reviewer user@example.com -c 12345
+
 # Get diff for review
 ger diff 12345
 
+# Search for changes using Gerrit query syntax
+ger search "owner:self status:open"
+ger search "project:my-project" -n 10
+
 # Extract URLs from messages (e.g., Jenkins build links)
 ger extract-url "build-summary-report" | tail -1
 
@@ -98,6 +105,54 @@ ger workspace
 ger workspace --pretty
 ```
 
+### Search Changes
+
+Search for changes across your Gerrit instance using native query syntax:
+
+```bash
+# Search for all open changes (default)
+ger search
+
+# Search for your open changes
+ger search "owner:self status:open"
+
+# Search for changes by a specific user
+ger search "owner:john@example.com"
+
+# Search by project
+ger search "project:my-project status:open"
+
+# Search with date filters
+ger search "owner:self after:2025-01-01"
+ger search "status:merged age:7d"
+
+# Combine filters
+ger search "owner:self status:merged before:2025-06-01"
+
+# Limit results (default: 25)
+ger search "project:my-project" -n 10
+
+# XML output for automation
+ger search "owner:self" --xml
+```
+
+#### Common query operators:
+| Operator | Description |
+|----------|-------------|
+| `owner:USER` | Changes owned by USER (use 'self' for yourself) |
+| `status:STATE` | open, merged, abandoned, closed |
+| `project:NAME` | Changes in a specific project |
+| `branch:NAME` | Changes targeting a branch |
+| `age:TIME` | Time since last update (e.g., 1d, 2w, 1mon) |
+| `before:DATE` | Changes modified before date (YYYY-MM-DD) |
+| `after:DATE` | Changes modified after date (YYYY-MM-DD) |
+| `is:wip` | Work-in-progress changes |
+| `is:submittable` | Changes ready to submit |
+| `reviewer:USER` | Changes where USER is a reviewer |
+| `label:NAME=VALUE` | Filter by label (e.g., label:Code-Review+2) |
+
+See the [full query syntax documentation](https://gerrit-review.googlesource.com/Documentation/user-search.html).
+
 ### Comments
 
 #### Overall Comments
@@ -359,6 +414,38 @@ ger abandon 12345
 ger abandon 12345 -m "Reason"
 ```
 
+### Add Reviewers
+
+Add reviewers or CCs to a change:
+
+```bash
+# Add a single reviewer
+ger add-reviewer user@example.com -c 12345
+
+# Add multiple reviewers
+ger add-reviewer user1@example.com user2@example.com -c 12345
+
+# Add as CC instead of reviewer
+ger add-reviewer --cc user@example.com -c 12345
+
+# Suppress email notifications
+ger add-reviewer --notify none user@example.com -c 12345
+
+# XML output for automation
+ger add-reviewer user@example.com -c 12345 --xml
+```
+
+#### Options:
+- `-c, --change <id>` - Change ID (required)
+- `--cc` - Add as CC instead of reviewer
+- `--notify <level>` - Notification level: `none`, `owner`, `owner_reviewers`, `all` (default: `all`)
+- `--xml` - XML output for LLM/automation consumption
+
+#### Notes:
+- Both email addresses and usernames are accepted
+- Multiple reviewers can be added in a single command
+- Use `--cc` for carbon copy (notified but not required to review)
+
 ### AI-Powered Review
 
 The `ger review` command provides automated code review using AI tools (claude, llm, or opencode CLI).

package/package.json

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

package/src/api/gerrit.ts

@@ -9,6 +9,8 @@ import {
   FileInfo,
   type GerritCredentials,
   type ReviewInput,
+  type ReviewerInput,
+  ReviewerResult,
   RevisionInfo,
 } from '@/schemas/gerrit'
 import { filterMeaningfulMessages } from '@/utils/message-filters'
@@ -50,6 +52,11 @@ export interface GerritApiServiceImpl {
     revisionId?: string,
   ) => Effect.Effect<Record<string, readonly CommentInfo[]>, ApiError>
   readonly getMessages: (changeId: string) => Effect.Effect<readonly MessageInfo[], ApiError>
+  readonly addReviewer: (
+    changeId: string,
+    reviewer: string,
+    options?: { state?: 'REVIEWER' | 'CC'; notify?: 'NONE' | 'OWNER' | 'OWNER_REVIEWERS' | 'ALL' },
+  ) => Effect.Effect<ReviewerResult, ApiError>
 }
 
 // Export both the tag value and the type for use in Effect requirements
@@ -485,6 +492,26 @@ export const GerritApiServiceLive: Layer.Layer<GerritApiService, never, ConfigSe
           return changeResponse.messages || []
         }).pipe(Effect.map(filterMeaningfulMessages))
 
+      const addReviewer = (
+        changeId: string,
+        reviewer: string,
+        options?: {
+          state?: 'REVIEWER' | 'CC'
+          notify?: 'NONE' | 'OWNER' | 'OWNER_REVIEWERS' | 'ALL'
+        },
+      ) =>
+        Effect.gen(function* () {
+          const { credentials, authHeader } = yield* getCredentialsAndAuth
+          const normalized = yield* normalizeAndValidate(changeId)
+          const url = `${credentials.host}/a/changes/${encodeURIComponent(normalized)}/reviewers`
+          const body: ReviewerInput = {
+            reviewer,
+            ...(options?.state && { state: options.state }),
+            ...(options?.notify && { notify: options.notify }),
+          }
+          return yield* makeRequest(url, authHeader, 'POST', body, ReviewerResult)
+        })
+
       return {
         getChange,
         listChanges,
@@ -499,6 +526,7 @@ export const GerritApiServiceLive: Layer.Layer<GerritApiService, never, ConfigSe
         getDiff,
         getComments,
         getMessages,
+        addReviewer,
       }
     }),
   )

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

@@ -0,0 +1,135 @@
+import { Effect } from 'effect'
+import { type ApiError, GerritApiService } from '@/api/gerrit'
+
+interface AddReviewerOptions {
+  change?: string
+  cc?: boolean
+  notify?: string
+  xml?: boolean
+}
+
+type NotifyLevel = 'NONE' | 'OWNER' | 'OWNER_REVIEWERS' | 'ALL'
+
+const VALID_NOTIFY_LEVELS: ReadonlyArray<NotifyLevel> = ['NONE', 'OWNER', 'OWNER_REVIEWERS', 'ALL']
+
+const escapeXml = (str: string): string =>
+  str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;')
+
+const outputXmlError = (message: string): void => {
+  console.log(`<?xml version="1.0" encoding="UTF-8"?>`)
+  console.log(`<add_reviewer_result>`)
+  console.log(`  <status>error</status>`)
+  console.log(`  <error><![CDATA[${message}]]></error>`)
+  console.log(`</add_reviewer_result>`)
+}
+
+class ValidationError extends Error {
+  readonly _tag = 'ValidationError'
+}
+
+export const addReviewerCommand = (
+  reviewers: string[],
+  options: AddReviewerOptions = {},
+): Effect.Effect<void, ApiError | ValidationError, GerritApiService> =>
+  Effect.gen(function* () {
+    const gerritApi = yield* GerritApiService
+
+    const changeId = options.change
+
+    if (!changeId) {
+      const message =
+        'Change ID is required. Use -c <change-id> or run from a branch with an active change.'
+      if (options.xml) {
+        outputXmlError(message)
+      } else {
+        console.error(`✗ ${message}`)
+      }
+      return yield* Effect.fail(new ValidationError(message))
+    }
+
+    if (reviewers.length === 0) {
+      const message = 'At least one reviewer is required.'
+      if (options.xml) {
+        outputXmlError(message)
+      } else {
+        console.error(`✗ ${message}`)
+      }
+      return yield* Effect.fail(new ValidationError(message))
+    }
+
+    const state: 'REVIEWER' | 'CC' = options.cc ? 'CC' : 'REVIEWER'
+    const stateLabel = options.cc ? 'cc' : 'reviewer'
+
+    let notify: NotifyLevel | undefined
+    if (options.notify) {
+      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) {
+          outputXmlError(message)
+        } else {
+          console.error(`✗ ${message}`)
+        }
+        return yield* Effect.fail(new ValidationError(message))
+      }
+      notify = upperNotify as NotifyLevel
+    }
+
+    const results: Array<{ reviewer: string; success: boolean; name?: string; error?: string }> = []
+
+    for (const reviewer of reviewers) {
+      const result = yield* Effect.either(
+        gerritApi.addReviewer(changeId, reviewer, { state, notify }),
+      )
+
+      if (result._tag === 'Left') {
+        const error = result.left
+        const message = 'message' in error ? String(error.message) : String(error)
+        results.push({ reviewer, success: false, error: message })
+        continue
+      }
+
+      const apiResult = result.right
+
+      if (apiResult.error) {
+        results.push({ reviewer, success: false, error: apiResult.error })
+      } else {
+        const added = apiResult.reviewers?.[0] || apiResult.ccs?.[0]
+        const name = added?.name || added?.email || reviewer
+        results.push({ reviewer, success: true, name })
+      }
+    }
+
+    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>`)
+      console.log(`  <state>${escapeXml(stateLabel)}</state>`)
+      console.log(`  <reviewers>`)
+      for (const r of results) {
+        if (r.success) {
+          console.log(`    <reviewer status="added">`)
+          console.log(`      <input>${escapeXml(r.reviewer)}</input>`)
+          console.log(`      <name><![CDATA[${r.name}]]></name>`)
+          console.log(`    </reviewer>`)
+        } else {
+          console.log(`    <reviewer status="failed">`)
+          console.log(`      <input>${escapeXml(r.reviewer)}</input>`)
+          console.log(`      <error><![CDATA[${r.error}]]></error>`)
+          console.log(`    </reviewer>`)
+        }
+      }
+      console.log(`  </reviewers>`)
+      const allSuccess = results.every((r) => r.success)
+      console.log(`  <status>${allSuccess ? 'success' : 'partial_failure'}</status>`)
+      console.log(`</add_reviewer_result>`)
+    } else {
+      for (const r of results) {
+        if (r.success) {
+          console.log(`✓ Added ${r.name} as ${stateLabel}`)
+        } else {
+          console.error(`✗ Failed to add ${r.reviewer}: ${r.error}`)
+        }
+      }
+    }
+  })

package/src/cli/commands/build-status.ts

@@ -3,6 +3,55 @@ import { type ApiError, GerritApiService } from '@/api/gerrit'
 import type { MessageInfo } from '@/schemas/gerrit'
 import { getChangeIdFromHead, GitError, NoChangeIdError } from '@/utils/git-commit'
 
+/** Help text for build-status command - exported to keep index.ts under line limit */
+export const BUILD_STATUS_HELP_TEXT = `
+This command parses Gerrit change messages to determine build status.
+It looks for "Build Started" messages and subsequent verification labels.
+
+Output is JSON with a "state" field that can be:
+  - pending: No build has started yet
+  - running: Build started but no verification yet
+  - success: Build completed with Verified+1
+  - failure: Build completed with Verified-1
+  - not_found: Change does not exist
+
+Exit codes:
+  - 0: Default for all states (like gh run watch)
+  - 1: Only when --exit-status is used AND build fails
+  - 2: Timeout reached in watch mode
+  - 3: API/network errors
+
+Examples:
+  # Single check (current behavior)
+  $ ger build-status 392385
+  {"state":"success"}
+
+  # Watch until completion (outputs JSON on each poll)
+  $ ger build-status 392385 --watch
+  {"state":"pending"}
+  {"state":"running"}
+  {"state":"running"}
+  {"state":"success"}
+
+  # Watch with custom interval (check every 5 seconds)
+  $ ger build-status --watch --interval 5
+
+  # Watch with custom timeout (60 minutes)
+  $ ger build-status --watch --timeout 3600
+
+  # Exit with code 1 on failure (for CI/CD pipelines)
+  $ ger build-status --watch --exit-status && deploy.sh
+
+  # Trigger notification when done (like gh run watch pattern)
+  $ ger build-status --watch && notify-send 'Build is done!'
+
+  # Parse final state in scripts
+  $ ger build-status --watch | tail -1 | jq -r '.state'
+  success
+
+Note: When no change-id is provided, it will be automatically extracted from the
+      Change-ID footer in your HEAD commit.`
+
 // Export types for external use
 export type BuildState = 'pending' | 'running' | 'success' | 'failure' | 'not_found'
 
@@ -37,7 +86,8 @@ const VERIFIED_PLUS_PATTERN = /Verified\s*[+]\s*1/
 const VERIFIED_MINUS_PATTERN = /Verified\s*[-]\s*1/
 
 /**
- * Parse messages to determine build status based on "Build Started" and verification messages
+ * Parse messages to determine build status based on "Build Started" and verification messages.
+ * Only considers verification messages for the same patchset as the latest build.
  */
 const parseBuildStatus = (messages: readonly MessageInfo[]): BuildStatus => {
   // Empty messages means change exists but has no activity yet - return pending
@@ -45,11 +95,13 @@ const parseBuildStatus = (messages: readonly MessageInfo[]): BuildStatus => {
     return { state: 'pending' }
   }
 
-  // Find the most recent "Build Started" message
+  // Find the most recent "Build Started" message and its revision number
   let lastBuildDate: string | null = null
+  let lastBuildRevision: number | undefined = undefined
   for (const msg of messages) {
     if (BUILD_STARTED_PATTERN.test(msg.message)) {
       lastBuildDate = msg.date
+      lastBuildRevision = msg._revision_number
     }
   }
 
@@ -58,12 +110,18 @@ const parseBuildStatus = (messages: readonly MessageInfo[]): BuildStatus => {
     return { state: 'pending' }
   }
 
-  // Check for verification messages after the build started
+  // Check for verification messages after the build started AND for the same revision
   for (const msg of messages) {
     const date = msg.date
     // Gerrit timestamps are ISO 8601 strings (lexicographically sortable)
     if (date <= lastBuildDate) continue
 
+    // Only consider verification messages for the same patchset
+    // If revision numbers are available, they must match
+    if (lastBuildRevision !== undefined && msg._revision_number !== undefined) {
+      if (msg._revision_number !== lastBuildRevision) continue
+    }
+
     if (VERIFIED_PLUS_PATTERN.test(msg.message)) {
       return { state: 'success' }
     } else if (VERIFIED_MINUS_PATTERN.test(msg.message)) {
@@ -99,13 +157,6 @@ const pollBuildStatus = (
     const startTime = Date.now()
     const timeoutMs = options.timeout * 1000
 
-    // Initial message to stderr
-    yield* Effect.sync(() => {
-      console.error(
-        `Watching build status (polling every ${options.interval}s, timeout: ${options.timeout}s)...`,
-      )
-    })
-
     while (true) {
       // Check timeout
       const elapsed = Date.now() - startTime
@@ -138,25 +189,18 @@ const pollBuildStatus = (
         process.stdout.write(JSON.stringify(status) + '\n')
       })
 
-      // Terminal states - return immediately
-      if (
-        status.state === 'success' ||
-        status.state === 'failure' ||
-        status.state === 'not_found'
-      ) {
-        yield* Effect.sync(() => {
-          console.error(`Build completed with status: ${status.state}`)
-        })
+      // Terminal states - wait for interval before returning to allow logs to be written
+      if (status.state === 'success' || status.state === 'not_found') {
         return status
       }
 
-      // Non-terminal states - log progress and wait
-      const elapsedSeconds = Math.floor(elapsed / 1000)
-      yield* Effect.sync(() => {
-        console.error(`[${elapsedSeconds}s elapsed] Build status: ${status.state}`)
-      })
+      if (status.state === 'failure') {
+        // Wait for interval seconds to allow build failure logs to be fully written
+        yield* Effect.sleep(options.interval * 1000)
+        return status
+      }
 
-      // Sleep for interval duration
+      // Non-terminal states - sleep for interval duration
       yield* Effect.sleep(options.interval * 1000)
     }
   })